national-rail 0.3.11 → 0.3.12

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

@@ -0,0 +1,54 @@
+module NationalRail
+  class JourneyPlanner
+    class DetailsPageParser
+
+      def initialize(doc, date)
+        @doc, @date = doc, date
+      end
+
+      def parse
+        details = {}
+        description_divs = (@doc/"table#journeyLegDetails tbody tr.lastRow td[@colspan='6'] div")
+        return details unless description_divs.any?
+        description = description_divs.last.inner_text.gsub(/\s+/, " ").strip
+        company_matches = /(.*) service from .* to .*/.match(description)
+        return details unless company_matches
+        details[:company] = company_matches[1].strip
+        origins, destinations = (/.* service from (.*) to (.*)/.match(description)[1,2]).map{ |s| s.split(",").map(&:strip) }
+        details[:origins], details[:destinations] = origins, destinations
+        parser = TimeParser.new(@date)
+
+        origin_code = (@doc/"td.origin abbr").inner_html.strip
+        departs_at = (@doc/"td.leaving").inner_html.strip
+        details[:initial_stop] = {
+          :station_code => origin_code,
+          :departs_at => parser.time(departs_at)
+        }
+
+        details[:stops] = []
+        (@doc/".callingpoints table > tbody > tr").each do |tr|
+          if (tr/".calling-points").length > 0
+            station_code = (tr/".calling-points > a > abbr").inner_html.strip
+            arrives_at = (tr/".arrives").inner_html.strip
+            departs_at = (tr/".departs").inner_html.strip
+            departs_at = arrives_at if arrives_at.present? && departs_at.blank?
+            arrives_at = departs_at if arrives_at.blank? && departs_at.present?
+            details[:stops] << {
+              :station_code => station_code,
+              :arrives_at => parser.time(arrives_at),
+              :departs_at => parser.time(departs_at)
+            }
+          end
+        end
+
+        destination_code = (@doc/"td.destination abbr").inner_html.strip
+        arrives_at = (@doc/"td.arriving").inner_html.strip
+        details[:final_stop] = {
+          :station_code => destination_code,
+          :arrives_at => parser.time(arrives_at)
+        }
+        details
+      end
+    end
+  end
+end

data/lib/national-rail/journey_planner.rb

@@ -3,6 +3,8 @@ require 'nokogiri'
 require 'active_support'
 require 'tidy_ffi'
 
+require 'national-rail/journey_planner/details_page_parser'
+
 module NationalRail
 
   class ParseError < StandardError
@@ -81,55 +83,17 @@ module NationalRail
         @agent.transact do
           details_page = @link.click
           JourneyPlanner.capture(details_page, "details.html")
-          parse_details(details_page, @date)
-        end
-      end
-
-      def parse_details(page, date)
-        details = {}
-        description = (page.doc/"table#journeyLegDetails tbody tr.lastRow td[@colspan='6'] div").last.inner_text.gsub(/\s+/, " ").strip
-        company_matches = /(.*) service from .* to .*/.match(description)
-        return details unless company_matches
-        details[:company] = company_matches[1].strip
-        origins, destinations = (/.* service from (.*) to (.*)/.match(description)[1,2]).map{ |s| s.split(",").map(&:strip) }
-        details[:origins], details[:destinations] = origins, destinations
-        parser = TimeParser.new(date)
-
-        origin_code = (page.doc/"td.origin abbr").inner_html.strip
-        departs_at = (page.doc/"td.leaving").inner_html.strip
-        details[:initial_stop] = {
-          :station_code => origin_code,
-          :departs_at => parser.time(departs_at)
-        }
-
-        details[:stops] = []
-        (page.doc/".callingpoints table > tbody > tr").each do |tr|
-          if (tr/".calling-points").length > 0
-            station_code = (tr/".calling-points > a > abbr").inner_html.strip
-            arrives_at = (tr/".arrives").inner_html.strip
-            departs_at = (tr/".departs").inner_html.strip
-            departs_at = arrives_at if arrives_at.present? && departs_at.blank?
-            arrives_at = departs_at if arrives_at.blank? && departs_at.present?
-            details[:stops] << {
-              :station_code => station_code,
-              :arrives_at => parser.time(arrives_at),
-              :departs_at => parser.time(departs_at)
-            }
+          parser = DetailsPageParser.new(details_page.doc, @date)
+          begin
+            parser.parse
+          rescue => e
+            JourneyPlanner.capture(details_page, "details-error.html")
+            page_html = TidyFFI::Tidy.new(details_page.parser.to_html).clean
+            raise ParseError.new(e, page_html)
           end
         end
-
-        destination_code = (page.doc/"td.destination abbr").inner_html.strip
-        arrives_at = (page.doc/"td.arriving").inner_html.strip
-        details[:final_stop] = {
-          :station_code => destination_code,
-          :arrives_at => parser.time(arrives_at)
-        }
-        details
-      rescue => e
-        JourneyPlanner.capture(page, "details-error.html")
-        page_html = TidyFFI::Tidy.new(page.parser.to_html).clean
-        raise ParseError.new(e, page_html)
       end
+
     end
 
     def initialize

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: national-rail
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - James Mead
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 +00:00
+date: 2010-12-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,7 +162,7 @@ dependencies:
         version: 1.6.1
   type: :development
   version_requirements: *id009
-description: 
+description: Includes journey planner, live departure boards (both National Rail & Virgin), and a station list with GPS co-ordinates.
 email: james@floehopper.org
 executables: []
 
@@ -174,12 +174,13 @@ files:
 - lib/national-rail.rb
 - lib/national-rail/index.html
 - lib/national-rail/journey_planner.rb
+- lib/national-rail/journey_planner/details_page_parser.rb
 - lib/national-rail/live_departure_boards.rb
 - lib/national-rail/station_list.rb
 - lib/national-rail/stations.kml
 - lib/national-rail/virgin_live_departure_boards.rb
 has_rdoc: true
-homepage: 
+homepage: http://github.com/floehopper/national-rail
 licenses: []
 
 post_install_message: