request_id 0.1.1 → 0.1.2

data/lib/rack/request_id.rb

@@ -15,15 +15,18 @@ module Rack
   #   logger.info "request_id=#{Thread.current[:request_id]} Hello world"
   #   # => request_id=a08a6712229fb991c0e5026c246862c7 Hello world
   class RequestId
-    REQUEST_ID_HEADER = 'HTTP_HEROKU_REQUEST_ID'.freeze
+    REQUEST_HEADER  = 'HTTP_HEROKU_REQUEST_ID'.freeze
+    RESPONSE_HEADER = 'X-Request-Id'.freeze
 
     def initialize(app, options = {})
       @app = app
     end
 
     def call(env)
-      ::RequestId.request_id = env[REQUEST_ID_HEADER]
-      @app.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
     end

data/lib/request_id/version.rb

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

data/spec/rack/request_id_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'securerandom'
 
 describe Rack::RequestId do
-  let(:app) { double('app', call: nil) }
+  let(:app) { double('app', call: [200, {}, ['Body']]) }
   let(:middleware) { described_class.new app }
 
   describe '.call' do
@@ -15,6 +15,11 @@ describe Rack::RequestId do
       middleware.call('HTTP_HEROKU_REQUEST_ID' => request_id)
     end
 
+    it 'sets the X-Request-Id header in the response' do
+      status, headers, body = middleware.call('HTTP_HEROKU_REQUEST_ID' => request_id)
+      expect(headers['X-Request-Id']).to eq request_id
+    end
+
     context 'when an exception is raised' do
       it 'still sets the request_id back to nil' do
         Thread.current.should_receive(:[]=).with(:request_id, request_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_id
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4065047775900537477
+      hash: -2341764705210223496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4065047775900537477
+      hash: -2341764705210223496
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23