echelon 1.0.1 → 1.0.2

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+script: "bundle exec rspec spec"

data/Gemfile

@@ -1,4 +1,9 @@
 source :rubygems
 
 # Specify your gem's dependencies in echelon.gemspec
-gemspec
+gemspec
+
+group :test do
+  # for travis-ci.org
+  gem "rake"
+end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    echelon (1.0.0)
+    echelon (1.0.1)
       json_pure (= 1.4.6)
-      xml-simple (= 1.0.12)
+      nokogiri (~> 1.5)
       zip (= 2.0.2)
 
 GEM
@@ -11,6 +11,8 @@ GEM
   specs:
     diff-lcs (1.1.2)
     json_pure (1.4.6)
+    nokogiri (1.5.5)
+    rake (0.9.2.2)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -19,7 +21,6 @@ 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 +29,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   echelon!
+  rake
   rspec (>= 2.4.0)

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.0.2 2012-08-21
+
+* Seaworld parks now work correctly on 1.9.2
+* Tests now pass correctly
+
+=== 1.0.1 2012-08-21
+
+* Fixed all the Walt Disney parks
+
 === 1.0.0 2012-06-09
 
 * Added park Disney World Orlando Parks

data/README.rdoc

@@ -2,6 +2,8 @@
 
 * http://github.com/lloydpick/echelon
 
+{<img src="https://secure.travis-ci.org/lloydpick/echelon.png?branch=master" alt="Build Status" />}[http://travis-ci.org/lloydpick/echelon]
+
 == DESCRIPTION:
 
 RubyGem to give quick access to Theme Park queue times

data/echelon.gemspec

@@ -20,7 +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.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

data/lib/echelon/park.rb

@@ -11,7 +11,7 @@ module Echelon
 
     def find_by_name(ride)
       raise ArgumentError, "Unknown ride name" unless ride_list.has_value?(ride)
-      ref = ride_list.index(ride)
+      ref = ride_list.respond_to?(:key) ? ride_list.key(ride) : ride_list.index(ride)
       create_ride_object(ref)
     end
 

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

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'xmlsimple'
+require 'nokogiri'
 require 'net/http'
 require 'date'
 
@@ -11,13 +11,14 @@ module Echelon
 
       def ride_list
         {
-          2002 => 'Wild Arctic Ride',
           2048 => 'Flying Fiddler',
           2049 => 'Swishy Fishies',
           2034 => 'Kraken',
           2018 => 'Sky Tower',
           2036 => 'Journey to Atlantis',
           2037 => 'Manta',
+          2220 => 'Wild Arctic Ride',
+          2343 => 'Turtle Trek',
           2008 => 'Sea Carousel',
           2044 => 'Shamu Express',
           2045 => 'Ocean Commotion',
@@ -33,17 +34,17 @@ module Echelon
         resp, data = http.get('/orlando/rides')
 
         # were only interested in the ride data, throw everything else away
-        xml_data = XmlSimple.xml_in(data)
-        @xml_data = xml_data['ride']
+        xml_data = Nokogiri::HTML(data)
+        @xml_data = xml_data.xpath("//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)
+          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)
           end
         end

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

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'xmlsimple'
+require 'nokogiri'
 require 'net/http'
 require 'date'
 
@@ -29,17 +29,17 @@ module Echelon
         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']
+        xml_data = Nokogiri::HTML(data)
+        @xml_data = xml_data.xpath("//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)
+          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)
           end
         end

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

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'xmlsimple'
+require 'nokogiri'
 require 'net/http'
 require 'date'
 
@@ -12,6 +12,7 @@ module Echelon
       def ride_list
         {
           1034 => 'Shipwreck Rapids',
+          1239 => 'Manta',
           1024 => 'Skytower',
           1010 => 'Journey to Atlantis',
           1011 => 'Wild Arctic Ride',
@@ -30,17 +31,17 @@ module Echelon
         resp, data = http.get('/san_diego/rides')
 
         # were only interested in the ride data, throw everything else away
-        xml_data = XmlSimple.xml_in(data)
-        @xml_data = xml_data['ride']
+        xml_data = Nokogiri::HTML(data)
+        @xml_data = xml_data.xpath("//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)
+          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)
           end
         end

data/lib/echelon/version.rb

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

data/spec/alton_towers_spec.rb

@@ -26,7 +26,7 @@ describe Echelon::AltonTowers do
 
   it "should return ride object values correctly" do
     ride = @park.find_by_id(3)
-    ride.name.should eql("Rita")
+    ride.name.should eql("TH13TEEN")
     ride.queue_time.should satisfy { |v| v >= 0 && v < 1000 }
     ride.active.should satisfy { |v| v == 0 || v == 1 }
   end

data/spec/seaworld_san_antonio_spec.rb

@@ -1,18 +1,18 @@
 require 'echelon/park'
-require 'echelon/parks/seaworld_san_antonio'
+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
+describe Echelon::Seaworld::SanAntonio do
 
   before do
-    @park = Echelon::SeaworldSanAntonio.new()
+    @park = Echelon::Seaworld::SanAntonio.new()
   end
 
   it "should inherit from Park" do
-    @park.should be_kind_of(Echelon::SeaworldSanAntonio)
+    @park.should be_kind_of(Echelon::Seaworld::SanAntonio)
   end
 
   it "should have some rides" do

metadata

@@ -1,113 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: echelon
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.0.2
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Lloyd Pick
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  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 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  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 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: zip
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        - 12
-        version: 1.0.12
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id005
-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)
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+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)
+email:
 - lloydpick@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -138,38 +133,26 @@ files:
 - spec/thorpe_park_spec.rb
 homepage: http://github.com/lloydpick/echelon
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: echelon
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RubyGem to give quick access to Theme Park queue times
 test_files: []
-