request_id 0.1.2 → 0.1.3

data/lib/rack/request_id.rb

@@ -23,12 +23,11 @@ module Rack
     end
 
     def call(env)
-      ::RequestId.request_id = env[REQUEST_HEADER]
-      status, headers, body = @app.call(env)
-      headers[RESPONSE_HEADER] ||= ::RequestId.request_id
-      [status, headers, body]
-    ensure
-      ::RequestId.request_id = nil
+      ::RequestId.with_request_id(env[REQUEST_HEADER]) do
+        status, headers, body = @app.call(env)
+        headers[RESPONSE_HEADER] ||= ::RequestId.request_id
+        [status, headers, body]
+      end
     end
   end
 end

data/lib/request_id/version.rb

@@ -1,3 +1,3 @@
 module RequestId
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/request_id.rb

@@ -28,6 +28,28 @@ module RequestId
       Thread.current[:request_id] = request_id
     end
 
+    # Public: Runs the block with the given request id set.
+    #
+    # Examples
+    #
+    #   RequestId.request_id
+    #   # => "9fee77ec37b483983839fe7a753b64d9"
+    #
+    #   RequestId.with_request_id('c8ee330973663097f50686eb17d3324e') do
+    #     RequestId.request_id
+    #     # => "c8ee330973663097f50686eb17d3324e"
+    #   end
+    #
+    #   RequestId.request_id
+    #   # => "9fee77ec37b483983839fe7a753b64d9"
+    def with_request_id(request_id)
+      last_request_id = RequestId.request_id
+      RequestId.request_id = request_id
+      yield
+    ensure
+      RequestId.request_id = last_request_id
+    end
+
   end
 end
 

data/spec/request_id_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'securerandom'
+
+describe RequestId do
+  let(:request_id) { SecureRandom.hex }
+
+  describe '.request_id' do
+    subject { described_class.request_id }
+
+    context 'when Thread.current[:request_id] is set' do
+      before { Thread.current[:request_id] = request_id }
+      it { should eq Thread.current[:request_id] }
+    end
+  end
+
+  describe '.request_id=' do
+    it 'sets Thread.current[:request_id]' do
+      Thread.current.should_receive(:[]=).with(:request_id, request_id)
+      described_class.request_id = request_id
+    end
+  end
+
+  describe '.with_request_id' do
+    before { Thread.current[:request_id] = request_id }
+
+    it 'sets the request_id to the new request_id' do
+      described_class.with_request_id('foobar') do
+        expect(described_class.request_id).to eq 'foobar'
+      end
+      expect(described_class.request_id).to eq request_id
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_id
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -80,6 +80,7 @@ files:
 - lib/sidekiq/middleware/server/request_id.rb
 - request_id.gemspec
 - spec/rack/request_id_spec.rb
+- spec/request_id_spec.rb
 - spec/sidekiq/middleware/client/request_id_spec.rb
 - spec/sidekiq/middleware/server/request_id_spec.rb
 - spec/spec_helper.rb
@@ -99,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2341764705210223496
+      hash: 4275333693123004164
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2341764705210223496
+      hash: 4275333693123004164
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -117,6 +118,7 @@ specification_version: 3
 summary: Classes for tracking request id
 test_files:
 - spec/rack/request_id_spec.rb
+- spec/request_id_spec.rb
 - spec/sidekiq/middleware/client/request_id_spec.rb
 - spec/sidekiq/middleware/server/request_id_spec.rb
 - spec/spec_helper.rb