tube 0.2.3 → 0.2.4

data/examples/service_board.rb

@@ -7,7 +7,7 @@ class String
 end
 
 LINE_COLORS = {
-  :bakerloo => [:bright_white, :yellow_bg],
+  :bakerloo => [:bright_white, :red_bg],
   :central => [:white, :bright_red_bg],
   :circle => [:blue, :bright_yellow_bg],
   :district => [:bright_white, :green_bg],
@@ -17,7 +17,9 @@ LINE_COLORS = {
   :northern => [:bright_white, :black_bg],
   :piccadilly => [:bright_white, :blue_bg],
   :victoria => [:bright_white, :bright_blue_bg],
-  :waterlooandcity => [:blue, :bright_cyan_bg]
+  :waterlooandcity => [:blue, :bright_cyan_bg],
+  :dlr => [:bright_white, :cyan_bg],
+  :overground => [:bright_white, :yellow_bg]
 }
 STATUS_COLOR = [:blue, :bright_white_bg]
 PROBLEM_COLOR = STATUS_COLOR + [:negative]

data/lib/tube/status_parser.rb

@@ -9,11 +9,13 @@ module Tube # :nodoc:
     
     def parse( html_doc )
       html_doc.gsub!( / /, " " )
-      service_board = Nokogiri::HTML( html_doc ).at_css( "#service-board" )
+      doc = Nokogiri::HTML( html_doc )
       
-      updated_element = service_board.previous_element.at_css( "h2" )
+      updated_element = doc.at_css( "div.hd-row > h2" )
       updated = parse_updated( updated_element )
       
+      service_board = doc.at_css( "#service-board" )
+      
       line_elements = service_board.css( "ul#lines > li.ltn-line" )
       lines = line_elements.map( &method( :parse_line ) )
       
@@ -31,8 +33,9 @@ module Tube # :nodoc:
     end
     
     def parse_line( line_element )
-      name = line_element.at_css( "h3.ltn-name" ).content
-      html_class = line_element["class"].split.first
+      name_element = line_element.at_css( "h3.ltn-name" )
+      name = name_element.content
+      html_class = name_element["class"].split.first
       status = parse_status( line_element.at_css( "div.status" ) )
       
       {:name => name, :html_class => html_class, :status => status}

data/test/dummy.html

@@ -31,15 +31,20 @@
                     <p>Get advance warning of weekend closures</p>
                 </div>
             </div>
+            
+            <div class="short-form">
+                <div class="clear"></div>
+            </div>
+            
             <div id="service-board">
                 <h2>Tube lines</h2>
                 <ul id="lines">
-                    <li class="central ltn-line">
+                    <li class="ltn-line">
                         <h3 class="central ltn-name">Central</h3>
                         <div class="status">Good service</div>
                     </li>
                     
-                    <li class="district ltn-line">
+                    <li class="ltn-line">
                         <h3 class="district ltn-name">District</h3>
                         <div class="problem status">
                             <h4 class="ltn-title">Part closure</h4>
@@ -55,7 +60,7 @@
                         </div>
                     </li>
                     
-                    <li class="waterlooandcity ltn-line">
+                    <li class="ltn-line">
                         <h3 class="waterlooandcity ltn-name">Waterloo &amp; City</h3>
                         <div class="problem status">
                             <h4 class="ltn-title">Planned closure</h4>

data/test/status_parser_test.rb

@@ -20,7 +20,7 @@ class TestStatusParser < Test::Unit::TestCase
   end
   
   def test_parse_line
-    document = Nokogiri::HTML(%Q{<li class="central ltn-line"><h3 class="central ltn-name">Central</h3><div class="status">Good service</div></li>})
+    document = Nokogiri::HTML(%Q{<li class="ltn-line"><h3 class="central ltn-name">Central</h3><div class="status">Good service</div></li>})
     element = document.at_css("li")
     result = Tube::StatusParser.parse_line(element)
     
@@ -30,7 +30,7 @@ class TestStatusParser < Test::Unit::TestCase
   end
   
   def test_parse_line_with_complex_name
-    document = Nokogiri::HTML(%Q{<li class="waterlooandcity ltn-line"><h3 class="waterlooandcity ltn-name">Waterloo &amp; City</h3><div class="status">Good service</div></li>})
+    document = Nokogiri::HTML(%Q{<li class="ltn-line"><h3 class="waterlooandcity ltn-name">Waterloo &amp; City</h3><div class="status">Good service</div></li>})
     element = document.at_css("li")
     result = Tube::StatusParser.parse_line(element)
     

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tube
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Matthew Sadler
@@ -14,23 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +01:00
+date: 2010-05-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 1
         version: 1.4.1
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: A simple Ruby library to access the status of the London Underground network.
 email: mat@sourcetagsandcodes.com
 executables: []
@@ -62,20 +53,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Access the status of the London Underground network.