garage_client 2.4.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b719783d93f2fe8a23421f6a05946aa376623d953c99ba1a3cf5435a5d248ac0
-  data.tar.gz: 40287bfa976d8608d43a67cd3b50135e1618a28232346508f6ad319d50cf1262
+  metadata.gz: 232578511292fd92e6d04a6fb38f4e792c2c9d2ad09233f6ec3dfbe34daee964
+  data.tar.gz: 9abb6580e134bd6721b8c818a5c1d72063a94b487f7c3682f598f63c59717c31
 SHA512:
-  metadata.gz: bebf81e6430a3765d0f4f970aeca63c6ee059050c2d5f1a9a58b611d17b80f0a6bc91f756f85dee2a2c3d5e7a091ef75a3b5fd87b282288e238494dac213b6cc
-  data.tar.gz: 20a0ae03b1803f66a2b3f1ad47329990326f96004c667091600d474c63c7a2e0d65ea037aa026af6880677137e11432b6b284cbd8ba078e8593443aa5f6d7c8e
+  metadata.gz: dea5f8c420f3321465855b00fb24542c76916dc4d786e370d72c904447fc410ad9cd8202fb3db3ec7e6c77e30bf276cf0088d9e0509801eb9bce9c61ddd20f51
+  data.tar.gz: 818264a87289e2d526c9c924a744e61b21c6737c9bdd5a13aa11a28d1883e14495d3fd60ef94d700e18b0d762d8cba2ee59cac6e3b98164ac146671b6c2ded1f

data/.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        ruby:
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - 'head'
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    name: Run test with Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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
+
 ## 2.4.5
 - Drop support for Ruby 2.5
 - Remove implicit dependency on Active Support

data/README.md

@@ -1,4 +1,4 @@
-# GarageClient [![Build Status](https://travis-ci.org/cookpad/garage_client.svg?branch=master)](https://travis-ci.org/cookpad/garage_client)
+# GarageClient [![Build Status](https://github.com/cookpad/garage_client/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/cookpad/garage_client/actions/workflows/ci.yml)
 GarageClient is a simple Ruby library to provide a primitive client interface to the Garage application API.
 
 ## Install

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

@@ -53,20 +53,20 @@ module GarageClient
     end
 
     def apply_auth_middleware(faraday_builder)
-      faraday_builder.authorization :Bearer, access_token if access_token
+      faraday_builder.request :authorization, :Bearer, access_token if access_token
     end
 
     def connection
       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.5'
+  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.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Cookpad Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 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:
     - - ">="
@@ -185,16 +199,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - garage_client.gemspec
-- gemfiles/Gemfile.faraday-0.8.x
 - lib/garage_client.rb
 - lib/garage_client/cachers/base.rb
 - lib/garage_client/client.rb
@@ -231,7 +244,7 @@ files:
 homepage: https://github.com/cookpad/garage_client
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -246,8 +259,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Ruby client library for the Garage API
 test_files:

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-
-rvm:
-  - ruby-head
-  - 3.0.0
-  - 2.7.2
-  - 2.6.6
-  - 2.5.8
-matrix:
-  allow_failures:
-    - rvm: "ruby-head"
-  fast_finish: true
-
-cache: bundler
-
-sudo: false

data/gemfiles/Gemfile.faraday-0.8.x

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