restful_resource 2.19.0 → 2.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '021493f1e1819711eb6eec48efa97a574e84f8fae8f505a320448589cf7db8be'
-  data.tar.gz: 991c6b0fde58a8fb3c62017c795f94ed89107ad8b6ca7259039fde338fb47dcd
+  metadata.gz: 14323bd6e2637680c2d405ea680e837525108165986ea58220e47517f913a8e6
+  data.tar.gz: 21a8cfd6e3a4830e4af1c050c237bd3e58960f6dd221e6e25f12507090ae0409
 SHA512:
-  metadata.gz: 76a70f6b7e21a066b682048bf70e21c28be5c29a0b0692f7406cd7dc9216427bbf37c8c62fa331d0f6d7ef28583f430491008833127d1de9bccfbd8cc9b43999
-  data.tar.gz: b2e04511965e66c30a8688e79eeb4726941c889db8475022072d60e49597a1f171bb6c5fb947fc6c16cf94108407090b512604a5b0b3570d1f516735b527bc99
+  metadata.gz: 21dd821aec6d3131d86cfa09a5a3e34e2d6d2a87d7f1d089db67666276e603085cb109f8e66769f631df0a84225965ef88ef98a1d2820a1328e4d99beda582d0
+  data.tar.gz: f8a7f4c6a88f817f154b077a2b5c31ca7d80a4dc352e7a78e7cd4856667e630dd1ad0bf667dd3fd4fd2c8d449fac3f7846e4a5c4cde923c68734139bd51aa700

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 # Changelog
+2.19.2
+---
+- Drop `faraday_middleware` dependency (deprecated upstream, no Faraday 2 support). `:gzip` now uses the `faraday-gzip` gem; `:instrumentation` is a small custom middleware reproducing the previous behaviour. `faraday` stays `~> 1.10` for now.
+
+2.19.1
+---
+- Update activesupport requirement to `>= 7, < 9`
+- Add explicit `ostruct` dependency
+
 2.19.0
 ---
 - Remove resolv-replace dependency

data/lib/restful_resource/faraday_instrumentation_middleware.rb

@@ -0,0 +1,22 @@
+require 'faraday'
+require 'active_support/notifications'
+
+module RestfulResource
+  # Faraday middleware that instruments requests via ActiveSupport::Notifications.
+  # Replaces FaradayMiddleware::Instrumentation, which the faraday_middleware gem
+  # does not ship a Faraday 2 compatible release of.
+  class InstrumentationMiddleware < Faraday::Middleware
+    def initialize(app, name: 'request.faraday')
+      super(app)
+      @name = name
+    end
+
+    def call(env)
+      ActiveSupport::Notifications.instrument(@name, env) do
+        @app.call(env)
+      end
+    end
+  end
+end
+
+Faraday::Middleware.register_middleware(instrumentation: RestfulResource::InstrumentationMiddleware)

data/lib/restful_resource/http_client.rb

@@ -235,7 +235,7 @@ module RestfulResource
         faraday_config&.call(b)
 
         b.response :encoding
-        b.use :gzip
+        b.request :gzip
 
         b.adapter Faraday.default_adapter
       end

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = '2.19.0'.freeze
+  VERSION = '2.19.2'.freeze
 end

data/lib/restful_resource.rb

@@ -2,13 +2,14 @@ require 'rack'
 require 'uri'
 require 'link_header'
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/gzip'
 require 'faraday-http-cache'
 require 'faraday_cdn_metrics'
 require 'faraday/encoding'
 require 'active_support'
 require 'active_support/all'
 require_relative 'restful_resource/version'
+require_relative 'restful_resource/faraday_instrumentation_middleware'
 require_relative 'restful_resource/null_logger'
 require_relative 'restful_resource/paginated_array'
 require_relative 'restful_resource/parameter_missing_error'

data/restful_resource.gemspec

@@ -26,12 +26,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'rspec_junit_formatter'
 
-  spec.add_dependency 'activesupport', '>= 6', '< 8'
+  spec.add_dependency 'activesupport', '>= 7', '< 9'
   spec.add_dependency 'faraday', '~> 1.10'
   spec.add_dependency 'faraday-cdn-metrics', '~> 0.2'
   spec.add_dependency 'faraday-encoding'
+  spec.add_dependency 'faraday-gzip', '~> 2.0'
   spec.add_dependency 'faraday-http-cache', '~> 2.2'
-  spec.add_dependency 'faraday_middleware', '~> 1.0'
   spec.add_dependency 'link_header'
+  spec.add_dependency 'ostruct'
   spec.add_dependency 'rack', '~> 3'
 end

data/spec/restful_resource/http_client_configuration_spec.rb

@@ -31,13 +31,13 @@ describe RestfulResource::HttpClient do
       end
 
       it 'compresses requests' do
-        expect(middleware).to include FaradayMiddleware::Gzip
+        expect(middleware).to include Faraday::Gzip::Middleware
       end
 
       describe 'instrumentation' do
         context 'with the default key' do
           it 'uses default instrumenter and key' do
-            expect(find_middleware_args(connection, 'FaradayMiddleware::Instrumentation')).to include(name: 'http.api')
+            expect(find_middleware_args(connection, 'RestfulResource::InstrumentationMiddleware')).to include(name: 'http.api')
           end
         end
 
@@ -45,7 +45,7 @@ describe RestfulResource::HttpClient do
           let(:connection) { described_class.new(instrumentation: { api_name: 'my_api_name' }).instance_variable_get('@connection') }
 
           it 'uses default instrumenter with the api_name' do
-            expect(find_middleware_args(connection, 'FaradayMiddleware::Instrumentation')).to include(name: 'http.my_api_name')
+            expect(find_middleware_args(connection, 'RestfulResource::InstrumentationMiddleware')).to include(name: 'http.my_api_name')
           end
         end
 
@@ -53,7 +53,7 @@ describe RestfulResource::HttpClient do
           let(:connection) { described_class.new(instrumentation: { request_instrument_name: 'foo.bar' }).instance_variable_get('@connection') }
 
           it 'uses default instrumenter with the custom key' do
-            expect(find_middleware_args(connection, 'FaradayMiddleware::Instrumentation')).to include(name: 'foo.bar')
+            expect(find_middleware_args(connection, 'RestfulResource::InstrumentationMiddleware')).to include(name: 'foo.bar')
           end
         end
 

data/spec/restful_resource/http_client_spec.rb

@@ -152,7 +152,7 @@ RSpec.describe RestfulResource::HttpClient do
     end
 
     describe 'Token auth' do
-      def http_client(connection)
+      def http_client_with_auth(connection)
         described_class.new(connection: connection, auth_token: 'abc123')
       end
 
@@ -161,7 +161,17 @@ RSpec.describe RestfulResource::HttpClient do
           stubs.get('http://httpbin.org/bearer', 'Authorization' => 'Bearer abc123') { |_env| [200, {}, nil] }
         end
 
-        response = http_client(connection).get('http://httpbin.org/bearer', headers: { 'Authorization' => 'Bearer abc123' })
+        response = http_client_with_auth(connection).get('http://httpbin.org/bearer')
+
+        expect(response.status).to eq 200
+      end
+
+      it 'overrides authentication headers when a custom authentication header is passed in' do
+        connection = faraday_connection do |stubs|
+          stubs.get('http://httpbin.org/bearer', 'Authorization' => 'Bearer my-custom-header') { |_env| [200, {}, nil] }
+        end
+
+        response = http_client_with_auth(connection).get('http://httpbin.org/bearer', headers: { 'Authorization' => 'Bearer my-custom-header' })
 
         expect(response.status).to eq 200
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.19.2
 platform: ruby
 authors:
 - David Santoro
 - Federico Rebora
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2026-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,20 +115,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -172,33 +172,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday-http-cache
+  name: faraday-gzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: link_header
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +213,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +266,7 @@ files:
 - lib/restful_resource/associations.rb
 - lib/restful_resource/authorization.rb
 - lib/restful_resource/base.rb
+- lib/restful_resource/faraday_instrumentation_middleware.rb
 - lib/restful_resource/http_client.rb
 - lib/restful_resource/instrumentation.rb
 - lib/restful_resource/null_logger.rb
@@ -283,7 +298,7 @@ homepage: http://www.github.com/carwow/restful_resource
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -298,8 +313,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.5.20
+signing_key:
 specification_version: 4
 summary: A simple activerecord inspired rest resource base class implemented using
   rest-client