quicktravel_client 3.6.1 → 4.0.0

data/lib/quick_travel/client.rb

@@ -1,6 +1,15 @@
+# frozen_string_literal: true
+
 require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
   class Client < Adapter
+    include QuickTravel::InitFromHash
+    self.api_base = '/api/clients'
+
+    def templates
+      get_and_validate("/api/clients/#{id}/templates")
+    end
   end
 end

data/lib/quick_travel/contact.rb

@@ -1,4 +1,7 @@
+require 'quick_travel/init_from_hash'
+
 module QuickTravel
-  class Contact < Adapter
+  class Contact
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/init_from_hash.rb

@@ -3,7 +3,8 @@ module QuickTravel
     def initialize(hash = {})
       return nil if hash.blank?
 
-      hash.each do |attr, val|
+      define_readers(hash.keys)
+      Parser.new(hash).parsed_attributes.each do |attr, val|
         # set datamember of the object using hash key and value
         if respond_to?("#{attr}=")
           send("#{attr}=", val)
@@ -12,5 +13,61 @@ module QuickTravel
         end
       end
     end
+
+    def define_readers(keys)
+      keys.each do |key|
+        next if respond_to?(key)
+        define_singleton_method(key) { instance_variable_get("@#{key}") }
+        if key.to_s.ends_with? '_cents'
+          name = key.to_s.gsub(/_in_cents$/, '')
+          define_singleton_method(name) {
+            cents = instance_variable_get("@#{key}")
+            return nil unless cents
+            Money.new(cents)
+          }
+        end
+      end
+    end
+
+    def to_hash
+      instance_values
+    end
+  end
+
+  class Parser
+    def initialize(attributes)
+      @attributes = attributes
+    end
+
+    def attributes
+      @attributes ||= {}
+    end
+
+    def parsed_attributes
+      @parsed_attributes ||= parse_attributes
+    end
+
+    private
+
+    def parse_attributes
+      attributes.map.with_object({}) do |(attribute, value), hash|
+        hash[attribute] = parse(attribute, value)
+      end
+    end
+
+    def parse(attribute, value)
+      return nil if value.nil?
+      return convert(value, :to_date) if attribute.to_s.ends_with?('_date')
+      return convert(value, :to_date) if attribute.to_s.ends_with?('_on')
+      # to_datetime as it converts to app time zone, to_time converts to system time zone
+      return convert(value, :to_datetime) if attribute.to_s.ends_with?('_time')
+      return convert(value, :to_datetime) if attribute.to_s.ends_with?('_at')
+      value
+    end
+
+    def convert(value, conversion_method)
+      convertable_value = value.is_a?(Hash) ? value['_value'] : value
+      convertable_value.try(conversion_method) || convertable_value
+    end
   end
 end

data/lib/quick_travel/package.rb

@@ -0,0 +1,13 @@
+require 'quick_travel/adapter'
+
+module QuickTravel
+  class Package < Adapter
+    attr_reader :error_message
+
+    self.api_base = '/api/packages'
+
+    def product_type
+      QuickTravel::ProductType.find(product_type_id)
+    end
+  end
+end

data/lib/quick_travel/passenger.rb

@@ -1,6 +1,11 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class Passenger < Adapter
+  class Passenger
+    include QuickTravel::InitFromHash
+
+    def passenger_type
+      QuickTravel::PassengerType.find(@passenger_type_id)
+    end
   end
 end

data/lib/quick_travel/passenger_price_break.rb

@@ -1,6 +1,7 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class PassengerPriceBreak < Adapter
+  class PassengerPriceBreak
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/passenger_split.rb

@@ -0,0 +1,5 @@
+module QuickTravel
+  class PassengerSplit
+    include QuickTravel::InitFromHash
+  end
+end

data/lib/quick_travel/passenger_type.rb

@@ -13,7 +13,7 @@ module QuickTravel
     end
 
     def self.pluralize(count, singular, plural = nil)
-      "#{count || 0} " + ((count == 1 || count =~ /^1(\.0+)?$/) ? singular : (plural || singular.pluralize))
+      "#{count || 0} " + ((count == 1) ? singular : (plural || singular.pluralize))
     end
   end
 end

data/lib/quick_travel/product_configuration.rb

@@ -31,7 +31,7 @@ module QuickTravel
     end
 
     def priced?
-      @product.pricing_details.present?
+      @product.try(:pricing_details).present?
     end
 
     def price

data/lib/quick_travel/products/base.rb

@@ -7,13 +7,13 @@ module QuickTravel
         bookable || exception_type == 'inventory'
       end
 
-      def self.find(search_params = {})
-        find_for_type(@reservation_for_type, search_params)
+      def self.find(search_params = {}, opts = {})
+        find_for_type(@reservation_for_type, search_params, opts)
       end
 
-      def self.find_for_type(type, search_params = {})
+      def self.find_for_type(type, search_params = {}, opts = {})
         url = "/reservation_for/#{type}/find_services_for.json"
-        product_maps = post_and_validate(url, search_params)
+        product_maps = post_and_validate(url, search_params, opts)
         product_maps.map { |product_map| new(product_map) }
       end
     end

data/lib/quick_travel/property.rb

@@ -3,6 +3,7 @@ require 'quick_travel/property_facility'
 
 module QuickTravel
   class Property < Adapter
+    self.api_base = '/api/properties'
     attr_reader :error
 
     def accommodations=(hash_array)
@@ -23,7 +24,7 @@ module QuickTravel
 
     def self.load_with_pricing(id, options)
       # Find property 'standard' way -- finds price for whole duration
-      fail ArgumentError.new('Must Specify valid property id') if id.blank? || id.class != Fixnum
+      fail ArgumentError.new('Must Specify valid property id') if id.blank? || !id.is_a?(Integer)
       property = find_all!("/api/properties/#{id}.json", options).first
       first_travel_date = options.fetch(:product).fetch(:first_travel_date)
       property.accommodations.each do |accommodation|

data/lib/quick_travel/property_facility.rb

@@ -1,6 +1,7 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class PropertyFacility < Adapter
+  class PropertyFacility
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/reservation.rb

@@ -30,6 +30,10 @@ module QuickTravel
       end_time.to_time.on(last_travel_date) if end_time
     end
 
+    def passenger_splits
+      @_passenger_splits ||= @passenger_splits.map{ |split| PassengerSplit.new(split) }
+    end
+
     def passengers_count_string(booking)
       passengers_count(booking).join(', ')
     end
@@ -38,7 +42,7 @@ module QuickTravel
       passenger_type_count = {}
       if passenger_splits.present?
         passenger_splits.each do |p|
-          passenger = booking.find_passenger_by_id(p['consumer_id'])
+          passenger = booking.find_passenger_by_id(p.consumer_id)
 
           if passenger.present?
             passenger_type_count[passenger.passenger_type_id] ||= 0

data/lib/quick_travel/resource.rb

@@ -5,21 +5,30 @@ require 'quick_travel/product_type'
 
 module QuickTravel
   class Resource < Adapter
-    self.api_base = '/resources'
+    self.api_base = '/api/resources'
 
     def sub_resources
-      Resource.find_all!('/resources.json', parent_resource_id: @id)
+      Resource.find_all!('/api/resources.json', parent_resource_id: @id)
     end
 
     def self.all_with_price(opts)
       cache_key = GenerateCacheKey.new(name, opts).call
-      find_all!("/api/resources/index_with_price.json", opts.merge(cache: cache_key))
+      find_all!("/api/resources/index_with_price.json", opts.merge(cache_key: cache_key))
     end
 
     def product_type
       QuickTravel::ProductType.find(product_type_id)
     end
 
+    def locations
+      location_ids.map{ |id| Location.find(id) }
+    end
+
+    def category
+      return nil if @category.nil?
+      @_category ||= QuickTravel::ResourceCategory.new(@category)
+    end
+
     def bed_requirements
       @_bed_requirements ||= Array.wrap(@bed_requirements).map do |bed_requirement|
         BedRequirement.new(bed_requirement)

data/lib/quick_travel/resource_category.rb

@@ -4,5 +4,9 @@ module QuickTravel
   class ResourceCategory < Adapter
     self.api_base = '/api/resource_categories'
     self.lookup = true
-  end
+
+    def product_type
+      QuickTravel::ProductType.find(product_type_id)
+    end
+ end
 end

data/lib/quick_travel/resource_group.rb

@@ -0,0 +1,9 @@
+module QuickTravel
+  class ResourceGroup
+    include QuickTravel::InitFromHash
+
+    def product_type
+      ProductType.find(product_type_id)
+    end
+  end
+end

data/lib/quick_travel/room_facility.rb

@@ -1,6 +1,7 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class RoomFacility < Adapter
+  class RoomFacility
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/route.rb

@@ -17,7 +17,7 @@ module QuickTravel
     # All routes for a given product type
     def self.all(product_type_id)
       find_all!("/product_types/#{product_type_id}/routes.json",
-                cache: "QuickTravel::Route.all-#{product_type_id}-attrs")
+                cache_key: "QuickTravel::Route.all-#{product_type_id}-attrs")
     end
 
     def self.find(routes_list, route_id)

data/lib/quick_travel/route_stop.rb

@@ -1,6 +1,22 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class RouteStop < Adapter
+  class RouteStop
+    include QuickTravel::InitFromHash
+
+    def stop
+      Stop.new({
+        id: stop_id,
+        name: name,
+        code: code,
+        address: address,
+        longitude: longitude,
+        latitude: latitude
+      })
+    end
+  end
+
+  class Stop
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/service.rb

@@ -1,6 +1,7 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class Service < Adapter
+  class Service
+    include QuickTravel::InitFromHash
   end
 end

data/lib/quick_travel/version.rb

@@ -1,3 +1,3 @@
 module QuickTravel
-  VERSION = '3.6.1'
+  VERSION = '4.0.0'
 end

data/quicktravel_client.gemspec

@@ -16,13 +16,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty', '~> 0.14'
-  spec.add_dependency 'json'
-  spec.add_dependency 'activesupport', '>= 2.0.0'
+  spec.add_dependency 'httparty'
+  spec.add_dependency 'activesupport', '>= 5.0.0'
   spec.add_dependency 'facets'
-  spec.add_dependency 'money', '>= 3.0', '< 6.0' # 6.0 starts to deprecate/split
+  spec.add_dependency 'money', '>= 6.0'
+  spec.add_dependency 'money_extensions', '>= 1.0'
+  spec.add_dependency 'will_paginate'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'

data/spec/adapter_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'quick_travel/adapter'
 
 describe QuickTravel::Adapter do
-  let(:response) { double code: 200, parsed_response: parsed_response }
+  let(:response) { double code: 200, parsed_response: parsed_response, headers: {} }
   let(:parsed_response) { { test: true } }
 
   before do
@@ -26,8 +26,7 @@ describe QuickTravel::Adapter do
     let(:expected_body) {
       {
         test: true,
-        sub_hash: { id: 42 },
-        access_key: an_instance_of(String)
+        sub_hash: { id: 42 }
       }
     }
 
@@ -37,7 +36,7 @@ describe QuickTravel::Adapter do
   end
 
   context 'when response non standard' do
-    let(:url) { 'http://www.google.com' }
+    let(:url) { 'https://httpstat.us/418' }
 
     let(:adapter_response) {
       VCR.use_cassette 'wrong_url' do
@@ -48,8 +47,40 @@ describe QuickTravel::Adapter do
     specify do
       expect { adapter_response }.to raise_error(
         QuickTravel::AdapterError,
-        /That’s all we know/
+        /418 I'm a teapot/
       )
     end
   end
+
+  context 'when cache options present' do
+    subject(:all) do
+      QuickTravel::Adapter.call_and_validate(:get, 'some_path', {}, { cache_key: 'test_key', cache_options: { expires_in: 3.minutes } })
+    end
+    let(:api) { double }
+
+    before do
+      QuickTravel::Cache.cache_store.clear
+      stub_const('QuickTravel::Api', api)
+      allow(api).to receive(:call_and_validate) { [{id: 1}, {id: 2}] }
+      all
+    end
+
+    specify { expect(api).to have_received(:call_and_validate).once }
+
+    context 'when called again' do
+      before do
+        QuickTravel::Adapter.call_and_validate(:get, 'some_path', {}, { cache_key: 'test_key', cache_options: { expires_in: 3.minutes } })
+      end
+
+      specify { expect(api).to have_received(:call_and_validate).once } # not called again
+    end
+
+    context 'when called with different key' do
+      before do
+        QuickTravel::Adapter.call_and_validate(:get, 'some_path', {}, { cache_key: 'test_key1', cache_options: { expires_in: 3.minutes } })
+      end
+
+      specify { expect(api).to have_received(:call_and_validate).twice }
+    end
+  end
 end

data/spec/booking_spec.rb

@@ -65,7 +65,7 @@ describe QuickTravel::Booking 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.size).to eq 4
       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
@@ -144,10 +144,12 @@ end
 
 describe QuickTravel::Booking, 'when booking accommodation' do
   let(:booking) {
-    VCR.use_cassette('booking_with_documents') {
-      QuickTravel::Booking.find(1)
-    }
+    VCR.use_cassette('booking_create_accommodation') do
+      QuickTravel.config.version = 4
+      QuickTravel::Booking.create
+    end
   }
+
   let(:reservation) {
     VCR.use_cassette('accommodation_reserve') do
       booking.accommodation_reserve(
@@ -157,14 +159,20 @@ describe QuickTravel::Booking, 'when booking accommodation' do
         first_travel_date: '01/03/2016',
         last_travel_date: '02/03/2016'
       )
-      booking.reservations.detect { |reservation| reservation.resource.name == 'Executive Room' }
+      QuickTravel::Booking.find(booking.id).reservations.detect { |reservation| reservation.resource.name == 'Executive Room' }
+    end
+  }
+
+  let(:resource) {
+    VCR.use_cassette('reservation_resource') do
+      QuickTravel::Resource.find(reservation.resource_id)
     end
   }
 
   it 'should create acommodation reservation' do
     expect(reservation.first_travel_date).to eq '2016-03-01'.to_date
     expect(reservation.last_travel_date).to eq '2016-03-02'.to_date
-    expect(reservation.resource.name).to eq 'Executive Room'
+    expect(resource.name).to eq 'Executive Room'
     expect(reservation.passenger_ids).to eq booking.passenger_ids
   end
 end
@@ -199,3 +207,13 @@ describe QuickTravel::Booking, "when booking doesn't exist" do
     end
   end
 end
+
+describe QuickTravel::Booking, "#customer_comments" do
+  let(:booking) { QuickTravel::Booking.find(333536) }
+
+  it 'should return customer comments' do
+    VCR.use_cassette('booking_with_comments') do
+      expect(booking.customer_comments).to eq 'I hate this'
+    end
+  end
+end