amtrak 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a54ef0f3c09e8114c0dd5b822f30c6f28ceae3a9
-  data.tar.gz: 6289270b60dfcea4db75badb5f1f5a03ea94b67a
+  metadata.gz: f6b65ee543c0ab3f6c50c3f6af2d873fdb6ea8bf
+  data.tar.gz: 0bbe04375b423a44476f15dceaa7f85a293756fd
 SHA512:
-  metadata.gz: 25490cf1b1d64518236723a508dc1825f3eb1d8d316d0c399d7a9f2122be65c390be18569979929f371ba7012721e87883d8bf74d0833c9f14280439be0d8b22
-  data.tar.gz: e0ccb8fd344a69f1a10de8b903bc1ac5ac3062071f3d35d2270dda186537600cb7b6ab3ed324cd406393ff1a1784b6a3f49ebd5334ad4a11fd6d7c2dc6c38e53
+  metadata.gz: 458227e5403222869fe87f704ee5ea19aeb61c936299fd5a4684979531ec473240fb5bec3df3bbd6bf7de963b2d0b7483d360cb0bdefed152ef333c49fe01a0e
+  data.tar.gz: 7e3ca8eea40bda322a3f5a7edefbf090e5a50cd6933726eb81a2919da430fc39b860fb276d3e7b8036f984c9715120f54482649c83e4edad33ab743e530840da

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/amtrak.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'excon', '~> 0.41.0'
+  spec.add_dependency 'mechanize', '~> 2.7'
   spec.add_dependency 'nokogiri', '~> 1.6.4'
 
   spec.add_development_dependency 'rake'
@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.25.0'
   spec.add_development_dependency 'simplecov', '~> 0.8.2'
   spec.add_development_dependency 'vcr', '~> 2.9.2'
+  spec.add_development_dependency 'webmock', '~> 1.24'
 end

data/lib/amtrak.rb

@@ -1,7 +1,13 @@
+require 'logger'
+
 # Main Amtrak module
 module Amtrak
   class Error < StandardError; end
 
+  def self.logger
+    @logger ||= Logger.new(STDOUT)
+  end
+
   def self.get(from, to, date: nil)
     Amtrak::TrainFetcher.get(from, to, date: date).map do |html|
       Amtrak::TrainParser.parse(html)

data/lib/amtrak/train_fetcher.rb

@@ -1,3 +1,5 @@
+require 'mechanize'
+
 module Amtrak
   # Service for getting train time HTML page from the Amtrak website
   class TrainFetcher
@@ -20,21 +22,33 @@ module Amtrak
     end
 
     def get
-      (1..total_pages).map do |page|
-        Amtrak::TrainFetcher::TrainPage.get(session_id, page)
+      requests = [first_page.body]
+
+      (2..total_pages).each do |page|
+        requests << Amtrak::TrainFetcher::TrainPage.get(agent, page)
       end
+
+      requests
     end
 
     def first_page
-      @first_page ||= Amtrak::TrainFetcher::MainPage.new(from, to, date: date)
+      @first_page ||= Amtrak::TrainFetcher::MainPage.new(agent, from, to, date: date)
     end
 
-    def session_id
-      @session_id ||= first_page.session_id
+    def total_pages
+      return @total_pages if @total_pages
+
+      total_pages = first_page.total_pages
+      Amtrak.logger.debug "Total pages: #{total_pages}"
+
+      @total_pages = total_pages
     end
 
-    def total_pages
-      @total_pages ||= first_page.total_pages
+    def agent
+      @agent ||= Mechanize.new.tap do |m|
+        m.user_agent_alias = 'Mac Safari'
+        m.log = Amtrak.logger
+      end
     end
   end
 end

data/lib/amtrak/train_fetcher/main_page.rb

@@ -1,13 +1,13 @@
-require 'excon'
 require 'date'
 
 module Amtrak
   class TrainFetcher
     # Service for getting train time results/cookies from the Amtrak website
     class MainPage
-      attr_reader :from, :to
+      attr_reader :agent, :from, :to
 
-      def initialize(from, to, date: nil)
+      def initialize(agent, from, to, date: nil)
+        @agent = agent
         @from = from
         @to = to
         @date = date
@@ -16,20 +16,19 @@ module Amtrak
       def request
         retries ||= 3
         _request
-      rescue Excon::Errors::SocketError, Excon::Errors::Timeout
+      rescue Mechanize::ResponseCodeError
         retries -= 1
-        retry unless retries.zero?
+        raise if retries.zero?
+
+        retry
       end
 
       def _request
-        @request ||= Excon.post(
-          'http://tickets.amtrak.com/itd/amtrak',
-          headers: headers,
-          body: URI.encode_www_form(body),
-          expects: [200]
+        @request ||= agent.post(
+          'https://tickets.amtrak.com/itd/amtrak',
+          request_body,
+          headers
         )
-      rescue Excon::Errors::ClientError, Excon::Errors::ServerError => ex
-        raise Amtrak::TrainFetcher::Error, "#{ex.class} #{ex.message}"
       end
 
       def headers
@@ -37,17 +36,17 @@ module Amtrak
       end
 
       # rubocop:disable all
-      def body
+      def request_body
         {
-          "_handler=amtrak.presentation.handler.request.rail.AmtrakRailTrainStatusSearchRequestHandler/_xpath=/sessionWorkflow/productWorkflow[@product='Rail']" => '',
+          "_handler=amtrak.presentation.handler.request.rail.AmtrakRailTrainStatusSearchRequestHandler/_xpath=/sessionWorkflow/productWorkflow[@product='Rail']" => "",
           "/sessionWorkflow/productWorkflow[@product='Rail']/tripRequirements/journeyRequirements[1]/departDate.usdate" => 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_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",
-          'wdf_destination'  => to.to_s,
+          "/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_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",
+          "wdf_destination"  => to.to_s,
         }
       end
       # rubocop:enable all
@@ -60,8 +59,8 @@ module Amtrak
         @date ||= Date.today
       end
 
-      def session_id
-        request.headers['Set-Cookie'].match(/JSESSIONID=([^;]*)/)[1]
+      def body
+        request.body
       end
 
       def total_pages
@@ -69,11 +68,15 @@ module Amtrak
       end
 
       def extract_listing_length
-        request.body.match(/var availabilityLength = '(\d+)';/)[1]
+        if matches = body.match(/var availabilityLength = '(\d+)';/)
+          matches[1]
+        else
+          0
+        end
       end
 
       def release
-        request.body.match(/"Amtrak Release ([^"]+)"/)[1]
+        body.match(/"Amtrak Release ([^"]+)"/)[1]
       end
     end
   end

data/lib/amtrak/train_fetcher/train_page.rb

@@ -1,5 +1,3 @@
-require 'excon'
-
 module Amtrak
   class TrainFetcher
     # Service for getting per page train time HTML from the Amtrak website
@@ -8,10 +6,10 @@ module Amtrak
         new(*args).get
       end
 
-      attr_reader :session_id, :page
+      attr_reader :agent, :page
 
-      def initialize(session_id, page)
-        @session_id = session_id
+      def initialize(agent, page)
+        @agent = agent
         @page = page
       end
 
@@ -22,23 +20,28 @@ module Amtrak
       def request
         retries ||= 3
         _request
-      rescue SocketError, TimeoutError
+      rescue Mechanize::ResponseCodeError
         retries -= 1
-        retry unless retries.zero?
+        raise if retries.zero?
+
+        retry
       end
 
       def _request
-        @request ||= Excon.get(
-          'https://tickets.amtrak.com/itd/amtrak/TrainStatusRequest',
-          headers: headers,
-          query: query
+        @request ||= agent.get(
+          "https://tickets.amtrak.com/itd/amtrak/TrainStatusRequest?&_trainstatuspage=#{page}",
+          [],
+          nil,
+          headers
         )
-      rescue Excon::Errors::ClientError, Excon::Errors::ServerError => ex
-        raise Amtrak::TrainFetcher::Error, "#{ex.class} #{ex.message}"
       end
 
       def headers
-        { 'Cookie' => "JSESSIONID=#{session_id}" }
+        {
+          'ADRUM' => 'isAjax:true',
+          'X-Prototype-Version' => '1.6.0.3',
+          'X-Requested-With' => 'XMLHttpRequest'
+        }
       end
 
       def query

data/lib/amtrak/version.rb

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

data/spec/amtrak/train_fetcher/main_page_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe Amtrak::TrainFetcher::MainPage do
+  let(:agent) { Mechanize.new }
   describe '#departure_date' do
-    subject { described_class.new('', '', date: date) }
+    subject { described_class.new(nil, '', '', date: date) }
     let(:date) { Date.parse('2014-11-12') }
 
     it 'prints out a formatted date' do
@@ -11,7 +12,7 @@ describe Amtrak::TrainFetcher::MainPage do
   end
 
   describe '#date' do
-    subject { described_class.new('', '', date: date) }
+    subject { described_class.new(nil, '', '', date: date) }
 
     context 'on an instance with a date' do
       let(:date) { Date.parse('2014-11-12') }
@@ -34,7 +35,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-12-07')) }
+      subject { described_class.new(agent, 'pvd', 'bby', date: Date.parse('2016-01-03')) }
 
       it 'returns 1', :vcr do
         expect(subject.total_pages).to eq(1)
@@ -42,34 +43,11 @@ 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-12-06')) }
+      subject { described_class.new(agent, 'pvd', 'bby', date: Date.parse('2015-12-31')) }
 
       it 'returns 2', :vcr do
         expect(subject.total_pages).to eq(2)
       end
     end
   end
-
-  describe '#session_id' do
-    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('0000faPsyYZwp2n8Wb_4BDhukyg:187j59p07')
-    end
-  end
-
-  describe '#request' do
-    context 'when Excon raises' do
-      subject { described_class.new('', '') }
-
-      it 'returns a TrainFetcher::Error' do
-        expect(Excon).to receive(:post) { fail Excon::Errors::ClientError, '' }
-        expect { subject.request }.to raise_error(Amtrak::TrainFetcher::Error)
-      end
-
-      it 'returns a TrainFetcher::Error' do
-        expect(Excon).to receive(:post) { fail Excon::Errors::ServerError, '' }
-        expect { subject.request }.to raise_error(Amtrak::TrainFetcher::Error)
-      end
-    end
-  end
 end

data/spec/amtrak/train_fetcher/train_page_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe Amtrak::TrainFetcher::TrainPage do
-  subject { described_class.get(session_id, page) }
+  let(:agent) { Mechanize.new }
+  subject { described_class.get(agent, page) }
 
   describe '#get', :vcr do
     context 'when it works' do
-      let(:session_id) { '0000faPsyYZwp2n8Wb_4BDhukyg:187j59p07' }
       let(:page) { '1' }
 
       it 'includes various classes' do
@@ -14,24 +14,5 @@ describe Amtrak::TrainFetcher::TrainPage do
         expect(subject).to include('resp_by_citypair_arrive_status_details')
       end
     end
-
-    context 'when Excon raises an error' do
-      let(:session_id) { '0000faPsyYZwp2n8Wb_4BDhukyg:187j59p07' }
-      let(:page) { '1' }
-
-      it 'reraises as a TrainFetcher::Error' do
-        expect(Excon).to receive(:get) {
-          fail Excon::Errors::ClientError, ''
-        }
-        expect { subject }.to raise_error(Amtrak::TrainFetcher::Error)
-      end
-
-      it 'reraises as a TrainFetcher::Error' do
-        expect(Excon).to receive(:get) {
-          fail Excon::Errors::ServerError, ''
-        }
-        expect { subject }.to raise_error(Amtrak::TrainFetcher::Error)
-      end
-    end
   end
 end

data/spec/amtrak/train_fetcher_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Amtrak::TrainFetcher do
   describe '.get', :vcr do
     let(:output) do
-      described_class.get('pvd', 'bby', date: Date.parse('2014-12-07'))
+      described_class.get('pvd', 'bby', date: Date.parse('2015-12-31'))
     end
 
     it 'does the same as #get' do
@@ -16,7 +16,7 @@ describe Amtrak::TrainFetcher do
   describe '#get', :vcr do
     describe 'given a valid date and train stations' do
       subject do
-        described_class.new('pvd', 'bby', date: Date.parse('2014-12-07'))
+        described_class.new('pvd', 'bby', date: Date.parse('2015-12-31'))
       end
 
       let(:output) { subject.get }
@@ -44,7 +44,7 @@ describe Amtrak::TrainFetcher do
 
     describe 'given a valid date and invalid train stations' do
       subject do
-        described_class.new('askdf', 'bby', date: Date.parse('2014-12-07'))
+        described_class.new('askdf', 'bby', date: Date.parse('2015-12-31'))
       end
 
       let(:output) { subject.get }

data/spec/amtrak_spec.rb

@@ -4,7 +4,7 @@ describe Amtrak do
   context '.get' do
     let(:from) { 'pvd' }
     let(:to) { 'bby' }
-    let(:date) { Date.parse('Fri, Dec 5, 2014') }
+    let(:date) { Date.parse('Sat, Jan 3, 2016') }
     let(:output) { described_class.get(from, to, date: date) }
     let(:expected) do
       JSON.parse(
@@ -14,6 +14,7 @@ describe Amtrak do
     end
 
     it 'returns a list of train times', :vcr do
+      puts JSON.pretty_generate(output)
       expect(output).to eq(expected)
     end
   end

data/spec/fixtures/json/_get.json

@@ -1 +1,54 @@
-[{"number":178,"departure":{"date":"Thu, Dec 4 2014","scheduled_time":"11:37 pm","estimated_time":"11:37 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"12:24 am","estimated_time":"12:08 am"}},{"number":66,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"6:56 am","estimated_time":"6:57 am"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"7:53 am","estimated_time":"7:46 am"}},{"number":2190,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"9:18 am","estimated_time":"9:30 am"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"9:59 am","estimated_time":"9:59 am"}},{"number":190,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"10:17 am","estimated_time":"10:30 am"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"10:59 am","estimated_time":"11:01 am"}},{"number":2150,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"10:53 am","estimated_time":"11:09 am"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"11:34 am","estimated_time":"11:38 am"}},{"number":170,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"11:58 am","estimated_time":"12:14 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"12:39 pm","estimated_time":"12:48 pm"}},{"number":2154,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"12:55 pm","estimated_time":"1:04 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"1:34 pm","estimated_time":"1:39 pm"}},{"number":172,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"2:23 pm","estimated_time":"2:47 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"3:09 pm","estimated_time":"3:21 pm"}},{"number":2158,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"2:54 pm","estimated_time":"3:09 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"3:36 pm","estimated_time":"3:40 pm"}},{"number":86,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"3:47 pm","estimated_time":"3:47 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"4:28 pm","estimated_time":"4:19 pm"}},{"number":2160,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"3:54 pm","estimated_time":"4:26 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"4:34 pm","estimated_time":"4:58 pm"}},{"number":174,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"5:30 pm","estimated_time":"5:36 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"6:25 pm","estimated_time":"6:32 pm"}},{"number":2164,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"5:50 pm","estimated_time":"5:59 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"6:34 pm","estimated_time":""}},{"number":2166,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"6:54 pm","estimated_time":"7:13 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"7:35 pm","estimated_time":"7:45 pm"}},{"number":176,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"7:19 pm","estimated_time":"8:45 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"8:06 pm","estimated_time":"9:29 pm"}},{"number":2168,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"7:56 pm","estimated_time":""},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"8:38 pm","estimated_time":""}},{"number":2170,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"8:54 pm","estimated_time":"9:41 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"9:34 pm","estimated_time":""}},{"number":94,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"9:16 pm","estimated_time":"10:21 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"10:02 pm","estimated_time":"11:02 pm"}},{"number":2172,"departure":{"date":"Fri, Dec 5 2014","scheduled_time":"9:54 pm","estimated_time":"10:08 pm"},"arrival":{"date":"Fri, Dec 5 2014","scheduled_time":"10:35 pm","estimated_time":"10:42 pm"}}]
+[
+  {
+    "number": 194,
+    "departure": {
+      "date": "Sun, Jan 3 2016",
+      "scheduled_time": "8:25 pm",
+      "estimated_time": "8:29 pm"
+    },
+    "arrival": {
+      "date": "Sun, Jan 3 2016",
+      "scheduled_time": "9:10 pm",
+      "estimated_time": "9:00 pm"
+    }
+  },
+  {
+    "number": 2256,
+    "departure": {
+      "date": "Sun, Jan 3 2016",
+      "scheduled_time": "8:55 pm",
+      "estimated_time": ""
+    },
+    "arrival": {
+      "date": "Sun, Jan 3 2016",
+      "scheduled_time": "9:39 pm",
+      "estimated_time": ""
+    }
+  },
+  {
+    "number": 2258,
+    "departure": {
+      "date": "Sun, Jan 3 2016",
+      "scheduled_time": "9:54 pm",
+      "estimated_time": "9:59 pm"
+    },
+    "arrival": {
+      "date": "Sun, Jan 3 2016",
+      "scheduled_time": "10:40 pm",
+      "estimated_time": "10:38 pm"
+    }
+  },
+  {
+    "number": 132,
+    "departure": {
+      "date": "Sun, Jan 3 2016",
+      "scheduled_time": "11:02 pm",
+      "estimated_time": "11:03 pm"
+    },
+    "arrival": {
+      "date": "Sun, Jan 3 2016",
+      "scheduled_time": "11:49 pm",
+      "estimated_time": "11:35 pm"
+    }
+  }
+]