metra_schedule 0.2.1 → 0.2.1.2

data/README.rdoc

@@ -25,9 +25,7 @@ How to use metra_schedule
 
 === Setup
 
-Make sure you have the gemcutter repository on your gem list and:
-  
-  sudo gem install metra_schedule
+  gem install metra_schedule -s http://gemcutter.org
 
 === Using
 
@@ -47,11 +45,14 @@ Make sure you have the gemcutter repository on your gem list and:
   line.inbound.saturday.from(:barrington).to(:ogilve).trains
 
   # All sunday/holiday outbound trains that start at Arlington Heights after 12:30PM and stop at Park Ridge 
-  line.outbound.holiday.from(:arlington_heights).at(Time.parse('12:30PM')).to(:park_ridge)
+  line.outbound.holiday.from(:arlington_heights).at(Time.parse('12:30PM')).to(:park_ridge).trains
+
+  # All inbound trains on December 30th 2009
+  line.inbound.on(Date.parse("December 30th 2009")).trains
 
 = Trains
 
-Each train has the following variables that can be accessed:
+=== Instance variables:
 
 train.train_num :: Metra train number.
 train.stops :: An array of all Stop objects. Contains the stop name and what time the train will arrive at that stop
@@ -59,6 +60,65 @@ train.schedule :: Symbol representing the day the train runs. Either :weekday, :
 train.direction :: Symbol representing the train direction. Either :inbound or :outbound
 train.bike_limit :: Maximum number of bikes per train. nil if no limit.
 
+=== Instance methods:
+
+train.my_travel_time :: Travel time in minutes of your trip. Assumes you specified Line#from and Line#to when you built your query
+train.print_my_travel_time :: Same as above, but in human readable form EG - "1 hour 2 minutes"
+train.has_stop?(stop) :: Takes a station name symbol and determines whether this train has that stop
+train.in_time?(station, time) :: Takes a station name symbol and time. Returns true if the time is before the time the train reaches that stop
+
+
+= Stops
+
+Stored inside each train.
+
+=== Instance variables:
+
+stop.station :: Symbol representing the station name
+stop.time :: Time object with the time the train stops there
+
+=== Instance methods:
+
+stop.in_time?(time) :: True if time is less than stop.time
+
+=== Class methods:
+
+Stop.pretty_print(station) :: Converts the station symbol to something human readable - EG: :irving_park becomes "Irving Park"
+
+= Lines
+
+=== Instance variables:
+
+line.line_key :: Symbol of the line name
+line.name :: Human readable line name EG - "Union Pacific Northwest"
+line.url :: Url that the parser scrapes from.
+line.dir :: Symbol representing selected line direction. :outbound or :inbound. Set with Line#outbound Line#inbound or deduced using Line#from and Line#to or by current time of day using Line#deduce_direction_by_time
+line.sched :: Symbol representing selected line schedule. :weekday, :saturday or :sunday. Set with Line#weekday, Line#saturday Line#sunday Line#on(date) or Line#deduce_schedule
+line.start :: Symbol representing starting station name. EG - :clyborn. Set with Line#from
+line.destination :: Symbol representing destanation station name. EG - :ogilve. Set with Line#to
+line.time :: Time object representing the time you'd like to depart. Used to filter down lines. Set with Line#at
+
+
+=== Instance methods:
+
+line.load_schedule :: Load cached engine data from Marshaled cache dir (~/.metra_schedule) or if not available, fetch from the Metra website, parse and cache it
+line.trains :: Takes in all the other parameters you specified and returns only the trains that meet the criteria you specfied
+line.from(station) :: Set your starting station
+line.to(station) :: Set your destination station
+line.direction(dir) :: Set the line direction. :outbound or :inbound
+line.outbound :: Same as line.direction(:outbound)
+line.inbound :: Same as line.direction(:inbound)
+line.deduce_direction :: Infers line direction if you specified Line#from and Line#to
+line.deduce_direction_by_time :: Infers line direction based on the system clocks time of day. Before noon it sets to inbound, after noon it assumes outbound
+line.schedule(sched) :: Sets the line schedule. Either :weekday :saturday or :sunday
+line.weekday :: Same as line.direction(:weekday)
+line.saturday :: Same as line.direction(:saturday)
+line.sunday :: Same as line.direction(:sunday)
+line.holiday :: Same as line.direction(:sunday)
+line.on(date) :: Sets schedule using the date you specified
+line.deduce_schedule :: Same as on(Date.today)
+line.at(time) :: Sets line time. Specifying this will only display trains that appear at your starting station (specified with Line#from) before the given time
+
 = Line Data
 
 Current supported lines:

data/Rakefile

@@ -4,11 +4,20 @@ require 'rake/testtask'
 task :default => [:test]
 
 desc "Run unit tests (functionals fail on win32)"
-task :test => [:test_units]
+task :test => [:test_units, :test_functionals]
 
 desc "Run just the unit tests"
 Rake::TestTask.new(:test_units) do |t|
-  t.test_files = FileList['test/test*.rb']
+  t.test_files = FileList['test/unit/test*.rb']
   t.warning = false
 end
 
+Rake::TestTask.new(:test_functionals) do |t|
+  t.test_files = FileList['test/functional/test*.rb']
+  t.warning = false
+end
+
+Rake::TestTask.new(:test_integrations) do |t|
+  t.test_files = FileList['test/integration/test*.rb']
+  t.warning = false
+end

data/lib/metra.rb

@@ -6,5 +6,5 @@ require File.join(File.dirname(__FILE__), 'metra', 'parser')
 require File.join(File.dirname(__FILE__), 'metra', 'cacher')
 
 class Metra
-  include MetraSchedule::ClassMethods
+  include MetraSchedule::InstanceMethods
 end

data/lib/metra/cacher.rb

@@ -45,7 +45,8 @@ module MetraSchedule
 
     def persist_line(line)
       create_cache_dir_if_not_exists
-      true if File.open(File.join(@cache_dir, line.line_key.to_s), 'w') {|f| Marshal.dump(line, f)}
+      return false unless line.engines
+      true if File.open(File.join(@cache_dir, line.line_key.to_s), 'w') {|f| Marshal.dump(line.engines, f)}
     end
 
     def retrieve_line(line)

data/lib/metra/classmethods.rb

@@ -1,5 +1,5 @@
 module MetraSchedule
-  module ClassMethods
+  module InstanceMethods
 
     def line(line_name)
       MetraSchedule::Line.new(line_name)

data/lib/metra/line.rb

@@ -4,6 +4,7 @@ module MetraSchedule
   class Line
     include MetraSchedule::TrainData
 
+    attr_reader :cacher, :cache_dir 
     attr_reader :line_key, :name, :url, :dir, :sched, :start, :destination, :time
     attr_accessor :engines
 
@@ -14,14 +15,20 @@ module MetraSchedule
       @line_key = line_name
       @name = LINES[line_name][:name]
       @url = LINES[line_name][:url]
+      @filters = [filter_by_stop, filter_by_start, filter_by_direction, filter_by_schedule, inject_my_times]
+    end
+
+    def config(args)
+      @cacher = args[:cacher] if args.has_key?(:cacher)
+      @cache_dir = args[:cache_dir] if args.has_key?(:cache_dir)
     end
 
     def load_schedule
-      cached_line = MetraSchedule::Cacher.load_from_cache(self)
-      unless cached_line
+      cached_engines = MetraSchedule::Cacher.load_from_cache(self)
+      unless cached_engines
         update_schedule
       else
-        @engines = cached_line.engines
+        @engines = cached_engines
       end
     end
 
@@ -89,6 +96,10 @@ module MetraSchedule
       schedule(:holiday)
     end
 
+    def deduce_schedule
+      on(Date.today)
+    end
+
     def set_station(start_or_destination, station)
       unless start_or_destination == :start or start_or_destination == :destination
         raise ArgumentError.new "First argument must be either :start or :destination"
@@ -108,65 +119,100 @@ module MetraSchedule
     end
 
     def at(time)
-      begin
-        @time = Time.parse(time)
-      rescue
-        raise ArgumentError.new "Time must be a valid time object" unless time.is_a?(Time)
+      if time.is_a?(String)
+        @time = Time.parse(time) 
+      elsif time.is_a?(Time)
+        @time = time 
+      else
+        raise ArgumentError.new "Time must be either a valid time object, or a string that parses to one"
       end
       self
     end
 
+    def on(date)
+      raise ArgumentError.new "Argument must be a date object!" unless date.is_a?(Date)
+      @sched = :weekday if (1..5).include?(date.cwday)
+      @sched = :saturday if date.cwday == 6
+      @sched = :sunday if date.cwday == 7
+      self
+    end
+
     def deduce_direction_by_time
-      @dir = :inbound if Time.now < Time.parse("12:00PM")
-      @dir = :outbound if Time.now > Time.parse("12:00PM")
+      before_noon = Time.now < Time.parse("12:00PM")
+      after_noon = Time.now > Time.parse("12:00PM")
+      after_midnight_until_two = (Time.now >= Time.parse("12:00AM") and Time.now < Time.parse("2:00AM"))
+      if after_noon or after_midnight_until_two
+        @dir = :outbound
+      elsif before_noon
+        @dir = :inbound
+      else
+        @dir = :inbound
+      end
       self
     end
 
+    def find_train_by_train_num(train_num)
+      @engines.find {|e| e.train_num == train_num}
+    end
+
     def trains
       return [] unless engines
-      engines.find_all do |engine|
-        filter_by_stop.include?(engine) and \
-          filter_by_start.include?(engine) and \
-          filter_by_direction.include?(engine) and \
-          filter_by_schedule.include?(engine)
-      end
+      @filters.inject(engines) { |e, fun| fun.call(e) }.sort
     end
 
     private
 
+    def inject_my_times
+      lambda do |engines|
+        return engines unless @start and @destination
+        engines.each do |engine|
+          engine.my_departure = engine.departure_and_arrival(@start, @destination)[:departure]
+          engine.my_arrival = engine.departure_and_arrival(@start, @destination)[:arrival]
+        end
+      end
+    end
+
     def filter_by_stop
-      if @start and not @destination
-        engines.find_all { |e| e.has_stop?(@start) }
-      elsif @destination and not @start
-        engines.find_all { |e| e.has_stop?(@destination) }
-      elsif @start and @destination
-        engines.find_all { |e| e.has_stop?(@start) and e.has_stop?(@destination)}
-      else
-        engines
+      lambda do |engines|
+        if @start and not @destination
+          engines.find_all { |e| e.has_stop?(@start) }
+        elsif @destination and not @start
+          engines.find_all { |e| e.has_stop?(@destination) }
+        elsif @start and @destination
+          engines.find_all { |e| e.has_stop?(@start) and e.has_stop?(@destination)}
+        else
+          engines
+        end
       end
     end
 
     def filter_by_start
-      return engines if not @time or not @start
-      engines.find_all do |engine|
-        engine.in_time?(@start, @time)
+      lambda do |engines|
+        return engines unless @time and @start
+        engines.find_all do |engine|
+          engine.in_time?(@start, @time)
+        end
       end
     end
 
     def filter_by_direction
-      return engines if deduce_direction == :unknown
-      engines.find_all do |engine|
-        engine.direction == deduce_direction
+      lambda do |engines|
+        return engines if deduce_direction == :unknown
+        engines.find_all do |engine|
+          engine.direction == deduce_direction
+        end
       end
     end
 
     def filter_by_schedule
-      return engines if not @sched
-      engines.find_all do |engine|
-        if @sched == :holiday or @sched == :sunday
-          engine.schedule == :sunday or engine.schedule == :holiday
-        else
-          engine.schedule == @sched
+      lambda do |engines|
+        return engines unless @sched
+        engines.find_all do |engine|
+          if @sched == :holiday or @sched == :sunday
+            engine.schedule == :sunday or engine.schedule == :holiday
+          else
+            engine.schedule == @sched
+          end
         end
       end
     end

data/lib/metra/parser.rb

@@ -66,6 +66,7 @@ module MetraSchedule
 
     def make_stop(node, station_num, direction)
       node_text = node.text
+      node_text = node_text[0..-2] if node_text[-1] == "x"
       return nil if node_text == "– "
       time = Time.parse(node_text + am_or_pm(node))
       if direction == :inbound

data/lib/metra/train.rb

@@ -1,6 +1,7 @@
 module MetraSchedule
   class Train
     attr_reader :train_num, :schedule, :bike_limit, :direction, :stops
+    attr_accessor :my_departure, :my_arrival # Injected when the line is filtered
 
     def initialize(options={})
       unless options.empty?
@@ -18,8 +19,18 @@ module MetraSchedule
     end
 
     def in_time?(station, time)
-      return true if stops.find {|s| s.station == station}.time > time
-      false
+      stop_time = stops.find {|s| s.station == station}.time
+      if (stop_time.hour == time.hour)
+        if (stop_time.min > time.min)
+          return true
+        else
+          return false
+        end
+      elsif (stop_time.hour > time.hour)
+        return true
+      else
+        return false
+      end
     end
 
     def departure_and_arrival(start, destination)
@@ -28,5 +39,55 @@ module MetraSchedule
       {:departure => departure, :arrival => arrival}
     end
 
+    def my_travel_time
+      return nil unless @my_departure and @my_arrival
+      minutes = (@my_arrival.to_i - @my_departure.to_i) / 60
+      return minutes if minutes > 0
+      return minutes + 1440 if minutes < 0
+    end
+
+    def print_my_travel_time
+      if my_travel_time
+        "#{print_my_travel_hours} #{print_my_travel_minutes}".strip
+      end
+    end
+
+    def <=>(other)
+      if my_departure
+        return 1 if self.my_departure > other.my_departure
+        return -1 if self.my_departure < other.my_departure
+        return 0 if self.my_departure == other.my_departure
+      elsif @stops.first and other.stops.first
+        return 1 if @stops.first.time > other.stops.first.time
+        return -1 if @stops.first.time < other.stops.first.time
+        return 0 if @stops.first.time == other.stops.first.time
+      else
+        0
+      end
+    end
+
+    private 
+
+    def my_travel_hours
+      (my_travel_time / 60.0).floor
+    end
+
+    def my_travel_minutes
+      my_travel_time - (60 * my_travel_hours)
+    end
+
+    def print_my_travel_hours
+      return nil if my_travel_hours == 0
+      return "#{my_travel_hours} hour" if my_travel_hours == 1
+      return "#{my_travel_hours} hours" if my_travel_hours > 1
+    end
+
+    def print_my_travel_minutes
+      return nil if my_travel_minutes == 0
+      return "#{my_travel_minutes} minute" if my_travel_minutes == 1
+      return "#{my_travel_minutes} minutes" if my_travel_minutes > 1
+    end
+
+
   end
 end

data/test/functional/test_all_filters.rb

@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
+
+class TestLine < Test::Unit::TestCase
+  include MetraSchedule::TrainData
+
+  def up_nw_stub
+    f = File.open(File.join(File.dirname(__FILE__), '../fixture/UP_NW.html'), 'r')
+    parser = MetraSchedule::Parser.new f
+    parser.line = LINES[:up_nw]
+    line = Metra.new.line(:up_nw)
+    line.engines = parser.scrape
+    line
+  end
+
+  def test_all_filters
+    line = up_nw_stub.from(:ogilve).to(:barrington).at(Time.parse("11:29PM")).on(Date.parse("Dec 27 2009"))
+    assert_equal(1, line.trains.count)
+    line = up_nw_stub.from(:ogilve).to(:barrington).at(Time.parse("3:00AM")).on(Date.parse("Dec 27 2009"))
+    assert_equal(7, line.trains.count)
+  end
+
+end

data/test/integration/test_line_integration.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
+
+class TestLine < Test::Unit::TestCase
+
+  def test_load_schedule
+    cleanup_cache_dir
+    line = Metra.new.line(:up_nw).outbound
+    line.load_schedule
+    assert_not_nil(line.trains)
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,19 @@
+require 'date'
+require 'time'
+require 'test/unit'
+require 'fileutils'
+
+require File.join(File.dirname(__FILE__), "timecop", "lib", "timecop")
+require File.join(File.dirname(__FILE__), "../lib", "metra")
+
+module TestUnit
+  module TestHelper
+
+    def cleanup_cache_dir
+      FileUtils.rmtree(MetraSchedule::Cacher.new.cache_dir)
+    end
+
+  end
+end
+
+Test::Unit::TestCase.send(:include, TestUnit::TestHelper)

data/test/{test_cacher.rb → unit/test_cacher.rb}

@@ -1,7 +1,4 @@
-require 'test/unit'
-require 'fileutils'
-
-require File.join(File.dirname(__FILE__), "../lib", "metra")
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
 
 class TestLine < Test::Unit::TestCase
 
@@ -56,7 +53,7 @@ class TestLine < Test::Unit::TestCase
     line.engines = [train1, train2, train3]
 
     assert_equal(true, c.persist_line(line))
-    assert_equal(line.engines.count, c.retrieve_line(line).engines.count)
+    assert_equal(line.engines.count, c.retrieve_line(line).count)
     cleanup_dir
   end
 
@@ -75,7 +72,7 @@ class TestLine < Test::Unit::TestCase
     line.engines = [train1, train2, train3]
 
     assert_equal(true, MetraSchedule::Cacher.store_to_cache(line))
-    assert_equal(c.retrieve_line(line).engines.count, MetraSchedule::Cacher.load_from_cache(line).engines.count)
+    assert_equal(c.retrieve_line(line).count, MetraSchedule::Cacher.load_from_cache(line).count)
     cleanup_dir
   end
 

data/test/{test_line.rb → unit/test_line.rb}

@@ -1,16 +1,7 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), "../lib", "metra")
-require File.join(File.dirname(__FILE__), "timecop", "lib", "timecop")
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
 
 class TestLine < Test::Unit::TestCase
 
-# INTEGRATION:
-#  def test_update_schedule
-#    line = Metra.new.line(:up_nw).outbound
-#    line.update_schedule
-#    assert_not_nil(line.trains)
-#  end
-
   def test_initialize_with_line_name
     assert_nothing_raised do
       Metra.new.line(:up_nw)
@@ -26,6 +17,13 @@ class TestLine < Test::Unit::TestCase
     end
   end
 
+  def test_cache_params
+    line = Metra.new.line(:up_nw)
+    line.config :cacher => :tokyo, :cache_dir => '/home/blake/.metra_scheudule'
+    assert_equal(:tokyo, line.cacher)
+    assert_equal('/home/blake/.metra_scheudule', line.cache_dir)
+  end
+
   def test_has_name_and_url
     line = Metra.new.line(:up_nw)
     assert_equal("Union Pacific Northwest", line.name)
@@ -131,10 +129,11 @@ class TestLine < Test::Unit::TestCase
     line = Metra.new.line(:up_nw)
     test_time = "12:30PM"
     assert_nothing_raised do
-      line.at(test_time)
       line.at(Time.now)
+      line.at(test_time)
     end
     assert_equal(line.time, Time.parse(test_time))
+    line.at(Time.parse("12:30PM"))
     assert_raises ArgumentError do
       line.at(:bloopybloop)
     end
@@ -147,6 +146,20 @@ class TestLine < Test::Unit::TestCase
     assert_equal(:inbound, line.from(:barrington).to(:ogilve).deduce_direction)
   end
 
+  def test_trains_sorted_by_departure_time
+    line = Metra.new.line(:up_nw)
+
+    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse('12:30')
+    stop2 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse('12:40')
+    stop3 = MetraSchedule::Stop.new :station => :ogilve, :time => Time.parse('13:30')
+    train1 = MetraSchedule::Train.new :stops => [stop1, stop3], :direction => :outbound, :schedule => :weekday
+    train2 = MetraSchedule::Train.new :stops => [stop2, stop3], :direction => :outbound, :schedule => :weekday
+    line.engines = [train2, train1]
+
+    valid_trains = line.outbound.trains
+    assert_equal([train1, train2], valid_trains)
+  end
+
   def test_trains_filter_by_station
     line = Metra.new.line(:up_nw)
 
@@ -262,4 +275,50 @@ class TestLine < Test::Unit::TestCase
     assert_equal(:outbound, line.dir)
   end
 
+  def test_deduce_direction_by_time_after_midnight
+    Timecop.freeze(Time.parse("12:01AM"))
+    line = Metra.new.line(:up_nw).deduce_direction_by_time
+    assert_equal(:outbound, line.dir)
+  end
+
+  def test_deduce_direction_by_time_at_midnight
+    Timecop.freeze(Time.parse("12:00AM"))
+    line = Metra.new.line(:up_nw).deduce_direction_by_time
+    assert_equal(:outbound, line.dir)
+  end
+
+  def test_deduce_direction_by_time_at_3AM
+    Timecop.freeze(Time.parse("3:00AM"))
+    line = Metra.new.line(:up_nw).deduce_direction_by_time
+    assert_equal(:inbound, line.dir)
+  end
+
+  def test_on
+    line = Metra.new.line(:up_nw)
+    assert_equal(:weekday, line.on(Date.civil(2009, 12, 29)).sched)
+    assert_equal(:saturday, line.on(Date.civil(2009, 12, 26)).sched)
+    assert_equal(:sunday, line.on(Date.civil(2009, 12, 27)).sched)
+
+    assert_raises ArgumentError do
+      line.on("blah")
+    end
+  end
+
+  def test_deduce_schedule
+    line = Metra.new.line(:up_nw)
+    Timecop.freeze(2009, 12, 27)
+    assert_equal(:sunday, line.deduce_schedule.sched)
+  end
+
+  def test_find_train_by_train_num
+    line = Metra.new.line(:up_nw)
+    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse('12:30')
+    stop2 = MetraSchedule::Stop.new :station => :ogilve, :time => Time.parse('13:30')
+    train1 = MetraSchedule::Train.new :train_num => 642, :direction => :inbound, :stops => [stop1, stop2], :schedule => :weekday
+    train2 = MetraSchedule::Train.new :train_num => 631, :direction => :outbound, :stops => [stop1, stop2], :schedule => :holiday
+    line.engines = [train1, train2]
+
+    assert_equal(train1, line.find_train_by_train_num(642))
+  end
+
 end

data/test/{test_metra.rb → unit/test_metra.rb}

@@ -1,5 +1,4 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), "../lib", "metra")
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
 
 class TestMetra < Test::Unit::TestCase
   def test_metra_init

data/test/{test_parser.rb → unit/test_parser.rb}

@@ -1,11 +1,10 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), "../lib", "metra")
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
 
 class TestLine < Test::Unit::TestCase
   include MetraSchedule::TrainData
 
   def up_nw_stub
-    f = File.open(File.join(File.dirname(__FILE__), 'fixture/UP_NW.html'), 'r')
+    f = File.open(File.join(File.dirname(__FILE__), '../fixture/UP_NW.html'), 'r')
     parser = MetraSchedule::Parser.new f
     parser.line = LINES[:up_nw]
     parser.scrape
@@ -93,6 +92,15 @@ class TestLine < Test::Unit::TestCase
     assert_equal(expected.time, p.make_stop(node, 19, :inbound).time)
   end
 
+  def test_make_stop_pm_express
+    p = up_nw_stub
+
+    node = p.tables[3][:tables][1].xpath("tbody[2]/tr/td[5]")[0]
+    expected = MetraSchedule::Stop.new :station => :clyborn, :time => Time.parse("5:29PM")
+    assert_equal(expected.station, p.make_stop(node, 1, :outbound).station)
+    assert_equal(expected.time, p.make_stop(node, 1, :outbound).time)
+  end
+
   def test_find_stops
     p = up_nw_stub
 

data/test/{test_stop.rb → unit/test_stop.rb}

@@ -1,5 +1,4 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), "../lib", "metra")
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
 
 class TestLine < Test::Unit::TestCase
 

data/test/unit/test_train.rb

@@ -0,0 +1,154 @@
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
+
+class TestLine < Test::Unit::TestCase
+
+  def test_initialize_empty_options
+    assert_nothing_raised do
+      t = MetraSchedule::Train.new
+    end
+  end
+
+  def test_initialize_one_option
+    assert_nothing_raised do
+      @@t = MetraSchedule::Train.new :train_num => 651
+    end
+    assert_equal(651, @@t.train_num)
+  end
+
+  def test_initialize_two_options
+    assert_nothing_raised do
+      @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12
+    end
+    assert_equal(651, @@t.train_num)
+    assert_equal(12, @@t.bike_limit)
+  end
+
+  def test_initialize_all_options
+    stop = MetraSchedule::Stop.new :station => :barrington, :time => Time.now
+    assert_nothing_raised do
+      @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :outbound, :stops => [stop]
+    end
+    assert_equal(651, @@t.train_num)
+    assert_equal(12, @@t.bike_limit)
+    assert_equal(:weekday, @@t.schedule)
+    assert_equal(:outbound, @@t.direction)
+    assert_equal([stop], @@t.stops)
+  end
+
+  def test_has_stop?
+    stop = MetraSchedule::Stop.new :station => :barrington, :time => Time.now
+    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :outbound, :stops => [stop]
+    assert_equal(true, @@t.has_stop?(:barrington))
+    assert_equal(false, @@t.has_stop?(:arlington_park))
+  end
+
+  def test_in_time?
+    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse("12:30PM")
+    stop2 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse("12:40PM")
+    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound, :stops => [stop1, stop2]
+    assert_equal(true, @@t.in_time?(:arlington_heights, Time.parse("12:35PM")))
+    assert_equal(false, @@t.in_time?(:barrington, Time.parse("12:35PM")))
+  end
+
+  def test_in_time_same_time_next_day
+    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse("12:30PM")
+    stop2 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse("12:40PM")
+    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound, :stops => [stop1, stop2]
+    tomorrow = Time.parse("12:35PM") + (60 * 60 * 24)
+    assert_equal(true, @@t.in_time?(:arlington_heights, tomorrow))
+    assert_equal(false, @@t.in_time?(:barrington, tomorrow))
+  end
+
+  def test_departure_and_arrival
+    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse("12:30")
+    stop2 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse("12:40")
+    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound, :stops => [stop1, stop2]
+
+    l = Metra.new.line(:up_nw)
+    l.engines = [@@t]
+    train = l.trains.first
+    assert_equal({:departure => Time.parse("12:30"), :arrival => Time.parse("12:40")}, train.departure_and_arrival(:barrington, :arlington_heights))
+  end
+
+  def test_my_departure_and_my_arrival
+    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse("12:30")
+    stop2 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse("12:40")
+    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound, :stops => [stop1, stop2]
+
+    l = Metra.new.line(:up_nw).from(:barrington).to(:arlington_heights)
+    l.engines = [@@t]
+    train = l.trains.first
+    assert_equal(Time.parse("12:30"), train.my_departure)
+    assert_equal(Time.parse("12:40"), train.my_arrival)
+  end
+
+  def test_my_departure_and_my_arrival_with_no_start_or_destination
+    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse("12:30")
+    stop2 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse("12:40")
+    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound, :stops => [stop1, stop2]
+
+    l = Metra.new.line(:up_nw)
+    l.engines = [@@t]
+    train = l.trains.first
+    assert_equal(nil, train.my_departure)
+    assert_equal(nil, train.my_arrival)
+  end
+
+  def test_my_travel_time
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    train.my_departure = Time.parse("12:30PM")
+    train.my_arrival = Time.parse("1:30PM")
+    assert_equal(60, train.my_travel_time)
+  end
+
+  def test_my_travel_time_nil
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    assert_equal(nil, train.my_travel_time)
+  end
+
+  def test_my_travel_time_one_day_into_next
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    train.my_departure = Time.parse("11:30PM")
+    train.my_arrival = Time.parse("12:30AM")
+    assert_equal(60, train.my_travel_time)
+
+    train.my_arrival = Time.parse("1:30AM")
+    assert_equal(120, train.my_travel_time)
+  end
+
+  def test_print_my_travel_time_minutes
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    train.my_departure = Time.parse("12:30PM")
+    train.my_arrival = Time.parse("1:29PM")
+    assert_equal("59 minutes", train.print_my_travel_time)
+  end
+
+  def test_print_my_travel_time_one_hour
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    train.my_departure = Time.parse("12:30PM")
+    train.my_arrival = Time.parse("1:30PM")
+    assert_equal("1 hour", train.print_my_travel_time)
+  end
+
+  def test_print_my_travel_time_one_hour_and_minutes
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    train.my_departure = Time.parse("12:30PM")
+    train.my_arrival = Time.parse("1:35PM")
+    assert_equal("1 hour 5 minutes", train.print_my_travel_time)
+  end
+
+  def test_print_my_travel_time_two_hours
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    train.my_departure = Time.parse("12:30PM")
+    train.my_arrival = Time.parse("2:30PM")
+    assert_equal("2 hours", train.print_my_travel_time)
+  end
+
+  def test_print_my_travel_time_two_hours_and_minutes
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    train.my_departure = Time.parse("12:30PM")
+    train.my_arrival = Time.parse("2:35PM")
+    assert_equal("2 hours 5 minutes", train.print_my_travel_time)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: metra_schedule
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.1.2
 platform: ruby
 authors: 
 - Blake Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 -06:00
+date: 2009-12-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,13 +42,16 @@ files:
 - lib/metra/stop.rb
 - lib/metra/train.rb
 - lib/metra/train_data.rb
+- test/test_helper.rb
 - test/fixture/UP_NW.html
-- test/test_cacher.rb
-- test/test_line.rb
-- test/test_metra.rb
-- test/test_parser.rb
-- test/test_stop.rb
-- test/test_train.rb
+- test/unit/test_cacher.rb
+- test/unit/test_line.rb
+- test/unit/test_metra.rb
+- test/unit/test_parser.rb
+- test/unit/test_stop.rb
+- test/unit/test_train.rb
+- test/functional/test_all_filters.rb
+- test/integration/test_line_integration.rb
 has_rdoc: true
 homepage: http://github.com/blakesmith/metra_schedule
 licenses: []

data/test/test_train.rb

@@ -1,65 +0,0 @@
-require 'test/unit'
-require File.join(File.dirname(__FILE__), "../lib", "metra")
-
-class TestLine < Test::Unit::TestCase
-
-  def test_initialize_empty_options
-    assert_nothing_raised do
-      t = MetraSchedule::Train.new
-    end
-  end
-
-  def test_initialize_one_option
-    assert_nothing_raised do
-      @@t = MetraSchedule::Train.new :train_num => 651
-    end
-    assert_equal(651, @@t.train_num)
-  end
-
-  def test_initialize_two_options
-    assert_nothing_raised do
-      @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12
-    end
-    assert_equal(651, @@t.train_num)
-    assert_equal(12, @@t.bike_limit)
-  end
-
-  def test_initialize_all_options
-    stop = MetraSchedule::Stop.new :station => :barrington, :time => Time.now
-    assert_nothing_raised do
-      @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :outbound, :stops => [stop]
-    end
-    assert_equal(651, @@t.train_num)
-    assert_equal(12, @@t.bike_limit)
-    assert_equal(:weekday, @@t.schedule)
-    assert_equal(:outbound, @@t.direction)
-    assert_equal([stop], @@t.stops)
-  end
-
-  def test_has_stop?
-    stop = MetraSchedule::Stop.new :station => :barrington, :time => Time.now
-    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :outbound, :stops => [stop]
-    assert_equal(true, @@t.has_stop?(:barrington))
-    assert_equal(false, @@t.has_stop?(:arlington_park))
-  end
-
-  def test_in_time?
-    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse("12:30")
-    stop2 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse("12:40")
-    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound, :stops => [stop1, stop2]
-    assert_equal(true, @@t.in_time?(:arlington_heights, Time.parse("12:35")))
-    assert_equal(false, @@t.in_time?(:barrington, Time.parse("12:35")))
-  end
-
-  def test_departure_and_arrival
-    stop1 = MetraSchedule::Stop.new :station => :barrington, :time => Time.parse("12:30")
-    stop2 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse("12:40")
-    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound, :stops => [stop1, stop2]
-
-    l = Metra.new.line(:up_nw)
-    l.engines = [@@t]
-    train = l.trains.first
-    assert_equal({:departure => Time.parse("12:30"), :arrival => Time.parse("12:40")}, train.departure_and_arrival(:barrington, :arlington_heights))
-  end
-
-end