parliament-ruby 1.0.0.pre → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291f639647bb81fcc5dd82a384cd0ecff70db477
-  data.tar.gz: 26f6551f09bcd80f4ff351ba55189bb77bc71580
+  metadata.gz: 3bfb325fe40f6c44c801632f76474d5ca5d84918
+  data.tar.gz: e2e347bdd4b29006da35915c44dfbef52544c8f5
 SHA512:
-  metadata.gz: 1dd49cab50167b71972428f3d53f61f22f72b8ff8d7dd69af0607d616d9280e19fee121864697ed9e423a0981e72b90ca8eae03b85146f8c6885f2a7b7d865a1
-  data.tar.gz: 321ece67fd29fea8af22fcd3197a12218edb9443a3760e4525ed84a158fe3ba787a9ca38c8c5a4abd5501d01f867c2e73b12ee8b1c03e09f11ce13f82e2575a3
+  metadata.gz: b2135460fb79a4f3c738a9e900493984bd7594b39ec9b68991f0002e5033dcb59ab70aabcf3b0665043af3ea33e9f6a13872c18f20b7737265492255098b3275
+  data.tar.gz: 3f96a1e82ff152c6211abbbea4b20611cf1a72213f4e29ef9eed35c6f055dff755d6e1c21502b6ee1fb3609a9490304afa8f111d1d5324fed0343efb7e20da70

data/lib/parliament/request/base_request.rb

@@ -90,24 +90,21 @@ module Parliament
       def get(params: nil)
         Typhoeus::Config.user_agent = 'Ruby'
 
-        @query_params = @query_params.merge(params) unless params.nil?
-
-        endpoint_uri    = URI.parse(query_url)
-        endpoint_params = URI.encode_www_form(@query_params.to_a) unless @query_params.empty?
+        uri_hash = separate_uri(query_url, @query_params, params)
 
         typhoeus_request = Typhoeus::Request.new(
-          endpoint_uri,
+          uri_hash[:endpoint],
           method:          :get,
-          params:          endpoint_params,
+          params:          uri_hash[:params],
           headers:         headers,
           accept_encoding: 'gzip'
         )
 
-        net_response = typhoeus_request.run
+        response = typhoeus_request.run
 
-        handle_errors(net_response)
+        handle_errors(response)
 
-        build_response(net_response)
+        build_response(response)
       end
 
       # Makes an HTTP POST request and process results into a response.
@@ -138,26 +135,23 @@ module Parliament
       def post(params: nil, body: nil, timeout: 60)
         Typhoeus::Config.user_agent = 'Ruby'
 
-        @query_params = @query_params.merge(params) unless params.nil?
-
-        endpoint_uri       = URI.parse(query_url)
-        endpoint_params    = URI.encode_www_form(@query_params.to_a) unless @query_params.empty?
+        uri_hash = separate_uri(query_url, @query_params, params)
 
         typhoeus_request = Typhoeus::Request.new(
-          endpoint_uri,
+          uri_hash[:endpoint],
           method:          :post,
-          params:          endpoint_params,
+          params:          uri_hash[:params],
           headers:         headers.merge({ 'Content-Type' => 'application/json' }),
           accept_encoding: 'gzip',
           timeout:         timeout,
           body:            body
         )
 
-        net_response = typhoeus_request.run
+        response = typhoeus_request.run
 
-        handle_errors(net_response)
+        handle_errors(response)
 
-        build_response(net_response)
+        build_response(response)
       end
 
       private
@@ -168,8 +162,8 @@ module Parliament
         attr_accessor :base_url, :headers
       end
 
-      def build_response(net_response)
-        @builder.new(response: net_response, decorators: @decorators).build
+      def build_response(response)
+        @builder.new(response: response, decorators: @decorators).build
       end
 
       def query_url
@@ -184,17 +178,31 @@ module Parliament
         default_headers.merge(@headers)
       end
 
-      def handle_errors(net_response)
-        exception_class = if net_response.success? # 2xx Status
-                            Parliament::NoContentResponseError if net_response.headers&.[]('Content-Length') == '0' ||
-                              (net_response.headers&.[]('Content-Length').nil? && net_response.body.empty?)
-                          elsif /\A4\w{2}/.match(net_response.code.to_s) # 4xx Status
+      def handle_errors(response)
+        exception_class = if response.success? # 2xx Status
+                            Parliament::NoContentResponseError if response.headers&.[]('Content-Length') == '0' ||
+                              (response.headers&.[]('Content-Length').nil? && response.body.empty?)
+                          elsif /\A4\w{2}/.match(response.code.to_s) # 4xx Status
                             Parliament::ClientError
-                          elsif /\A5\w{2}/.match(net_response.code.to_s) # 5xx Status
+                          elsif /\A5\w{2}/.match(response.code.to_s) # 5xx Status
                             Parliament::ServerError
                           end
 
-        raise exception_class.new(query_url, net_response) if exception_class
+        raise exception_class.new(query_url, response) if exception_class
+      end
+
+      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)) if endpoint.query
+        temp_params = temp_params.merge(additional_params) unless additional_params.nil?
+
+        endpoint.query = nil
+
+        encoded_params = URI.encode_www_form(temp_params.to_a) unless temp_params.empty?
+
+        { endpoint: endpoint, params: encoded_params }
       end
     end
   end

data/lib/parliament/request/url_request.rb

@@ -73,6 +73,7 @@ module Parliament
         uri_string = [@base_url, @endpoint_parts].join('/').gsub(' ', '%20')
 
         uri = URI.parse(uri_string)
+        uri.query = URI.encode_www_form(@query_params) unless @query_params.empty?
 
         uri.to_s
       end

data/lib/parliament/version.rb

@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '1.0.0.pre'.freeze
+  VERSION = '1.0.0.pre2'.freeze
 end

metadata

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