restful_resource 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bde6cf5ec5aad431ca3e9d06e2fad1787d8060dd
-  data.tar.gz: 6d9a8f2062d2952df9b6d3f3fc1413d093469046
+  metadata.gz: 03a7e9a15a400320a4a636f9d010e65e34880b49
+  data.tar.gz: ebcae394889e3a8dbe9193a8a43a07d6377aa911
 SHA512:
-  metadata.gz: 9a8f4f98f262ef51cf3219acacffc48b2cc1e74d453fa16f71bf224bd49b5238966b30bc9c435f0f76b7d8ea09a2491c259b6166b28edd230cfd6da319a78a56
-  data.tar.gz: 1e73b6228ba3143e96eec6f2d98ea2014d8061654f30fc34bdf48e8749c07479a1a40cccd5226cd2afc1f12aeb73412f70429224632772d003dc84bdea97a621
+  metadata.gz: 3a22f16b829e19e92215c00cadf942b042026cba134aefc4f75bcdaeab66dfdc20b23a6608c639bdfb8faf4fdf07b067f56ff3f2836208f71d80f15410fffb09
+  data.tar.gz: 5980a0c3537c0147a947c1470df0f7a79f9850b30377a03bae1dcf699049c9f6f01b74c5e97949d28b94c78fc6bbef2c07cb391aa68a470cce968d3fe79d1fe6

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 .idea
+*.swp
+*.swo

data/lib/restful_resource/base.rb

@@ -7,7 +7,8 @@ module RestfulResource
                        password: nil,
                        logger: nil,
                        cache_store: nil,
-                       instrumentation: {})
+                       instrumentation: {},
+                       faraday_config: nil)
 
       @base_url = URI.parse(base_url)
 
@@ -15,7 +16,8 @@ module RestfulResource
                                               password: password,
                                               logger: logger,
                                               cache_store: cache_store,
-                                              instrumentation: instrumentation)
+                                              instrumentation: instrumentation,
+                                              faraday_config: faraday_config)
     end
 
     def self.resource_path(url)

data/lib/restful_resource/http_client.rb

@@ -69,7 +69,8 @@ module RestfulResource
                    connection: nil,
                    instrumentation: {},
                    open_timeout: 2,
-                   timeout: 10)
+                   timeout: 10,
+                   faraday_config: nil)
       api_name = instrumentation[:api_name]            ||= 'api'
       instrumentation[:request_instrument_name]        ||= "http.#{api_name}"
       instrumentation[:cache_instrument_name]          ||= "http_cache.#{api_name}"
@@ -91,7 +92,8 @@ module RestfulResource
                                                         instrumenter: ActiveSupport::Notifications,
                                                         request_instrument_name: instrumentation.fetch(:request_instrument_name, nil),
                                                         cache_instrument_name: instrumentation.fetch(:cache_instrument_name, nil),
-                                                        server_cache_instrument_name: instrumentation.fetch(:server_cache_instrument_name, nil))
+                                                        server_cache_instrument_name: instrumentation.fetch(:server_cache_instrument_name, nil),
+                                                        faraday_config: faraday_config)
 
       @connection.basic_auth(username, password) if username && password
       @default_open_timeout = open_timeout
@@ -157,7 +159,8 @@ module RestfulResource
                               instrumenter: nil,
                               request_instrument_name: nil,
                               cache_instrument_name: nil,
-                              server_cache_instrument_name: nil)
+                              server_cache_instrument_name: nil,
+                              faraday_config: nil)
 
       @connection = Faraday.new do |b|
         b.request :json
@@ -183,6 +186,10 @@ module RestfulResource
           b.use :instrumentation, name: request_instrument_name
         end
 
+        if faraday_config
+          faraday_config.call(b)
+        end
+
         b.response :encoding
         b.use :gzip
 

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

data/spec/restful_resource/base_spec.rb

@@ -310,6 +310,32 @@ RSpec.describe RestfulResource::Base do
     end
   end
 
+  describe ".configure" do
+     let(:username) { double }
+     let(:password) { double }
+     let(:logger) { double }
+     let(:cache_store) { double }
+     let(:instrumentation) { double }
+     let(:faraday_config) { double }
+
+    it "passes arguments to HttpClient" do
+      expect(RestfulResource::HttpClient).to receive(:new).with(username: username,
+                                                                password: password,
+                                                                logger: logger,
+                                                                cache_store: cache_store,
+                                                                instrumentation: instrumentation,
+                                                                faraday_config: faraday_config)
+
+      RestfulResource::Base.configure(base_url: 'http://foo.bar',
+                                      username: username,
+                                      password: password,
+                                      logger: logger,
+                                      cache_store: cache_store,
+                                      instrumentation: instrumentation,
+                                      faraday_config: faraday_config)
+    end
+  end
+
   def response_with_page_information
     RestfulResource::Response.new(body: [{ id: 1, name: 'Golf'}, { id: 2, name: 'Polo' }].to_json,
                                  headers: { links: '<http://api.carwow.co.uk/makes/Volkswagen/models.json?page=6>;rel="last",<http://api.carwow.co.uk/makes/Volkswagen/models.json?page=2>;rel="next"'})

data/spec/restful_resource/http_client_configuration_spec.rb

@@ -137,6 +137,18 @@ describe RestfulResource::HttpClient do
           end
         end
       end
+
+      describe 'when provided a faraday config block' do
+        let(:faraday_config_block) do
+          proc { |conn| @block_arg = conn }
+        end
+        let(:connection) { described_class.new(faraday_config: faraday_config_block).instance_variable_get("@connection") }
+
+        it 'passes faraday connection instance and calls it' do
+          connection
+          expect(@block_arg.class).to eq(Faraday::Connection)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - David Santoro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A simple activerecord inspired rest resource base class implemented using