quicktravel_client 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 72a489cb7817b24b10974577573ac48201ada117
-  data.tar.gz: d0588b714309e3e3cbd7425638171a32193cf615
+SHA256:
+  metadata.gz: b60bf00c1c2d71210f2d1f462986abba8859b7acd216b13d68c8d4ad2c475e9d
+  data.tar.gz: 79cb1bad6bdd5a2178577824c1196ff9e5728beda74e5474bac7f9e53e63c053
 SHA512:
-  metadata.gz: aa65860cb328ee8428b409c33c10d42c4bc2ce838c9c53ec386da17a0350d6af2c6d0d3f08e56d8074421df5a71f63d99e57759d1448e640d6c8ff94caa462ca
-  data.tar.gz: 246af3dc7676cd28979f6e681573b2c8a893bc8c0675095d0f118b597bc20552299bbc4b911a0ea0a15a55644d7b9cda2b3f2542faac1f6e58028b2092413502
+  metadata.gz: 205130ad17115f1f0491351af5b76242a8b67a1f384912708fa4ebad3211d428e83284c41aa8c024d82b1004371415848d47a7fd44bd86fcd375952c5eb68737
+  data.tar.gz: b0cca6ec2c7b5dd695112ba71d112f7593c8bc174070c380aade2d3ddd5aed23b9a44eec3796c207b65ef3d87c6f6bd2f02ced5c3248e58a505907ddfcb2c1f4

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.5.0

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 script: bundle && bundle exec rake spec
 gemfile:
   - gemfiles/rails4.gemfile

data/CHANGELOG.md

@@ -3,12 +3,21 @@ 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/).
 
-## [Unreleased]
+## [3.7.0]
+### Added
+- [DC-1437] Add relationship accesssor methods
+- [TT-3337] Add booking.delete_reservations method
+- [TT-3780] Add tests for Opal payments
+- [TT-3780] Add tests for Opal payment using create / update workflow
 
-## [3.6.1]
-###
+### Fixed
 - [TT-3304] Handle no response in booking update API
 
+### Changed
+- [TT-3333] URL encode data sent to booking reference lookup
+- [TT-3783] Remove deprecated FixNum
+- [TT-3812] Update cassettes
+
 ## [3.6.0]
 ###
 - [ROT-114] Add drop off details

data/README.md

@@ -27,4 +27,4 @@ bundle exec puma -Ilib -p7000
 
 In QuickTravel Client:
 rm spec/support/cassettes/ -rf
-QT_KEYS=a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2,a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2 bundle exec rspec
+QT_KEYS=a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2,1b0a9f8e7d6c5b4a3f2e1d0c9b8a7f6e5d4c3b2a1f0e9d8c7b6a5f4e3d2c1b0a bundle exec rspec

data/lib/quick_travel.rb

@@ -36,6 +36,7 @@ module QuickTravel
   require 'quick_travel/party'
   require 'quick_travel/passenger'
   require 'quick_travel/passenger_type'
+  require 'quick_travel/passenger_split'
   require 'quick_travel/payment'
   require 'quick_travel/background_check'
   require 'quick_travel/payment_type'
@@ -49,6 +50,7 @@ module QuickTravel
   require 'quick_travel/reservation'
   require 'quick_travel/resource'
   require 'quick_travel/resource_category'
+  require 'quick_travel/resource_group'
   require 'quick_travel/room_facility'
   require 'quick_travel/route_stop'
   require 'quick_travel/service'

data/lib/quick_travel/adapter.rb

@@ -25,27 +25,6 @@ module QuickTravel
     # ]
     class_attribute :object_key # Key of sub-objects (i.e. convert under a key)
 
-    def initialize(hash = {})
-      return nil if hash.blank?
-      define_readers(hash.keys)
-      super(Parser.new(hash).parsed_attributes)
-    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 self.has_many(relation_name, options = {})
       define_method relation_name do
         instance_variable_get("@#{relation_name}") || instance_variable_set(
@@ -105,6 +84,14 @@ module QuickTravel
       instance_values
     end
 
+    def to_s
+      if defined? @to_s
+        @to_s
+      else
+        super
+      end
+    end
+
     protected
 
     def self.check_id!(id)
@@ -223,43 +210,6 @@ module QuickTravel
     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.send(conversion_method)
-    end
-  end
-
   class Api
     include HTTParty
 

data/lib/quick_travel/address.rb

@@ -1,7 +1,9 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class Address < Adapter
+  class Address
+    include QuickTravel::InitFromHash
+
     def country_name
       QuickTravel::Country.find(@country_id).name
     end

data/lib/quick_travel/adjustment.rb

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

data/lib/quick_travel/background_check.rb

@@ -1,7 +1,9 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class BackgroundCheck < Adapter
+  class BackgroundCheck
+    include QuickTravel::InitFromHash
+
     def self.check(options = {})
       get_and_validate('/background_check/check.json', options)
     end

data/lib/quick_travel/bed_configuration.rb

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

data/lib/quick_travel/bed_requirement.rb

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

data/lib/quick_travel/booking.rb

@@ -4,6 +4,7 @@ require 'quick_travel/vehicle'
 require 'quick_travel/payment'
 require 'quick_travel/payment_type'
 require 'quick_travel/price_changes'
+require 'uri'
 
 module QuickTravel
   class Booking < Adapter
@@ -12,7 +13,7 @@ module QuickTravel
     end
 
     def self.find_by_reference(reference)
-      find_all!("#{api_base}/reference/#{reference}.json").first
+      find_all!("#{api_base}/reference/#{URI.escape(reference)}.json").first
     end
 
     def documents(regenerate = false)
@@ -156,6 +157,10 @@ module QuickTravel
       reserve(:packages, options)
     end
 
+    def delete_reservations
+      delete_and_validate("#{api_base}/#{@id}/reservations")
+    end
+
     # Delete a reservation
     #
     # Returns current booking object after deleting the reservation
@@ -184,6 +189,10 @@ module QuickTravel
       vehicles.detect { |v| v.id.to_i == vid.to_i }
     end
 
+    def passengers
+      @passenger_objects ||= @passengers_attributes.map{ |p| Passenger.new(p) }
+    end
+
     def passenger_types_counts
       passengers.each_with_object(Hash.new(0)) do |passenger, hash|
         hash[passenger.passenger_type_id] += 1

data/lib/quick_travel/checkout.rb

@@ -46,7 +46,7 @@ module QuickTravel
     # TODO Move to an external builder?
     def self.attributes_for
       attrs = yield
-      attrs[:completed] = (attrs['progress'] == 'completed')
+      attrs[:completed] = attrs['progress'] == 'completed' || attrs['successful']
       attrs[:successful] = attrs[:completed]
       attrs
     rescue AdapterError => e

data/lib/quick_travel/client.rb

@@ -1,6 +1,7 @@
-require 'quick_travel/adapter'
+require 'quick_travel/init_from_hash'
 
 module QuickTravel
-  class Client < Adapter
+  class Client
+    include QuickTravel::InitFromHash
   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,57 @@ 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
+  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/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/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

data/lib/quick_travel/resource.rb

@@ -5,10 +5,10 @@ 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)
@@ -20,6 +20,15 @@ module QuickTravel
       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)