national-rail 0.3.8 → 0.3.10

data/lib/national-rail/journey_planner.rb

@@ -5,8 +5,34 @@ require 'tidy_ffi'
 
 module NationalRail
 
+  class ParseError < StandardError
+    attr_reader :original_exception, :page_html
+    def initialize(original_exception, page_html)
+      super(original_exception.message)
+      @original_exception, @page_html = original_exception, page_html
+    end
+    def inspect
+      "#{self.class} wrapping #{@original_exception.inspect}"
+    end
+  end
+
+  class InputError < StandardError; end
+
   class JourneyPlanner
 
+    class << self
+      attr_accessor :capture_path
+      def capture(page, filename)
+        if capture_path.present?
+          FileUtils.mkdir_p(capture_path)
+          path = File.join(capture_path, filename)
+          File.open(path, "w") { |f| f.write(TidyFFI::Tidy.new(page.parser.to_html).clean) }
+        end
+      rescue => e
+        puts e
+      end
+    end
+
     class NokogiriParser < Mechanize::Page
       attr_reader :doc
       def initialize(uri = nil, response = nil, body = nil, code = nil)
@@ -38,23 +64,32 @@ module NationalRail
 
       attr_reader :departure_time, :number_of_changes
 
-      def initialize(agent, date, departure_time, number_of_changes, link)
+      def initialize(agent, date, departure_time, number_of_changes, link, status)
         @agent, @date = agent, date
         @departure_time, @number_of_changes, @link = departure_time, number_of_changes, link
+        @status = status
+      end
+
+      def cancelled?
+        @status =~ %r{cancelled}i
       end
 
       def details
-        return if number_of_changes.to_i > 0
+        return {} if number_of_changes.to_i > 0
+        return {} if cancelled?
         @agent.transact do
-          parse_details(@link.click, @date)
+          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 = (/(.*) service from .* to .*/.match(description)[1]).strip
-        details[:company] = company
+        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)
@@ -90,9 +125,9 @@ module NationalRail
         }
         details
       rescue => e
-        filename = File.join(File.dirname(__FILE__), "..", "..", "details-error.html")
-        File.open(filename, "w") { |f| f.write(page.parser.to_html) }
-        raise 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
 
@@ -106,6 +141,7 @@ module NationalRail
     def plan(options = {})
       summary_rows = []
       @agent.get("http://www.nationalrail.co.uk/") do |home_page|
+        JourneyPlanner.capture(home_page, "index.html")
         button = nil
         times_page = home_page.form_with(:action => "http://ojp.nationalrail.co.uk/en/s/planjourney/plan") do |form|
           button = form.buttons.last
@@ -132,8 +168,10 @@ module NationalRail
           form["_includeOvertakenTrains"] = "on"
         end.click_button(button)
 
+        JourneyPlanner.capture(times_page, "summary.html")
+
         if (times_page.doc/".error-message").any?
-          raise (times_page.doc/".error-message").first.inner_text.gsub(/\s+/, " ").strip
+          raise InputError.new((times_page.doc/".error-message").first.inner_text.gsub(/\s+/, " ").strip)
         end
 
         date = Date.parse((times_page.doc/".journey-details span").first.children.first.inner_text.gsub(/\s+/, " ").gsub(/\+ 1 day/, '').strip)
@@ -145,22 +183,24 @@ module NationalRail
             next
           end
 
-          departure_time = TimeParser.new(date).time((tr/"td.leaving").inner_text.strip)
+          departure_time = TimeParser.new(date).time((tr/"td:nth-child(1)").inner_text.strip)
           number_of_changes = (tr/"td:nth-child(6)").inner_text.strip
+          status = (tr/"td:nth-child(10) .status").inner_text.strip
 
           anchor = (tr/"a[@id^=journeyOption]").first
           next unless anchor
 
           link = times_page.links.detect { |l| l.attributes["id"] == anchor.attributes["id"].value }
 
-          summary_rows << SummaryRow.new(@agent, date, departure_time, number_of_changes, link)
+          summary_rows << SummaryRow.new(@agent, date, departure_time, number_of_changes, link, status)
         end
       end
       summary_rows
     rescue => e
-      filename = File.join(File.dirname(__FILE__), "..", "..", "summary-error.html")
-      File.open(filename, "w") { |f| f.write(TidyFFI::Tidy.new(@agent.current_page.parser.to_html).clean) }
-      raise e
+      page = @agent.current_page
+      JourneyPlanner.capture(page, "summary-error.html")
+      page_html = TidyFFI::Tidy.new(page.parser.to_html).clean
+      raise ParseError.new(e, page_html)
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: national-rail
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - James Mead
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +00:00
+date: 2010-12-05 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -35,9 +38,11 @@ dependencies:
   name: hpricot
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 8
@@ -49,9 +54,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 4
@@ -63,9 +70,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -74,19 +83,85 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: tidy_ffi
+  name: ffi
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 6
+        - 3
+        version: 0.6.3
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: tidy_ffi
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 1
         - 3
         version: 0.1.3
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
+        version: 0.4.1
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 3
+        - 23
+        version: 0.3.23
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
+  type: :development
+  version_requirements: *id009
 description: 
 email: james@floehopper.org
 executables: []
@@ -113,23 +188,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: national-rail
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby API for the National Rail website