garage_client 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c28d0f7144700d3eb5347249df282095c2b716c1e45fb7f6fb25c7cb3c3c668
-  data.tar.gz: 9e2dd1472a2d4998cd584bdb8223373c1693346c3227af5b2ccd9f2511e6d730
+  metadata.gz: 580980067ed04267e85d03e5a9f0fdfef39ebac8142e9110a9bc42f622e2fb02
+  data.tar.gz: 59bc77a7d6499d2f22e7bb3434b0756d2315abfe104cbd883bef653fe2cda52b
 SHA512:
-  metadata.gz: 99e68b0cb1c67c5c2ce2079a70ab6d070c4dbce710b009833fd85c7d5390b1e9e521576e98d834c97c87110a6c8f1f75d68a719b9239aa8e36dbdff5a2198d9f
-  data.tar.gz: ec8102b0b9c423e33aea965dcf01b817d8cfb9d541f35e74d2b8e6a1f3bd6674ca851aa01acb545b8ce481073f055b0d37c7ed8283ad6149b59efa56ad0fa813
+  metadata.gz: 8a7cba1f1cba35a7bf16bb0c2f00bbcb046a759ed372bddea33878a355bef8a7e39f8b9914645d2d25e86a36e66544632122b186b966afc7f37527d469fb3518
+  data.tar.gz: e58414b3291d9b60dae0d7d82f516e7b587b9005facc1b2f889a6fa0f3632111109f2cac3e434c68409765f7d31a8c7f4f12bc9f0e7c4a8de45b0622581f6c43

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.4.4
+- Remove activesupport dependency
+- Fix request ID not being propagated
+
 ## 2.4.3
 - Support query methods on GarageClient::Resource
 - Use Module#module_parent_name for Rails 6.0

data/garage_client.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.authors       = ['Cookpad Inc.']
   s.email         = ['kaihatsu@cookpad.com']
 
-  s.add_dependency 'activesupport', '> 3.2.0'
   s.add_dependency 'faraday', '>= 0.8.0'
   s.add_dependency 'faraday_middleware'
   s.add_dependency 'hashie', '>= 1.2.0'

data/lib/garage_client.rb

@@ -1,4 +1,3 @@
-require 'active_support/all'
 require 'faraday'
 require 'faraday_middleware'
 

data/lib/garage_client/request/propagate_request_id.rb

@@ -2,8 +2,8 @@ module GarageClient
   module Request
     class PropagateRequestId < Faraday::Middleware
       def call(env)
-        if Thread.current[:request_id] && !env[:request_headers]["HTTP_X_REQUEST_ID"]
-          env[:request_headers]["HTTP_X_REQUEST_ID"] = Thread.current[:request_id]
+        if Thread.current[:request_id] && !env[:request_headers]["X-Request-Id"]
+          env[:request_headers]["X-Request-Id"] = Thread.current[:request_id]
         end
         @app.call(env)
       end

data/lib/garage_client/version.rb

@@ -1,3 +1,3 @@
 module GarageClient
-  VERSION = '2.4.3'
+  VERSION = '2.4.4'
 end

data/spec/garage_client/cacher_spec.rb

@@ -64,10 +64,6 @@ describe GarageClient::Cachers::Base do
 
   # Check dump data. Because cache data not broken on the version up of faraday.
   describe "check Faraday::Response marshal" do
-    specify do
-      expect(Faraday::VERSION).to be < "1.0.0", "This spec is no longer needed. Delete this 'describe' section!"
-    end
-
     context "v0.9.1's marshal data" do
       let(:res) do
         Marshal.load(File.read(File.expand_path('../fixtures/faraday_0.9.1_response.dump', __dir__)))
@@ -75,7 +71,7 @@ describe GarageClient::Cachers::Base do
 
       it "load data" do
         expect(res).to be_instance_of Faraday::Response
-        expect(res.env[:body]).to eq fixture("example.yaml")[:body]
+        expect(res.env[:body]).to eq fixture("example.yaml")["body"]
       end
     end
 
@@ -86,7 +82,7 @@ describe GarageClient::Cachers::Base do
 
       it "load data" do
         expect(res).to be_instance_of Faraday::Response
-        expect(res.env[:body]).to eq fixture("example.yaml")[:body]
+        expect(res.env[:body]).to eq fixture("example.yaml")["body"]
       end
     end
   end

data/spec/garage_client/request/propagate_request_id_spec.rb

@@ -13,7 +13,7 @@ describe GarageClient::Request::PropagateRequestId do
   end
 
   it 'sends request_id via header' do
-    stub_get("/examples").with(headers: { 'HTTP_X_REQUEST_ID' => 'request_id' })
+    stub_get("/examples").with(headers: { 'X-Request-Id' => 'request_id' })
     expect { client.get("/examples") }.not_to raise_error
   end
 
@@ -24,7 +24,7 @@ describe GarageClient::Request::PropagateRequestId do
 
     it 'does not send request_id via header' do
       stub_get("/examples").with do |request|
-        !request.headers.include?('HTTP_X_REQUEST_ID')
+        !request.headers.include?('X-Request-Id')
       end
       expect { client.get("/examples") }.not_to raise_error
     end
@@ -32,11 +32,11 @@ describe GarageClient::Request::PropagateRequestId do
 
   context 'if already has request_id' do
     let(:client) do
-      GarageClient::Client.new(headers: { 'HTTP_X_REQUEST_ID' => 'another_id' })
+      GarageClient::Client.new(headers: { 'X-Request-Id' => 'another_id' })
     end
 
     it 'does not overwrite request_id' do
-      stub_get("/examples").with(headers: { 'HTTP_X_REQUEST_ID' => 'another_id' })
+      stub_get("/examples").with(headers: { 'X-Request-Id' => 'another_id' })
       expect { client.get("/examples") }.not_to raise_error
     end
   end

data/spec/spec_helper.rb

@@ -47,7 +47,7 @@ end
 def fixture(file)
   prefix = File.expand_path('../fixtures', __FILE__)
   path = File.join(prefix, file)
-  HashWithIndifferentAccess.new(YAML.load_file(path))
+  YAML.load_file(path)
 end
 
 RSpec.configure do |config|

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: garage_client
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Cookpad Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby client library for the Garage API