parliament-ruby 1.0.0.pre3 → 1.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05af5b9c52c73118177ca2063f26ec7d907530d9
-  data.tar.gz: b9ad0d07d5590b3049c73c739fc8bffc390d6863
+  metadata.gz: fce7d9868bffbb9e8dc6d7a74bac5363f162e992
+  data.tar.gz: 123f984616d9b2d5f5e623d9b22ed40a3328ef7a
 SHA512:
-  metadata.gz: 32a7bff4fcccb8ee812e910b01866a7198c1a1487525411161b1e3555e5a792128442df78ddbc3a69b4a0f8db909f7821a352a9ff798fa83f20b6c4296fc6c74
-  data.tar.gz: 7561e825f4148fc2daaed7703287b27718b7972edf0bed1e9f5bd09f5f1bbf5d6701517e75f86285b36de5baf131657bceb349ef34643a54bc786b4abdd5e779
+  metadata.gz: 07c5c78e0312f5a73a8444182b7d184dd8628e1c032682246dff42a06ea2f61ab5583fe6716c80a5c47b47387e0e9e9bad74b25474fbce07d32036aa860fa34e
+  data.tar.gz: 944895ca5b29fd03ee27cc744fd763c13868884c59a8d4957b518f591e2e92b3ca9fc0787e8868c5687d93576d15da57b34dc3ace4cf30501b81d71ca991eba9

data/lib/parliament/request/base_request.rb

@@ -194,8 +194,8 @@ module Parliament
       def separate_uri(query_url, query_params, additional_params)
         endpoint = URI.parse(query_url)
 
-        temp_params = query_params
-        temp_params = temp_params.merge(URI.decode_www_form(endpoint.query).to_h) if endpoint.query
+        temp_params = endpoint.query ? URI.decode_www_form(endpoint.query).to_h : {}
+        temp_params = temp_params.merge(query_params)
         temp_params = temp_params.merge(additional_params) unless additional_params.nil?
 
         endpoint.query = nil

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '1.0.0.pre3'.freeze
+  VERSION = '1.0.0.pre4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parliament-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.pre4
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus