garage_client 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876435ec94b293955088ff468b9f15eda5a5f08d
-  data.tar.gz: 2aa489fb0250350d47c86c6751950d1db5a36743
+  metadata.gz: 9e74a44c3a35415ce42c5c5f522ca71cbea0c859
+  data.tar.gz: d350897b48c1733a457748f373bb6d5424656474
 SHA512:
-  metadata.gz: e7acdb469b6d4493aab2e86669c55c05f2209eea17c03eb9ef7dfc954f871ba8a7d7ed0beb94a451bef03e53a2bffee5480e48efde848c0da50afda07001bebe
-  data.tar.gz: e772d7c35be9afa30b6d04cab2abb3df81808e5429cccd1b9f48aa18662d143ba160ea60c560199aebe8bbd9cda1525b65f43103689ffc2437d5c15f58e98740
+  metadata.gz: 51bef033014e9b7330d671097ba96188b31b6886cde1a5bb51eec2bd73ac8a80854dd20f5dc61f3615a8b2c5f06aeed4d2ce2e63c04fb91b627b75f27ca56745
+  data.tar.gz: 3d9682ba319b2948e289504fe610e1adf3febd032acce0cf6a1b55baef73deae037b276ced1b037ecd4de88ff74ccb8a3b47009c37f1c544aa8d59752f607f2f

data/lib/garage_client.rb

@@ -8,6 +8,7 @@ require 'garage_client/configuration'
 require 'garage_client/error'
 require 'garage_client/request'
 require 'garage_client/request/json_encoded'
+require 'garage_client/request/propagate_request_id'
 require 'garage_client/response'
 require 'garage_client/response/cacheable'
 require 'garage_client/response/raise_http_exception'

data/lib/garage_client/client.rb

@@ -67,6 +67,7 @@ module GarageClient
         # Request Middlewares
         builder.use Faraday::Request::Multipart
         builder.use GarageClient::Request::JsonEncoded
+        builder.use GarageClient::Request::PropagateRequestId
 
         # Low-level Middlewares
         apply_auth_middleware builder

data/lib/garage_client/request/propagate_request_id.rb

@@ -0,0 +1,12 @@
+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]
+        end
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/garage_client/version.rb

@@ -1,3 +1,3 @@
 module GarageClient
-  VERSION = '2.1.6'
+  VERSION = '2.1.7'
 end

data/spec/garage_client/request/propagate_request_id_spec.rb

@@ -0,0 +1,43 @@
+require "spec_helper"
+
+describe GarageClient::Request::PropagateRequestId do
+  let(:client) do
+    GarageClient::Client.new
+  end
+
+  around do |example|
+    original = Thread.current[:request_id]
+    Thread.current[:request_id] = 'request_id'
+    example.run
+    Thread.current[:request_id] = original
+  end
+
+  it 'sends request_id via header' do
+    stub_get("/examples").with(headers: { 'HTTP_X_REQUEST_ID' => 'request_id' })
+    expect { client.get("/examples") }.not_to raise_error
+  end
+
+  context 'without request_id' do
+    before do
+      Thread.current[:request_id] = nil
+    end
+
+    it 'does not send request_id via header' do
+      stub_get("/examples").with do |request|
+        !request.headers.include?('HTTP_X_REQUEST_ID')
+      end
+      expect { client.get("/examples") }.not_to raise_error
+    end
+  end
+
+  context 'if already has request_id' do
+    let(:client) do
+      GarageClient::Client.new(headers: { 'HTTP_X_REQUEST_ID' => 'another_id' })
+    end
+
+    it 'does not overwrite request_id' do
+      stub_get("/examples").with(headers: { 'HTTP_X_REQUEST_ID' => 'another_id' })
+      expect { client.get("/examples") }.not_to raise_error
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: garage_client
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Cookpad Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -203,6 +203,7 @@ files:
 - lib/garage_client/error.rb
 - lib/garage_client/request.rb
 - lib/garage_client/request/json_encoded.rb
+- lib/garage_client/request/propagate_request_id.rb
 - lib/garage_client/resource.rb
 - lib/garage_client/response.rb
 - lib/garage_client/response/cacheable.rb
@@ -220,6 +221,7 @@ files:
 - spec/garage_client/configuration_spec.rb
 - spec/garage_client/error_spec.rb
 - spec/garage_client/request/json_encoded_spec.rb
+- spec/garage_client/request/propagate_request_id_spec.rb
 - spec/garage_client/resource_spec.rb
 - spec/garage_client/response_spec.rb
 - spec/garage_client_spec.rb
@@ -243,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby client library for the Garage API
@@ -260,7 +262,9 @@ test_files:
 - spec/garage_client/configuration_spec.rb
 - spec/garage_client/error_spec.rb
 - spec/garage_client/request/json_encoded_spec.rb
+- spec/garage_client/request/propagate_request_id_spec.rb
 - spec/garage_client/resource_spec.rb
 - spec/garage_client/response_spec.rb
 - spec/garage_client_spec.rb
 - spec/spec_helper.rb
+has_rdoc: