lib/echelon/parks/disneyland/disneyland.rb in echelon-1.0.3 vs lib/echelon/parks/disneyland/disneyland.rb in echelon-1.0.4

@@ -3,38 +3,34 @@
 require 'net/http'
 
 module Echelon
   module Disneyland
     class Disneyland < Park
-
       attr_reader :json_data
 
       def ride_list
-        self.json_data.keys.inject({}) { |r,k| r[k] = k; r }
+        json_data.keys.inject({}) { |a, e| a[e] = e; a }
       end
 
       def initialize
         # fetch the json feed
-        url = "http://dparks.uiemedia.net/dmm_v2/jsondata/JsonUpdateData?version=14&p=330339"
+        url = 'http://dparks.uiemedia.net/dmm_v2/jsondata/JsonUpdateData?version=14&p=330339'
         resp = Net::HTTP.get_response(URI.parse(url))
         data = resp.body
 
         # were only interested in the ride data, throw everything else away
         json_data = JSON.parse(data)
-        ride_data = json_data["attractions"]["homeLabels"]
-        queue_data = json_data["attractions"]["homeValues"].map { |v| v.to_i }
-        @json_data = json_data["attractions"]["homeLabels"].each_with_index.inject({}) { |r,i| r[i.first.gsub("\302\240",'')] = queue_data[i.last]; r }
+        ride_data = json_data['attractions']['homeLabels']
+        queue_data = json_data['attractions']['homeValues'].map(&:to_i)
+        @json_data = ride_data.each_with_index.inject({}) { |a, e| a[e.first.gsub("\302\240", '')] = queue_data[e.last]; a }
       end
 
       private
 
       def create_ride_object(ref)
-        self.json_data.each do |ride|
-          if ride[0] == ref
-            return Ride.new(:name => ride[0], :queue_time => ride[1])
-          end
+        json_data.each do |ride|
+          return Ride.new(name: ride[0], queue_time: ride[1]) if ride[0] == ref
         end
       end
-
     end
   end
-end
\ No newline at end of file
+end