pebblebed 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a72b667ab7760684fba215b9c8b1efcae9c1294
-  data.tar.gz: 2a0663c6a8a01c4996c5e4726d39efbeca6cb97e
+  metadata.gz: 6499b7c6db946a08a8965eb636dd2664c77766d4
+  data.tar.gz: a2bef073f3582e8abeb730c9f51fdd043f537c3a
 SHA512:
-  metadata.gz: 22492117f67d35017f0458d5d6b829378f8ae9583b4fcd1d7d6a36d88ddce51e8ea2f886c3b3060072c4834629ca8ef7a722c462dcd82aff232d77e0bcb0f495
-  data.tar.gz: ac85b869fe8d67e0f364ddf3054bb72bf107740c9fa45daf9a3c0174b0ed247a64af2835f8dad39a40c73e60511bd667f1ba00e6c920a371ff8c541b697bfe4d
+  metadata.gz: cf8b594a75a82357e9875d982853653bdaee5781efee3dba623d08b28cb068c9411c38068bf8eda8cd7420fd2a106f0103c04e2875432ad1ac0c91580896ccb2
+  data.tar.gz: d83e1d1ef0ab9b42bbde60dc0a49843c759d853a35dbca27c906273f114b1843aa1af893d0ad5f9610df69918a4cc105b23c7dc421cf4015f77bb3e4f3e7a5e2

data/lib/pebblebed/http.rb

@@ -9,6 +9,7 @@ require 'pathbuilder'
 require 'active_support'
 require 'timeout'
 require 'resolv'
+require 'addressable/uri'
 
 module Pebblebed
 
@@ -78,19 +79,19 @@ module Pebblebed
     end
 
     def self.get(url = nil, params = nil, &block)
-      url, params = url_and_params_from_args(url, params, &block)
+      url, params, query = url_and_params_from_args(url, params, &block)
       return do_request(url) { |connection|
         connection.get(
           :host => url.host,
           :path => url.path,
-          :query => params,
+          :query => QueryParams.encode((params || {}).merge(query)),
           :persistent => true
         )
       }
     end
 
     def self.post(url, params, &block)
-      url, params = url_and_params_from_args(url, params, &block)
+      url, params, query = url_and_params_from_args(url, params, &block)
       content_type, body = serialize_params(params)
       return do_request(url, idempotent: false) { |connection|
         connection.post(
@@ -101,13 +102,14 @@ module Pebblebed
             'Content-Type' => content_type
           },
           :body => body,
+          :query => query,
           :persistent => true
         )
       }
     end
 
     def self.put(url, params, &block)
-      url, params = url_and_params_from_args(url, params, &block)
+      url, params, query = url_and_params_from_args(url, params, &block)
       content_type, body = serialize_params(params)
       return do_request(url) { |connection|
         connection.put(
@@ -118,18 +120,19 @@ module Pebblebed
             'Content-Type' => content_type
           },
           :body => body,
+          :query => query,
           :persistent => true
         )
       }
     end
 
     def self.delete(url, params, &block)
-      url, params = url_and_params_from_args(url, params, &block)
+      url, params, query = url_and_params_from_args(url, params, &block)
       return do_request(url) { |connection|
         connection.delete(
           :host => url.host,
           :path => url.path,
-          :query => params,
+          :query => query,
           :persistent => true
         )
       }
@@ -145,12 +148,12 @@ module Pebblebed
     def self.stream_get(url = nil, params = nil, options = {})
       on_data = options[:on_data] or raise "Option :on_data must be specified"
 
-      url, params = url_and_params_from_args(url, params)
+      url, params, query = url_and_params_from_args(url, params)
       return do_request(url) { |connection|
         connection.get(
           :host => url.host,
           :path => url.path,
-          :query => params,
+          :query => QueryParams.encode((params || {}).merge(query)),
           :persistent => false,
           :response_block => streamer(on_data)
         )
@@ -160,7 +163,7 @@ module Pebblebed
     def self.stream_post(url, params, options = {})
       on_data = options[:on_data] or raise "Option :on_data must be specified"
 
-      url, params = url_and_params_from_args(url, params)
+      url, params, query = url_and_params_from_args(url, params)
       content_type, body = serialize_params(params)
 
       return do_request(url) { |connection|
@@ -173,6 +176,7 @@ module Pebblebed
           },
           :body => body,
           :persistent => false,
+          :query => query,
           :response_block => streamer(on_data)
         )
       }
@@ -181,7 +185,7 @@ module Pebblebed
     def self.stream_put(url, params, options = {})
       on_data = options[:on_data] or raise "Option :on_data must be specified"
 
-      url, params = url_and_params_from_args(url, params)
+      url, params, query = url_and_params_from_args(url, params)
       content_type, body = serialize_params(params)
 
       return do_request(url) { |connection|
@@ -193,6 +197,7 @@ module Pebblebed
             'Content-Type' => content_type
           },
           :body => body,
+          :query => query,
           :persistent => false,
           :response_block => streamer(on_data)
         )
@@ -315,7 +320,8 @@ module Pebblebed
         url.path = url.path.chomp("/")+pathbuilder.path
         (params ||= {}).merge!(pathbuilder.params)
       end
-      [url, params]
+      query = Addressable::URI.parse(url.to_s).query_values
+      [url, params, query]
     end
 
     def self.extract_error_summary(body)

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/http_spec.rb

@@ -17,7 +17,7 @@ describe Pebblebed::Http do
   end
 
   let :pebble_url do
-    "http://localhost:8666/api/mock/v1/echo"
+    "http://localhost:8666/api/mock/v1/echo?foo=bar"
   end
 
   before :all do
@@ -86,9 +86,17 @@ describe Pebblebed::Http do
   end
 
   it "encodes gets as url params" do
-    response = Pebblebed::Http.get(pebble_url, {hello: 'world'})
+    params = {
+      'min' => {
+        'hits' => '1'
+      },
+      'limit' => '2'
+    }
+    params['fields'] = {'document.category' => 'test'}
+    params['max'] = {'hits' => '3'}
+    response = Pebblebed::Http.get(pebble_url, params)
     result = JSON.parse(response.body)
-    expect(result["QUERY_STRING"]).to eq "hello=world"
+    expect(result["QUERY_STRING"]).to eq "min[hits]=1&limit=2&fields[document.category]=test&max[hits]=3&foo=bar"
   end
 
   describe 'streaming' do
@@ -100,7 +108,7 @@ describe Pebblebed::Http do
             buf << data
           })
         result = JSON.parse(buf)
-        expect(result["QUERY_STRING"]).to eq "hello=world"
+        expect(result["QUERY_STRING"]).to eq "hello=world&foo=bar"
         expect(response.body).to eq ''
       end
 
@@ -112,7 +120,7 @@ describe Pebblebed::Http do
               buf << data
             })
           result = JSON.parse(buf)
-          expect(result["QUERY_STRING"]).to eq "hello=world"
+          expect(result["QUERY_STRING"]).to eq "hello=world&foo=bar"
           expect(response.body).to eq ''
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Katrina Owen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec