quicktravel_client 2.9.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a76d145655f8fbc3fbfa075eecd441b01e90007
-  data.tar.gz: e53d5216a6e40d44416c0752db5bfe060ed8f799
+  metadata.gz: d406224338a518959484d11dcef14412f50cf92a
+  data.tar.gz: c63d38aeadcc3504609d5f0177dafa291d74d789
 SHA512:
-  metadata.gz: 44ba1235552de14a7384a47c45d5d25e980f838a05de1c1436dba7da7f6681e733c93b52e22c2bc8010b2ee5edf423c7bc112da498be552863d9621e50259112
-  data.tar.gz: 464f0a91ca06c4da7549f1c3d0126d4977513cf6a0b52b67b07f250291d6b9ecfe300a69064a3a498ce7cc2ad5f3aa566ff14cb44e8000b18bd8a20fa9e0f660
+  metadata.gz: 54c408479abad2926f6573a5703b7d0154feebaf8d60a6bbf59d9189e8f6cbb266798145e1dd47f9f394c4636c826de0ab4bfdd2f1317ab954cfe43f61fd442c
+  data.tar.gz: 0b53e81800754f522628d39cbd2602ae486ef8a08e597e3517ba9a5d5a524f8a354252115d998f259747fe553e0c80b3f960b83527a055e8fe69bdc6355c54f5

data/CHANGELOG.md

@@ -3,6 +3,20 @@ 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/).
 
+
+## [3.0.0]
+### Fixed
+- Allow zero pricing for extra pick items
+
+### Changed
+- Use new reset password url
+
+### Added
+- Setting API
+
+### Removed
+- Removed geocode function on address
+
 ## [2.9.0]
 ### Changed
 - Use new API login

data/lib/quick_travel/address.rb

@@ -1,5 +1,4 @@
 require 'quick_travel/adapter'
-require 'geokit'
 
 module QuickTravel
   class Address < Adapter
@@ -7,17 +6,6 @@ module QuickTravel
       QuickTravel::Country.find(@country_id).name
     end
 
-    # TODO: Remove this method
-    # Geokit is a dependency and ONLY used here
-    # This function should be done outside this gem
-    def geocode
-      @_geocode ||= QuickTravel::Cache.cache("geocode_#{self}") {
-        Geokit::Geocoders::MultiGeocoder.geocode(to_s)
-      }
-    rescue Geokit::Geocoders::TooManyQueriesError
-      nil # do not cache, do not error
-    end
-
     def to_s
       "#{address_line1} #{address_line2}, #{city}, #{post_code}, #{state}, #{country_name}"
     end

data/lib/quick_travel/party.rb

@@ -32,11 +32,11 @@ module QuickTravel
 
     def self.request_password(login, url)
       options = { login: login, url: url }
-      post_and_validate('/sessions/request_password_reset', options)
+      post_and_validate('/api/sessions/request_password_reset', options)
     end
 
     def self.set_password_via_token(token, password)
-      post_and_validate('/sessions/set_password_via_token', token: token, password: password)
+      post_and_validate('/api/sessions/set_password_via_token', token: token, password: password)
     rescue QuickTravel::AdapterError => e
       { error: e.message }
     end

data/lib/quick_travel/product_configuration.rb

@@ -102,20 +102,28 @@ module QuickTravel
       end
     end
 
+    def selected_extra_picks_with_price
+      selected_extra_pick_configurations.select(&:priced?)
+    end
+
     def selected_extra_picks_price
-      selected_extra_pick_configurations.map(&:price).total_money
+      total_money(selected_extra_picks_with_price.map(&:price))
     end
 
     def selected_extra_picks_price_without_rules
-      selected_extra_pick_configurations.map(&:price_without_rules).total_money
+      total_money(selected_extra_picks_with_price.map(&:price_without_rules))
     end
 
     def selected_extra_picks_price_for_rack_rate
-      selected_extra_pick_configurations.map(&:price_for_rack_rate).total_money
+      total_money(selected_extra_picks_with_price.map(&:price_for_rack_rate))
     end
 
     def selected_extra_picks_applied_rules
-      selected_extra_pick_configurations.flat_map(&:applied_rules)
+      selected_extra_picks_with_price.flat_map(&:applied_rules)
+    end
+
+    def total_money(array)
+      array.reduce(Money.new(0), :+)
     end
 
     def pricing_details

data/lib/quick_travel/setting.rb

@@ -0,0 +1,9 @@
+require 'quick_travel/adapter'
+
+module QuickTravel
+  class Setting < Adapter
+    def self.basic
+      find_all!("/api/settings/basic.json").first
+    end
+  end
+end

data/lib/quick_travel/version.rb

@@ -1,3 +1,3 @@
 module QuickTravel
-  VERSION = '2.9.0'
+  VERSION = '3.0.0'
 end

data/quicktravel_client.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'httparty', '~> 0.14'
   spec.add_dependency 'json'
-  # Geokit dependency should be removed (see address.rb for details)
-  spec.add_dependency 'geokit', '~> 1.8.3' # used in address model
   spec.add_dependency 'activesupport', '>= 2.0.0'
   spec.add_dependency 'facets'
   spec.add_dependency 'money', '>= 3.0', '< 6.0' # 6.0 starts to deprecate/split

data/spec/product_configuration_spec.rb

@@ -0,0 +1,265 @@
+require 'spec_helper'
+require 'money'
+require 'quick_travel/product_configuration'
+
+describe QuickTravel::ProductConfiguration do
+  ADULT_PASSENGER_TYPE_ID = 0
+  CHILD_PASSENGER_TYPE_ID = 1
+
+  let(:extra_pick_available) { false }
+  let(:extra_pick_minimum_price) { Money.new(2) }
+
+  let(:applied_rules) { [] }
+  let(:extra_pick_applied_rules) { [] }
+
+  let(:extra_pick_pricing_details) do
+    double(
+      applied_rules: extra_pick_applied_rules,
+      price_per_pax_type: [],
+      minimum_price_with_adjustments: extra_pick_minimum_price
+    )
+  end
+
+  let(:extra_pick_product) do
+    double(
+      extras: [],
+      pricing_details: extra_pick_pricing_details,
+      available?: extra_pick_available
+    )
+  end
+
+  let(:unpriced_extra_pick_product) { double(extras: [], available?: true) }
+
+  let(:extras) { [extra_pick_product] }
+
+  let(:available) { false }
+  let(:minimum_price) { Money.new(10) }
+  let(:minimum_without_rules_price) { Money.new(100) }
+  let(:minimum_rack_price) { Money.new(50) }
+
+  let(:pricing_details) do
+    double(
+      applied_rules: applied_rules,
+      price_per_pax_type: [2, 1],
+      minimum_price_with_adjustments: minimum_price
+    )
+  end
+
+  let(:pricing_details_for_rack_rate) do
+    double(
+      applied_rules: [],
+      price_per_pax_type: [],
+      minimum_price_with_adjustments: minimum_rack_price
+    )
+  end
+
+  let(:pricing_details_without_rules) do
+    double(
+      applied_rules: [],
+      price_per_pax_type: [],
+      minimum_price_with_adjustments: minimum_without_rules_price
+    )
+  end
+
+  let(:product) do
+    double(
+      extras: extras,
+      available?: available,
+      pricing_details: pricing_details,
+      pricing_details_without_rules: pricing_details_without_rules,
+      pricing_details_for_rack_rate: pricing_details_for_rack_rate
+    )
+  end
+
+  subject(:config) { QuickTravel::ProductConfiguration.new(product) }
+
+  context '#initialize' do
+    it 'should create the extra pick configurations' do
+      expect(subject.extra_pick_configurations.size).to be 1
+    end
+  end
+
+  context 'selections' do
+    it { is_expected.not_to be_selected }
+
+    context '#select!' do
+      before { subject.select! }
+      it { is_expected.to be_selected }
+
+      context '#deselect!' do
+        before { subject.deselect! }
+        it { is_expected.not_to be_selected }
+      end
+    end
+  end
+
+  context '#available?' do
+    context 'the product is available' do
+      let(:available) { true }
+      it { is_expected.to be_available }
+
+      context 'extra pick unavailable' do
+        let(:extra_pick_available) { false }
+
+        context 'non selected extra picks' do
+          it { is_expected.to be_available }
+        end
+
+        context 'selected extra pick' do
+          before { subject.select_extra_pick(extra_pick_product) }
+          it { is_expected.not_to be_available }
+        end
+      end
+    end
+
+    context 'the product is unavailable' do
+      let(:available) { false }
+      it { is_expected.not_to be_available }
+    end
+  end
+
+  context '#priced?' do
+    context 'when the pricing details are present' do
+      it { is_expected.to be_priced }
+    end
+
+    context 'when no pricing details are present' do
+      let(:pricing_details) { nil }
+      it { is_expected.not_to be_priced }
+    end
+  end
+
+  context '#price' do
+    subject { config.price }
+    it { is_expected.to eq minimum_price }
+  end
+
+  context '#price_without_rules' do
+    subject { config.price_without_rules }
+
+    context 'when the rules are not defined' do
+      let(:pricing_details_without_rules) { nil }
+      it { is_expected.to eq config.price }
+    end
+
+    context 'when the rules are defined' do
+      it { is_expected.to eq minimum_without_rules_price }
+    end
+  end
+
+  context '#price_for_rack_rate' do
+    subject { config.price_for_rack_rate }
+
+    context 'when the rules are not defined' do
+      let(:pricing_details_for_rack_rate) { nil }
+      it { is_expected.to eq config.price }
+    end
+
+    context 'when the rules are defined' do
+      it { is_expected.to eq minimum_rack_price }
+    end
+  end
+
+  context '#total_price' do
+    subject { config.total_price }
+
+    context 'when there are no selected extra picks' do
+      it { is_expected.to eq config.price }
+    end
+
+    context 'when there are selected extra picks' do
+      before { config.select_extra_pick(extra_pick_product) }
+      it { is_expected.to eq extra_pick_minimum_price + minimum_price }
+
+      context 'without a price' do
+        let(:extra_pick_pricing_details) { nil }
+        it { is_expected.to eq config.price }
+      end
+    end
+  end
+
+  context '#total_price_without_rules' do
+    subject { config.total_price_without_rules }
+    context 'when there are no selected extra picks' do
+      it { is_expected.to eq config.price_without_rules }
+    end
+  end
+
+  context '#total_price_for_rack_rate' do
+    subject { config.total_price_for_rack_rate }
+    context 'when there are no selected extra picks' do
+      it { is_expected.to eq config.price_for_rack_rate }
+    end
+  end
+
+  context '#applied_rules' do
+    let(:applied_rules) { [1, 1, 2, 2] }
+    subject { config.applied_rules }
+    it { is_expected.to eq [1, 2] }
+  end
+
+  context '#total_applied_rules' do
+    let(:applied_rules) { [1, 1, 2, 2] }
+    let(:extra_pick_applied_rules) { [1, 3] }
+    before do
+      subject.select_extra_pick(extra_pick_product)
+    end
+    it 'should return unique rules from product and selected extra picks' do
+      expect(subject.total_applied_rules).to eq [1, 2, 3]
+    end
+  end
+
+  context '#price_per_passenger_type' do
+    it 'should return a price for adult' do
+      expect(subject.price_per_passenger_type(ADULT_PASSENGER_TYPE_ID)).to be 2
+    end
+
+    it 'should return a price for child' do
+      expect(subject.price_per_passenger_type(CHILD_PASSENGER_TYPE_ID)).to be 1
+    end
+  end
+
+  context '#selected_extra_pick_configurations' do
+    it 'should have no selected extra picks by default' do
+      expect(subject.selected_extra_pick_configurations).to be_empty
+    end
+  end
+
+  context '#available_extra_pick_configurations' do
+    context 'when there are available extra picks' do
+      let(:extra_pick_available) { true }
+      it 'should return the available extra picks' do
+        expect(subject.available_extra_pick_configurations.size).to be 1
+      end
+    end
+
+    context 'when there are no available extra picks' do
+      let(:extra_pick_available) { false }
+      it 'should return the available extra picks' do
+        expect(subject.available_extra_pick_configurations).to be_empty
+      end
+    end
+  end
+
+  context '#select_extra_picks' do
+    let(:extras) { [extra_pick_product, unpriced_extra_pick_product] }
+    before do
+      subject.select_extra_picks(extras)
+    end
+
+    it 'should select all the extra pick configurations' do
+      expect(subject.extra_pick_configurations.all?(&:selected?)).to be true
+    end
+  end
+
+  context '#select_extra_pick' do
+    context 'when the extra pick does not exist' do
+      it 'should raise an exception' do
+        expect { subject.select_extra_pick(product) }.to raise_error(
+          ArgumentError,
+          'That extra pick does not belong to the product'
+        )
+      end
+    end
+  end
+end

data/spec/setting_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'quick_travel/setting'
+
+describe QuickTravel::Checkout do
+  subject {
+    VCR.use_cassette 'settings_basic' do
+      QuickTravel::Setting.basic
+    end
+  }
+
+  specify do
+    expect(subject.vehicle_optional_fields).to eq %w(weight registration)
+    expect(subject.default_passenger_type_id).to eq 1
+    expect(subject.time_zone).to eq 'Australia/Adelaide'
+    expect(subject.ob_num_pax_requiring_details).to eq 'none'
+    expect(subject.person_titles).to eq %w(Mr Mrs Ms Miss)
+  end
+end

data/spec/support/cassettes/settings_basic.yml

@@ -0,0 +1,61 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://test.qt.sealink.com.au:8080/api/settings/basic.json
+    body:
+      encoding: UTF-8
+      string: access_key=<QT_KEY>
+    headers:
+      Content-Length:
+      - '0'
+  response:
+    status:
+      code: 200
+      message: 'OK '
+    headers:
+      P3p:
+      - CP="IDC DSP CAO COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Etag:
+      - '"168ce77e85be5b01489cbdeb4579ae80"'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Request-Id:
+      - 9bc0325ad1d87df4cfeabe842fd54665
+      X-Runtime:
+      - '0.162131'
+      Vary:
+      - Origin
+      Date:
+      - Fri, 01 Jan 2016 02:35:07 GMT
+      X-Rack-Cache:
+      - miss
+      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.5/2016-04-26)
+      Content-Length:
+      - '195'
+      Connection:
+      - Keep-Alive
+      Set-Cookie:
+      - _session_id=BAh7B0kiD3Nlc3Npb25faWQGOgZFVEkiJTA1MTMxYmM3MzVkODRmNDc3ZTJkYzdjMTQ5YzM3M2Q3BjsAVEkiCXVzZXIGOwBGaQY%3D--a046d093f16ee7b3088c89116f6cfe2d12594657;
+        path=/; HttpOnly
+    body:
+      encoding: UTF-8
+      string: '{"vehicle_optional_fields":["weight","registration"],"default_passenger_type_id":1,"time_zone":"Australia/Adelaide","ob_num_pax_requiring_details":"none","person_titles":["Mr","Mrs","Ms","Miss"]}'
+    http_version: 
+  recorded_at: Tue, 23 May 2017 04:09:58 GMT
+recorded_with: VCR 3.0.3

data/spec/support/coverage_loader.rb

@@ -1,4 +1,4 @@
 require 'simplecov-rcov'
 require 'coveralls'
 require 'coverage/kit'
-Coverage::Kit.setup(minimum_coverage: 78.76)
+Coverage::Kit.setup(minimum_coverage: 82.10)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quicktravel_client
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Michael Noack
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -40,20 +40,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: geokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -347,6 +333,7 @@ files:
 - lib/quick_travel/route_stop.rb
 - lib/quick_travel/search.rb
 - lib/quick_travel/service.rb
+- lib/quick_travel/setting.rb
 - lib/quick_travel/status.rb
 - lib/quick_travel/trip.rb
 - lib/quick_travel/vehicle.rb
@@ -363,6 +350,7 @@ files:
 - spec/passenger_type_spec.rb
 - spec/payment_type_spec.rb
 - spec/price_quote_spec.rb
+- spec/product_configuration_spec.rb
 - spec/product_spec.rb
 - spec/product_type_spec.rb
 - spec/products/scheduled_trip_spec.rb
@@ -372,6 +360,7 @@ files:
 - spec/resource_category_spec.rb
 - spec/resource_spec.rb
 - spec/route_spec.rb
+- spec/setting_spec.rb
 - spec/spec_helper.rb
 - spec/status_spec.rb
 - spec/support/cassettes/accommodation_reserve.yml
@@ -409,6 +398,7 @@ files:
 - spec/support/cassettes/resource_fare_bases.yml
 - spec/support/cassettes/resource_show.yml
 - spec/support/cassettes/resource_with_price.yml
+- spec/support/cassettes/settings_basic.yml
 - spec/support/cassettes/tenant_switcher.yml
 - spec/support/cassettes/wrong_url.yml
 - spec/support/coverage_loader.rb
@@ -433,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Booking process using QuickTravel API
@@ -447,6 +437,7 @@ test_files:
 - spec/passenger_type_spec.rb
 - spec/payment_type_spec.rb
 - spec/price_quote_spec.rb
+- spec/product_configuration_spec.rb
 - spec/product_spec.rb
 - spec/product_type_spec.rb
 - spec/products/scheduled_trip_spec.rb
@@ -456,6 +447,7 @@ test_files:
 - spec/resource_category_spec.rb
 - spec/resource_spec.rb
 - spec/route_spec.rb
+- spec/setting_spec.rb
 - spec/spec_helper.rb
 - spec/status_spec.rb
 - spec/support/cassettes/accommodation_reserve.yml
@@ -493,6 +485,7 @@ test_files:
 - spec/support/cassettes/resource_fare_bases.yml
 - spec/support/cassettes/resource_show.yml
 - spec/support/cassettes/resource_with_price.yml
+- spec/support/cassettes/settings_basic.yml
 - spec/support/cassettes/tenant_switcher.yml
 - spec/support/cassettes/wrong_url.yml
 - spec/support/coverage_loader.rb