tube 0.2.0 → 0.2.1

data/lib/tube/status.rb

@@ -52,7 +52,7 @@ module Tube # :nodoc:
     # 
     def initialize( url=
         "http://www.tfl.gov.uk/tfl/livetravelnews/realtime/tube/default.html" )
-      results = Tube::StatusParser.parse( open( url ) )
+      results = Tube::StatusParser.parse( open( url ).read )
       @updated = results[:updated]
       
       @lines = results[:lines].map do |line|

data/lib/tube/status_parser.rb

@@ -8,6 +8,7 @@ module Tube # :nodoc:
     extend self
     
     def parse( html_doc )
+      html_doc.gsub!(" ", " ")
       service_board = Hpricot( html_doc ).at( "#service-board" )
       
       updated_element = service_board.previous_sibling.children.first
@@ -26,7 +27,7 @@ module Tube # :nodoc:
     end
     
     def parse_updated( updated_element )
-      time_text = updated_element.inner_text.match( /(\d?\d:\d\d(a|p)m)/ )[0]
+      time_text = updated_element.inner_text.match( /(\d?\d:\d\d)/ )[0]
       time_zone = if is_bst? then "+0100" else "+0000" end
       
       Time.parse( "#{time_text} #{time_zone}" )
@@ -99,8 +100,12 @@ module Tube # :nodoc:
       bst_end = last_sunday_of_month( "october" )
       
       one_hour = 3600
-      bst_start = Time.gm( bst_start.year, bst_start.month ) + one_hour
-      bst_end = Time.gm( bst_end.year, bst_end.month ) + one_hour
+      
+      bst_start = Time.gm( bst_start.year, bst_start.month, bst_start.day )
+      bst_start += one_hour
+      
+      bst_end = Time.gm( bst_end.year, bst_end.month, bst_end.day )
+      bst_end += one_hour
       
       (bst_start..bst_end).include?( Time.now.getgm )
     end

data/test/dummy.html

@@ -14,7 +14,7 @@
         <div id="main-content">
             <h1>Live travel news</h1>
             
-            <h2>Service update at 12:12pm <a href="later.html" id="works_later" class="alert" name="works_later">View engineering works planned for <strong>later today</strong></a></h2>
+            <h2>Service update at 12:12 <a href="later.html" id="works_later" class="alert" name="works_later">View engineering works planned for <strong>later today</strong></a></h2>
             <div id="service-board">
                 <dl id="lines">
                     <dt class="central">Central</dt>

data/test/status_parser_test.rb

@@ -4,7 +4,7 @@ require "#{File.dirname( __FILE__ )}/../lib/tube/status"
 
 class TestStatusParser < Test::Unit::TestCase
   def test_parse_updated
-    document = Hpricot("<h2>Service update at 6:26pm</h2>")
+    document = Hpricot("<h2>Service update at 18:26</h2>")
     element = document.at("h2")
     result = Tube::StatusParser.parse_updated(element)
     
@@ -12,7 +12,7 @@ class TestStatusParser < Test::Unit::TestCase
   end
   
   def test_parse_updated_with_anchor_in_element
-    document = Hpricot(%Q{<h2>Service update at 12:12pm <a href="/later.html">View engineering works planned for later today</a></h2>})
+    document = Hpricot(%Q{<h2>Service update at 12:12 <a href="/later.html">View engineering works planned for later today</a></h2>})
     element = document.at("h2")
     result = Tube::StatusParser.parse_updated(element)
     
@@ -121,7 +121,7 @@ class TestStatusParser < Test::Unit::TestCase
   def test_parse
     # the file used here is an approximation of the most important bits of the
     # Live travel news at http://www.tfl.gov.uk/tfl/livetravelnews/realtime/tube/default.html
-    document = open("#{File.dirname( __FILE__ )}/dummy.html")
+    document = open("#{File.dirname( __FILE__ )}/dummy.html").read
     result = Tube::StatusParser.parse(document)
     
     assert(result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tube
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Matthew Sadler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 +00:00
+date: 2010-03-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency