From cdf35cf6315ba2dda89148eda54a97d6dc358b1f Mon Sep 17 00:00:00 2001 From: Marcos Tapajos Date: Fri, 5 Aug 2022 12:34:46 -0300 Subject: [PATCH 1/2] Remove depredated faraday_middleware --- json_api_client.gemspec | 2 +- lib/json_api_client.rb | 2 +- lib/json_api_client/connection.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/json_api_client.gemspec b/json_api_client.gemspec index 658f92f3..0bf66064 100644 --- a/json_api_client.gemspec +++ b/json_api_client.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.add_dependency "activesupport", '>= 3.2.0' s.add_dependency "faraday", '>= 0.15.2', '< 2.0' - s.add_dependency "faraday_middleware", '>= 0.9.0', '< 2.0' + s.add_dependency "faraday-gzip", '>= 0.1.0', '< 2.0' s.add_dependency "addressable", '~> 2.2' s.add_dependency "activemodel", '>= 3.2.0' s.add_dependency "rack", '>= 0.2' diff --git a/lib/json_api_client.rb b/lib/json_api_client.rb index b4082727..f261a019 100644 --- a/lib/json_api_client.rb +++ b/lib/json_api_client.rb @@ -1,5 +1,5 @@ require 'faraday' -require 'faraday_middleware' +require 'faraday/gzip' require 'json' require 'addressable/uri' require 'json_api_client/formatter' diff --git a/lib/json_api_client/connection.rb b/lib/json_api_client/connection.rb index d7e9ab33..50026abb 100644 --- a/lib/json_api_client/connection.rb +++ b/lib/json_api_client/connection.rb @@ -14,7 +14,7 @@ def initialize(options = {}) builder.use Middleware::JsonRequest builder.use Middleware::Status, status_middleware_options builder.use Middleware::ParseJson - builder.use ::FaradayMiddleware::Gzip + builder.use ::Faraday::Gzip::Middleware builder.adapter(*adapter_options) end yield(self) if block_given? From f844b1059ce925f08e04b916922b952844817a98 Mon Sep 17 00:00:00 2001 From: Marcos Tapajos Date: Thu, 1 Jun 2023 14:07:51 -0300 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92fd7a55..3b85b0de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- [#402](https://github.com/JsonApiClient/json_api_client/pull/402) - Remove deprecated faraday_middleware and add faraday-gzip + ## 1.21.0 - [#395](https://github.com/JsonApiClient/json_api_client/pull/395) - relaxing faraday dependency to anything less than 2.0