global_registry 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ce57dbf8a816d806e978b1bc5bcd31c84ea387
-  data.tar.gz: 405831e2b00acd2096977138a5184569877b82d0
+  metadata.gz: 0c1da68dc3d18b0e400a36959cc3490b8305854e
+  data.tar.gz: 1bcf5038d5945ea5f38ac765e8fd33df78519156
 SHA512:
-  metadata.gz: 0d9eb988e414bf32f4e5a2da3f312a66ec0e639d493a625b5f419d7e922d18049125c17079c9d887c42acb2a2932cf279e3340520a328de18cb7de565779d758
-  data.tar.gz: 6ab0a32677502ddf3a49f03a31b6ddbac9fbe5a8da6b85b61fcd350eebcf6ddf8e7873cbca6b0d1fb951ff98007916d1d48246c0b754b7d1f8b8e2f06999d9c3
+  metadata.gz: 6a24e9f1d705dae61f8f0927c2aab03aa27e7c728dc939140693b3e407c014d6cc79709dab665fd8849f0d8ff2bf053e35bf19591022bbe6430a8d3bc7b19159
+  data.tar.gz: 3da71e5ad1571c46d787ee3b172c6060eb1a5d87cbe3dfc387eff81898b6028f6cb6c038015c0a5f299de43edb56180674cb5662e1cce668a7ea3a8a3a20392f

data/lib/global_registry/base.rb

@@ -64,25 +64,29 @@ module GlobalRegistry
     def request(method, params, path = nil, headers = {})
       raise 'You need to configure GlobalRegistry with your access_token.' unless access_token
 
-      path ||= default_path
-      url = base_url
-      url += '/' unless url.last == '/'
-      url += path
+      url = if base_url.starts_with? 'http'
+              Addressable::URI.parse(base_url)
+            else
+              Addressable::URI.parse("http://#{base_url}")
+            end
+      url.path = path || default_path
+      url.query_values = headers.delete(:params) if headers[:params]
 
       case method
       when :post
         post_headers = default_headers.merge(content_type: :json, timeout: -1).merge(headers)
-        RestClient.post(url, params.to_json, post_headers) { |response, request, result, &block|
+        RestClient.post(url.to_s, params.to_json, post_headers) { |response, request, result, &block|
           handle_response(response, request, result)
         }
       when :put
         put_headers = default_headers.merge(content_type: :json, timeout: -1).merge(headers)
-        RestClient.put(url, params.to_json, put_headers) { |response, request, result, &block|
+        RestClient.put(url.to_s, params.to_json, put_headers) { |response, request, result, &block|
           handle_response(response, request, result)
         }
       else
-        get_args = { method: method, url: url, timeout: -1,
-                     headers: default_headers.merge(params: params).merge(headers)
+        url.query_values = (url.query_values || {}).merge(params) if params.any?
+        get_args = { method: method, url: url.to_s, timeout: -1,
+                     headers: default_headers.merge(headers)
                    }
         RestClient::Request.execute(get_args) { |response, request, result, &block|
           handle_response(response, request, result)

data/lib/global_registry/version.rb

@@ -1,4 +1,4 @@
 module GlobalRegistry
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end
 

data/spec/base_spec.rb

@@ -14,13 +14,21 @@ describe 'Base' do
     end
 
     it 'can be configured' do
-      @custom_gr_url = stub_request(:get, 'http://cru.org/bases')
+      @custom_gr_url = stub_request(:get, 'https://cru.org/bases')
                            .with(headers: { authorization: 'Bearer qwer',
                                             'X-Forwarded-For': '203.0.113.7' })
                            .to_return(:body => {a: 'b'}.to_json)
-      gr = GlobalRegistry::Base.new(access_token: 'qwer', base_url: 'cru.org', xff: '203.0.113.7')
+      gr = GlobalRegistry::Base.new(access_token: 'qwer', base_url: 'https://cru.org', xff: '203.0.113.7')
       expect(gr.get).to be_a Hash
       expect(@custom_gr_url).to have_been_requested
     end
   end
+
+  describe '#find' do
+    it 'correctly handles array params' do
+      @custom_gr_url = stub_request(:get, 'http://google.com/bases/1?a[]=b&a[]=c')
+      GlobalRegistry::Base.find(1, 'a[]': ['b','c'])
+      expect(@custom_gr_url).to have_been_requested
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: global_registry
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Josh Starcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client