echelon 0.0.2 → 0.0.3

data/.gitignore

@@ -0,0 +1,3 @@
+pkg/*
+*.gem
+.bundle

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,31 @@
+PATH
+  remote: .
+  specs:
+    echelon (0.0.2)
+      json_pure (= 1.4.6)
+      zip (= 2.0.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    json_pure (1.4.6)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    zip (2.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  echelon!
+  json_pure (= 1.4.6)
+  rspec (>= 2.4.0)
+  zip (= 2.0.2)

data/Rakefile

@@ -1,24 +1,2 @@
-require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
-require './lib/echelon'
-
-Hoe.plugin :newgem
-# Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec 'echelon' do
-  self.developer 'Lloyd Pick', 'lloydpick@gmail.com'
-  self.rubyforge_name       = self.name
-  self.extra_deps         = [['json_pure','>= 1.4.6']]
-end
-
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/echelon.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path("../lib/echelon/version", __FILE__)
+
+Gem::Specification.new do |s|
+  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 (Disneyland Paris and Thorpe Park supported)"
+
+  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_dependency "json_pure", "1.4.6"
+  s.add_dependency "zip", "2.0.2"
+
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
+end

data/lib/echelon/park.rb

@@ -0,0 +1,24 @@
+module Echelon
+  class Park
+
+    def ride_list
+      {}
+    end
+
+    def rides
+      ride_list.inject([]) do |r, e| r << create_ride_object(e[0]) end
+    end
+
+    def find_by_name(ride)
+      raise ArgumentError, "Unknown ride name" unless ride_list.has_value?(ride)
+      ref = 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)
+      create_ride_object(ref)
+    end
+
+  end
+end

data/lib/echelon/parks/disneyland_paris.rb

@@ -0,0 +1,103 @@
+require 'rubygems'
+require 'json'
+require 'net/http'
+require 'net/https'
+require 'zip/zip'
+
+module Echelon
+  class DisneylandParis < Park
+
+    attr_reader :json_data
+
+    def ride_list
+      {
+        'P1AA01' => 'La Cabane des Robinson',
+        'P1AA02' => 'Indiana Jones and the Temple of Peril',
+        'P1AA04' => 'Pirates of the Caribbean',
+        'P1DA03' => 'Autopia',
+        'P1DA04' => 'Buzz Lightyear Laser Blast',
+        'P1DA06' => 'Les Mystères du Nautilus',
+        'P1DA07' => 'Orbitron',
+        'P1DA08' => 'Space Mountain: Mission 2',
+        'P1DA09' => 'Star Tours',
+        'P1DA12' => 'Captain EO',
+        'P1NA00' => 'Alice\'s Curious Labyrinth',
+        'P1NA01' => 'Blanche-Neige et les Sept Nains',
+        'P1NA02' => 'Le Carrousel de Lancelot',
+        'P1NA03' => 'Casey Jr. - le Petit Train du Cirque',
+        'P1NA05' => 'Dumbo the Flying Elephant',
+        'P1NA07' => '"it\'s a small world" Celebration',
+        'P1NA08' => 'Mad Hatter\'s Tea Cups',
+        'P1NA09' => 'Le Pays des Contes de Fées',
+        'P1NA10' => 'Peter Pan\'s Flight',
+        'P1NA13' => 'Les Voyages de Pinocchio',
+        'P1RA00' => 'Big Thunder Mountain',
+        'P1RA03' => 'Phantom Manor',
+        'P1RA04' => 'River Rogue Keelboats',
+        'P2XA00' => 'Studio Tram Tour: Behind the Magic',
+        'P2XA01' => 'CinéMagique',
+        'P2XA02' => 'Cars Quatre Roues Rallye',
+        'P2XA03' => 'Crush\'s Coaster',
+        'P2XA05' => 'Flying Carpets Over Agrabah',
+        'P2XA06' => 'RC Racer',
+        'P2XA07' => 'Toy Soldiers Parachute Drop',
+        'P2XA08' => 'Slinky Dog Zigzag Spin',
+        'P2ZA00' => 'Armageddon : les Effets Spéciaux',
+        'P2ZA01' => 'Rock\'n\'Roller Coaster starring Aerosmith',
+        'P2ZA02' => 'The Twilight Zone Tower of Terror'
+      }
+    end
+
+    def initialize
+      # fetch the zipped json feed from the same url as the disney iphone app
+      # (you have no idea how long this took to work out)
+
+      http = Net::HTTP.new('disney.cms.pureagency.com', 443)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      data = 'key=Ajjjsh;Uj'
+      headers = {
+        '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)
+
+      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"]
+      }
+
+      i = 0
+      rides = []
+      while i < json_data.count
+        ride = []
+        ride << json_data[i]
+        ride << json_data[i + 1]
+        ride << json_data[i + 2]
+        ride << json_data[i + 3]
+        ride << json_data[i + 4]
+        rides << ride
+        i += 5
+      end
+
+      @json_data = rides
+    end
+
+    private
+
+    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)
+        end
+      end
+    end
+
+  end
+end

data/lib/echelon/parks/thorpe_park.rb

@@ -0,0 +1,62 @@
+require 'rubygems'
+require 'json'
+require 'net/http'
+
+module Echelon
+  class ThorpePark < Park
+
+    attr_reader :json_data
+
+    def ride_list
+      {
+        1 => 'SAW - The Ride',
+        3 => 'Stealth',
+        4 => 'Colossus',
+        5 => 'Detonator',
+        6 => 'Nemesis Inferno',
+        7 => 'Rush',
+        8 => 'Samurai',
+        9 => 'Slammer',
+        10 => 'Tidal Wave',
+        11 => 'Vortex',
+        12 => 'X:\No Way Out',
+        13 => 'Time Voyagers',
+        14 => 'Quantum',
+        15 => 'Loggers Leap',
+        16 => 'Flying Fish',
+        17 => 'Rumba Rapids',
+        18 => 'Zodiac',
+        19 => 'Depth Charge',
+        20 => 'SAW Alive',
+        21 => 'Mr. Monkey\'s Banana Ride',
+        22 => 'Storm in a Teacup',
+        23 => 'Rocky Express',
+        24 => 'Wet Wet Wet',
+        25 => 'Neptune\'s Beach',
+        26 => 'Chief Ranger\'s Carousel'
+      }
+    end
+
+    def initialize
+      # fetch the json feed from the merlin site
+      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"]
+    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/version.rb

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

data/lib/echelon.rb

@@ -2,9 +2,10 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require "#{File.dirname(__FILE__)}/echelon/ride.rb"
-require "#{File.dirname(__FILE__)}/echelon/thorpe_park.rb"
-require "#{File.dirname(__FILE__)}/echelon/disneyland_paris.rb"
+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"
 
 module Echelon
-  VERSION = '0.0.2'
 end

data/spec/disneyland_paris_spec.rb

@@ -0,0 +1,34 @@
+require 'echelon/park'
+require 'echelon/parks/disneyland_paris'
+
+# 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::DisneylandParis do
+
+  before do
+    @park = Echelon::DisneylandParis.new()
+  end
+
+  it "should inherit from Park" do
+    @park.should be_kind_of(Echelon::DisneylandParis)
+  end
+
+  it "should have some rides" do
+    @park.ride_list.count.should satisfy { |v| v > 1 && v < 40 }
+  end
+
+  it "should return ride objects" do
+    @park.find_by_name("Pirates of the Caribbean").should be_kind_of(Echelon::Ride)
+    @park.find_by_id('P1AA04').should be_kind_of(Echelon::Ride)
+  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 }
+  end
+
+end

data/spec/echelon_spec.rb

@@ -0,0 +1,54 @@
+require 'echelon/ride'
+require 'echelon/park'
+
+describe Echelon::Ride do
+
+  before do
+    @ride = Echelon::Ride.new(:name => 'Ride', :queue_time => 10, :active => 1)
+  end
+
+  it "should return the name of the ride" do
+    @ride.name.should eql('Ride')
+  end
+
+  it "should return the queue time" do
+    @ride.queue_time.should eql(10)
+  end
+
+  it "should return the ride status" do
+    @ride.active.should eql(1)
+  end
+
+end
+
+describe Echelon::Park do
+
+  before do
+    @park = Echelon::Park.new
+  end
+
+  it "should provide a set of methods" do
+    @park.should respond_to(:ride_list)
+    @park.should respond_to(:rides)
+    @park.should respond_to(:find_by_name)
+    @park.should respond_to(:find_by_id)
+  end
+
+  it "should contain a blank ride list" do
+    @park.ride_list.should eql({})
+    @park.rides.should eql([])
+  end
+
+  describe 'find_by_name' do
+    it "should raise if ride isn't available" do
+      lambda { @park.find_by_name('Unknown Ride') }.should raise_error(ArgumentError)
+    end
+  end
+
+  describe 'find_by_id' do
+    it "should raise if ride isn't available" do
+      lambda { @park.find_by_id(1) }.should raise_error(ArgumentError)
+    end
+  end
+
+end

data/spec/thorpe_park_spec.rb

@@ -0,0 +1,34 @@
+require 'echelon/park'
+require 'echelon/parks/thorpe_park'
+
+# 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::ThorpePark do
+  
+  before do
+    @park = Echelon::ThorpePark.new()
+  end
+
+  it "should inherit from Park" do
+    @park.should be_kind_of(Echelon::ThorpePark)
+  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("Stealth").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
+    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 }
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: echelon
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lloyd Pick
@@ -15,86 +15,107 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 +00:00
+date: 2011-01-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 23
         segments: 
         - 1
-        - 4
-        - 6
-        version: 1.4.6
-  type: :runtime
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 31
         segments: 
         - 2
-        - 0
         - 4
-        version: 2.0.4
+        - 0
+        version: 2.4.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: json_pure
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: zip
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
-        - 7
         - 0
-        version: 2.7.0
-  type: :development
-  version_requirements: *id003
-description: RubyGem to give quick access to Theme Park queue times
+        - 2
+        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)
 email: 
 - lloydpick@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- echelon.gemspec
 - lib/echelon.rb
+- lib/echelon/park.rb
+- lib/echelon/parks/disneyland_paris.rb
+- lib/echelon/parks/thorpe_park.rb
 - lib/echelon/ride.rb
-- lib/echelon/thorpe_park.rb
-- lib/echelon/disneyland_paris.rb
-- test/test_echelon.rb
-- test/test_helper.rb
+- lib/echelon/version.rb
+- spec/disneyland_paris_spec.rb
+- spec/echelon_spec.rb
+- spec/thorpe_park_spec.rb
 has_rdoc: true
 homepage: http://github.com/lloydpick/echelon
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -111,17 +132,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: echelon
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: RubyGem to give quick access to Theme Park queue times
-test_files: 
-- test/test_helper.rb
-- test/test_echelon.rb
+test_files: []
+

data/lib/echelon/disneyland_paris.rb

@@ -1,118 +0,0 @@
-require 'rubygems'
-require 'json'
-require 'net/http'
-require 'net/https'
-require 'zip/zip'
-
-module Echelon
-  class DisneylandParis
-
-    attr_reader :json_data
-
-    RIDES = {
-      'P1AA01' => 'La Cabane des Robinson',
-      'P1AA02' => 'Indiana Jones and the Temple of Peril',
-      'P1AA04' => 'Pirates of the Caribbean',
-      'P1DA03' => 'Autopia',
-      'P1DA04' => 'Buzz Lightyear Laser Blast',
-      'P1DA06' => 'Les Mystères du Nautilus',
-      'P1DA07' => 'Orbitron',
-      'P1DA08' => 'Space Mountain: Mission 2',
-      'P1DA09' => 'Star Tours',
-      'P1DA12' => 'Captain EO',
-      'P1NA00' => 'Alice\'s Curious Labyrinth',
-      'P1NA01' => 'Blanche-Neige et les Sept Nains',
-      'P1NA02' => 'Le Carrousel de Lancelot',
-      'P1NA03' => 'Casey Jr. - le Petit Train du Cirque',
-      'P1NA05' => 'Dumbo the Flying Elephant',
-      'P1NA07' => '"it\'s a small world" Celebration',
-      'P1NA08' => 'Mad Hatter\'s Tea Cups',
-      'P1NA09' => 'Le Pays des Contes de Fées',
-      'P1NA10' => 'Peter Pan\'s Flight',
-      'P1NA13' => 'Les Voyages de Pinocchio',
-      'P1RA00' => 'Big Thunder Mountain',
-      'P1RA03' => 'Phantom Manor',
-      'P1RA04' => 'River Rogue Keelboats',
-      'P2XA00' => 'Studio Tram Tour: Behind the Magic',
-      'P2XA01' => 'CinéMagique',
-      'P2XA02' => 'Cars Quatre Roues Rallye',
-      'P2XA03' => 'Crush\'s Coaster',
-      'P2XA05' => 'Flying Carpets Over Agrabah',
-      'P2XA06' => 'RC Racer',
-      'P2XA07' => 'Toy Soldiers Parachute Drop',
-      'P2XA08' => 'Slinky Dog Zigzag Spin',
-      'P2ZA00' => 'Armageddon : les Effets Spéciaux',
-      'P2ZA01' => 'Rock\'n\'Roller Coaster starring Aerosmith',
-      'P2ZA02' => 'The Twilight Zone Tower of Terror'
-    }
-
-    def initialize
-      # fetch the zipped json feed from the same url as the disney iphone app
-      # (you have no idea how long this took to work out)
-
-      http = Net::HTTP.new('disney.cms.pureagency.com', 443)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      data = 'key=Ajjjsh;Uj'
-      headers = {
-        '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)
-
-      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"]
-      }
-
-      i = 0
-      rides = []
-      while i < json_data.count
-        ride = []
-        ride << json_data[i]
-        ride << json_data[i + 1]
-        ride << json_data[i + 2]
-        ride << json_data[i + 3]
-        ride << json_data[i + 4]
-        rides << ride
-        i += 5
-      end
-
-      @json_data = rides
-    end
-
-    def rides
-      all_rides = []
-      RIDES.each do |ride| all_rides << create_ride_object(ride[0]) end
-      all_rides
-    end
-
-    def find_by_name(ride)
-      raise ArgumentError, "Unknown ride name" unless RIDES.has_value?(ride)
-      ref = RIDES.index(ride)
-      create_ride_object(ref)
-    end
-
-    def find_by_id(ref)
-      raise ArgumentError, "Unknown ride name" unless RIDES.has_key?(ref)
-      create_ride_object(ref)
-    end
-
-    private
-
-    def create_ride_object(ref)
-      self.json_data.each do |ride|
-        if ride[0] == ref
-          return Ride.new(:name => RIDES[ref], :queue_time => ride[4].to_i, :active => ride[3].to_i)
-        end
-      end
-    end
-
-  end
-end

data/lib/echelon/thorpe_park.rb

@@ -1,77 +0,0 @@
-require 'rubygems'
-require 'json'
-require 'net/http'
-
-module Echelon
-  class ThorpePark
-
-    attr_reader :json_data
-
-    RIDES = {
-      1 => 'SAW - The Ride',
-      3 => 'Stealth',
-      4 => 'Colossus',
-      5 => 'Detonator',
-      6 => 'Nemesis Inferno',
-      7 => 'Rush',
-      8 => 'Samurai',
-      9 => 'Slammer',
-      10 => 'Tidal Wave',
-      11 => 'Vortex',
-      12 => 'X:\No Way Out',
-      13 => 'Time Voyagers',
-      14 => 'Quantum',
-      15 => 'Loggers Leap',
-      16 => 'Flying Fish',
-      17 => 'Rumba Rapids',
-      18 => 'Zodiac',
-      19 => 'Depth Charge',
-      20 => 'SAW Alive',
-      21 => 'Mr. Monkey\'s Banana Ride',
-      22 => 'Storm in a Teacup',
-      23 => 'Rocky Express',
-      24 => 'Wet Wet Wet',
-      25 => 'Neptune\'s Beach',
-      26 => 'Chief Ranger\'s Carousel'
-    }
-
-    def initialize
-      # fetch the json feed from the merlin site
-      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"]
-    end
-
-    def rides
-      all_rides = []
-      RIDES.each do |ride| all_rides << create_ride_object(ride[0]) end
-      all_rides
-    end
-
-    def find_by_name(ride)
-      raise ArgumentError, "Unknown ride name" unless RIDES.has_value?(ride)
-      ref = RIDES.index(ride)
-      create_ride_object(ref)
-    end
-
-    def find_by_id(ref)
-      raise ArgumentError, "Unknown ride name" unless RIDES.has_key?(ref)
-      create_ride_object(ref)
-    end
-
-    private
-
-    def create_ride_object(ref)
-      self.json_data.each do |ride|
-        if ride["ref"].to_i == ref
-          return Ride.new(:name => RIDES[ref], :queue_time => ride["queue"].to_i, :active => ride["active"].to_i)
-        end
-      end
-    end
-
-  end
-end

data/test/test_echelon.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestEchelon < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end

data/test/test_helper.rb

@@ -1,3 +0,0 @@
-require 'stringio'
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/echelon'