echelon 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    echelon (0.0.2)
+    echelon (0.0.3)
       json_pure (= 1.4.6)
+      xml-simple (= 1.0.12)
       zip (= 2.0.2)
 
 GEM
@@ -18,6 +19,7 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
+    xml-simple (1.0.12)
     zip (2.0.2)
 
 PLATFORMS
@@ -28,4 +30,5 @@ DEPENDENCIES
   echelon!
   json_pure (= 1.4.6)
   rspec (>= 2.4.0)
+  xml-simple (= 1.0.12)
   zip (= 2.0.2)

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.0.4 2011-01-12
+
+* Added Seaworld San Antonio
+* Added Alton Towers (not enabled, remote server not operational yet)
+
+=== 0.0.3 2011-01-10
+
+* Added rSpec tests
+* Refactored how parks work
+
 === 0.0.2 2010-11-27
 
 * Added Disneyland Paris

data/echelon.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   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 (Disneyland Paris and Thorpe Park supported)"
+  s.description = "RubyGem to give quick access to Theme Park queue times (Disneyland Paris, Thorpe Park, Seaworld San Antonio supported)"
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "echelon"
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json_pure", "1.4.6"
   s.add_dependency "zip", "2.0.2"
+  s.add_dependency "xml-simple", "1.0.12"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/lib/echelon.rb

@@ -6,6 +6,7 @@ require "#{File.dirname(__FILE__)}/echelon/park.rb"
 
 require "#{File.dirname(__FILE__)}/echelon/parks/thorpe_park.rb"
 require "#{File.dirname(__FILE__)}/echelon/parks/disneyland_paris.rb"
+require "#{File.dirname(__FILE__)}/echelon/parks/seaworld_san_antonio.rb"
 
 module Echelon
 end

data/lib/echelon/parks/alton_towers.rb

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'json'
+require 'net/http'
+
+module Echelon
+  class AltonTowers < Park
+
+    attr_reader :json_data
+
+    def ride_list
+      {
+        1 => 'Air',
+        2 => 'Enterprise',
+        3 => 'Rita'
+      }
+    end
+
+    def initialize
+      # fetch the json feed from the merlin site
+      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"]
+    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)
+        end
+      end
+    end
+
+  end
+end

data/lib/echelon/parks/disneyland_paris.rb

@@ -94,7 +94,7 @@ module Echelon
     def create_ride_object(ref)
       self.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)
+          return Ride.new(:name => self.ride_list[ref], :queue_time => ride[4].to_i, :active => ride[3].to_i, :updated_at => DateTime.now)
         end
       end
     end

data/lib/echelon/parks/seaworld_san_antonio.rb

@@ -0,0 +1,64 @@
+require 'rubygems'
+require 'xmlsimple'
+require 'net/http'
+
+module Echelon
+  class SeaworldSanAntonio < Park
+
+    attr_reader :xml_data
+
+    def ride_list
+      {
+        10 => 'Shamu Express',
+        11 => 'Steel Eel',
+        12 => 'Texas Splashdown',
+        13 => 'Great White',
+        14 => 'Rio Loco',
+        15 => 'Journey to Atlantis',
+        164 => 'Lost Lagoon'
+      }
+    end
+
+    def initialize
+      # fetch the xml file
+      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')
+
+      # were only interested in the ride data, throw everything else away
+      xml_data = XmlSimple.xml_in(data)
+      @xml_data = xml_data['ride']
+    end
+
+    private
+
+    def create_ride_object(ref)
+      self.xml_data.each do |ride|
+        if ride["id"].to_s.to_i == ref
+          active, queue_time = parse_wait_time(ride["waitTime"].to_s)
+          updated_at = DateTime.parse(ride["lastModified"].to_s)
+          return Ride.new(:name => self.ride_list[ref], :queue_time => queue_time, :active => active, :updated_at => updated_at)
+        end
+      end
+    end
+
+    def parse_wait_time(wait)
+      if wait == "Closed"
+        queue_time = 0
+        active = 0
+      elsif wait == "No Wait"
+        queue_time = 0
+        active = 1
+      elsif wait =~ /(\d*) min/
+        queue_time = $1.to_i
+        active = 1
+      else
+        queue_time = 0
+        active = 0
+      end
+      return active, queue_time
+    end
+
+  end
+end

data/lib/echelon/ride.rb

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

data/lib/echelon/version.rb

@@ -1,3 +1,3 @@
 module Echelon
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/alton_towers_spec.rb

@@ -0,0 +1,34 @@
+require 'echelon/park'
+require 'echelon/parks/alton_towers'
+
+# Mosts of the test here are pretty generic, although you can test for specific
+# cases, such as the active states may differ between parks, and queue times may
+# not exceed a certain value etc etc.
+
+describe Echelon::AltonTowers do
+
+  before do
+    @park = Echelon::AltonTowers.new()
+  end
+
+  it "should inherit from Park" do
+    @park.should be_kind_of(Echelon::AltonTowers)
+  end
+
+  it "should have some rides" do
+    @park.ride_list.count.should satisfy { |v| v > 1 && v < 30 }
+  end
+
+  it "should return ride objects" do
+    @park.find_by_name("Rita").should be_kind_of(Echelon::Ride)
+    @park.find_by_id(3).should be_kind_of(Echelon::Ride)
+  end
+
+  it "should return ride object values correctly" do
+    ride = @park.find_by_id(3)
+    ride.name.should eql("Rita")
+    ride.queue_time.should satisfy { |v| v >= 0 && v < 1000 }
+    ride.active.should satisfy { |v| v == 0 || v == 1 }
+  end
+
+end

data/spec/disneyland_paris_spec.rb

@@ -25,10 +25,10 @@ describe Echelon::DisneylandParis do
   end
 
   it "should return ride object values correctly" do
-    stealth = @park.find_by_id("P1AA04")
-    stealth.name.should eql("Pirates of the Caribbean")
-    stealth.queue_time.should satisfy { |v| v >= 0 && v < 500 }
-    stealth.active.should satisfy { |v| v >= -1 && v < 3 }
+    ride = @park.find_by_id("P1AA04")
+    ride.name.should eql("Pirates of the Caribbean")
+    ride.queue_time.should satisfy { |v| v >= 0 && v < 500 }
+    ride.active.should satisfy { |v| v >= -1 && v < 3 }
   end
 
 end

data/spec/echelon_spec.rb

@@ -4,7 +4,8 @@ require 'echelon/park'
 describe Echelon::Ride do
 
   before do
-    @ride = Echelon::Ride.new(:name => 'Ride', :queue_time => 10, :active => 1)
+    @datetime = DateTime.now
+    @ride = Echelon::Ride.new(:name => 'Ride', :queue_time => 10, :active => 1, :updated_at => @datetime)
   end
 
   it "should return the name of the ride" do
@@ -19,6 +20,10 @@ describe Echelon::Ride do
     @ride.active.should eql(1)
   end
 
+  it "should return the ride updated at datetime" do
+    @ride.updated_at.should eql(@datetime)
+  end
+
 end
 
 describe Echelon::Park do

data/spec/seaworld_san_antonio_spec.rb

@@ -0,0 +1,45 @@
+require 'echelon/park'
+require 'echelon/parks/seaworld_san_antonio'
+
+# Mosts of the test here are pretty generic, although you can test for specific
+# cases, such as the active states may differ between parks, and queue times may
+# not exceed a certain value etc etc.
+
+describe Echelon::SeaworldSanAntonio do
+
+  before do
+    @park = Echelon::SeaworldSanAntonio.new()
+  end
+
+  it "should inherit from Park" do
+    @park.should be_kind_of(Echelon::SeaworldSanAntonio)
+  end
+
+  it "should have some rides" do
+    @park.ride_list.count.should satisfy { |v| v > 1 && v < 30 }
+  end
+
+  it "should return ride objects" do
+    @park.find_by_name("Steel Eel").should be_kind_of(Echelon::Ride)
+    @park.find_by_id(11).should be_kind_of(Echelon::Ride)
+  end
+
+  it "should return ride object values correctly" do
+    ride = @park.find_by_id(11)
+    ride.name.should eql("Steel Eel")
+    ride.queue_time.should satisfy { |v| v >= 0 && v < 1000 }
+    ride.active.should satisfy { |v| v == 0 || v == 1 }
+  end
+
+  describe "parse_wait_time" do
+
+    it "should return a wait time and active state correctly" do
+      @park.send(:parse_wait_time, "15 mins").should eql([1, 15])
+      @park.send(:parse_wait_time, "Closed").should eql([0, 0])
+      @park.send(:parse_wait_time, "No Wait").should eql([1, 0])
+      @park.send(:parse_wait_time, "30 mins").should eql([1, 30])
+      @park.send(:parse_wait_time, "Invalid").should eql([0, 0])
+    end
+  end
+
+end

data/spec/thorpe_park_spec.rb

@@ -25,10 +25,10 @@ describe Echelon::ThorpePark do
   end
 
   it "should return ride object values correctly" do
-    stealth = @park.find_by_id(3)
-    stealth.name.should eql("Stealth")
-    stealth.queue_time.should satisfy { |v| v >= 0 && v < 1000 }
-    stealth.active.should satisfy { |v| v == 0 || v == 1 }
+    ride = @park.find_by_id(3)
+    ride.name.should eql("Stealth")
+    ride.queue_time.should satisfy { |v| v >= 0 && v < 1000 }
+    ride.active.should satisfy { |v| v == 0 || v == 1 }
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: echelon
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Lloyd Pick
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +00:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,23 @@ dependencies:
         version: 2.0.2
   type: :runtime
   version_requirements: *id004
-description: RubyGem to give quick access to Theme Park queue times (Disneyland Paris and Thorpe Park supported)
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        - 12
+        version: 1.0.12
+  type: :runtime
+  version_requirements: *id005
+description: RubyGem to give quick access to Theme Park queue times (Disneyland Paris, Thorpe Park, Seaworld San Antonio supported)
 email: 
 - lloydpick@gmail.com
 executables: []
@@ -102,12 +118,16 @@ files:
 - echelon.gemspec
 - lib/echelon.rb
 - lib/echelon/park.rb
+- lib/echelon/parks/alton_towers.rb
 - lib/echelon/parks/disneyland_paris.rb
+- lib/echelon/parks/seaworld_san_antonio.rb
 - lib/echelon/parks/thorpe_park.rb
 - lib/echelon/ride.rb
 - lib/echelon/version.rb
+- spec/alton_towers_spec.rb
 - spec/disneyland_paris_spec.rb
 - spec/echelon_spec.rb
+- spec/seaworld_san_antonio_spec.rb
 - spec/thorpe_park_spec.rb
 has_rdoc: true
 homepage: http://github.com/lloydpick/echelon