metra_schedule 0.2.2 → 0.3.0

data/test/fixture/service_updates_alerts_no_range.html

@@ -0,0 +1,25 @@
+<div id="serviceAdvisory">
+                
+                      
+                      
+                          <h2><span class="hidden">Service Advisories</span></h2>
+                      
+                  
+                    <dl>
+                        
+                            
+                                
+                                    
+
+                                        <dt class="line md-w first">Milwaukee District / West Line</dt>
+                                    
+                                    
+                                    
+                                
+                                <dd class="first"><a href="#serviceAdvisory1">Inbound Train #2226 15  Minute Delay</a></dd>
+                                <dd id="serviceAdvisory1" class="details">Train #2226, scheduled to arrive Chicago at 9:00 a.m., is operating approximately 15 minutes behind schedule due to earlier delays.  Updated at 8:34 a.m.</dd>
+                            
+                        
+                    </dl>
+                </div>
+

data/test/functional/test_all_filters.rb

@@ -3,20 +3,20 @@ require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
 class TestLine < Test::Unit::TestCase
   include MetraSchedule::TrainData
 
-  def up_nw_stub
+  def setup
     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
+    @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)
+    @line.from(:ogilve).to(:barrington).at(Time.parse("11:29PM")).on(Date.parse("Dec 27 2009"))
+    assert_equal(2, @line.trains.count)
+    @line.from(:ogilve).to(:barrington).at(Time.parse("3:00AM")).on(Date.parse("Dec 27 2009"))
+    assert_equal(8, @line.trains.count)
   end
 
 end

data/test/integration/test_line_integration.rb

@@ -9,4 +9,20 @@ class TestLine < Test::Unit::TestCase
     assert_not_nil(line.trains)
   end
 
+  def test_inject_delays_filter
+    cleanup_cache_dir
+    data = [{:train_num => 602, :delay => (10..15)}]
+    result = MetraSchedule::Cacher.new.persist_delays(data)
+    assert_equal(true, result)
+    line = Metra.new.line(:up_nw).from(:barrington).to(:ogilve)
+    line.load_schedule
+    trains = line.trains
+    the_602 = trains.find {|t| t.train_num == 602}
+    assert_not_nil(the_602)
+    assert_not_nil(the_602.delay)
+    assert_equal(data.first[:delay], the_602.delay)
+    cleanup_cache_dir
+  end
+
+
 end

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'date'
 require 'time'
 require 'test/unit'
 require 'fileutils'
+require 'rubygems'
 
 require File.join(File.dirname(__FILE__), "timecop", "lib", "timecop")
 require File.join(File.dirname(__FILE__), "../lib", "metra")

data/test/unit/test_cacher.rb

@@ -76,4 +76,33 @@ class TestLine < Test::Unit::TestCase
     cleanup_dir
   end
 
+  def test_persist_delays
+    cleanup_dir
+    c = MetraSchedule::Cacher.new
+    data = [{:train_num => 800, :delay => (15..30)}]
+    assert_equal(true, c.persist_delays(data))
+    cleanup_dir
+  end
+
+  def test_retrieve_delays
+    cleanup_dir
+    c = MetraSchedule::Cacher.new
+    data = [{:train_num => 800, :delay => (15..30)}]
+    c.persist_delays(data)
+    assert_equal(data, c.retrieve_delays)
+    cleanup_dir
+  end
+
+  def test_clear_delays
+    cleanup_dir
+    c = MetraSchedule::Cacher.new
+    data = [{:train_num => 800, :delay => (15..30)}]
+    c.persist_delays(data)
+    assert_equal(true, c.delays_exist?)
+    assert_equal(true, c.clear_delays)
+    assert_equal(false, c.delays_exist?)
+    assert_equal(false, c.clear_delays)
+    cleanup_dir
+  end
+
 end

data/test/unit/test_delay_parser.rb

@@ -0,0 +1,76 @@
+require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
+
+class TestDelayParser < Test::Unit::TestCase
+  include MetraSchedule::TrainData
+
+  def advisory_alert_stub
+    f = File.open(File.join(File.dirname(__FILE__), '../fixture/service_updates_alerts.html'), 'r')
+    parser = MetraSchedule::DelayParser.new f
+    parser.scrape
+    parser
+  end
+
+  def no_advisory_stub
+    f = File.open(File.join(File.dirname(__FILE__), '../fixture/service_updates_alerts_no_advisories.html'), 'r')
+    parser = MetraSchedule::DelayParser.new f
+    parser.scrape
+    parser
+  end
+
+  def no_range_stub
+    f = File.open(File.join(File.dirname(__FILE__), '../fixture/service_updates_alerts_no_range.html'), 'r')
+    parser = MetraSchedule::DelayParser.new f
+    parser.scrape
+    parser
+  end
+
+  def no_delay_advisory
+    f = File.open(File.join(File.dirname(__FILE__), '../fixture/service_updates_alerts_multiple_with_non_delay.html'), 'r')
+    parser = MetraSchedule::DelayParser.new f
+    parser.scrape
+    parser
+  end
+
+  def test_init
+    assert_nothing_raised do
+      @@p = MetraSchedule::DelayParser.new 'http://blake.com'
+    end
+    assert_not_nil(advisory_alert_stub.html_doc)
+    assert_not_nil(@@p.html_doc)
+  end
+
+  def test_find_train_num
+    node = advisory_alert_stub.html_doc.css('#serviceAdvisory')
+    assert_equal(2156, advisory_alert_stub.find_train_num(node))
+  end
+
+  def test_find_delay
+    node = advisory_alert_stub.html_doc.css('#serviceAdvisory')
+    assert_equal("20 minutes delayed", advisory_alert_stub.find_delay(node))
+  end
+
+  def test_make_train_delays
+    assert_equal([{:train_num => 2156, :delay => "18 - 20 minutes delayed"}], advisory_alert_stub.make_train_delays)
+  end
+
+  def test_has_delays?
+    assert_equal(true, advisory_alert_stub.has_delays?)
+    assert_equal(false, no_advisory_stub.has_delays?)
+  end
+
+  def test_find_delay_no_range
+    node = no_range_stub.html_doc.css('#serviceAdvisory dd.first')
+    assert_equal("15 Minute Delay", no_range_stub.find_delay(node))
+  end
+
+  def test_find_delay
+    node = advisory_alert_stub.html_doc.css('#serviceAdvisory dd.first')
+    assert_equal("18 - 20 minutes delayed", advisory_alert_stub.find_delay(node))
+  end
+
+  def test_find_delay_advisory_with_no_delay
+    node = no_delay_advisory.html_doc.css('#serviceAdvisory dd.first')
+    assert_equal("Stopped North of Ashburn", no_delay_advisory.find_delay(node))
+  end
+
+end

data/test/unit/test_line.rb

@@ -1,4 +1,9 @@
 require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
+begin
+  require 'mocha'
+rescue
+  puts "Not all the tests may function properly without Mocha installed. gem install mocha"
+end
 
 class TestLine < Test::Unit::TestCase
 
@@ -189,6 +194,21 @@ class TestLine < Test::Unit::TestCase
     assert_equal([train2], valid_trains)
   end
 
+  def test_trains_filter_by_start_with_delay_threshold
+    line = Metra.new.line(:up_nw).delay_threshold(10)
+
+    stop1 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse('12:30')
+    stop2 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse('12:40')
+    stop3 = MetraSchedule::Stop.new :station => :ogilve, :time => Time.parse('13:30')
+    train1 = MetraSchedule::Train.new :stops => [stop1, stop3], :direction => :inbound, :schedule => :weekday
+    train2 = MetraSchedule::Train.new :stops => [stop2, stop3], :direction => :inbound, :schedule => :weekday
+    train1.delay = "Delayed"
+    line.engines = [train1, train2]
+
+    valid_trains = line.to(:ogilve).from(:arlington_heights).at('12:35').trains
+    assert_equal([train1, train2], valid_trains)
+  end
+
   def test_trains_just_direction_and_time
     line = Metra.new.line(:up_nw)
 
@@ -321,4 +341,10 @@ class TestLine < Test::Unit::TestCase
     assert_equal(train1, line.find_train_by_train_num(642))
   end
 
+  def test_delay_threshold
+    line = Metra.new.line(:up_nw)
+    line.delay_threshold(5)
+    assert_equal(5, line.del_threshold)
+  end
+
 end

data/test/unit/test_parser.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), "../", "test_helper.rb")
 class TestLine < Test::Unit::TestCase
   include MetraSchedule::TrainData
 
-  def up_nw_stub
+  def p
     f = File.open(File.join(File.dirname(__FILE__), '../fixture/UP_NW.html'), 'r')
     parser = MetraSchedule::Parser.new f
     parser.line = LINES[:up_nw]
@@ -11,6 +11,10 @@ class TestLine < Test::Unit::TestCase
     parser
   end
 
+  def up_nw_stub
+    p
+  end
+
   def test_init
     assert_nothing_raised do
       @@p = MetraSchedule::Parser.new 'http://blake.com'
@@ -20,20 +24,17 @@ class TestLine < Test::Unit::TestCase
   end
 
   def test_seperate_tables
-    p = up_nw_stub
     assert_equal(2, p.tables.find_all {|t| t[:schedule] == :weekday}.count)
     assert_equal(2, p.tables.find_all {|t| t[:schedule] == :saturday}.count)
     assert_equal(2, p.tables.find_all {|t| t[:schedule] == :sunday}.count)
   end
 
   def test_sanitize
-    p = up_nw_stub
     list = [1, 2, 3]
     assert_equal(2, p.sanitize(list).count)
   end
 
   def test_train_count
-    p = up_nw_stub
     assert_equal(16, p.train_count(p.tables[0][:tables][0]))
     assert_equal(16, p.train_count(p.tables[0][:tables][1]))
     assert_equal(12, p.train_count(p.tables[1][:tables][0]))
@@ -45,13 +46,10 @@ class TestLine < Test::Unit::TestCase
   end
 
   def test_stop_count
-    p = up_nw_stub
     assert_equal(23, p.stop_count(p.tables[0][:tables][0]))
   end
 
   def test_make_stop_inbound
-    p = up_nw_stub
-
     node = p.tables[0][:tables][0].xpath("tbody[4]/tr/td[1]")[0]
     expected = MetraSchedule::Stop.new :station => :crystal_lake, :time => Time.parse("4:47AM")
     assert_equal(expected.station, p.make_stop(node, 3, :inbound).station)
@@ -59,8 +57,6 @@ class TestLine < Test::Unit::TestCase
   end
 
   def test_make_stop_outbound
-    p = up_nw_stub
-
     node = p.tables[3][:tables][0].xpath("tbody[4]/tr/td[1]")[0]
     expected = MetraSchedule::Stop.new :station => :jefferson_park, :time => Time.parse("6:13AM")
     assert_equal(expected.station, p.make_stop(node, 3, :outbound).station)
@@ -68,15 +64,11 @@ class TestLine < Test::Unit::TestCase
   end
 
   def test_make_stop_nil
-    p = up_nw_stub
-
     node = p.tables[0][:tables][0].xpath("tbody[1]/tr/td[1]")[0]
     assert_nil(p.make_stop(node, 0, :inbound))
   end
 
   def test_make_stop_am
-    p = up_nw_stub
-
     node = p.tables[0][:tables][1].xpath("tbody[18]/tr/td[5]")[0]
     expected = MetraSchedule::Stop.new :station => :norwood_park, :time => Time.parse("11:57AM")
     assert_equal(expected.station, p.make_stop(node, 17, :inbound).station)
@@ -84,8 +76,6 @@ class TestLine < Test::Unit::TestCase
   end
 
   def test_make_stop_pm
-    p = up_nw_stub
-
     node = p.tables[0][:tables][1].xpath("tbody[20]/tr/td[5]")[0]
     expected = MetraSchedule::Stop.new :station => :jefferson_park, :time => Time.parse("12:01PM")
     assert_equal(expected.station, p.make_stop(node, 19, :inbound).station)
@@ -93,8 +83,6 @@ class TestLine < Test::Unit::TestCase
   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)
@@ -102,15 +90,11 @@ class TestLine < Test::Unit::TestCase
   end
 
   def test_find_stops
-    p = up_nw_stub
-
     table = p.tables[0][:tables][0]
     assert_equal(19, p.find_stops(table, 1, :inbound).count)
   end
 
   def test_find_stops_express
-    p = up_nw_stub
-
     table = p.tables[0][:tables][0]
     stops = p.find_stops(table, 5, :inbound)
     assert_equal(Time.parse("6:43AM").to_f , stops[6].time.to_f)
@@ -119,13 +103,11 @@ class TestLine < Test::Unit::TestCase
   end
 
   def test_make_trains_count
-    p = up_nw_stub
     trains = p.make_trains
     assert_equal(104, p.make_trains.count)
   end
 
   def test_find_train_num
-    p = up_nw_stub
     train_602 = p.make_trains.first
     train_632 = p.make_trains[15]
 
@@ -134,7 +116,6 @@ class TestLine < Test::Unit::TestCase
   end
 
   def test_find_bike_count
-    p = up_nw_stub
     train_602 = p.make_trains.first
     train_640 = p.make_trains[18]
 

data/test/unit/test_time_extension.rb

@@ -9,4 +9,11 @@ class TestTimeExtension < Test::Unit::TestCase
     assert_equal(expected, sample.to_today)
   end
 
+  def test_to_today_midnight_inclusive
+    sample = Time.local(2009, 5, 5, 0, 30, 45)
+    today = Time.now
+    expected = Time.local(today.year, today.month, today.day+1, sample.hour, sample.min, sample.sec)
+    assert_equal(expected, sample.to_today)
+  end
+
 end

data/test/unit/test_train.rb

@@ -50,6 +50,16 @@ class TestLine < Test::Unit::TestCase
     assert_equal(false, @@t.in_time?(:barrington, Time.parse("12:35PM")))
   end
 
+  def test_in_time_midnight_inclusive
+    stop1 = MetraSchedule::Stop.new :station => :arlington_heights, :time => Time.parse("12:30AM")
+    stop2 = MetraSchedule::Stop.new :station => :cary, :time => Time.parse("2:45AM")
+    stop3 = MetraSchedule::Stop.new :station => :harvard, :time => Time.parse("4:00AM")
+    @@t = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound, :stops => [stop1, stop2, stop3]
+    assert_equal(true, @@t.in_time?(:arlington_heights, Time.parse("11:45PM")))
+    assert_equal(true, @@t.in_time?(:cary, Time.parse("11:45PM")))
+    assert_equal(false, @@t.in_time?(:harvard, Time.parse("11:45PM")))
+  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")
@@ -165,4 +175,11 @@ class TestLine < Test::Unit::TestCase
     assert_equal("2 hours 5 minutes", train.print_my_travel_time)
   end
 
+  def test_departure_with_delay
+    train = MetraSchedule::Train.new :train_num => 651, :bike_limit => 12, :schedule => :weekday, :direction => :inbound
+    train.my_departure = Time.parse("12:30PM")
+    train.del_threshold = 5
+    assert_equal(Time.parse("12:35PM"), train.departure_with_delay)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: metra_schedule
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Blake Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -06:00
+date: 2010-02-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - lib/metra.rb
 - lib/metra/cacher.rb
 - lib/metra/classmethods.rb
+- lib/metra/delay_parser.rb
 - lib/metra/extensions/time_extension.rb
 - lib/metra/line.rb
 - lib/metra/parser.rb
@@ -48,6 +49,10 @@ files:
 - lib/metra/train_data.rb
 - metra_schedule.gemspec
 - test/fixture/UP_NW.html
+- test/fixture/service_updates_alerts.html
+- test/fixture/service_updates_alerts_multiple_with_non_delay.html
+- test/fixture/service_updates_alerts_no_advisories.html
+- test/fixture/service_updates_alerts_no_range.html
 - test/functional/test_all_filters.rb
 - test/integration/test_line_integration.rb
 - test/test_helper.rb
@@ -61,6 +66,7 @@ files:
 - test/timecop/lib/timecop/time_stack_item.rb
 - test/timecop/lib/timecop/timecop.rb
 - test/unit/test_cacher.rb
+- test/unit/test_delay_parser.rb
 - test/unit/test_line.rb
 - test/unit/test_metra.rb
 - test/unit/test_parser.rb
@@ -108,5 +114,6 @@ test_files:
 - test/unit/test_metra.rb
 - test/unit/test_stop.rb
 - test/unit/test_parser.rb
+- test/unit/test_delay_parser.rb
 - test/unit/test_cacher.rb
 - test/test_helper.rb