heroku-request-id 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 82a2faf66bd7a74a8491db5c8c829b73b703fdde
+  data.tar.gz: 35486a3a476614e2944d2cb6dbc10603dccc4586
+SHA512:
+  metadata.gz: 285cfc49dfe52fe0d60bd8dccb478c925c86e0a93627db65648cf8fef5cc72159d2ac75ca571ca95988d6a647984a37c04d390d8b08d76ecdc9477e4c4aa6a43
+  data.tar.gz: bf01e0150a1d42f4e36043ad3f09c52cb62451a2491e5b4e81dfa93e59c4197d12ebb5b28f8a70c48e3690bf0770431eb6ce16b660222ed393c3b9c367739e3d

data/lib/heroku-request-id/middleware.rb

@@ -36,7 +36,7 @@ module HerokuRequestId
     end
 
     def call(env)
-      @start = Time.now
+      @env = env
       @request_id = env['HTTP_HEROKU_REQUEST_ID']
       env["HTTP_X_REQUEST_ID"] = @request_id if self.class.x_request_id_replication
       @status, @headers, @response = @app.call(env)
@@ -44,16 +44,26 @@ module HerokuRequestId
     end
 
     def each(&block)
-      @stop = Time.now
-      @elapsed = @stop - @start
+      msg = build_msg
       if self.class.html_comment && @headers["Content-Type"] && @headers["Content-Type"].include?("text/html")
-        block.call("<!-- Heroku request id : #{@request_id} - Elapsed time : #{@elapsed} -->\n")
+        block.call("<!-- #{msg} -->\n")
       end
       if self.class.log_line
-        $stdout.puts("heroku-request-id=#{@request_id} measure=\"rack-request\" elapsed=#{@elapsed}")
+        $stdout.puts(msg)
       end
       @response.each(&block)
     end
+    
+    def build_msg
+      elapsed = @env['X-Runtime']
+      msg = %[Heroku request id : #{@request_id}]
+      if elapsed && elapsed.strip != ""
+        msg += %[ - Elapsed time (from Rack::Runtime) : #{elapsed}]
+      else
+        msg += %[ - Runtime info not available.  (Use Rack::Runtime)]
+      end
+      msg
+    end
 
   end
 end

data/lib/heroku-request-id/railtie.rb

@@ -1,7 +1,7 @@
 module HerokuRequestId
   class Railtie < Rails::Railtie
     initializer 'heroku_request_id.add_middleware' do |app|
-      app.config.middleware.insert 0, "HerokuRequestId::Middleware"
+      app.config.middleware.insert_before "Rack::Runtime", "HerokuRequestId::Middleware"
     end
   end
 end

data/lib/heroku-request-id/version.rb

@@ -1,3 +1,3 @@
 module HerokuRequestId
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/heroku-request-id/middleware_spec.rb

@@ -10,19 +10,33 @@ describe HerokuRequestId::Middleware do
 
   let(:app) { HerokuRequestId::Middleware.new(inner_app) }
 
-  subject do
-    capture_stdout { get("/", {}, { "HTTP_HEROKU_REQUEST_ID" => "the_id_string" }) }
+  let(:request_without_rack_runtime)do
+    capture_stdout{ get("/", {}, {"HTTP_HEROKU_REQUEST_ID" => "the_id_string"}) }
+  end
+
+  let(:request_with_rack_runtime)do
+    capture_stdout{ get("/", {}, {"HTTP_HEROKU_REQUEST_ID" => "the_id_string","X-Runtime" => "42"}) }
   end
 
   it "prints the request id to stdout by default" do
-    output = subject
-    output.should match("heroku-request-id")
+    output = request_without_rack_runtime
+    output.should match("Heroku request id")
     output.should match("the_id_string")
   end
 
+  it "Does not include runtime information if the 'X-Runtime' header is not present" do
+    output = request_without_rack_runtime
+    output.should match("Runtime info not available")
+  end
+
+  it "Does include runtime information if the 'X-Runtime' header is present" do
+    output = request_with_rack_runtime
+    output.should match("Elapsed time")
+  end
+
   it "does not print the request id to stdout if log_line == false" do
     HerokuRequestId::Middleware.log_line = false
-    output = subject
+    output = request_without_rack_runtime
     output.should_not match("heroku-request-id")
     output.should_not match("the_id_string")
     # reset html_comment so that random test order works
@@ -30,14 +44,14 @@ describe HerokuRequestId::Middleware do
   end
 
   it "does not add a comment with the Heroku request id by default" do
-    subject
+    request_without_rack_runtime
     last_response.body.should_not match("Heroku request id")
     last_response.body.should_not match("the_id_string")
   end
 
   it "does add a comment with the Heroku request id if html_comment == true" do
     HerokuRequestId::Middleware.html_comment = true
-    subject
+    request_without_rack_runtime
     last_response.body.should match("Heroku request id")
     last_response.body.should match("the_id_string")
     # reset html_comment so that random test order works
@@ -45,7 +59,7 @@ describe HerokuRequestId::Middleware do
   end
 
   it "makes no change to response status" do
-    subject
+    request_without_rack_runtime
     last_response.should be_ok
   end
 
@@ -60,6 +74,9 @@ describe HerokuRequestId::Middleware do
       }
     end
     let(:app){ HerokuRequestId::Middleware.new(inner_app) }
+    subject do
+      capture_stdout { get("/", {}, { "HTTP_HEROKU_REQUEST_ID" => "the_id_string" }) }
+    end
     context "by default" do
       it "does not replicate the heroku header into rails header" do
         subject

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: heroku-request-id
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Jeremy Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,49 +27,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple Rack middleware to log the heroku request id and write it to the
@@ -100,33 +91,26 @@ files:
 homepage: https://github.com/Octo-Labs/heroku-request-id
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2380672724000137210
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2380672724000137210
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Rack middleware to log the heroku request id and write it to the end
   of html requests. Both optionally, of course.
 test_files: