restful_resource 2.13.4 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 811b916cd8a44f9a8c94185176a2a99e55719dbe7320c8772efb856a5fb17229
-  data.tar.gz: '08eec998987cefdee15d7816c5b3ee801d9a7f0e5f5f609d5ee5fade7ad6ee7b'
+  metadata.gz: 7af1361039382e70e477e2092457d8d816ed698a2c1e04395eb970fbfd491fde
+  data.tar.gz: dc56db8631527d46c3e670e338eb5272881233ae50b528cb4e50faaf8a87de46
 SHA512:
-  metadata.gz: 6a1bc2e111f392ec4d50a41225b1534b1a6f19bc36d730cbad3047b793624fc0022d9d293be7578ed9886eceb90ed744a94daa7b4239cd68ed83fefe78f982c5
-  data.tar.gz: 84684eba6db73549f8b116d7637e2502b7a6721214c10bc1aab4c0adff1a6aca6755a104efb57ea11f9ed7195502aa9177a3b9bd83c8f04f51083e2155ce86dd
+  metadata.gz: a0532d37adbb89b6f53d98a359c3c54f52a11b26d0c7d1ac7b58b814e1831e8ab9825156d9f61676fff0c5c7afb2ede67dff28689922d8cac2bd5680439ef00a
+  data.tar.gz: 357089f436e9d7b984a053f1fcc7642366220033a6e5ffdd6e05a1e37096714eff50130e0a1129b97c1393849392f976437f15311ea50edea31398ff794b3b0b

data/CHANGELOG.md

@@ -1,4 +1,14 @@
 # Changelog
+2.15
+---
+
+- Bump `faraday` to a minimum of `1.10` to resolve dependency issues
+
+2.14
+---
+
+- Added support for default headers when configuring a `RestfulResource::Base`
+
 2.13.4
 ---
 

data/lib/restful_resource/base.rb

@@ -12,7 +12,9 @@ module RestfulResource
       timeout: nil,
       open_timeout: nil,
       faraday_config: nil,
-      faraday_options: {})
+      faraday_options: {},
+      default_headers: {}
+    )
 
       @base_url = URI.parse(base_url)
 
@@ -25,7 +27,8 @@ module RestfulResource
                                               open_timeout: open_timeout,
                                               instrumentation: instrumentation,
                                               faraday_config: faraday_config,
-                                              faraday_options: faraday_options
+                                              faraday_options: faraday_options,
+                                              default_headers: default_headers
                                              )
     end
 

data/lib/restful_resource/http_client.rb

@@ -92,7 +92,9 @@ module RestfulResource
       timeout: nil,
       open_timeout: nil,
       faraday_config: nil,
-      faraday_options: {})
+      faraday_options: {},
+      default_headers: {}
+    )
       api_name = instrumentation[:api_name]            ||= 'api'
       instrumentation[:request_instrument_name]        ||= "http.#{api_name}"
       instrumentation[:cache_instrument_name]          ||= "http_cache.#{api_name}"
@@ -123,6 +125,8 @@ module RestfulResource
                                                         faraday_options: faraday_options
                                                        )
 
+      @connection.headers.merge!(default_headers)
+
       if auth_token
         @connection.headers[:authorization] = "Bearer #{auth_token}"
       elsif username && password

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = '2.13.4'.freeze
+  VERSION = '2.15.0'.freeze
 end

data/restful_resource.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec_junit_formatter'
 
   spec.add_dependency 'activesupport', '>= 6', '< 8'
-  spec.add_dependency 'faraday', '~> 1.0'
+  spec.add_dependency 'faraday', '~> 1.10'
   spec.add_dependency 'faraday-cdn-metrics', '~> 0.2'
   spec.add_dependency 'faraday-encoding'
   spec.add_dependency 'faraday-http-cache', '~> 2.2'

data/spec/restful_resource/base_spec.rb

@@ -390,33 +390,38 @@ RSpec.describe RestfulResource::Base do
     let(:open_timeout) { double }
     let(:faraday_config) { double }
     let(:faraday_options) { double }
+    let(:default_headers) { double }
 
     it 'passes arguments to HttpClient' do
       client = Class.new(described_class)
-      expect(RestfulResource::HttpClient).to receive(:new).with(username: username,
-                                                                password: password,
-                                                                auth_token: auth_token,
-                                                                logger: logger,
-                                                                cache_store: cache_store,
-                                                                instrumentation: instrumentation,
-                                                                timeout: timeout,
-                                                                open_timeout: open_timeout,
-                                                                faraday_config: faraday_config,
-                                                                faraday_options: faraday_options
-                                                               )
-
-      client.configure(base_url: 'http://foo.bar',
-                       username: username,
-                       password: password,
-                       auth_token: auth_token,
-                       logger: logger,
-                       cache_store: cache_store,
-                       instrumentation: instrumentation,
-                       timeout: timeout,
-                       open_timeout: open_timeout,
-                       faraday_config: faraday_config,
-                       faraday_options: faraday_options
-                      )
+      expect(RestfulResource::HttpClient).to receive(:new).with(
+        username: username,
+        password: password,
+        auth_token: auth_token,
+        logger: logger,
+        cache_store: cache_store,
+        instrumentation: instrumentation,
+        timeout: timeout,
+        open_timeout: open_timeout,
+        faraday_config: faraday_config,
+        faraday_options: faraday_options,
+        default_headers: default_headers
+      )
+
+      client.configure(
+        base_url: 'http://foo.bar',
+        username: username,
+        password: password,
+        auth_token: auth_token,
+        logger: logger,
+        cache_store: cache_store,
+        instrumentation: instrumentation,
+        timeout: timeout,
+        open_timeout: open_timeout,
+        faraday_config: faraday_config,
+        faraday_options: faraday_options,
+        default_headers: default_headers
+      )
     end
   end
 

data/spec/restful_resource/http_client_spec.rb

@@ -271,4 +271,16 @@ RSpec.describe RestfulResource::HttpClient do
       expect(response.status).to eq 200
     end
   end
+
+  describe 'default headers' do
+    it 'uses default headers' do
+      connection = faraday_connection do |stubs|
+        stubs.get('http://httpbin.org/get', 'Foo' => 'bar') { |_env| [200, {}, nil] }
+      end
+
+      response = described_class.new(connection: connection, default_headers: { foo: 'bar' }).get('http://httpbin.org/get')
+
+      expect(response.status).to eq 200
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 2.13.4
+  version: 2.15.0
 platform: ruby
 authors:
 - David Santoro
 - Federico Rebora
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: faraday-cdn-metrics
   requirement: !ruby/object:Gem::Requirement
@@ -297,7 +297,7 @@ homepage: http://www.github.com/carwow/restful_resource
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A simple activerecord inspired rest resource base class implemented using
   rest-client