echelon 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db14024c0e3222ac1c609300cbae0f50b895aa5c
-  data.tar.gz: a6862271c7b5f01885e74d3bb5f2e6a79d3ed22b
+  metadata.gz: 789453d3c1948d753eb0f627a6363aa148a39cb8
+  data.tar.gz: ba0f22e5483e7831ccd493e26d593ee81c39fa91
 SHA512:
-  metadata.gz: 6e40449b0b6d65d6f737378f0348d828cc63466af9e2a5a050ce9a36d5f5adedcfeba78de2761967d906541cf91dcf1ec8b18e5397d3d41eba691a82a18fae70
-  data.tar.gz: f309887fde0eede1b840699ee106eb4d9949806b97104fb7501d4d5b31e84d7e8739ff0ec98e33ed003f1cf641a58875d5992bca9222968bb9363376c42a1dd9
+  metadata.gz: dc3524b85a8dc6b557193ab299b541e485c7e52cf67317d1732afa53706460a461d80738587cce68ce655e092dba348c9c5a53474aaa22b0f9ab9e1f47a5e37b
+  data.tar.gz: 5777892598010cd75ed452bc14296c8868478831967197f3d6756d2aac074ea85e5d03e98a0f3de55cc25a9a78d829eed87595a50ad07bfa663e8d8c90c2b2b7

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1.2

data/Gemfile

@@ -4,6 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  # for travis-ci.org
-  gem "rake"
-end
+  gem 'rake'
+end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    echelon (1.0.2)
-      json_pure (= 1.4.6)
+    echelon (1.0.4)
+      json_pure (= 1.8.1)
       nokogiri (~> 1.5)
       zip (= 2.0.2)
 
@@ -10,10 +10,10 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    json_pure (1.4.6)
-    mini_portile (0.5.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    json_pure (1.8.1)
+    mini_portile (0.6.1)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     rake (0.9.2.2)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)

data/README.rdoc

@@ -32,12 +32,14 @@ Currently only the following parks are supported...
 * Seaworld Orlando
 * Seaworld San Antonio
 * Seaworld San Diego
+* Universal Studios Orlando
+* Universal Studios Islands of Adventure
 
 
 == SYNOPSIS:
 
   require 'echelon'
-  seaworld = Echelon::Seaworld::SanAntonio.new()
+  seaworld = Echelon::Seaworld::SanAntonio.new
   seaworld.find_by_name("Steel Eel")
   => #<Echelon::Ride:0xb7179ca8 @updated_at=#<DateTime>, @name="Steel Eel", @active=1, @queue_time=30>
   seaworld.rides
@@ -52,27 +54,32 @@ Currently only the following parks are supported...
 == PARK LISTS
 
   # Seaworld
-  Echelon::Seaworld::SanAntonio.new()
-  Echelon::Seaworld::Orlando.new()
-  Echelon::Seaworld::SanDiego.new()
-  
+  Echelon::Seaworld::SanAntonio.new
+  Echelon::Seaworld::Orlando.new
+  Echelon::Seaworld::SanDiego.new
+
   # Disney World
-  wdw = Echelon::DisneyWorld.new()
+  wdw = Echelon::DisneyWorld.new
   wdw.animal_kingdom
   wdw.epcot
   wdw.hollywood_studios
   wdw.magic_kingdom
 
   # Disneyland California
-  Echelon::Disneyland::Disneyland.new()
-  Echelon::Disneyland::CaliforniaAdventure.new()
-  
+  Echelon::Disneyland::Disneyland.new
+  Echelon::Disneyland::CaliforniaAdventure.new
+
   # Disneyland Paris
-  Echelon::DisneylandParis.new()
+  Echelon::DisneylandParis.new
 
   # UK Parks
-  Echelon::AltonTowers.new()
-  Echelon::ThorpePark.new()
+  Echelon::AltonTowers.new
+  Echelon::ThorpePark.new
+
+  # Universal Studios Orlando Resort
+  uo = Echelon::UniversalStudiosOrlando.new
+  uo.islands_of_adventure.rides
+  uo.universal_studios.rides
 
 == INSTALL:
 
@@ -82,7 +89,7 @@ Currently only the following parks are supported...
 
 (The MIT License)
 
-Copyright (c) 2010-2014 Lloyd Pick
+Copyright (c) 2010-2015 Lloyd Pick
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -101,4 +108,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,2 +1,2 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks

data/echelon.gemspec

@@ -1,28 +1,28 @@
 # -*- encoding: utf-8 -*-
 
-require File.expand_path("../lib/echelon/version", __FILE__)
+require File.expand_path('../lib/echelon/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "echelon"
+  s.name        = 'echelon'
   s.version     = Echelon::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Lloyd Pick"]
-  s.email       = ["lloydpick@gmail.com"]
-  s.homepage    = "http://github.com/lloydpick/echelon"
-  s.summary     = "RubyGem to give quick access to Theme Park queue times"
-  s.description = "RubyGem to give quick access to Theme Park queue times (Alton Towers, Disney World Animal Kingdom, Disney World Epcot, Disney World Hollywood Studios, Disney World Magic Kingdom, Disneyland, Disneyland California Adventure, Disneyland Paris, Seaworld San Antonio, Seaworld San Diego, Seaworld Orlando, Thorpe Park)"
+  s.authors     = ['Lloyd Pick']
+  s.email       = ['lloydpick@gmail.com']
+  s.homepage    = 'http://github.com/lloydpick/echelon'
+  s.summary     = 'RubyGem to give quick access to Theme Park queue times'
+  s.description = 'RubyGem to give quick access to Theme Park queue times (Alton Towers, Disney World Animal Kingdom, Disney World Epcot, Disney World Hollywood Studios, Disney World Magic Kingdom, Disneyland, Disneyland California Adventure, Disneyland Paris, Seaworld San Antonio, Seaworld San Diego, Seaworld Orlando, Thorpe Park)'
 
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "echelon"
+  s.required_rubygems_version = '>= 1.3.6'
+  s.rubyforge_project         = 'echelon'
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec", ">= 2.4.0"
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+  s.add_development_dependency 'rspec',   '>= 2.4.0'
 
-  s.add_dependency "json_pure", "1.4.6"
-  s.add_dependency "zip", "2.0.2"
-  s.add_dependency "nokogiri", "~> 1.5"
+  s.add_dependency 'json_pure', '1.8.1'
+  s.add_dependency 'zip',       '2.0.2'
+  s.add_dependency 'nokogiri',  '~> 1.5'
 
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.executables  = `git ls-files`.split("\n").map { |f| f =~ /^bin\/(.*)/ ? $1 : nil }.compact
   s.require_path = 'lib'
-end
+end

data/lib/echelon.rb

@@ -15,10 +15,6 @@ require "#{File.dirname(__FILE__)}/echelon/parks/seaworld/orlando.rb"
 
 # Disney World Resort
 require "#{File.dirname(__FILE__)}/echelon/parks/disney_world.rb"
-# require "#{File.dirname(__FILE__)}/echelon/parks/disney_world/magic_kingdom.rb"
-# require "#{File.dirname(__FILE__)}/echelon/parks/disney_world/epcot.rb"
-# require "#{File.dirname(__FILE__)}/echelon/parks/disney_world/hollywood_studios.rb"
-# require "#{File.dirname(__FILE__)}/echelon/parks/disney_world/animal_kingdom.rb"
 
 # Disneyland Resort California
 require "#{File.dirname(__FILE__)}/echelon/parks/disneyland/disneyland.rb"
@@ -27,10 +23,11 @@ require "#{File.dirname(__FILE__)}/echelon/parks/disneyland/california_adventure
 # Disneyland Resort Paris
 require "#{File.dirname(__FILE__)}/echelon/parks/disneyland_paris.rb"
 
+# Universal Studios Orlando Resort
+require "#{File.dirname(__FILE__)}/echelon/parks/universal_studios_orlando.rb"
+
 module Echelon
-  
   def self.parameterize(params)
-    URI.escape(params.collect{|k,v| "#{k}=#{v}"}.join('&'))
+    URI.escape(params.collect { |k, v| "#{k}=#{v}" }.join('&'))
   end
-  
-end
+end

data/lib/echelon/park.rb

@@ -1,24 +1,22 @@
 module Echelon
   class Park
-
     def ride_list
       {}
     end
 
     def rides
-      ride_list.inject([]) do |r, e| r << create_ride_object(e[0]) end
+      ride_list.inject([]) { |a, e| a << create_ride_object(e[0]) }
     end
 
     def find_by_name(ride)
-      raise ArgumentError, "Unknown ride name" unless ride_list.has_value?(ride)
+      fail ArgumentError, 'Unknown ride name' unless ride_list.value?(ride)
       ref = ride_list.respond_to?(:key) ? ride_list.key(ride) : ride_list.index(ride)
       create_ride_object(ref)
     end
 
     def find_by_id(ref)
-      raise ArgumentError, "Unknown ride name" unless ride_list.has_key?(ref)
+      fail ArgumentError, 'Unknown ride name' unless ride_list.key?(ref)
       create_ride_object(ref)
     end
-
   end
-end
+end

data/lib/echelon/parks/alton_towers.rb

@@ -24,24 +24,23 @@ module Echelon
 
     def initialize
       # fetch the json feed from the merlin site
-      url = "http://www.merlincms.com/2.php"
+      url = 'http://www.merlincms.com/2.php'
       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)
-      @json_data = json_data["Rides"]
+      @json_data = json_data['Rides']
     end
 
     private
 
     def create_ride_object(ref)
-      self.json_data.each do |ride|
-        if ride["ref"].to_i == ref
-          return Ride.new(:name => self.ride_list[ref], :queue_time => ride["queue"].to_i, :active => ride["active"].to_i)
+      json_data.each do |ride|
+        if ride['ref'].to_i == ref
+          return Ride.new(name: ride_list[ref], queue_time: ride['queue'].to_i, active: ride['active'].to_i)
         end
       end
     end
-
   end
-end
+end

data/lib/echelon/parks/disney_world.rb

@@ -5,118 +5,112 @@ require 'net/https'
 
 module Echelon
   class DisneyWorld
-    
+
     attr_reader :access_token, :expires_at
-    
+
     def initialize
-      
-      uri = URI.parse("https://authorization.go.com/token")
+      uri = URI.parse('https://authorization.go.com/token')
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      
-      params = Echelon::parameterize({ grant_type: 'assertion', assertion_type: 'public', client_id: 'WDPRO-MOBILE.CLIENT-PROD' })
+
+      params = Echelon::parameterize(grant_type: 'assertion', assertion_type: 'public', client_id: 'WDPRO-MOBILE.CLIENT-PROD')
       resp = http.post(uri.request_uri, params)
-      
+
       data = JSON.parse(resp.body)
       @access_token = data['access_token']
       @expires_at = Time.now.to_i + data['expires_in'].to_i
-      
     end
-    
+
     def animal_kingdom
-      @animal_kingdom ||= DisneyWorld::AnimalKingdom.new(self.access_token)
+      @animal_kingdom ||= DisneyWorld::AnimalKingdom.new(access_token)
     end
-    
+
     def magic_kingdom
-      @magic_kingdom ||= DisneyWorld::MagicKingdom.new(self.access_token)
+      @magic_kingdom ||= DisneyWorld::MagicKingdom.new(access_token)
     end
-    
+
     def hollywood_studios
-      @hollywood_studios ||= DisneyWorld::HollywoodStudios.new(self.access_token)
+      @hollywood_studios ||= DisneyWorld::HollywoodStudios.new(access_token)
     end
-    
+
     def epcot
-      @epcot ||= DisneyWorld::Epcot.new(self.access_token)
+      @epcot ||= DisneyWorld::Epcot.new(access_token)
     end
-    
+
     class Park < Echelon::Park
-      
       attr_reader :json_data
-      
+
       def ride_list
-        self.json_data['entries'].inject({}) { |r,a| r[a['id'].split(';').first.to_i] = a['name']; r }
+        json_data['entries'].inject({}) { |a, r| a[r['id'].split(';').first.to_i] = r['name']; a }
       end
-      
+
       def initialize(access_token, park_id)
-        
         uri = URI.parse("https://api.wdpro.disney.go.com/facility-service/theme-parks/#{park_id};entityType=theme-park/wait-times")
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        
+
         headers = {
           'Authorization' => "BEARER #{access_token}",
           'Accept' => 'application/json;apiversion=1',
           'X-Conversation-Id' => '~WDPRO-MOBILE.CLIENT-PROD'
         }
-        
+
         resp = http.get(uri.request_uri, headers)
         @json_data = JSON.parse(resp.body)
-
       end
-      
+
       private
 
       def create_ride_object(ref)
-        self.json_data['entries'].each do |ride|
+        json_data['entries'].each do |ride|
           if ride['id'].split(';').first.to_i == ref
-            
+
             ride_status = ride['waitTime']['status']
             status = 1 if ride_status == 'Operating'
             status = 0 if ride_status == 'Closed'
             status = -1 if ride_status == 'Down'
-            
-            queue_times = { 
+
+            queue_times = {
               actual: ride['waitTime']['actualWaitMinutes'].to_i,
               posted: ride['waitTime']['postedWaitMinutes'].to_i
             }
-            
+
             meta = {
               fastpass_available: ride['waitTime']['fastPass']['available'],
               single_rider: ride['waitTime']['singleRider']
             }
-            
-            return Ride.new(:name => self.ride_list[ref], :queue_time => queue_times, :active => status, :meta => meta)
+
+            return Ride.new(name: ride_list[ref], queue_time: queue_times, active: status, meta: meta)
           end
         end
       end
-      
+
     end
-    
+
     class Epcot < Park
       def initialize(access_token)
-        super(access_token, 80007838)
+        super(access_token, 80_007_838)
       end
     end
-    
+
     class MagicKingdom < Park
       def initialize(access_token)
-        super(access_token, 80007944)
+        super(access_token, 80_007_944)
       end
     end
-    
+
     class HollywoodStudios < Park
       def initialize(access_token)
-        super(access_token, 80007998)
+        super(access_token, 80_007_998)
       end
     end
-    
+
     class AnimalKingdom < Park
       def initialize(access_token)
-        super(access_token, 80007823)
+        super(access_token, 80_007_823)
       end
     end
-    
   end
-end
+end

data/lib/echelon/parks/disneyland/california_adventure.rb

@@ -5,36 +5,32 @@ require 'net/http'
 module Echelon
   module Disneyland
     class CaliforniaAdventure < 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=336894"
+        url = 'http://dparks.uiemedia.net/dmm_v2/jsondata/JsonUpdateData?version=14&p=336894'
         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
+end

data/lib/echelon/parks/disneyland/disneyland.rb

@@ -5,36 +5,32 @@ 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
+end

data/lib/echelon/parks/disneyland_paris.rb

@@ -63,17 +63,17 @@ module Echelon
         'User-Agent' => 'Disneyland 1.0 (iPhone; iPhone OS 4.1; en_GB)',
         'Content-Type' => 'application/x-www-form-urlencoded;charset=UTF-8'
       }
-      resp, data = http.post('/cms/ProxyTempsAttente', data, headers)
+      resp, _data = http.post('/cms/ProxyTempsAttente', data, headers)
 
       tmp = Tempfile.new('disneyland_paris_zip')
       tmp << resp.body
       tmp.close
 
       json_data = nil
-      Zip::ZipFile.open(tmp.path) { |zipfile|
-        json_data = JSON.parse(zipfile.read("temps_attente.json"))
-        json_data = json_data["l"]
-      }
+      Zip::ZipFile.open(tmp.path) do |zipfile|
+        json_data = JSON.parse(zipfile.read('temps_attente.json'))
+        json_data = json_data['l']
+      end
 
       i = 0
       rides = []
@@ -94,12 +94,11 @@ module Echelon
     private
 
     def create_ride_object(ref)
-      self.json_data.each do |ride|
+      json_data.each do |ride|
         if ride[0] == ref
-          return Ride.new(:name => self.ride_list[ref], :queue_time => ride[4].to_i, :active => ride[3].to_i, :updated_at => DateTime.now)
+          return Ride.new(name: ride_list[ref], queue_time: ride[4].to_i, active: ride[3].to_i)
         end
       end
     end
-
   end
-end
+end

data/lib/echelon/parks/seaworld/orlando.rb

@@ -31,7 +31,7 @@ module Echelon
         http = Net::HTTP.new('lab.defimobile.com', 443)
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        resp, data = http.get('/orlando/rides')
+        _resp, data = http.get('/orlando/rides')
 
         # were only interested in the ride data, throw everything else away
         xml_data = Nokogiri::HTML(data)
@@ -41,20 +41,20 @@ module Echelon
       private
 
       def create_ride_object(ref)
-        self.xml_data.each do |ride|
+        xml_data.each do |ride|
           if ride.xpath('id').inner_text.to_i == ref
             active, queue_time = parse_wait_time(ride.xpath('waittime').inner_text)
             updated_at = DateTime.parse(ride.xpath('lastmodified').inner_text)
-            return Ride.new(:name => self.ride_list[ref], :queue_time => queue_time, :active => active, :updated_at => updated_at)
+            return Ride.new(name: ride_list[ref], queue_time: queue_time, active: active, updated_at: updated_at)
           end
         end
       end
 
       def parse_wait_time(wait)
-        if wait == "Closed"
+        if wait == 'Closed'
           queue_time = 0
           active = 0
-        elsif wait == "No Wait"
+        elsif wait == 'No Wait'
           queue_time = 0
           active = 1
         elsif wait =~ /(\d*) min/
@@ -64,8 +64,9 @@ module Echelon
           queue_time = 0
           active = 0
         end
+
         return active, queue_time
       end
     end
   end
-end
+end

data/lib/echelon/parks/seaworld/san_antonio.rb

@@ -26,7 +26,7 @@ module Echelon
         http = Net::HTTP.new('lab.defimobile.com', 443)
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        resp, data = http.get('/seaworld/rides')
+        _resp, data = http.get('/seaworld/rides')
 
         # were only interested in the ride data, throw everything else away
         xml_data = Nokogiri::HTML(data)
@@ -36,20 +36,20 @@ module Echelon
       private
 
       def create_ride_object(ref)
-        self.xml_data.each do |ride|
+        xml_data.each do |ride|
           if ride.xpath('id').inner_text.to_i == ref
             active, queue_time = parse_wait_time(ride.xpath('waittime').inner_text)
             updated_at = DateTime.parse(ride.xpath('lastmodified').inner_text)
-            return Ride.new(:name => self.ride_list[ref], :queue_time => queue_time, :active => active, :updated_at => updated_at)
+            return Ride.new(name: ride_list[ref], queue_time: queue_time, active: active, updated_at: updated_at)
           end
         end
       end
 
       def parse_wait_time(wait)
-        if wait == "Closed"
+        if wait == 'Closed'
           queue_time = 0
           active = 0
-        elsif wait == "No Wait"
+        elsif wait == 'No Wait'
           queue_time = 0
           active = 1
         elsif wait =~ /(\d*) min/
@@ -59,8 +59,9 @@ module Echelon
           queue_time = 0
           active = 0
         end
+
         return active, queue_time
       end
     end
   end
-end
+end

data/lib/echelon/parks/seaworld/san_diego.rb

@@ -28,7 +28,7 @@ module Echelon
         http = Net::HTTP.new('lab.defimobile.com', 443)
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        resp, data = http.get('/san_diego/rides')
+        _resp, data = http.get('/san_diego/rides')
 
         # were only interested in the ride data, throw everything else away
         xml_data = Nokogiri::HTML(data)
@@ -38,20 +38,20 @@ module Echelon
       private
 
       def create_ride_object(ref)
-        self.xml_data.each do |ride|
+        xml_data.each do |ride|
           if ride.xpath('id').inner_text.to_i == ref
             active, queue_time = parse_wait_time(ride.xpath('waittime').inner_text)
             updated_at = DateTime.parse(ride.xpath('lastmodified').inner_text)
-            return Ride.new(:name => self.ride_list[ref], :queue_time => queue_time, :active => active, :updated_at => updated_at)
+            return Ride.new(name: ride_list[ref], queue_time: queue_time, active: active, updated_at: updated_at)
           end
         end
       end
 
       def parse_wait_time(wait)
-        if wait == "Closed"
+        if wait == 'Closed'
           queue_time = 0
           active = 0
-        elsif wait == "No Wait"
+        elsif wait == 'No Wait'
           queue_time = 0
           active = 1
         elsif wait =~ /(\d*) min/
@@ -61,8 +61,9 @@ module Echelon
           queue_time = 0
           active = 0
         end
+
         return active, queue_time
       end
     end
   end
-end
+end

data/lib/echelon/parks/thorpe_park.rb

@@ -41,24 +41,23 @@ module Echelon
 
     def initialize
       # fetch the json feed from the merlin site
-      url = "http://www.merlincms.com/1.php"
+      url = 'http://www.merlincms.com/1.php'
       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)
-      @json_data = json_data["Rides"]
+      @json_data = json_data['Rides']
     end
 
     private
 
     def create_ride_object(ref)
-      self.json_data.each do |ride|
-        if ride["ref"].to_i == ref
-          return Ride.new(:name => self.ride_list[ref], :queue_time => ride["queue"].to_i, :active => ride["active"].to_i)
+      json_data.each do |ride|
+        if ride['ref'].to_i == ref
+          return Ride.new(name: self.ride_list[ref], queue_time: ride['queue'].to_i, active: ride['active'].to_i)
         end
       end
     end
-
   end
-end
+end

data/lib/echelon/parks/universal_studios_orlando.rb

@@ -0,0 +1,108 @@
+require 'rubygems'
+require 'json'
+require 'net/http'
+require 'net/https'
+require 'openssl'
+require 'base64'
+
+module Echelon
+  class UniversalStudiosOrlando
+    attr_reader :access_token, :expires_at
+
+    KEY    = 'AndroidMobileApp'.freeze
+    SECRET = 'AndroidMobileAppSecretKey182014'.freeze
+    SHARED_HEADERS = {
+      'Accept'                          => 'application/json',
+      'Accept-Language'                 => 'en-US',
+      'X-UNIWebService-AppVersion'      => '1.2.1',
+      'X-UNIWebService-Platform'        => 'Android',
+      'X-UNIWebService-PlatformVersion' => '4.4.2',
+      'X-UNIWebService-Device'          => 'samsung SM-N9005',
+      'X-UNIWebService-ServiceVersion'  => '1',
+      'User-Agent'                      => 'Dalvik/1.6.0 (Linux; U; Android 4.4.2; SM-N9005 Build/KOT49H)',
+      'Connection'                      => 'Keep-Alive',
+      'Accept-Encoding'                 => 'gzip'
+    }.freeze
+
+    def initialize
+      uri = URI.parse('https://services.universalorlando.com/api')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      date = DateTime.now.strftime("%a, %d %b %Y %H:%M:%S #{Time.now.strftime('%Z')}")
+      digest = OpenSSL::HMAC.digest('sha256', SECRET, "#{KEY}\n#{date}\n")
+      signature = Base64.encode64(digest).strip.gsub(/\=$/, "\u003d")
+      params = { apikey: 'AndroidMobileApp', signature: signature }.to_json
+
+      headers = {
+        'Date'         => date,
+        'Content-Type' => 'application/json; charset=UTF-8'
+      }.merge(SHARED_HEADERS)
+
+      resp = http.post(uri.path, params, headers)
+      data = JSON.parse(resp.body)
+      @access_token = data['Token']
+      @expires_at = DateTime.parse(data['TokenExpirationString']).to_time
+    end
+
+    def islands_of_adventure
+      @islands_of_adventure ||= UniversalStudiosOrlando::IslandsOfAdventure.new(access_token)
+    end
+
+    def universal_studios
+      @universal_studios ||= UniversalStudiosOrlando::UniversalStudios.new(access_token)
+    end
+
+    class Park < Echelon::Park
+      attr_reader :json_data, :park_id
+
+      def ride_list
+        park_rides = json_data['Rides'].keep_if { |r| r['VenueId'] == park_id }
+        park_rides.inject({}) { |a, e| a[e['Id'].to_i] = e['MblDisplayName']; a }
+      end
+
+      def initialize(access_token, park_id)
+        @park_id = park_id
+        uri = URI.parse('https://services.universalorlando.com/api/pointsOfInterest')
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+        headers = {
+          'X-UNIWebService-ApiKey' => 'AndroidMobileApp',
+          'X-UNIWebService-Token'  => access_token
+        }.merge(SHARED_HEADERS)
+
+        resp = http.get(uri.request_uri, headers)
+        @json_data = JSON.parse(resp.body)
+      end
+
+      private
+
+      def create_ride_object(ref)
+        ride = json_data['Rides'].find { |k, _v| k['Id'].to_i == ref }
+
+        meta = {
+          express_pass_accepted: ride['ExpressPassAccepted'],
+          single_rider: ride['HasSingleRiderLine']
+        }
+
+        Ride.new(name: ride['MblDisplayName'], queue_time: ride['WaitTime'], meta: meta)
+      end
+
+    end
+
+    class IslandsOfAdventure < Park
+      def initialize(access_token)
+        super(access_token, 10_000)
+      end
+    end
+
+    class UniversalStudios < Park
+      def initialize(access_token)
+        super(access_token, 10_010)
+      end
+    end
+  end
+end

data/lib/echelon/ride.rb

@@ -8,4 +8,4 @@ module Echelon
       end
     end
   end
-end
+end

data/lib/echelon/version.rb

@@ -1,3 +1,3 @@
 module Echelon
-  VERSION = '1.0.3'
-end
+  VERSION = '1.0.4'
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: echelon
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Lloyd Pick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 description: RubyGem to give quick access to Theme Park queue times (Alton Towers,
@@ -90,10 +90,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -112,6 +112,7 @@ files:
 - lib/echelon/parks/seaworld/san_antonio.rb
 - lib/echelon/parks/seaworld/san_diego.rb
 - lib/echelon/parks/thorpe_park.rb
+- lib/echelon/parks/universal_studios_orlando.rb
 - lib/echelon/ride.rb
 - lib/echelon/version.rb
 - spec/alton_towers_spec.rb
@@ -128,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: echelon
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RubyGem to give quick access to Theme Park queue times