national-rail 0.2.0 → 0.3.0

data/lib/national-rail/journey_planner.rb

@@ -43,6 +43,7 @@ module NationalRail
       end
 
       def details
+        return if number_of_changes.to_i > 0
         @agent.transact do
           parse_details(@link.click, @date)
         end
@@ -50,7 +51,7 @@ module NationalRail
 
       def parse_details(page, date)
         details = {}
-        description = (page.doc/"table#journeyLegDetails tbody tr.lastRow td[@colspan=6] div").first.inner_text.gsub(/\s+/, " ").strip
+        description = (page.doc/"table#journeyLegDetails tbody tr.lastRow td[@colspan=6] div").last.inner_text.gsub(/\s+/, " ").strip
         origins, destinations = (/from (.*) to (.*)/.match(description)[1,2]).map{ |s| s.split(",").map(&:strip) }
         details[:origins], details[:destinations] = origins, destinations
         parser = TimeParser.new(date)
@@ -102,7 +103,9 @@ module NationalRail
     def plan(options = {})
       summary_rows = []
       @agent.get("http://www.nationalrail.co.uk/") do |home_page|
+        button = nil
         times_page = home_page.form_with(:action => "http://ojp.nationalrail.co.uk/en/s/planjourney/plan") do |form|
+          button = form.buttons.last
           form["jpState"] = "single"
           form["commandName"] = "journeyPlannerCommand"
           form["from.searchTerm"] = options[:from]
@@ -124,7 +127,7 @@ module NationalRail
           form["_lookForSleeper"] = "on"
           form["_directTrains"] = "on"
           form["_includeOvertakenTrains"] = "on"
-        end.click_button
+        end.click_button(button)
 
         if (times_page.doc/"error-message").any?
           raise (times_page.doc/"error-message").first.inner_text.gsub(/\s+/, " ").strip

data/lib/national-rail/live_departure_boards.rb

@@ -1,105 +1,66 @@
-require 'mechanize'
-require 'hpricot'
+require "active_support"
+require "active_support/core_ext"
 
 module NationalRail
 
   class LiveDepartureBoards
 
-    class HpricotParser < Mechanize::Page
-      attr_reader :doc
-      def initialize(uri = nil, response = nil, body = nil, code = nil)
-        @doc = Hpricot(body)
-        super(uri, response, body, code)
-      end
-    end
-    
     class SummaryRow
       attr_reader :attributes
-      def initialize(agent, attributes)
-        @agent, @attributes = agent, attributes
+      def initialize(attributes)
+        @attributes = attributes
       end
       def [](key)
         @attributes[key]
       end
       def details
-        page = nil
-        @agent.transact do
-          page = @attributes[:details][:link].click
-          station = nil
-          (page.doc/"table.arrivaltable tbody tr").map do |tr|
-            tds = (tr/"td")
-            tds.unshift(station) if tds.length < 4
-            station = tds[0]
-            station_url = (station/"a").first.attributes["href"]
-            station_code = /station_query\=(.*)$/.match(station_url)[1]
-            deparr = (tds[1]/".deparr").remove
-            direction = (deparr.inner_text.strip == "Dep") ? "departure" : "arrival"
-            {
-              :station => {
-                :name => (station/"a").inner_text.strip,
-                :url => station_url,
-                :code => station_code
-              },
-              :timetabled => {
-                :time => tds[1].inner_text.strip,
-                :direction => direction
-              },
-              :expected => {
-                :time => tds[2].inner_text.strip
-              },
-              :actual => {
-                :time => tds[3].inner_text.strip
-              }
-            }
-          end
+        url = "http://ojp.nationalrail.co.uk/en/s/ldbdetailsJson"
+        params = { "departing" => "false", "serviceId" => @attributes[:service_id] }
+        uri = URI.parse("#{url}?#{params.to_query}")
+        response = Net::HTTP.get_response(uri)
+        json = ActiveSupport::JSON.decode(response.body)
+        json["trains"].map do |row|
+          {
+            :departs => row[1],
+            :station => row[2],
+            :status => row[3..4],
+            :platform => row[5]
+          }
         end
-      rescue => e
-        File.open("error.html", "w") { |f| f.write(page.parser.to_html) } if page
-        raise e
       end
     end
 
-    def initialize
-      @agent = Mechanize.new
-      @agent.pluggable_parser.html = HpricotParser
-    end
-
     def summary(options = {})
-      summary_url = "http://realtime.nationalrail.co.uk/ldb/sumdep.aspx"
-      page = @agent.get(summary_url, "T" => options[:from], "S" => options[:to])
-      (page.doc/"table.arrivaltable tbody tr").map do |tr|
-        destination = (tr/"td:nth-child(1)")
-        destination_url = (destination/"a").first.attributes["href"]
-        destination_code = /station_query\=(.*)$/.match(destination_url)[1]
-        operator = (tr/"td:nth-child(5)")
-        operator_url = (operator/"a").first.attributes["href"]
-        operator_code = /atocCode\=(.*)$/.match(operator_url)[1]
-        details = (tr/"td:nth-child(6)")
-        details_url = (details/"a").first.attributes["href"]
-        details_link = page.links.detect { |l| l.attributes["href"] == details_url }
-        SummaryRow.new(@agent,
-          :destination => {
-            :name => destination.inner_text,
-            :url => destination_url,
-            :code => destination_code
-          },
-          :platform => (tr/"td:nth-child(2)").inner_text,
-          :timetabled_at => (tr/"td:nth-child(3)").inner_text,
-          :expected_at => (tr/"td:nth-child(4)").inner_text,
-          :operator => {
-            :name => operator.inner_text,
-            :url => operator_url,
-            :code => operator_code
-          },
-          :details => {
-            :url => details_url,
-            :link => details_link
-          }
+      departing = case options[:type]
+      when :departures
+        true
+      when :arrivals
+        false
+      else
+        true
+      end
+      if departing
+        liveTrainsFrom, liveTrainsTo = options[:from], options[:to]
+        origin_or_destination = :destination
+      else
+        liveTrainsFrom, liveTrainsTo = options[:to], options[:from]
+        origin_or_destination = :origin
+      end
+      url = "http://ojp.nationalrail.co.uk/en/s/ldb/liveTrainsJson"
+      params = { "departing" => departing.to_s, "liveTrainsFrom" => liveTrainsFrom, "liveTrainsTo" => liveTrainsTo }
+      uri = URI.parse("#{url}?#{params.to_query}")
+      response = Net::HTTP.get_response(uri)
+      json = ActiveSupport::JSON.decode(response.body)
+      trains = json["trains"].map do |row|
+        service_id = CGI.unescape(%r{/en/s/ldbdetails/([^\?]+)}.match(row[5])[1])
+        SummaryRow.new(
+          :service_id => service_id,
+          :due => row[1],
+          origin_or_destination => row[2],
+          :status => CGI.unescapeHTML(row[3]).split("<br/>").map(&:strip),
+          :platform => row[4]
         )
       end
-    rescue => e
-      File.open("error.html", "w") { |f| f.write(@agent.current_page.parser.to_html) }
-      raise e
     end
 
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Mead
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 +01:00
+date: 2010-11-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,10 +53,10 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
 description: