echelon 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: db14024c0e3222ac1c609300cbae0f50b895aa5c
+  data.tar.gz: a6862271c7b5f01885e74d3bb5f2e6a79d3ed22b
+SHA512:
+  metadata.gz: 6e40449b0b6d65d6f737378f0348d828cc63466af9e2a5a050ce9a36d5f5adedcfeba78de2761967d906541cf91dcf1ec8b18e5397d3d41eba691a82a18fae70
+  data.tar.gz: f309887fde0eede1b840699ee106eb4d9949806b97104fb7501d4d5b31e84d7e8739ff0ec98e33ed003f1cf641a58875d5992bca9222968bb9363376c42a1dd9

data/.ruby-gemset

@@ -0,0 +1 @@
+echelon

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in echelon.gemspec
 gemspec

data/Gemfile.lock

@@ -1,17 +1,19 @@
 PATH
   remote: .
   specs:
-    echelon (1.0.1)
+    echelon (1.0.2)
       json_pure (= 1.4.6)
       nokogiri (~> 1.5)
       zip (= 2.0.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.2)
     json_pure (1.4.6)
-    nokogiri (1.5.5)
+    mini_portile (0.5.2)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     rake (0.9.2.2)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)

data/README.rdoc

@@ -57,10 +57,11 @@ Currently only the following parks are supported...
   Echelon::Seaworld::SanDiego.new()
   
   # Disney World
-  Echelon::DisneyWorld::AnimalKingdom.new()
-  Echelon::DisneyWorld::Epcot.new()
-  Echelon::DisneyWorld::HollywoodStudios.new()
-  Echelon::DisneyWorld::MagicKingdom.new()
+  wdw = Echelon::DisneyWorld.new()
+  wdw.animal_kingdom
+  wdw.epcot
+  wdw.hollywood_studios
+  wdw.magic_kingdom
 
   # Disneyland California
   Echelon::Disneyland::Disneyland.new()
@@ -81,7 +82,7 @@ Currently only the following parks are supported...
 
 (The MIT License)
 
-Copyright (c) 2010-2012 Lloyd Pick
+Copyright (c) 2010-2014 Lloyd Pick
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/echelon.rb

@@ -14,10 +14,11 @@ require "#{File.dirname(__FILE__)}/echelon/parks/seaworld/san_diego.rb"
 require "#{File.dirname(__FILE__)}/echelon/parks/seaworld/orlando.rb"
 
 # Disney World Resort
-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"
+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,4 +28,9 @@ require "#{File.dirname(__FILE__)}/echelon/parks/disneyland/california_adventure
 require "#{File.dirname(__FILE__)}/echelon/parks/disneyland_paris.rb"
 
 module Echelon
+  
+  def self.parameterize(params)
+    URI.escape(params.collect{|k,v| "#{k}=#{v}"}.join('&'))
+  end
+  
 end

data/lib/echelon/parks/disney_world.rb

@@ -0,0 +1,122 @@
+require 'rubygems'
+require 'json'
+require 'net/http'
+require 'net/https'
+
+module Echelon
+  class DisneyWorld
+    
+    attr_reader :access_token, :expires_at
+    
+    def initialize
+      
+      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' })
+      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)
+    end
+    
+    def magic_kingdom
+      @magic_kingdom ||= DisneyWorld::MagicKingdom.new(self.access_token)
+    end
+    
+    def hollywood_studios
+      @hollywood_studios ||= DisneyWorld::HollywoodStudios.new(self.access_token)
+    end
+    
+    def epcot
+      @epcot ||= DisneyWorld::Epcot.new(self.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 }
+      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|
+          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 = { 
+              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)
+          end
+        end
+      end
+      
+    end
+    
+    class Epcot < Park
+      def initialize(access_token)
+        super(access_token, 80007838)
+      end
+    end
+    
+    class MagicKingdom < Park
+      def initialize(access_token)
+        super(access_token, 80007944)
+      end
+    end
+    
+    class HollywoodStudios < Park
+      def initialize(access_token)
+        super(access_token, 80007998)
+      end
+    end
+    
+    class AnimalKingdom < Park
+      def initialize(access_token)
+        super(access_token, 80007823)
+      end
+    end
+    
+  end
+end

data/lib/echelon/ride.rb

@@ -1,6 +1,6 @@
 module Echelon
   class Ride
-    attr_reader :name, :queue_time, :active, :updated_at
+    attr_reader :name, :queue_time, :active, :updated_at, :meta
 
     def initialize(*params)
       params.each do |key|

data/lib/echelon/version.rb

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

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: echelon
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Lloyd Pick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,6 +91,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -113,10 +104,7 @@ files:
 - lib/echelon.rb
 - lib/echelon/park.rb
 - lib/echelon/parks/alton_towers.rb
-- lib/echelon/parks/disney_world/animal_kingdom.rb
-- lib/echelon/parks/disney_world/epcot.rb
-- lib/echelon/parks/disney_world/hollywood_studios.rb
-- lib/echelon/parks/disney_world/magic_kingdom.rb
+- lib/echelon/parks/disney_world.rb
 - lib/echelon/parks/disneyland/california_adventure.rb
 - lib/echelon/parks/disneyland/disneyland.rb
 - lib/echelon/parks/disneyland_paris.rb
@@ -133,26 +121,25 @@ files:
 - spec/thorpe_park_spec.rb
 homepage: http://github.com/lloydpick/echelon
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: echelon
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RubyGem to give quick access to Theme Park queue times
 test_files: []

data/lib/echelon/parks/disney_world/animal_kingdom.rb

@@ -1,40 +0,0 @@
-require 'rubygems'
-require 'json'
-require 'net/http'
-
-module Echelon
-  module DisneyWorld
-    class AnimalKingdom < Park
-
-      attr_reader :json_data
-
-      def ride_list
-        self.json_data.keys.inject({}) { |r,k| r[k] = k; r }
-      end
-
-      def initialize
-        # fetch the json feed
-        url = "http://dparks.uiemedia.net/dmm_v2/jsondata/JsonUpdateData?version=14&p=80007823"
-        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] = queue_data[i.last]; r }
-      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
-        end
-      end
-
-    end
-  end
-end

data/lib/echelon/parks/disney_world/epcot.rb

@@ -1,40 +0,0 @@
-require 'rubygems'
-require 'json'
-require 'net/http'
-
-module Echelon
-  module DisneyWorld
-    class Epcot < Park
-
-      attr_reader :json_data
-
-      def ride_list
-        self.json_data.keys.inject({}) { |r,k| r[k] = k; r }
-      end
-
-      def initialize
-        # fetch the json feed
-        url = "http://dparks.uiemedia.net/dmm_v2/jsondata/JsonUpdateData?version=14&p=80007838"
-        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] = queue_data[i.last]; r }
-      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
-        end
-      end
-
-    end
-  end
-end

data/lib/echelon/parks/disney_world/hollywood_studios.rb

@@ -1,40 +0,0 @@
-require 'rubygems'
-require 'json'
-require 'net/http'
-
-module Echelon
-  module DisneyWorld
-    class HollywoodStudios < Park
-
-      attr_reader :json_data
-
-      def ride_list
-        self.json_data.keys.inject({}) { |r,k| r[k] = k; r }
-      end
-
-      def initialize
-        # fetch the json feed
-        url = "http://dparks.uiemedia.net/dmm_v2/jsondata/JsonUpdateData?version=14&p=80007998"
-        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] = queue_data[i.last]; r }
-      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
-        end
-      end
-
-    end
-  end
-end

data/lib/echelon/parks/disney_world/magic_kingdom.rb

@@ -1,40 +0,0 @@
-require 'rubygems'
-require 'json'
-require 'net/http'
-
-module Echelon
-  module DisneyWorld
-    class MagicKingdom < Park
-
-      attr_reader :json_data
-
-      def ride_list
-        self.json_data.keys.inject({}) { |r,k| r[k] = k; r }
-      end
-
-      def initialize
-        # fetch the json feed
-        url = "http://dparks.uiemedia.net/dmm_v2/jsondata/JsonUpdateData?version=14&p=80007944"
-        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] = queue_data[i.last]; r }
-      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
-        end
-      end
-
-    end
-  end
-end