garage_client 2.4.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 897dd3b0bc65c1611c55f849ea5bfdc798cbfb252aa525f19c81aaadff2aadb0
-  data.tar.gz: 0a6def3201226a01ab1c415933ef3e4496ade096ab7e273a28694fe69cd657d2
+  metadata.gz: 232578511292fd92e6d04a6fb38f4e792c2c9d2ad09233f6ec3dfbe34daee964
+  data.tar.gz: 9abb6580e134bd6721b8c818a5c1d72063a94b487f7c3682f598f63c59717c31
 SHA512:
-  metadata.gz: c668202336fa97610663f9f5e321f114bc2b9254beba0feb2858828460bd7686ae250ff919740fd7b6108daaadc2f8277a6970c8e360e3bb134fde8528a9c115
-  data.tar.gz: dd21ae1aa64f9687a49a172e50b2b92e6af5f93b6dc68899b2a20d4d5c43d678dcb7f770bd65c952ba3d0eb10404c58aaf0950e9038ef9a91a6374afa66f619f
+  metadata.gz: dea5f8c420f3321465855b00fb24542c76916dc4d786e370d72c904447fc410ad9cd8202fb3db3ec7e6c77e30bf276cf0088d9e0509801eb9bce9c61ddd20f51
+  data.tar.gz: 818264a87289e2d526c9c924a744e61b21c6737c9bdd5a13aa11a28d1883e14495d3fd60ef94d700e18b0d762d8cba2ee59cac6e3b98164ac146671b6c2ded1f

data/.github/workflows/ci.yml

@@ -11,20 +11,15 @@ jobs:
       fail-fast: true
       matrix:
         ruby:
-          - '2.5'
-          - '2.6'
-          - '2.7'
           - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
           - 'head'
-        gemfile:
-          - 'gemfiles/Gemfile.faraday-0.x'
-          - 'gemfiles/Gemfile.faraday-1.x'
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
-    name: Run test with Ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
+    name: Run test with Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.0
+- Upgrade faraday gem to v2 and drop support for Ruby 2.6 and 2.7
+
 ## 2.4.6
 - Fix deprecation warning from Faraday
 

data/garage_client.gemspec

@@ -10,14 +10,15 @@ Gem::Specification.new do |s|
   s.description   = s.summary
 
   s.files         = `git ls-files`.split($\)
-  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
   s.authors       = ['Cookpad Inc.']
   s.email         = ['kaihatsu@cookpad.com']
 
-  s.add_dependency 'faraday', '>= 0.8.0'
-  s.add_dependency 'faraday_middleware'
+  s.add_dependency 'faraday', '>= 2.0.1'
+  s.add_dependency 'faraday-mashify'
+  s.add_dependency 'faraday-multipart'
   s.add_dependency 'hashie', '>= 1.2.0'
   s.add_dependency 'link_header'
 

data/lib/garage_client/cachers/base.rb

@@ -9,15 +9,9 @@ module GarageClient
       def call
         response = store.read(key, options) if read_from_cache?
         if response
-          # Faraday::Response#marshal_dump is drop request object and url
-          # https://github.com/lostisland/faraday/blob/edacd5eb57ea13accab3097649690ae5f48f421a/lib/faraday/response.rb#L74
-          #
-          # XXX: We can't use #merge! here because Faraday::Env does not implement
-          # the method as same as Hash#merge! with Faraday v0.12.1.
-          @env.each do |k, v|
-            original = response.env[k]
-            response.env[k] = v if !original && v
-          end
+          # Faraday::Response#marshal_dump drops the request object
+          # https://github.com/lostisland/faraday/blob/cc5d60776645d3d341ff0f425c45b3b3d48d98e0/lib/faraday/response.rb#L70
+          response.env.merge!(@env)
         else
           response = yield
           store.write(key, response, options) if written_to_cache?

data/lib/garage_client/client.rb

@@ -60,13 +60,13 @@ module GarageClient
       Faraday.new(headers: headers, url: endpoint) do |builder|
         # Response Middlewares
         builder.use Faraday::Response::Logger if verbose
-        builder.use FaradayMiddleware::Mashify
-        builder.use Faraday::Response::ParseJson, :content_type => /\bjson$/
+        builder.use Faraday::Mashify::Middleware
+        builder.use Faraday::Response::Json, content_type: /\bjson$/
         builder.use GarageClient::Response::Cacheable, cacher: cacher if cacher
         builder.use GarageClient::Response::RaiseHttpException
 
         # Request Middlewares
-        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Multipart::Middleware
         builder.use GarageClient::Request::JsonEncoded
         builder.use GarageClient::Request::PropagateRequestId
 

data/lib/garage_client/response/cacheable.rb

@@ -1,8 +1,6 @@
-require "faraday_middleware"
-
 module GarageClient
   class Response
-    class Cacheable < Faraday::Response::Middleware
+    class Cacheable < Faraday::Middleware
       register_middleware cache: self
 
       def initialize(app, args)

data/lib/garage_client/response/raise_http_exception.rb

@@ -1,9 +1,6 @@
-require 'garage_client/error'
-require 'faraday_middleware'
-
 module GarageClient
   class Response
-    class RaiseHttpException < Faraday::Response::Middleware
+    class RaiseHttpException < Faraday::Middleware
       ClientErrorStatuses = 400...500
       ServerErrorStatuses = 500...600
 

data/lib/garage_client/response.rb

@@ -11,11 +11,9 @@ module GarageClient
       @client = client
       @response = response
 
-      # Faraday's Net::Http adapter returns '' if response is nil.
-      # Changes from faraday v0.9.0. faraday/f41ffaabb72d3700338296c79a2084880e6a9843
-      #
-      # GarageClient::Response#body should be always a String when Faraday
-      # became v1.0.0. Because 0.9.0 seems to be not stable.
+      # faraday-net_http adapter converts the response body from nil to '' to ensure the body is a string.
+      # https://github.com/lostisland/faraday/commit/f41ffaabb72d3700338296c79a2084880e6a9843
+      # https://github.com/lostisland/faraday-net_http/blob/11953160f75dd488133a74857c2b07d41be8995d/lib/faraday/adapter/net_http.rb#L186
       response.env[:body] = nil if response.env[:body] == ''
 
       unless ACCEPT_BODY_TYPES.any? {|type| type === response.body }

data/lib/garage_client/version.rb

@@ -1,3 +1,3 @@
 module GarageClient
-  VERSION = '2.4.6'
+  VERSION = '3.0.0'
 end

data/lib/garage_client.rb

@@ -1,5 +1,6 @@
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/mashify'
+require 'faraday/multipart'
 
 require 'garage_client/version'
 require 'garage_client/cachers/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garage_client
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 3.0.0
 platform: ruby
 authors:
 - Cookpad Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,16 +16,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-mashify
+  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: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,8 +208,6 @@ files:
 - README.md
 - Rakefile
 - garage_client.gemspec
-- gemfiles/Gemfile.faraday-0.x
-- gemfiles/Gemfile.faraday-1.x
 - lib/garage_client.rb
 - lib/garage_client/cachers/base.rb
 - lib/garage_client/client.rb
@@ -247,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ruby client library for the Garage API

data/gemfiles/Gemfile.faraday-0.x

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'faraday', '~> 0'
-gemspec path: '../'

data/gemfiles/Gemfile.faraday-1.x

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'faraday', '~> 1'
-gemspec path: '../'