quicktravel_client 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5dcbf38f81c9b909173948030ab544edf2b10a6
-  data.tar.gz: fde0ede3e1331d355c4ee42db771e2c9f0e2e8ed
+  metadata.gz: b46659b883b055d384d0d6002646e619d636c4a4
+  data.tar.gz: a906274663a27d46b74eda888a5200bde90cc884
 SHA512:
-  metadata.gz: ac7e14d70db0fe8944f44f07dbdd37f5bb8825dce307b38856e1f893734956a792c692876c770014ae0f6ad347c9bdd7cbacc48a430061113c75435ec0292052
-  data.tar.gz: 0b4ca73328cea2f66a10f89cd005403443ebbd39f15f3385180d37f68d77548fd0fa82a7b042931dc8e81b464ba5b7c380c1b8abbeeaadf27a202208139f8d17
+  metadata.gz: bfc223f8ec2d51dddc2974b40281cc49ff6225cbbeae35a75f18b515c8656ac0a307e3f280b57b0df5e8adad90a36b1c4674eec2b2ad2696568f5bf848c0b5d8
+  data.tar.gz: 381d7a52dce286c3874f17e260348b2c5c2d0c294193d4ce9226c53bc69c626a77b5f5de9919ffe248142362004ea9d8b32a5c728f0306d0b119c1e2931a6ca3

data/.travis.yml

@@ -1,24 +1,13 @@
 language: ruby
 rvm:
-  - 1.9
-  - 2.2
-  - 2.3.0
+  - 2.2.5
+  - 2.3.1
 script: bundle && bundle exec rake spec
 gemfile:
-  - gemfiles/rails2.gemfile
   - gemfiles/rails4.gemfile
-matrix:
-  exclude:
-    - rvm: 1.9
-      gemfile: gemfiles/rails4.gemfile
-    - rvm: 2.2
-      gemfile: gemfiles/rails2.gemfile
-    - rvm: 2.3.0
-      gemfile: gemfiles/rails2.gemfile
+  - gemfiles/rails5.gemfile
 notifications:
   email:
     - support@travellink.com.au
-  flowdock:
-    secure: tIc3OVnTl83tGjhjzBSPk7AMRHVta4zAdacBDWOVA3s/YpDoa1wCMaq7xfG7GlEgHtPscvucSKbxoLocBd5d54jQVx3X9q9OrQ91D6h6tbTOK8ZTh1vTdSfMkIoxNjnVJ9KyZYJ3zy44DzfzgmcgqesshqSrXAgcpSvxkEcjAz8=
 sudo: false
 cache: bundler

data/CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).
 
+## [2.4.0]
+### Changed
+- Improve error handling when non JSON response
+- Update test cassettes due to API changes
+- Update test data due to new bootstrap.sql
+
 ## [2.3.1]
 ### Fixed
 - Omits empty array parameters

data/README.md

@@ -15,3 +15,13 @@ Gives models that are integrated with the QuickTravel API
 
 Add to your Gemfile:
 gem 'quicktravel_client'
+
+# REGENERATE CASSETTES
+
+In QuickTravel:
+mysql quicktravel_test < ../quicktravel_test/bootstrap.sql
+TIMECOP=1 QUICKTRAVEL_CONFIG_DIR=spec/support/config RAILS_ENV=test bundle exec rails s -p8080
+
+In QuickTravel Client:
+rm spec/support/cassettes/ -rf
+QT_KEYS=a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2,a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2 bundle exec rspec

data/gemfiles/rails5.gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activesupport', '~> 5.0'
+  gem 'activerecord', '~> 5.0'
+  gem 'actionpack', '~> 5.0'
+end

data/lib/quick_travel/adapter.rb

@@ -46,6 +46,34 @@ module QuickTravel
       end
     end
 
+    def self.has_many(relation_name, options = {})
+      define_method relation_name do
+        instance_variable_get("@#{relation_name}") || instance_variable_set(
+          "@#{relation_name}",
+          begin
+            klass = QuickTravel.const_get(options[:class_name] || relation_name.to_s.singularize.classify)
+            instance_variable_get("@#{relation_name}_attributes").map { |attr|
+              klass.new(attr)
+            }
+          end
+        )
+      end
+    end
+
+    def self.belongs_to(relation_name, options = {})
+      define_method relation_name do
+        instance_variable_get("@#{relation_name}") || instance_variable_set(
+          "@#{relation_name}",
+          begin
+            attrs = instance_variable_get("@#{relation_name}_attributes")
+            return nil unless attrs
+            klass = QuickTravel.const_get(options[:class_name] || relation_name.to_s.singularize.classify)
+            klass.new(attrs)
+          end
+        )
+      end
+    end
+
     def self.find(id, opts = {})
       check_id!(id)
       if lookup

data/lib/quick_travel/adapter_error.rb

@@ -3,13 +3,21 @@ module QuickTravel
     attr_reader :response
 
     def initialize(response)
-      @response = if response.is_a? String
+      @response = case response
+                  when String
                     { 'error' => response }
-                  else
+                  when HTTParty::Response
                     response.parsed_response
+                  else
+                    fail "Unexpected response type #{response.class}"\
+                         "Should be String or HTTParty::Response"
                   end
 
-      error_message = @response.fetch('error', "We're sorry, but something went wrong. Please call us.")
+      error_message = if @response.is_a? Hash
+        @response.fetch('error', "We're sorry, but something went wrong. Please call us.")
+      else
+        @response
+      end
       super(error_message)
     end
 

data/lib/quick_travel/booking.rb

@@ -11,10 +11,6 @@ module QuickTravel
       '/api/bookings'
     end
 
-    def self.front_office_base
-      '/front_office/bookings'
-    end
-
     def self.find_by_reference(reference)
       find_all!("#{api_base}/reference/#{reference}.json").first
     end
@@ -24,13 +20,11 @@ module QuickTravel
                          last_group: true, regenerate: regenerate)
     end
 
-    def payments
-      Payment.find_all!("#{Booking.front_office_base}/#{@id}/payments.json")
-    end
-
-    def payment_types
-      PaymentType.find_all!("#{Booking.front_office_base}/#{@id}/payment_types.json")
-    end
+    has_many :reservations
+    has_many :passengers
+    has_many :vehicles
+    has_many :payments
+    has_many :payment_types
 
     def on_account_payment_type
       payment_types_by_code = payment_types.group_by(&:code)
@@ -192,18 +186,6 @@ module QuickTravel
       Booking.find(@id)  # refresh
     end
 
-    # Generate passenger objects from passenger data (hash)
-    def passengers
-      @passengers ||=
-        @passengers_attributes.map { |passenger| Passenger.new(passenger) }
-    end
-
-    # Generate passenger objects from passenger data (hash)
-    def vehicles
-      @vehicles ||=
-        @vehicles_attributes.map { |vehicle| Vehicle.new(vehicle) }
-    end
-
     def find_passenger_by_id(pid)
       passengers.detect { |p| p.id.to_i == pid.to_i }
     end
@@ -218,21 +200,6 @@ module QuickTravel
       end
     end
 
-    def vehicles_hash
-      @vehicles
-    end
-
-    # It returns booking items for a booking.
-    # Array of BookingItem
-    def reservations
-      fail AdapterError, 'Reservations have not been set from API' if @reservations_attributes.nil?
-      @_reservations_object_array ||= @reservations_attributes.map { |item| Reservation.new(item) }
-    end
-
-    def legacy_reservations
-      @_reservations_object_array = @reservations.map { |item| Reservation.new(item) }
-    end
-
     def client_address
       return nil unless @client_address
       @client_address_object ||= Address.new(@client_address)

data/lib/quick_travel/payment.rb

@@ -7,10 +7,6 @@ module QuickTravel
       QuickTravel::PaymentType.find(@payment_type_id)
     end
 
-    def self.create(options = {})
-      post_and_validate("/front_office/bookings/#{options[:booking_id]}/payments.json", options)
-    end
-
     def self.get_redirect_url(options)
       response = get_and_validate("/api/checkouts/migs_redirect_url.json", options)
       response[:redirect_url]

data/lib/quick_travel/products/scheduled_trip.rb

@@ -4,15 +4,12 @@ require 'quick_travel/products/base'
 module QuickTravel
   module Products
     class ScheduledTrip < Base
+      belongs_to :to_route_stop, class_name: 'RouteStop'
+      belongs_to :from_route_stop, class_name: 'RouteStop'
+
       @reservation_for_type = :scheduled_trips
 
-      def to_route_stop
-        RouteStop.new(@to_route_stop_attributes) if @to_route_stop_attributes
-      end
 
-      def from_route_stop
-        RouteStop.new(@from_route_stop_attributes) if @from_route_stop_attributes
-      end
 
       def from_route_stop_id
         return nil if from_route_stop.nil?

data/lib/quick_travel/property.rb

@@ -28,6 +28,7 @@ module QuickTravel
       property = find_all!("/api/properties/#{id}.json", options).first
       first_travel_date = options.fetch(:product).fetch(:first_travel_date)
       property.accommodations.each do |accommodation|
+        # Is this right? Why is first_travel_date assumed to be cheapest
         accommodation.minimum_nightly_price      = accommodation.nightly_price_on first_travel_date
         accommodation.minimum_price_for_duration = accommodation.minimum_price_on first_travel_date
       end

data/lib/quick_travel/reservation.rb

@@ -4,6 +4,11 @@ require 'quick_travel/resource'
 
 module QuickTravel
   class Reservation < Adapter
+    has_many :adjustments
+    has_many :sub_reservations, class_name: 'Reservation'
+    belongs_to :to_route_stop, class_name: 'RouteStop'
+    belongs_to :from_route_stop, class_name: 'RouteStop'
+
     def self.create(options)
       json = post_and_validate('/api/reservations.json', options, expect: :json)
       new(json)
@@ -13,10 +18,6 @@ module QuickTravel
       delete_and_validate("/api/reservations/#{id}.json")
     end
 
-    def adjustments
-      @adjustments_attributes.map { |adjustment| Adjustment.new(adjustment) }
-    end
-
     def resource
       @resource ||= QuickTravel::Resource.find(resource_id) if resource_id
     end
@@ -29,29 +30,6 @@ module QuickTravel
       end_time.to_time.on(last_travel_date) if end_time
     end
 
-    def to_route_stop
-      QuickTravel::RouteStop.new(@to_route_stop_attributes) if @to_route_stop_attributes
-    end
-
-    def from_route_stop
-      QuickTravel::RouteStop.new(@from_route_stop_attributes) if @from_route_stop_attributes
-    end
-
-    # it send API request for Resource show. and cache the data.
-    # i think now this method is not required because now booking show api call have display_text for every reservation
-    def details
-      if @_resource.blank?
-        @_resource = Resource.find(@resource_id) unless @resource_id.blank?
-      end
-      @_resource
-    end
-
-    def sub_reservations
-      @sub_reservations ||= Array(@sub_reservations_attributes).map do |attributes|
-        Reservation.new(attributes)
-      end
-    end
-
     def passengers_count_string(booking)
       passengers_count(booking).join(', ')
     end

data/lib/quick_travel/version.rb

@@ -1,3 +1,3 @@
 module QuickTravel
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/spec/adapter_spec.rb

@@ -35,4 +35,21 @@ describe QuickTravel::Adapter do
 
     specify { expect(QuickTravel::Api).to have_received(:post).with(url, expected_params) }
   end
+
+  context 'when response non standard' do
+    let(:url) { 'http://www.google.com' }
+
+    let(:adapter_response) {
+      VCR.use_cassette 'wrong_url' do
+        QuickTravel::Adapter.get_and_validate(url)
+      end
+    }
+
+    specify do
+      expect { adapter_response }.to raise_error(
+        QuickTravel::AdapterError,
+        /That’s all we know/
+      )
+    end
+  end
 end

data/spec/booking_spec.rb

@@ -61,6 +61,17 @@ describe QuickTravel::Booking do
     end
   end
 
+  it 'should be able to return its payments and payment types' do
+    VCR.use_cassette('booking_show') do
+      b = QuickTravel::Booking.find(@booking.id)
+      expect(b.payment_types).to be_an_instance_of Array
+      expect(b.payment_types.size).to eq 3
+      expect(b.payment_types.first).to be_an_instance_of QuickTravel::PaymentType
+      expect(b.payments).to be_an_instance_of Array
+      expect(b.payments.size).to eq 0
+    end
+  end
+
   it 'should be able to update the booking' do
     VCR.use_cassette('booking_update') do
       response = @booking.update(customer_contact_name: 'John')

data/spec/product_type_spec.rb

@@ -9,7 +9,7 @@ describe QuickTravel::ProductType do
     end
 
     its(:class) { should == Array }
-    its(:length) { should == 8 }
+    its(:length) { should == 9 }
 
     context 'first element' do
       subject(:ferry) { all.first }

data/spec/reservation_spec.rb

@@ -10,8 +10,11 @@ describe QuickTravel::Reservation do
         first_travel_date: '2016-03-01',
         passenger_types_numbers: { '1' => '2', '2' => '1' }
       )
-      expect(reservation.booking_id).to eq 3 # based on running ALL specs
+      expect(reservation.booking_id).to eq 4 # based on running ALL specs
                                              # from a fresh bootstrap.sql
+                                             # bootstrap.sql has 2 bookings
+                                             # Plus 3rd booking created in booking_spec
+                                             # Plus 4th booking created here
     end
   end
 

data/spec/support/cassettes/basic_product_scheduled_trips.yml

@@ -14,16 +14,6 @@ http_interactions:
       code: 200
       message: 'OK '
     headers:
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Xss-Protection:
-      - '1'
-      X-Content-Type-Options:
-      - nosniff
-      X-Download-Options:
-      - noopen
-      X-Permitted-Cross-Domain-Policies:
-      - none
       P3p:
       - CP="IDC DSP CAO COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"
       Content-Type:
@@ -35,23 +25,33 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 91d524692c087648a1441c481cb68a75
+      - 4aaa8ad21113c2b935ea363623ea6842
       X-Runtime:
-      - '0.248636'
+      - '0.392632'
       Vary:
       - Origin
       Date:
-      - Thu, 28 Feb 2013 13:58:07 GMT
+      - Fri, 01 Jan 2016 02:32:37 GMT
       X-Rack-Cache:
       - invalidate, pass
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - sameorigin
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Xss-Protection:
+      - 1; mode=block
       Server:
-      - WEBrick/1.3.1 (Ruby/2.2.4/2015-12-16)
+      - WEBrick/1.3.1 (Ruby/2.2.5/2016-04-26)
       Content-Length:
       - '5528'
       Connection:
       - Keep-Alive
       Set-Cookie:
-      - _session_id=BAh7B0kiD3Nlc3Npb25faWQGOgZFVEkiJTU5NWIxODhiOGRmODZjZWQ2ODVkNjdlMTYxYjZhNjgzBjsAVEkiCXVzZXIGOwBGaQY%3D--488a6a29ce9432df25900b3453a9f87ede1651f9;
+      - _quick_travel_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFVEkiJTEyMWNhOTc4YmM2Mjg2NDQ3ZjBkZjA1OWFiY2JlYzgxBjsAVEkiCXVzZXIGOwBGaQY%3D--20f11c05a3d416b3c8a1276b2ef7c06ef03bb2cd;
         path=/; HttpOnly
     body:
       encoding: UTF-8
@@ -77,5 +77,5 @@ http_interactions:
         class=\"money positive\"\u003E$40.00\u003C/span\u003E","pre_adjusted_price":"$40.00","price_breakdown":"\u003Cspan\u003E\u003Cstrong\u003EPassengers:\u003C/strong\u003E\u0026nbsp;\u003Cspan
         class=\"money positive\"\u003E$40.00\u003C/span\u003E\u0026nbsp;\u003C/span\u003E","price_breakdown_passengers_in_cents":4000,"price_breakdown_vehicles_in_cents":0,"trip_id":6,"stop_departure_time":"2000-01-01T21:00:00Z","stop_arrival_time":"2000-01-01T21:45:00Z","from_route_stop_attributes":null,"to_route_stop_attributes":null,"departure_time":"2000-01-01T21:00:00Z","arrival_time":"2000-01-01T21:45:00Z"}]'
     http_version: 
-  recorded_at: Tue, 12 Apr 2016 06:41:39 GMT
-recorded_with: VCR 3.0.1
+  recorded_at: Fri, 28 Oct 2016 05:28:13 GMT
+recorded_with: VCR 3.0.3

data/spec/support/cassettes/basic_product_scheduled_trips_multi_sector.yml

@@ -14,16 +14,6 @@ http_interactions:
       code: 200
       message: 'OK '
     headers:
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Xss-Protection:
-      - '1'
-      X-Content-Type-Options:
-      - nosniff
-      X-Download-Options:
-      - noopen
-      X-Permitted-Cross-Domain-Policies:
-      - none
       P3p:
       - CP="IDC DSP CAO COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"
       Content-Type:
@@ -31,53 +21,55 @@ http_interactions:
       X-Ua-Compatible:
       - IE=Edge,chrome=1
       Etag:
-      - '"cd3d11993df18b66625a3215b62b1895"'
+      - '"05bd5d4d4ef6c4b5d312cad0ed8fc08f"'
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - b71587c0c43e33d5d56d7520b92cec6b
+      - 67e63e1e224eb5484a402505f341baf2
       X-Runtime:
-      - '0.203403'
+      - '0.235456'
       Vary:
       - Origin
       Date:
-      - Thu, 28 Feb 2013 13:58:07 GMT
+      - Fri, 01 Jan 2016 02:32:37 GMT
       X-Rack-Cache:
       - invalidate, pass
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Frame-Options:
+      - sameorigin
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Xss-Protection:
+      - 1; mode=block
       Server:
-      - WEBrick/1.3.1 (Ruby/2.2.4/2015-12-16)
+      - WEBrick/1.3.1 (Ruby/2.2.5/2016-04-26)
       Content-Length:
-      - '4201'
+      - '3733'
       Connection:
       - Keep-Alive
       Set-Cookie:
-      - _session_id=BAh7B0kiD3Nlc3Npb25faWQGOgZFVEkiJTcyNWE1ZmU1NWVhMGEyMDBkNmRhNGU5YTliOGI0YjExBjsAVEkiCXVzZXIGOwBGaQY%3D--6b64f5c2f1d5328ed9b3aa3a6153b965bbc329b7;
+      - _quick_travel_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFVEkiJTZhNDliNGM1YmNhNWFiMjczM2JjODMzMDFkM2U4ZThlBjsAVEkiCXVzZXIGOwBGaQY%3D--7b94523c7f150819b65217849cea43c305f4bbc8;
         path=/; HttpOnly
     body:
       encoding: UTF-8
       string: '[{"product_id":"9","product_id_field":"trip_id","resource_id":2,"resource_class_name_underscore":"scheduled_trip_resource","product_name_underscore":"mainland_coach_transfers","tariff_level_id":1,"service_ids":[25,26,27],"first_travel_date":"01-03-2016","last_travel_date":"01-03-2016","time_class":"","exception_type":null,"bookable_class":"
-        bookable","bookable":true,"display_text":"Advise clients times can vary by
-        up to 10mins and to be waiting in view of coach","from_label":"from","reason_unbookable":null,"service_notes":null,"booking_notes":"Advise
-        clients times can vary by up to 10mins and to be waiting in view of coach","adjustment_notes":null,"developer_notes":null,"inventory_type_code":"A","price_in_cents":3000,"total_price_adjustment_in_cents":0,"selection_name":"06:45am
+        bookable","bookable":true,"display_text":"","from_label":"from","reason_unbookable":null,"service_notes":null,"booking_notes":null,"adjustment_notes":null,"developer_notes":null,"inventory_type_code":"A","price_in_cents":3000,"total_price_adjustment_in_cents":0,"selection_name":"06:45am
         - Ferry ConnectionDeparting Adelaide - AM","input_disabled":"","input_overbook":"","formatted_price":"\u003Cspan
         class=\"money positive\"\u003E$30.00\u003C/span\u003E","price":"$30.00","formatted_pre_adjusted_price":"\u003Cspan
         class=\"money positive\"\u003E$30.00\u003C/span\u003E","pre_adjusted_price":"$30.00","price_breakdown":"\u003Cspan\u003E\u003Cstrong\u003EPassengers:\u003C/strong\u003E\u0026nbsp;\u003Cspan
-        class=\"money positive\"\u003E$30.00\u003C/span\u003E\u0026nbsp;\u003C/span\u003E","price_breakdown_passengers_in_cents":3000,"price_breakdown_vehicles_in_cents":0,"trip_id":9,"stop_departure_time":"2000-01-01T06:45:00Z","stop_arrival_time":"2000-01-01T08:30:00Z","from_route_stop_attributes":{"address":"85
-        Franklin Street, Adelaide","code":"ACBS","created_at":"2013-03-01T01:49:04+10:30","id":5,"inventory_controlled":true,"name":"Adelaide
-        Central Bus Station","position":1,"route_id":3,"stop_id":3,"updated_at":"2013-03-01T01:49:04+10:30"},"to_route_stop_attributes":{"address":"Main
-        Road, Cape Jervis","code":"CPJ","created_at":"2013-03-01T01:49:04+10:30","id":14,"inventory_controlled":true,"name":"Cape
-        Jervis Ferry Terminal","position":10,"route_id":3,"stop_id":12,"updated_at":"2013-03-01T01:49:04+10:30"},"departure_time":"2000-01-01T06:00:00Z","arrival_time":"2000-01-01T08:30:00Z"},{"product_id":"13","product_id_field":"trip_id","resource_id":2,"resource_class_name_underscore":"scheduled_trip_resource","product_name_underscore":"mainland_coach_transfers","tariff_level_id":1,"service_ids":[28,29,30],"first_travel_date":"01-03-2016","last_travel_date":"01-03-2016","time_class":"","exception_type":null,"bookable_class":"
-        bookable","bookable":true,"display_text":"Advise clients times can vary by
-        up to 10mins and to be waiting in view of coach","from_label":"from","reason_unbookable":null,"service_notes":null,"booking_notes":"Advise
-        clients times can vary by up to 10mins and to be waiting in view of coach","adjustment_notes":null,"developer_notes":null,"inventory_type_code":"A","price_in_cents":3000,"total_price_adjustment_in_cents":0,"selection_name":"03:45pm
+        class=\"money positive\"\u003E$30.00\u003C/span\u003E\u0026nbsp;\u003C/span\u003E","price_breakdown_passengers_in_cents":3000,"price_breakdown_vehicles_in_cents":0,"trip_id":9,"stop_departure_time":"2000-01-01T06:45:00Z","stop_arrival_time":"2000-01-01T08:30:00Z","from_route_stop_attributes":{"id":5,"inventory_controlled":true,"route_id":3,"position":1,"created_at":"2013-03-01T01:49:04+10:30","updated_at":"2013-03-01T01:49:04+10:30","stop_id":3,"name":"Adelaide
+        Central Bus Station","code":"ACBS"},"to_route_stop_attributes":{"id":14,"inventory_controlled":true,"route_id":3,"position":10,"created_at":"2013-03-01T01:49:04+10:30","updated_at":"2013-03-01T01:49:04+10:30","stop_id":12,"name":"Cape
+        Jervis Ferry Terminal","code":"CPJ"},"departure_time":"2000-01-01T06:00:00Z","arrival_time":"2000-01-01T08:30:00Z"},{"product_id":"13","product_id_field":"trip_id","resource_id":2,"resource_class_name_underscore":"scheduled_trip_resource","product_name_underscore":"mainland_coach_transfers","tariff_level_id":1,"service_ids":[28,29,30],"first_travel_date":"01-03-2016","last_travel_date":"01-03-2016","time_class":"","exception_type":null,"bookable_class":"
+        bookable","bookable":true,"display_text":"","from_label":"from","reason_unbookable":null,"service_notes":null,"booking_notes":null,"adjustment_notes":null,"developer_notes":null,"inventory_type_code":"A","price_in_cents":3000,"total_price_adjustment_in_cents":0,"selection_name":"03:45pm
         - Ferry ConnectionDeparting Adelaide - PM","input_disabled":"","input_overbook":"","formatted_price":"\u003Cspan
         class=\"money positive\"\u003E$30.00\u003C/span\u003E","price":"$30.00","formatted_pre_adjusted_price":"\u003Cspan
         class=\"money positive\"\u003E$30.00\u003C/span\u003E","pre_adjusted_price":"$30.00","price_breakdown":"\u003Cspan\u003E\u003Cstrong\u003EPassengers:\u003C/strong\u003E\u0026nbsp;\u003Cspan
-        class=\"money positive\"\u003E$30.00\u003C/span\u003E\u0026nbsp;\u003C/span\u003E","price_breakdown_passengers_in_cents":3000,"price_breakdown_vehicles_in_cents":0,"trip_id":13,"stop_departure_time":"2000-01-01T15:45:00Z","stop_arrival_time":"2000-01-01T17:30:00Z","from_route_stop_attributes":{"address":"85
-        Franklin Street, Adelaide","code":"ACBS","created_at":"2013-03-01T01:49:04+10:30","id":5,"inventory_controlled":true,"name":"Adelaide
-        Central Bus Station","position":1,"route_id":3,"stop_id":3,"updated_at":"2013-03-01T01:49:04+10:30"},"to_route_stop_attributes":{"address":"Main
-        Road, Cape Jervis","code":"CPJ","created_at":"2013-03-01T01:49:04+10:30","id":14,"inventory_controlled":true,"name":"Cape
-        Jervis Ferry Terminal","position":10,"route_id":3,"stop_id":12,"updated_at":"2013-03-01T01:49:04+10:30"},"departure_time":"2000-01-01T15:00:00Z","arrival_time":"2000-01-01T17:30:00Z"}]'
+        class=\"money positive\"\u003E$30.00\u003C/span\u003E\u0026nbsp;\u003C/span\u003E","price_breakdown_passengers_in_cents":3000,"price_breakdown_vehicles_in_cents":0,"trip_id":13,"stop_departure_time":"2000-01-01T15:45:00Z","stop_arrival_time":"2000-01-01T17:30:00Z","from_route_stop_attributes":{"id":5,"inventory_controlled":true,"route_id":3,"position":1,"created_at":"2013-03-01T01:49:04+10:30","updated_at":"2013-03-01T01:49:04+10:30","stop_id":3,"name":"Adelaide
+        Central Bus Station","code":"ACBS"},"to_route_stop_attributes":{"id":14,"inventory_controlled":true,"route_id":3,"position":10,"created_at":"2013-03-01T01:49:04+10:30","updated_at":"2013-03-01T01:49:04+10:30","stop_id":12,"name":"Cape
+        Jervis Ferry Terminal","code":"CPJ"},"departure_time":"2000-01-01T15:00:00Z","arrival_time":"2000-01-01T17:30:00Z"}]'
     http_version: 
-  recorded_at: Tue, 12 Apr 2016 06:41:39 GMT
-recorded_with: VCR 3.0.1
+  recorded_at: Fri, 28 Oct 2016 05:28:14 GMT
+recorded_with: VCR 3.0.3