request_id 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04f6bb692a9428eae84c65802ef209c801b5f621
-  data.tar.gz: d9d99f2739d1f495b2872ff54c3b48171ba4941b
+  metadata.gz: 32098034b450d59355544d24586315a661db4476
+  data.tar.gz: be4cf3f3dbd644c9a35d9acd55961fff6eabbf23
 SHA512:
-  metadata.gz: 8a387cc775203c7f9a3726c430059e39d0bad5b2a68356db35200211f314d0b23b537f503a61fb55debb355294daf4ebd0f577b753fdff24b33f3c6bc664de96
-  data.tar.gz: 7a8ca15f5175521d60a9c42d6d4cede5cde21d26265b67df1234a65d5bba226de805001e23f900d739af7bdbb6736dd55c09a3d080eb2cb3a4fa73a0d9bd1dbe
+  metadata.gz: 066273aa2c77438d5c12be5f4b5be07f5ae194e4fe6d1a8df3b2c99256e4f80e5f4f182a6bed87093aa9ed2ed8802d236ad13f48e97e5182f663feda22afe736
+  data.tar.gz: 1f66869a4275451097a7742b4a9a18c4566670e51293451b867b3562c07a773cd68fa51118d51b5f9cb8576efc78acb2e4d2a62e25f9704308abe0d0f6a0e8ce

data/lib/faraday/request_id.rb

@@ -0,0 +1,27 @@
+require 'request_id'
+require 'faraday'
+
+module Faraday
+  class RequestId < Faraday::Middleware
+    HEADER = 'X-Request-Id'.freeze
+
+    def call(env)
+      set_header(env) if needs_header?(env)
+      @app.call(env)
+    end
+
+  private
+
+    def needs_header?(env)
+      request_id && !env[:request_headers][HEADER]
+    end
+
+    def set_header(env)
+      env[:request_headers][HEADER] = request_id
+    end
+
+    def request_id
+      ::RequestId.request_id
+    end
+  end
+end

data/lib/request_id/version.rb

@@ -1,3 +1,3 @@
 module RequestId
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/request_id.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'faraday'
 end

data/spec/faraday/request_id_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'faraday/request_id'
+
+describe Faraday::RequestId do
+  let(:app) { double('app', call: nil) }
+  let(:middleware) { described_class.new(app) }
+
+  describe '.call' do
+    context 'when a request_id is set' do
+      before do
+        RequestId.stub(request_id: SecureRandom.hex)
+      end
+
+      it 'adds the X-Request-Id header' do
+        env = { request_headers: {} }
+        middleware.call(env)
+        expect(env[:request_headers]['X-Request-Id']).to eq RequestId.request_id
+      end
+    end
+
+    context 'when no request_id is set' do
+      before do
+        RequestId.stub(request_id: nil)
+      end
+
+      it 'does not add the X-Request-Id header' do
+        env = { request_headers: {} }
+        middleware.call(env)
+        expect(env[:request_headers]).to_not have_key 'X-Request-Id'
+      end
+    end
+
+    context 'when a request_id is already set in request headers' do
+      let(:request_id) { SecureRandom.hex }
+
+      it 'uses the request id from the env hash' do
+        env = { request_headers: { 'X-Request-Id' => request_id } }
+        middleware.call(env)
+        expect(env[:request_headers]['X-Request-Id']).to eq request_id
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: request_id
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Eric J. Holmes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Classes for tracking request id
 email:
 - eric@ejholmes.net
@@ -66,6 +80,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/faraday/request_id.rb
 - lib/rack/request_id.rb
 - lib/request_id.rb
 - lib/request_id/configuration.rb
@@ -74,6 +89,7 @@ files:
 - lib/sidekiq/middleware/client/request_id.rb
 - lib/sidekiq/middleware/server/request_id.rb
 - request_id.gemspec
+- spec/faraday/request_id_spec.rb
 - spec/rack/request_id_spec.rb
 - spec/request_id_spec.rb
 - spec/sidekiq/middleware/client/request_id_spec.rb
@@ -105,6 +121,7 @@ signing_key:
 specification_version: 4
 summary: Classes for tracking request id
 test_files:
+- spec/faraday/request_id_spec.rb
 - spec/rack/request_id_spec.rb
 - spec/request_id_spec.rb
 - spec/sidekiq/middleware/client/request_id_spec.rb