amtrak 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 893ffef1c08c1763b3a34c0f70d9dd303f89385f
-  data.tar.gz: c2e940a65b8bf344359b2ca25a15b0c853776c3a
+  metadata.gz: 2ec72cfc1f5a1b52b737a3b1744af0f11a097347
+  data.tar.gz: 4552142bd84a4699d7fad70183378a6d5ce1523a
 SHA512:
-  metadata.gz: f98144098bbe5944ababe3817acc7713a838279dc63b1a9cacf5af17a34584faaf879c8ebce826a462867ddab44bce7fb5db5e1fca9ad4acce5ad05a60edf442
-  data.tar.gz: 42ce40b14aeb3341e0d46e20512b2275fb80e02d51cdf03ff475314974084db1190244c340f79cf6c175add675cc2d261e0d3a28bf1cd6249008c109cc10dd84
+  metadata.gz: 1766915385f034a27c00210e732f9ff4b7725323d312153d732074b0d6c3da19806c3de6e1ff61b89431ff0d15bdd187c38c2e52f765d787ff19888ed1467560
+  data.tar.gz: 9c56312cbf9c98572d199fcd437dcff6e0abd25fe2252ea0b5f124f9bab01dbaa3c70eb49235a53deb1895129ebdfa9c89ab48a87261d3988d680e8e20d5e437

data/lib/amtrak/train_fetcher/main_page.rb

@@ -33,11 +33,9 @@ module Amtrak
         {
           "_handler=amtrak.presentation.handler.request.rail.AmtrakRailTrainStatusSearchRequestHandler/_xpath=/sessionWorkflow/productWorkflow[@product='Rail']" => '',
           "/sessionWorkflow/productWorkflow[@product='Rail']/tripRequirements/journeyRequirements[1]/departDate.date" => departure_date,
+          "/sessionWorkflow/productWorkflow[@product='Rail']/tripRequirements/@trainStatusType" => 'statusByCityPair',
+          "/sessionWorkflow/productWorkflow[@product='Rail']/tripRequirements/journeyRequirements[1]/departDate/@radioSelect" => 'arrivalTime',
           'requestor'        => 'amtrak.presentation.handler.page.rail.AmtrakRailGetTrainStatusPageHandler',
-          'xwdf_trainNumber' => "/sessionWorkflow/productWorkflow[@product='Rail']/tripRequirements/journeyRequirements[1]/segmentRequirements[1]/serviceCode",
-          'wdf_trainNumber'  => 'optional',
-          'xwdf_SortBy'      => "/sessionWorkflow/productWorkflow[@product='Rail']/tripRequirements/journeyRequirements[1]/departDate/@radioSelect",
-          'wdf_SortBy'       => 'arrivalTime',
           'xwdf_origin'      => "/sessionWorkflow/productWorkflow[@product='Rail']/travelSelection/journeySelection[1]/departLocation/search",
           'wdf_origin'       => from.to_s,
           'xwdf_destination' => "/sessionWorkflow/productWorkflow[@product='Rail']/travelSelection/journeySelection[1]/arriveLocation/search",

data/lib/amtrak/train_parser.rb

@@ -19,12 +19,11 @@ module Amtrak
     def parse
       trains = []
 
-      until train_nodes.empty?
-        departure, arrival = train_nodes.shift(2)
+      while train_node = train_nodes.shift
         trains << {
-          number: parse_train_number(departure),
-          departure: parse_train(departure),
-          arrival: parse_train(arrival)
+          number: parse_train_number(train_node),
+          departure: parse_train(find_depart_status(train_node)),
+          arrival: parse_train(find_arrive_status(train_node))
         }
       end
 
@@ -35,33 +34,39 @@ module Amtrak
 
     def train_nodes
       @train_nodes ||= document.search(
-        "//tr[contains(@class, 'status_result')]"
+        "//div[@id='train_status_resp_by_citypair']"
       ).tap { |results| fail 'No trains found' unless results.count > 0 }.to_a
     end
 
+    def find_depart_status(node)
+      find!(node, ".//div[@id='resp_by_citypair_depart_status_details']")
+    end
+
+    def find_arrive_status(node)
+      find!(node, ".//div[@id='resp_by_citypair_arrive_status_details']")
+    end
+
     def parse_train_number(node)
       find!(
-        node, ".//th[@class='service']/div[@class='route_num']/text()"
+        node,
+        ".//div[@id='resp_by_citypair_subheading']/\
+        div[@id='resp_by_citypair_subheading_trainname']/text()"
       ).to_s.to_i
     end
 
     def parse_train(node) # rubocop:disable Metrics/MethodLength
-      scheduled_date = find!(
-        node, ".//td[@class='scheduled']/div[@class='date']/text()"
-      ).to_s
-      estimated_date = find!(
-        node, ".//td[@class='act_est']/div[@class='date']/text()"
+      date = find!(
+        node, ".//div[@class='arriveDepartDate']/text()"
       ).to_s
-      scheduled_time = remove_parentheses(
-        find!(node, ".//td[@class='scheduled']/div[@class='time']/text()").to_s
-      )
-      estimated_time = remove_parentheses(
-        find!(node, ".//td[@class='act_est']/div[@class='time']/text()").to_s
+      scheduled_time = clean_msg(
+        find!(node, ".//div[@class='scheduledArriveDepartMsg']/text()").to_s
       )
+      estimated_time = find(
+        node, ".//div[@class='arriveDepartTime']/text()"
+      ).to_s
 
       {
-        scheduled_date: scheduled_date,
-        estimated_date: estimated_date,
+        date: date,
         scheduled_time: scheduled_time,
         estimated_time: estimated_time
       }
@@ -71,20 +76,15 @@ module Amtrak
       node.search(xpath).tap { |rs| fail "#{rs.count} results" if rs.count > 1 }
     end
 
-    def make_datetime(date, time)
-      if date.nil? || time.nil?
-        return
-      else
-        DateTime.parse("#{date} at #{time}")
-      end
+    def find(node, xpath)
+      find!(node, xpath)
+    rescue RuntimeError # rubocop:disable Lint/HandleExceptions
     end
 
-    def remove_parentheses(time_string)
-      if matches = /\(([^)]+)\)/.match(time_string)
-        matches[1]
-      else
-        time_string
-      end
+    def clean_msg(time_msg)
+      return unless matches = /\d+:\d+ (a|p)m/.match(time_msg)
+
+      matches[0]
     end
   end
 end

data/lib/amtrak/version.rb

@@ -1,6 +1,6 @@
 module Amtrak
   # This module holds the Amtrak version
   module Version
-    VERSION = '0.0.1'
+    VERSION = '1.0.0'
   end
 end

data/spec/amtrak/train_fetcher/main_page_spec.rb

@@ -34,7 +34,7 @@ describe Amtrak::TrainFetcher::MainPage do
 
   describe '#total_pages' do
     context 'when only one page exists on the website' do
-      subject { described_class.new('pvd', 'bby', date: Date.parse('2014-11-28')) }
+      subject { described_class.new('pvd', 'bby', date: Date.parse('2014-12-07')) }
 
       it 'returns 1', :vcr do
         expect(subject.total_pages).to eq(1)
@@ -42,7 +42,7 @@ describe Amtrak::TrainFetcher::MainPage do
     end
 
     context 'when more than one page exists on the website' do
-      subject { described_class.new('pvd', 'bby', date: Date.parse('2014-11-27')) }
+      subject { described_class.new('pvd', 'bby', date: Date.parse('2014-12-06')) }
 
       it 'returns 2', :vcr do
         expect(subject.total_pages).to eq(2)
@@ -51,9 +51,9 @@ describe Amtrak::TrainFetcher::MainPage do
   end
 
   describe '#session_id' do
-    subject { described_class.new('pvd', 'bby', date: Date.parse('2014-11-28')) }
+    subject { described_class.new('pvd', 'bby', date: Date.parse('2014-12-06')) }
     it 'pulls the session id from the cookies', :vcr do
-      expect(subject.session_id).to eq('0000kOxPFtO4mDoSiIGk2yzvAz6:187j4dq9a')
+      expect(subject.session_id).to eq('0000faPsyYZwp2n8Wb_4BDhukyg:187j59p07')
     end
   end
 

data/spec/amtrak/train_fetcher/train_page_spec.rb

@@ -5,18 +5,18 @@ describe Amtrak::TrainFetcher::TrainPage do
 
   describe '#get', :vcr do
     context 'when it works' do
-      let(:session_id) { '0000ITjAiGUWm-mBBpAyeGZ43Rv:187j4ddrq' }
+      let(:session_id) { '0000faPsyYZwp2n8Wb_4BDhukyg:187j59p07' }
       let(:page) { '1' }
 
       it 'includes various classes' do
-        expect(subject).to include('route_num')
-        expect(subject).to include('scheduled')
-        expect(subject).to include('act_est')
+        expect(subject).to include('resp_by_citypair_subheading_trainname')
+        expect(subject).to include('resp_by_citypair_depart_status_details')
+        expect(subject).to include('resp_by_citypair_arrive_status_details')
       end
     end
 
     context 'when Excon raises an error' do
-      let(:session_id) { '0000ITjAiGUWm-mBBpAyeGZ43Rv:187j4ddrq' }
+      let(:session_id) { '0000faPsyYZwp2n8Wb_4BDhukyg:187j59p07' }
       let(:page) { '1' }
 
       it 'reraises as a TrainFetcher::Error' do

data/spec/amtrak/train_fetcher_spec.rb

@@ -3,56 +3,56 @@ require 'spec_helper'
 describe Amtrak::TrainFetcher do
   describe '.get', :vcr do
     let(:output) do
-      described_class.get('pvd', 'bby', date: Date.parse('2014-11-27'))
+      described_class.get('pvd', 'bby', date: Date.parse('2014-12-07'))
     end
 
     it 'does the same as #get' do
-      expect(output.join).to include('route_num')
-      expect(output.join).to include('scheduled')
-      expect(output.join).to include('act_est')
+      expect(output.join).to include('resp_by_citypair_subheading_trainname')
+      expect(output.join).to include('resp_by_citypair_depart_status_details')
+      expect(output.join).to include('resp_by_citypair_arrive_status_details')
     end
   end
 
   describe '#get', :vcr do
     describe 'given a valid date and train stations' do
       subject do
-        described_class.new('pvd', 'bby', date: Date.parse('2014-11-27'))
+        described_class.new('pvd', 'bby', date: Date.parse('2014-12-07'))
       end
 
       let(:output) { subject.get }
 
       it 'includes various classes' do
-        expect(output.join).to include('route_num')
-        expect(output.join).to include('scheduled')
-        expect(output.join).to include('act_est')
+        expect(output.join).to include('resp_by_citypair_subheading_trainname')
+        expect(output.join).to include('resp_by_citypair_depart_status_details')
+        expect(output.join).to include('resp_by_citypair_arrive_status_details')
       end
     end
 
     describe 'given an invalid date and valid train stations' do
       subject do
-        described_class.new('pvd', 'bby', date: Date.parse('2014-11-6'))
+        described_class.new('pvd', 'bby', date: Date.parse('2014-11-06'))
       end
 
       let(:output) { subject.get }
 
       it 'does not include various classes and includes an error' do
-        expect(output.join).to_not include('route_num')
-        expect(output.join).to_not include('scheduled')
-        expect(output.join).to_not include('act_est')
+        expect(output.join).to_not include('resp_by_citypair_subheading_trainname')
+        expect(output.join).to_not include('resp_by_citypair_depart_status_details')
+        expect(output.join).to_not include('resp_by_citypair_arrive_status_details')
       end
     end
 
     describe 'given a valid date and invalid train stations' do
       subject do
-        described_class.new('askdf', 'bby', date: Date.parse('2014-11-27'))
+        described_class.new('askdf', 'bby', date: Date.parse('2014-12-07'))
       end
 
       let(:output) { subject.get }
 
       it 'does not include various classes and includes an error' do
-        expect(output.join).to_not include('route_num')
-        expect(output.join).to_not include('scheduled')
-        expect(output.join).to_not include('act_est')
+        expect(output.join).to_not include('resp_by_citypair_subheading_trainname')
+        expect(output.join).to_not include('resp_by_citypair_depart_status_details')
+        expect(output.join).to_not include('resp_by_citypair_arrive_status_details')
       end
     end
   end

data/spec/amtrak/train_parser_spec.rb

@@ -1,75 +1,33 @@
 require 'spec_helper'
 
 describe Amtrak::TrainParser do
-  describe '#remove_parentheses' do
+  describe '#clean_msg' do
     subject { described_class.new('') }
-    let(:output) { subject.remove_parentheses(message) }
+    let(:output) { subject.clean_msg(message) }
 
-    context 'on a string with no surrounding parentheses' do
-      let(:message) { '3:30 pm' }
-      let(:expected) { '3:30 pm' }
-
-      it 'returns the statement' do
-        expect(output).to eq(expected)
-      end
-    end
-
-    context 'on a string with a leading parentheses' do
-      let(:message) { '(3:30 pm' }
-      let(:expected) { '(3:30 pm' }
-
-      it 'returns the statement' do
-        expect(output).to eq(expected)
-      end
-    end
-
-    context 'on a string with a trailing parentheses' do
-      let(:message) { '3:30 pm)' }
-      let(:expected) { '3:30 pm)' }
+    context 'on a string with no time' do
+      let(:message) { 'Scheduled arrival' }
+      let(:expected) { nil }
 
-      it 'returns the statement' do
+      it 'returns nil' do
         expect(output).to eq(expected)
       end
     end
 
-    context 'on a string with surrounding parentheses' do
-      let(:message) { '(3:30 pm)' }
+    context 'on a string with a time' do
+      let(:message) { 'Scheduled arrival 3:30 pm' }
       let(:expected) { '3:30 pm' }
 
-      it 'returns the statement without parentheses' do
+      it 'returns the time' do
         expect(output).to eq(expected)
       end
     end
-  end
-
-  describe '#make_datetime' do
-    subject { described_class.new('') }
-    let(:output) { subject.make_datetime(date, time) }
 
-    context 'given no date' do
-      let(:date) { nil }
-      let(:time) { '3:30 pm' }
-
-      it 'returns nil' do
-        expect(output).to be_nil
-      end
-    end
-
-    context 'given no time' do
-      let(:date) { 'Wed Nov 19, 2014' }
-      let(:time) { nil }
-
-      it 'returns nil' do
-        expect(output).to be_nil
-      end
-    end
-
-    context 'given a string date and time' do
-      let(:date) { 'Wed Nov 19, 2014' }
-      let(:time) { '3:30 pm' }
-      let(:expected) { DateTime.new(2014, 11, 19, 15, 30) }
+    context 'on a string with only a time' do
+      let(:message) { '3:30 pm' }
+      let(:expected) { '3:30 pm' }
 
-      it 'returns a datetime' do
+      it 'returns the time' do
         expect(output).to eq(expected)
       end
     end
@@ -90,131 +48,16 @@ describe Amtrak::TrainParser do
     let(:document) do
       File.read(File.join('spec', 'fixtures', 'html', 'pvd_to_bby.html'))
     end
+    let(:expected) do
+      JSON.parse(
+        File.read(File.join('spec', 'fixtures', 'json', '_parse.json')),
+        symbolize_names: true
+      )
+    end
 
     context 'without an error' do
       it 'returns a list of train times' do
-        expect(output).to eq([
-          {
-            number: 174,
-            departure: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: '',
-              scheduled_time: '5:30 pm',
-              estimated_time: '5:52 pm'
-            },
-            arrival: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '6:25 pm',
-              estimated_time: '6:27 pm'
-            }
-          },
-          {
-            number: 2164,
-            departure: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: '',
-              scheduled_time: '5:50 pm',
-              estimated_time: '6:45 pm'
-            },
-            arrival: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '6:34 pm',
-              estimated_time: '7:14 pm'
-            }
-          },
-          {
-            number: 2166,
-            departure: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: '',
-              scheduled_time: '6:54 pm',
-              estimated_time: ''
-            },
-            arrival: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '7:35 pm',
-              estimated_time: '7:28 pm'
-            }
-          },
-          {
-            number: 176,
-            departure: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '7:19 pm',
-              estimated_time: '7:22 pm'
-            },
-            arrival: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '8:06 pm',
-              estimated_time: '7:51 pm'
-            }
-          },
-          {
-            number: 2168,
-            departure: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '7:56 pm',
-              estimated_time: '7:57 pm'
-            },
-            arrival: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '8:38 pm',
-              estimated_time: '8:34 pm'
-            }
-          },
-          {
-            number: 2170,
-            departure: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '8:54 pm',
-              estimated_time: '8:55 pm'
-            },
-            arrival: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '9:34 pm',
-              estimated_time: '9:32 pm'
-            }
-          },
-          {
-            number: 94,
-            departure: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '9:16 pm',
-              estimated_time: '9:22 pm'
-            },
-            arrival: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '10:02 pm',
-              estimated_time: '9:51 pm'
-            }
-          },
-          {
-            number: 2172,
-            departure: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '9:54 pm',
-              estimated_time: '9:55 pm'
-            },
-            arrival: {
-              scheduled_date: 'Wed Nov 19, 2014',
-              estimated_date: 'Wed Nov 19, 2014',
-              scheduled_time: '10:35 pm',
-              estimated_time: '10:32 pm'
-            }
-          }
-        ])
+        expect(output).to eq(expected)
       end
 
       context 'with an error' do