quicktravel_client 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12215f7e586d4dcc5d210f34eed5823f029be331
-  data.tar.gz: b3be0ebba0bf6ae60b0f5039958e25e9f86fa1b5
+  metadata.gz: b5dcbf38f81c9b909173948030ab544edf2b10a6
+  data.tar.gz: fde0ede3e1331d355c4ee42db771e2c9f0e2e8ed
 SHA512:
-  metadata.gz: 04283f96ff13e9e588b641d03e71d2b365c4651272a0361547fb5727d8c110e6bfe954fba1a99eec171ba7731b94f4e3469b4f7a9ae4b243bec938c2b929ef89
-  data.tar.gz: 37ea14639851b762575c87fde07b8fe45af6711389ccd81f4b17fb912124ac2dfee4a1bf171e63035d14fb63a22838d7f6ff192e18ee24228d0f457e4cd9acda
+  metadata.gz: ac7e14d70db0fe8944f44f07dbdd37f5bb8825dce307b38856e1f893734956a792c692876c770014ae0f6ad347c9bdd7cbacc48a430061113c75435ec0292052
+  data.tar.gz: 0b4ca73328cea2f66a10f89cd005403443ebbd39f15f3385180d37f68d77548fd0fa82a7b042931dc8e81b464ba5b7c380c1b8abbeeaadf27a202208139f8d17

data/CHANGELOG.md

@@ -3,9 +3,13 @@ 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.1]
+### Fixed
+- Omits empty array parameters
+
 ## [2.3.0]
 ### Changed
- - Change cache expiries
+- Change cache expiries
 - Adds support for passing dates to Resource#all_with_price
 
 ### Fixed
@@ -14,21 +18,21 @@ This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).
 
 ## [2.2.2]
 ### Changed
- - Deprecates Booking#calculate_price_quote
- - Fix when money is nil from QT
+- Deprecates Booking#calculate_price_quote
+- Fix when money is nil from QT
 
 ## [2.2.1] - 2016-04-18
 ### Fixed
- - Adds missing require for PriceQuote adapter
+- Adds missing require for PriceQuote adapter
 
 ## [2.2.0] - 2016-04-18
 ### Added
- - PriceQuote adapter
+- PriceQuote adapter
 
 ## [2.1.0] - 2016-04-13
 ### Added
- - Resource categories
- - Products
+- Resource categories
+- Products
 
 ## [2.0.0] - 2016-04-08
 ### Added

data/lib/quick_travel/adapter.rb

@@ -3,6 +3,8 @@ require 'pp'
 require 'json'
 require 'active_support/core_ext'
 require 'money'
+require 'facets/hash/recurse'
+require 'facets/hash/delete_values'
 
 require 'quick_travel/config'
 require 'quick_travel/adapter_error'
@@ -247,7 +249,7 @@ module QuickTravel
       return_response_object = http_params.delete(:return_response_object)
 
       # Set default token
-      http_params[:query] ||= query
+      http_params[:query]   ||= FilterQuery.new(query).call
       http_params[:headers] ||= {}
       http_params[:headers]['Content-length'] = '0' if http_params[:body].blank?
       expect = http_params.delete(:expect)
@@ -313,5 +315,35 @@ module QuickTravel
       parsed_response = response.parsed_response
       parsed_response.is_a?(Hash) && parsed_response.key?('error')
     end
+
+    # HTTParty v0.14.0 introduced this change:
+    #
+    #   * [allow empty array to be used as param](https://github.com/jnunemaker/httparty/pull/477)
+    #
+    # Unfortunately, when submitting an empty array as a parameter,
+    # Rack interprets it as an array containing an empty string:
+    #
+    #   Rack::Utils.parse_nested_query('array[]=') #=> {"array"=>[""]}
+    #
+    # The workaround is to avoid sending empty arrays to Rack based web applications
+    class FilterQuery
+      def initialize(query)
+        @query = query
+      end
+
+      def call
+        return @query unless @query.is_a? Hash
+        without_empty_arrays
+      end
+
+      private
+
+      def without_empty_arrays
+        @query.recurse { |hash|
+          hash.delete_values([])
+          hash
+        }
+      end
+    end
   end
 end

data/lib/quick_travel/version.rb

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

data/spec/adapter_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'quick_travel/adapter'
+
+describe QuickTravel::Adapter do
+  let(:response) { double code: 200, parsed_response: parsed_response }
+  let(:parsed_response) { { test: true } }
+
+  before do
+    allow(QuickTravel::Api).to receive(:post).and_return(response)
+  end
+
+  context 'when the query contains empty arrays' do
+    let(:url) { 'http://test.quicktravel.com.au' }
+    let(:query) {
+      {
+        test: true,
+        empty_array: [],
+        sub_hash: { id: 42, values: [] }
+      }
+    }
+
+    before do
+      QuickTravel::Adapter.post_and_validate(url, query)
+    end
+
+    let(:expected_body) {
+      {
+        test: true,
+        sub_hash: { id: 42 },
+        access_key: an_instance_of(String)
+      }
+    }
+
+    let(:expected_params) { a_hash_including body: expected_body }
+
+    specify { expect(QuickTravel::Api).to have_received(:post).with(url, expected_params) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quicktravel_client
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Michael Noack
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -355,6 +355,7 @@ files:
 - lib/quick_travel/version.rb
 - lib/quicktravel_client.rb
 - quicktravel_client.gemspec
+- spec/adapter_spec.rb
 - spec/booking_spec.rb
 - spec/country_spec.rb
 - spec/credit_card_spec.rb
@@ -436,6 +437,7 @@ signing_key:
 specification_version: 4
 summary: Booking process using QuickTravel API
 test_files:
+- spec/adapter_spec.rb
 - spec/booking_spec.rb
 - spec/country_spec.rb
 - spec/credit_card_spec.rb