quicktravel_client 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421aff4ace14fcc897f2e4e2fb6ce1322c59cee5
-  data.tar.gz: 866639c423532c55b063a28c01158c3c3878a9cb
+  metadata.gz: 12215f7e586d4dcc5d210f34eed5823f029be331
+  data.tar.gz: b3be0ebba0bf6ae60b0f5039958e25e9f86fa1b5
 SHA512:
-  metadata.gz: 8958463c230448871416721396a4942f67028d263a107f7bd873ea34b325f956d3cb509e53bea8500f28c421dbf13a441ab410b79b9c4d196577c441792a4400
-  data.tar.gz: 1701d78f156203ad7dfda195608f97561a74d6a3783a32882aee910b180709b4a244f64cf6efa61be92265ec7dd158041e5afb87263b0085c16a22817eca650f
+  metadata.gz: 04283f96ff13e9e588b641d03e71d2b365c4651272a0361547fb5727d8c110e6bfe954fba1a99eec171ba7731b94f4e3469b4f7a9ae4b243bec938c2b929ef89
+  data.tar.gz: 37ea14639851b762575c87fde07b8fe45af6711389ccd81f4b17fb912124ac2dfee4a1bf171e63035d14fb63a22838d7f6ff192e18ee24228d0f457e4cd9acda

data/CHANGELOG.md

@@ -3,6 +3,15 @@ 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.3.0]
+### Changed
+ - Change cache expiries
+- Adds support for passing dates to Resource#all_with_price
+
+### Fixed
+- Fixes issue with HTTParty ~> 0.14
+- Updates HTTParty dependency to ~> 0.14
+
 ## [2.2.2]
 ### Changed
  - Deprecates Booking#calculate_price_quote

data/gemfiles/rails2.gemfile

@@ -2,7 +2,10 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 group :development, :test do
+  gem 'json', '~> 1.8'
+  gem 'tins', '~> 1.6.0'
   gem 'activesupport', '~> 2.3'
   gem 'activerecord', '~> 2.3'
   gem 'actionpack', '~> 2.3'
+  gem 'rubocop', '~> 0.41.2'
 end

data/lib/quick_travel/adapter.rb

@@ -272,7 +272,7 @@ module QuickTravel
         raise ConnectionError.new('Timeout error')
       end
 
-      if expect && expect == :json && !response.is_a?(Hash)
+      if expect && expect == :json && !response.parsed_response.is_a?(Hash)
         fail AdapterError, <<-FAIL
           Request expected to be json but failed. Debug information below:
           http_method: #{http_method.inspect}

data/lib/quick_travel/cache.rb

@@ -10,6 +10,8 @@ module QuickTravel
       cached_value = cache_store.read(key)
       return cached_value unless cached_value.nil?
       return nil unless block_given?
+      cache_options ||= {}
+      cache_options[:expires_in] = 1.day unless cache_options.key?(:expires_in)
       yield.tap { |value| cache_store.write(key, value, cache_options) }
     end
 

data/lib/quick_travel/resource.rb

@@ -12,8 +12,8 @@ module QuickTravel
     end
 
     def self.all_with_price(opts)
-      find_all!("/api/resources/index_with_price.json",
-                opts.merge(cache: "#{name}.all_with_price-attrs"))
+      cache_key = GenerateCacheKey.new(name, opts).call
+      find_all!("/api/resources/index_with_price.json", opts.merge(cache: cache_key))
     end
 
     def product_type
@@ -25,5 +25,24 @@ module QuickTravel
         BedRequirement.new(bed_requirement)
       end
     end
+
+    private
+
+    class GenerateCacheKey
+      def initialize(resource_name, opts)
+        @resource_name = resource_name
+        @opts = opts
+      end
+
+      def call
+        "#{@resource_name}.all_with_price-attrs?#{cache_params.to_param}"
+      end
+
+      private
+
+      def cache_params
+        { date: Date.current }.merge(@opts.symbolize_keys)
+      end
+    end
   end
 end

data/lib/quick_travel/route.rb

@@ -17,9 +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",
-                # expires_in will only work with something like Rails.cache
-                cache_options: { expires_in: 1440.minutes })
+                cache: "QuickTravel::Route.all-#{product_type_id}-attrs")
     end
 
     def self.find(routes_list, route_id)

data/lib/quick_travel/version.rb

@@ -1,3 +1,3 @@
 module QuickTravel
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 end

data/quicktravel_client.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty'
+  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'

data/spec/spec_helper.rb

@@ -11,22 +11,14 @@ require 'bundler/setup'
 require 'rspec/its'
 require 'date' # Needed for stamp
 require 'stamp' # Some reasons stamp doesn't load automatically?
-require 'vcr'
 
 ENV['QT_KEYS'] ||= 'test_key_1,test_key_2'
-qt_keys = ENV['QT_KEYS'].split(',')
-VCR.configure do |c|
-  c.cassette_library_dir = 'spec/support/cassettes'
-  c.default_cassette_options = { match_requests_on: [:method, :uri, :body] }
-  c.filter_sensitive_data('<QT_KEY>')   { qt_keys[0] }
-  c.filter_sensitive_data('<QT_KEY_2>') { qt_keys[1] }
-  c.hook_into :webmock
-end
-
+require 'support/vcr_loader'
 require 'support/coverage_loader'
 require 'quick_travel' # eager load to ensure coverage correct
 
 require 'quick_travel/config'
+qt_keys = ENV['QT_KEYS'].split(',')
 QuickTravel.configure do |c|
   c.url = 'http://test.qt.sealink.com.au:8080'
   c.access_key = qt_keys[0]

data/spec/support/vcr_loader.rb

@@ -0,0 +1,12 @@
+require 'vcr'
+require 'webmock/rspec'
+
+qt_keys = ENV['QT_KEYS'].split(',')
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/support/cassettes'
+  c.default_cassette_options = { match_requests_on: [:method, :uri, :body] }
+  c.filter_sensitive_data('<QT_KEY>')   { qt_keys[0] }
+  c.filter_sensitive_data('<QT_KEY_2>') { qt_keys[1] }
+  c.hook_into :webmock
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quicktravel_client
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Michael Noack
@@ -10,10 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -396,6 +410,7 @@ files:
 - spec/support/cassettes/route_all.yml
 - spec/support/cassettes/tenant_switcher.yml
 - spec/support/coverage_loader.rb
+- spec/support/vcr_loader.rb
 - spec/tenant_spec.rb
 homepage: https://bitbucket.org/team-sealink/quicktravel_client
 licenses: []
@@ -416,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Booking process using QuickTravel API
@@ -476,4 +491,5 @@ test_files:
 - spec/support/cassettes/route_all.yml
 - spec/support/cassettes/tenant_switcher.yml
 - spec/support/coverage_loader.rb
+- spec/support/vcr_loader.rb
 - spec/tenant_spec.rb