amtrak 2.0.0 → 3.0.0

data/lib/amtrak/version.rb

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

data/spec/amtrak/train_fetcher_spec.rb

@@ -2,57 +2,61 @@ require 'spec_helper'
 
 describe Amtrak::TrainFetcher do
   describe '.get', :vcr do
-    let(:output) do
-      described_class.get('pvd', 'bby', date: Date.parse('2015-12-31'))
-    end
+    let(:output) { described_class.get('pvd', 'bby', date: Date.parse('2017-10-12')) }
+    let(:segment) { output['journeys'][0]['segments'][0] }
 
     it 'does the same as #get' do
-      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')
+      expect(segment.keys).to include(
+        'originEstimatedDepartureDateTime',
+        'originScheduledDepartureDateTime',
+        'trainNumber'
+      )
     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('2015-12-31'))
+        described_class.new('pvd', 'bby', date: Date.parse('2017-10-12'))
       end
 
       let(:output) { subject.get }
-
-      it 'includes various classes' do
-        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')
+      let(:segment) { output['journeys'][0]['segments'][0] }
+
+      it 'includes various keys' do
+        expect(segment.keys).to include(
+          'originEstimatedDepartureDateTime',
+          'originScheduledDepartureDateTime',
+          'trainNumber'
+        )
       end
     end
 
     describe 'given an invalid date and valid train stations' do
       subject do
-        described_class.new('pvd', 'bby', date: Date.parse('2014-11-06'))
+        described_class.new('pvd', 'bby', date: Date.parse('2014-10-12'))
       end
 
       let(:output) { subject.get }
+      let(:error) { output['errors'][0] }
 
-      it 'does not include various classes and includes an error' do
-        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')
+      it 'does not include various keys and includes an error' do
+        expect(error['code']).to eq('R602')
+        expect(error['text']).to match(/R602/)
       end
     end
 
     describe 'given a valid date and invalid train stations' do
       subject do
-        described_class.new('askdf', 'bby', date: Date.parse('2015-12-31'))
+        described_class.new('askdf', 'bby', date: Date.parse('2017-10-12'))
       end
 
       let(:output) { subject.get }
+      let(:error) { output['errors'][0] }
 
-      it 'does not include various classes and includes an error' do
-        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')
+      it 'does not include various keys and includes an error' do
+        expect(error['code']).to eq('APPLICATION_ERROR')
+        expect(error['text']).to match(/R440/)
       end
     end
   end

data/spec/amtrak/train_parser_spec.rb

@@ -1,52 +1,22 @@
 require 'spec_helper'
 
 describe Amtrak::TrainParser do
-  describe '#clean_msg' do
-    subject { described_class.new('') }
-    let(:output) { subject.clean_msg(message) }
-
-    context 'on a string with no time' do
-      let(:message) { 'Scheduled arrival' }
-      let(:expected) { nil }
-
-      it 'returns nil' do
-        expect(output).to eq(expected)
-      end
-    end
-
-    context 'on a string with a time' do
-      let(:message) { 'Scheduled arrival 3:30 pm' }
-      let(:expected) { '3:30 pm' }
-
-      it 'returns the time' do
-        expect(output).to eq(expected)
-      end
-    end
-
-    context 'on a string with only a time' do
-      let(:message) { '3:30 pm' }
-      let(:expected) { '3:30 pm' }
-
-      it 'returns the time' do
-        expect(output).to eq(expected)
-      end
-    end
-  end
-
   describe '.parse' do
     let(:parser) { double(Amtrak::TrainParser) }
+
     it 'calls new and parse' do
-      expect(described_class).to receive(:new).with('') { parser }
+      expect(described_class).to receive(:new).with('journeys' => []) { parser }
       expect(parser).to receive(:parse)
-      described_class.parse('')
+      described_class.parse('journeys' => [])
     end
   end
 
   describe '#parse' do
-    subject { described_class.new(document) }
+    subject { described_class.new(json) }
     let(:output) { subject.parse }
+    let(:json) { JSON.parse(document) }
     let(:document) do
-      File.read(File.join('spec', 'fixtures', 'html', 'pvd_to_bby.html'))
+      File.read(File.join('spec', 'fixtures', 'json', 'pvd_to_bby.json'))
     end
     let(:expected) do
       JSON.parse(
@@ -55,34 +25,8 @@ describe Amtrak::TrainParser do
       )
     end
 
-    context 'without an error' do
-      it 'returns a list of train times' do
-        expect(output).to eq(expected)
-      end
-
-      context 'with an error' do
-        it 'raises a TrainParser::Error' do
-          expect(subject.document).to receive(:search) {
-            fail Nokogiri::SyntaxError
-          }
-          expect { output }.to raise_error(Amtrak::TrainParser::Error)
-        end
-      end
-
-      context 'with a cancelled train' do
-        let(:document) do
-          File.read(File.join('spec', 'fixtures', 'html', 'pvd_to_bby_cancelled.html'))
-        end
-        let(:expected) do
-          JSON.parse(
-            File.read(File.join('spec', 'fixtures', 'json', '_parse_cancelled.json')),
-            symbolize_names: true
-          )
-        end
-        it 'returns a list with some trains marked Cancelled' do
-          expect(output).to eq(expected)
-        end
-      end
+    it 'returns a list of train times' do
+      expect(output).to eq(expected)
     end
   end
 end

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('Sat, Jan 3, 2016') }
+    let(:date) { Date.parse('Thur, Oct 12, 2017') }
     let(:output) { described_class.get(from, to, date: date) }
     let(:expected) do
       JSON.parse(
@@ -14,7 +14,6 @@ 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,54 +1,249 @@
 [
   {
-    "number": 194,
+    "number": 178,
     "departure": {
-      "date": "Sun, Jan 3 2016",
-      "scheduled_time": "8:25 pm",
-      "estimated_time": "8:29 pm"
+      "date": "2017-10-11",
+      "scheduled_time": "23:29:00",
+      "estimated_time": "23:29:00"
     },
     "arrival": {
-      "date": "Sun, Jan 3 2016",
-      "scheduled_time": "9:10 pm",
-      "estimated_time": "9:00 pm"
+      "date": "2017-10-11",
+      "scheduled_time": "23:29:00",
+      "estimated_time": "23:29:00"
     }
   },
   {
-    "number": 2256,
+    "number": 66,
     "departure": {
-      "date": "Sun, Jan 3 2016",
-      "scheduled_time": "8:55 pm",
-      "estimated_time": ""
+      "date": "2017-10-12",
+      "scheduled_time": "06:56:00",
+      "estimated_time": "06:56:00"
     },
     "arrival": {
-      "date": "Sun, Jan 3 2016",
-      "scheduled_time": "9:39 pm",
-      "estimated_time": ""
+      "date": "2017-10-12",
+      "scheduled_time": "06:56:00",
+      "estimated_time": "06:56:00"
     }
   },
   {
-    "number": 2258,
+    "number": 2190,
     "departure": {
-      "date": "Sun, Jan 3 2016",
-      "scheduled_time": "9:54 pm",
-      "estimated_time": "9:59 pm"
+      "date": "2017-10-12",
+      "scheduled_time": "09:20:00",
+      "estimated_time": null
     },
     "arrival": {
-      "date": "Sun, Jan 3 2016",
-      "scheduled_time": "10:40 pm",
-      "estimated_time": "10:38 pm"
+      "date": "2017-10-12",
+      "scheduled_time": "09:20:00",
+      "estimated_time": null
     }
   },
   {
-    "number": 132,
+    "number": 190,
     "departure": {
-      "date": "Sun, Jan 3 2016",
-      "scheduled_time": "11:02 pm",
-      "estimated_time": "11:03 pm"
+      "date": "2017-10-12",
+      "scheduled_time": "10:17:00",
+      "estimated_time": null
     },
     "arrival": {
-      "date": "Sun, Jan 3 2016",
-      "scheduled_time": "11:49 pm",
-      "estimated_time": "11:35 pm"
+      "date": "2017-10-12",
+      "scheduled_time": "10:17:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2150,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "10:53:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "10:53:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 170,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "11:55:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "11:55:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2154,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "12:56:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "12:56:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 172,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "14:23:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "14:23:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2158,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "14:59:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "14:59:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 86,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "15:47:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "15:47:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2160,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "16:02:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "16:02:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 174,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "17:30:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "17:30:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2164,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "17:51:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "17:51:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2166,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "18:54:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "18:54:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 176,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "19:19:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "19:19:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2168,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "19:56:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "19:56:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2170,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "20:54:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "20:54:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 94,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "21:16:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "21:16:00",
+      "estimated_time": null
+    }
+  },
+  {
+    "number": 2172,
+    "departure": {
+      "date": "2017-10-12",
+      "scheduled_time": "22:03:00",
+      "estimated_time": null
+    },
+    "arrival": {
+      "date": "2017-10-12",
+      "scheduled_time": "22:03:00",
+      "estimated_time": null
     }
   }
 ]