national-rail 0.4.9 → 0.4.10

data/lib/national-rail/virgin_live_departure_boards.rb

@@ -13,15 +13,22 @@ module NationalRail
       end
     end
     class TimeParser
-      def initialize(date = Date.today)
-        @date = date
+      def initialize(time = Time.zone.now)
+        @time = time
       end
       def parse(value)
         value = value.gsub(%r{&#\d+;}, '').gsub(%r{\*+$}, '')
         return value if ['On time', 'Starts here', 'No report', 'Cancelled', 'Delayed'].include?(value)
         parts = value.scan(%r{\d{2}})
         return nil unless parts.length == 2
-        Time.zone.parse("#{@date} #{parts.join(':')}")
+        hhmm = parts.join(':')
+        time = Time.zone.parse("#{@time.to_date} #{hhmm}")
+        if time > 12.hours.from_now(@time)
+          time = Time.zone.parse("#{@time.to_date - 1} #{hhmm}")
+        elsif time < 12.hours.ago(@time)
+          time = Time.zone.parse("#{@time.to_date + 1} #{hhmm}")
+        end
+        time
       end
     end
   end
@@ -60,10 +67,9 @@ module NationalRail
 
       def details
         @agent.transact do
-          time_parser = TimeParser.new
           page = @details_link.click
           VirginLiveDepartureBoards.capture(page, @details_link.href)
-          parser = DetailsPageParser.new(page.doc, time_parser)
+          parser = DetailsPageParser.new(page.doc)
           parser.parse
         end
       end
@@ -92,7 +98,7 @@ module NationalRail
       @agent.get("http://realtime.nationalrail.co.uk/virgintrains/#{filename}") do |page|
         VirginLiveDepartureBoards.capture(page, filename)
         encoding = 'UTF-8'
-        summary_rows = (page.doc/"table#TrainTable tbody tr")[2..-1].map do |tr|
+        summary_rows = ((page.doc/"table#TrainTable tbody tr")[2..-1] || []).map do |tr|
           tds = tr/"td"
           details_href = (tds[0]/"a").first["href"]
           details_link = page.links.detect { |l| l.attributes["href"] == details_href }

data/lib/national-rail/virgin_live_departure_boards/details_page_parser.rb

@@ -4,8 +4,9 @@ module NationalRail
 
       include CellParser
 
-      def initialize(doc, time_parser)
-        @doc, @time_parser = doc, time_parser
+      def initialize(doc)
+        @doc = doc
+        @time_parser = TimeParser.new
       end
 
       def parse
@@ -15,11 +16,11 @@ module NationalRail
           (table/"tbody tr").each do |tr|
             tds = tr/"td"
             next unless tds.length == 3
-            will_call_at << {
+            will_call_at.push({
               :station => cell_text(tds[0]),
               :timetabled_arrival => @time_parser.parse(cell_text(tds[1])),
               :expected_arrival => @time_parser.parse(cell_text(tds[2]))
-            }
+            })
           end
         end
         previous_calling_points = []
@@ -28,12 +29,12 @@ module NationalRail
           (table/"tbody tr").each do |tr|
             tds = tr/"td"
             next unless tds.length == 4
-            previous_calling_points << {
+            previous_calling_points.push({
               :station => cell_text(tds[0]),
               :timetabled_departure => @time_parser.parse(cell_text(tds[1])),
               :expected_departure => @time_parser.parse(cell_text(tds[2])),
               :actual_departure => @time_parser.parse(cell_text(tds[3]))
-            }
+            })
           end
         end
         { :will_call_at => will_call_at, :previous_calling_points => previous_calling_points }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: national-rail
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 4
-  - 9
-  version: 0.4.9
+  - 10
+  version: 0.4.10
 platform: ruby
 authors: 
 - James Mead
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +00:00
+date: 2011-04-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency