matsadler-tube 0.1.1 → 0.1.2

data/lib/status.rb

@@ -76,44 +76,31 @@ module Tube # :nodoc:
     def reload
       doc = Hpricot( open( @url ) )
       
-      time_el = doc.at( "div#service-board" ).previous_sibling.children.first
-      time_text = time_el.inner_text.match( /(\d?\d:\d\d(a|p)m)/ )[0]
-      time_zone = if is_bst? then "+0100" else "+0000" end
-      @updated = Time.parse( "#{time_text} #{time_zone}" )
+      results = Tube::StatusParser.parse( doc )
       
-      lines = doc.search( "dl#lines dt" ).map do |el|
-        id = el.attributes["class"]
-        name = el.inner_text.strip
-        
-        status = el.next_sibling
-        if status_el = status.at( "h3" )
-          status_text = status_el.inner_text.strip
-          message = format_messages( status.search( "div.message p" ) )
-        else
-          status_text = status.inner_text.strip
-        end
-        problem = status.attributes["class"] == "problem"
+      @updated = results[:updated]
+      
+      lines = results[:lines].map do |line|
+        id = line[:html_class]
+        name = line[:name]
+        status_text = line[:status][:headline]
+        problem = line[:status][:problem]
+        message = line[:status][:message]
         
         Line.new( id, status_text, problem, message, name )
       end
       @lines = LineGroup.new( lines )
       
-      @station_groups = StationGroupGroup.new
-      doc.search( "dl#stations dt" ).each do |el|
-        station_group = StationGroup.new( el.inner_text.strip )
-        while el = el.next_sibling
-          if el.to_html =~ /^<dd/ && name_el = el.at( "h3" )
-            name = name_el.inner_text.strip
-            message = format_messages( el.search( "div.message p" ) )
-            station = Station.new( name, message )
-            station_group.push( station )
-          elsif el.to_html =~ /^<dt/
-            break
-          end
+      station_groups = results[:station_groups].map do |station_group|
+        stations = station_group[:stations].map do |station|
+          Station.new( station[:name], station[:message] )
         end
-        @station_groups.push( station_group )
+        
+        StationGroup.new( station_group[:name], stations )
       end
       
+      @station_groups = StationGroupGroup.new( station_groups )
+      
       self
     end
     
@@ -266,52 +253,5 @@ module Tube # :nodoc:
       if as_string then doc.to_s else doc end
     end
     
-    private
-    
-    # :call-seq: format_messages(messages) -> string
-    # 
-    # Takes an array of elements, strips those elements of elements they contain
-    # and returns only the text within the root elements.
-    #  <p>Suspended. Rail replacement bus services operate.</p>
-    #  <p>Service A: ...</p>
-    #  <p><a href="/transform">See how we are transforming the Tube</a></p>
-    # becomes
-    #  Suspended. Rail replacement bus services operate.
-    #  Service A: ...
-    # 
-    def format_messages( messages )
-      text_messages = messages.map do |message|
-        if message.children
-          message.children.select {|child| child.text?}.join( " " )
-        end
-      end.compact
-      text_messages.reject! {|m| m.empty?}
-      text_messages.map {|m| m.gsub( /\s+/, " " ).strip}.join( "\n" )
-    end
-    
-    # :call-seq: is_bst? -> bool
-    # 
-    # Is British Summer Time currently in effect.
-    # 
-    def is_bst?
-      bst_start = last_sunday_of_preceding_month( "april" )
-      bst_end = last_sunday_of_preceding_month( "november" )
-      
-      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..bst_end).include?(Time.now.getgm)
-    end
-    
-    # :call-seq: last_sunday_of_preceding_month(month_name) -> date
-    # 
-    def last_sunday_of_preceding_month( month_name )
-      start_of_preceding_month = Date.parse( month_name )
-      week_day = start_of_preceding_month.wday
-      distance_from_sunday = if week_day == 0 then 7 else week_day end
-      start_of_preceding_month - distance_from_sunday
-    end
-    
   end
 end

data/lib/status_parser.rb

@@ -0,0 +1,130 @@
+module Tube # :nodoc:
+  module StatusParser
+    extend self
+    
+    def parse( hpricot_doc )
+      service_board = hpricot_doc.at( "#service-board" )
+      
+      updated_element = service_board.previous_sibling.children.first
+      updated = parse_updated( updated_element )
+      
+      lines = service_board.search( "dl#lines dt" ).map do |line_element|
+        parse_line( line_element )
+      end
+      
+      station_group_elements = service_board.search( "dl#stations dt" )
+      station_groups = station_group_elements.map do |station_group_element|
+        parse_station_group( station_group_element )
+      end
+      
+      {:updated => updated, :lines => lines, :station_groups => station_groups}
+    end
+    
+    def parse_updated( updated_element )
+      time_text = updated_element.inner_text.match( /(\d?\d:\d\d(a|p)m)/ )[0]
+      time_zone = if is_bst? then "+0100" else "+0000" end
+      
+      Time.parse( "#{time_text} #{time_zone}" )
+    end
+    
+    def parse_line( line_element )
+      name = line_element.inner_text.strip
+      html_class = line_element.attributes["class"]
+      status = parse_status( line_element.next_sibling )
+      
+      {:name => name, :html_class => html_class, :status => status}
+    end
+    
+    def parse_status( status_element )
+      header = status_element.at( "h3" )
+      
+      if header
+        headline = header.inner_text.strip
+        message = parse_status_message( status_element.search( "div.message p" ) )
+      else
+        headline = status_element.inner_text.strip
+      end
+      problem = status_element.attributes["class"] == "problem"
+      
+      {:headline => headline, :problem => problem, :message => message}
+    end
+    
+    def parse_station_group( station_group_element )
+      name = station_group_element.inner_text.strip
+      stations = []
+      
+      station_element = station_group_element
+      while station_element = station_element.next_sibling
+        if station_element.to_html =~ /^<dd/
+          stations.push( parse_station( station_element ) )
+        elsif station_element.to_html =~ /^<dt/
+          break
+        end
+      end
+      
+      {:name => name, :stations => stations}
+    end
+    
+    def parse_station( station_element )
+      name = station_element.at( "h3" ).inner_text.strip
+      message = parse_status_message( station_element.search( "div.message p" ) )
+      
+      {:name => name, :message => message}
+    end
+    
+    def parse_status_message( messages )
+      text_messages = messages.map do |message|
+        if message.children
+          message.children.select {|child| child.text?}.join( " " )
+        end
+      end.compact
+      text_messages.reject! {|m| m.empty?}
+      
+      text_messages.map {|m| m.gsub( /\s+/, " " ).strip}.join( "\n" )
+    end
+    
+    private
+    
+    # :call-seq: is_bst? -> bool
+    # 
+    # Is British Summer Time currently in effect.
+    # 
+    def is_bst?
+      bst_start = last_sunday_of_month( "march" )
+      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..bst_end).include?( Time.now.getgm )
+    end
+    
+    # :call-seq: last_sunday_of_month(month_name) -> date
+    # 
+    def last_sunday_of_month( month )
+      start_of_next_month = Date.parse( next_month_name( month ) )
+      
+      week_day = start_of_next_month.wday
+      
+      distance_from_sunday = if week_day == 0 then 7 else week_day end
+      start_of_next_month - distance_from_sunday
+    end
+    
+    # :call-seq: next_month_name(month_name) -> string
+    # 
+    def next_month_name( month )
+      index = Date::MONTHNAMES.index( month.capitalize )
+      index ||= ABBR_MONTHNAMES.index( month.capitalize )
+      
+      index += 1
+      
+      if index >= 12
+        index = 1
+      end
+      
+      Date::MONTHNAMES[index]
+    end
+    
+  end
+end

data/lib/tube.rb

@@ -2,9 +2,11 @@ require 'rubygems'
 require 'hpricot'
 require 'open-uri'
 require 'time'
+require 'date'
 require 'json'
 require 'rexml/document'
 
+require 'status_parser'
 require 'line'
 require 'station'
 require 'line_group'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matsadler-tube
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mat Sadler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -07:00
+date: 2009-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/line.rb
+- lib/status_parser.rb
 - lib/line_group.rb
 - lib/station.rb
 - lib/station_group.rb
@@ -50,6 +51,7 @@ files:
 - lib/tube.rb
 has_rdoc: true
 homepage: http://github.com/matsadler/tube
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -75,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: A simple Ruby library to access the status of the London Underground network.