request_id 0.1.3 → 0.1.4

data/README.md

@@ -14,7 +14,7 @@ Throughout the system. It includes:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'request_id', github: 'remind101/request_id'
+gem 'request_id'
 ```
 
 ## Usage
@@ -25,7 +25,6 @@ Add the rack middleware:
 use Rack::RequestId
 ```
 
-
 ### If you're using Sidekiq
 
 Add the client middleware.

data/lib/rack/request_id.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Rack
 
   # Public: Rack middleware that stores the Heroku-Request-Id header in a
@@ -23,11 +25,26 @@ module Rack
     end
 
     def call(env)
-      ::RequestId.with_request_id(env[REQUEST_HEADER]) do
+      ::RequestId.with_request_id(request_id(env)) do
         status, headers, body = @app.call(env)
         headers[RESPONSE_HEADER] ||= ::RequestId.request_id
         [status, headers, body]
       end
     end
+
+  private
+
+    def request_id(env)
+      env[REQUEST_HEADER] || generate
+    end
+
+    def generate
+      generate? && SecureRandom.hex(16)
+    end
+
+    def generate?
+      ::RequestId.configuration.generate
+    end
+
   end
 end

data/lib/request_id.rb

@@ -1,6 +1,8 @@
 require 'request_id/version'
 
 module RequestId
+  autoload :Configuration, 'request_id/configuration'
+
   class << self
 
     # Public: Retrieve the current request_id, which is generally set by the
@@ -50,6 +52,21 @@ module RequestId
       RequestId.request_id = last_request_id
     end
 
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    # Public: Configure RequestId.
+    #
+    # Examples
+    #
+    #   RequestId.configure do |config|
+    #     config.generate = false
+    #   end
+    def configure
+      yield configuration
+    end
+
   end
 end
 

data/lib/request_id/configuration.rb

@@ -0,0 +1,12 @@
+module RequestId
+  class Configuration
+    # If set to true, the rack middleware will automatically generate a request
+    # id. Useful in development. Defaults to true if this is a rails app an
+    # we're in development.
+    attr_accessor :generate
+
+    def initialize
+      @generate = defined?(Rails) && Rails.env.development?
+    end
+  end
+end

data/lib/request_id/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_id
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - Rakefile
 - lib/rack/request_id.rb
 - lib/request_id.rb
+- lib/request_id/configuration.rb
 - lib/request_id/version.rb
 - lib/sidekiq/middleware/client/request_id.rb
 - lib/sidekiq/middleware/server/request_id.rb
@@ -100,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4275333693123004164
+      hash: -4189853304360477906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4275333693123004164
+      hash: -4189853304360477906
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23