request_id 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 90e9e52682dae635efe8277e84f6b56091e789b0
-  data.tar.gz: 5134b1a1fb7744cd9346e47136171b9a57248653
+SHA1:
+  metadata.gz: 9a76b5cd12acc661e7512907335ed0ad7319b950
+  data.tar.gz: f3358b4b485b347c149b01d395ba52df3e9f426d
 SHA512:
-  metadata.gz: c982c52a35c9b684657dfbc642fa632bd4a6fa47b92f3e14ba0af8c5262c315ba7948669ade1caae6497745d96929741b98ae9139c1b45cacfeecd9c65aa3588
-  data.tar.gz: 49eb46adf59664450f0c64976ed1f937a3e11ce58b0f324b904aaa19f32c6c95282b3e7264c769eb31c9c35209e2bdcaed40171cdc3dbdc624078610c1625217
+  metadata.gz: bda55ec9eb12d58a4742b1c0babb9dbbd4c2c8f6f9418140bb3f01b28ced1287a91656ebb3110c00c8432f958c91b10ce9f76acde17ecf4d63dea32647287aae
+  data.tar.gz: 41cb3c90e7a96031ed8a7b4ff8b38915af99c2a1cc60f20a16202b36be6b432b794a5cd90aa89dde8489c3b0354ddb23705151317d282d53a878f6065d1779ce

data/lib/rack/request_id.rb

@@ -26,7 +26,7 @@ module Rack
     end
 
     def call(env)
-      ::RequestId.with(@options[:key], @options[:value].call(env)) do
+      ::RequestId.with(@options[:key], @options[:value].call(env) || generate) do
         status, headers, body = @app.call(env)
 
         if @options[:response_header]
@@ -42,5 +42,10 @@ module Rack
     def default_options
       { key: :request_id, value: lambda { |env| env[REQUEST_HEADER] }, response_header: RESPONSE_HEADER }
     end
+
+    def generate
+      SecureRandom.uuid if ::RequestId.configuration.generate
+    end
+
   end
 end

data/lib/request_id/version.rb

@@ -1,3 +1,3 @@
 module RequestId
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/rack/request_id_spec.rb

@@ -21,6 +21,36 @@ describe Rack::RequestId do
       expect(headers['X-Request-Id']).to eq request_id
     end
 
+    context 'when config.generate == false' do
+      before do
+        RequestId.configure { |c| c.generate = false }
+      end
+
+      after do
+        RequestId.configure { |c| c.generate = true }
+      end
+
+      it 'does not generate a request id if none is present' do
+        status, headers, body = middleware.call({})
+        expect(headers['X-Request-Id']).to be_empty
+      end
+    end
+
+    context 'when config.generate == true' do
+      before do
+        RequestId.configure { |c| c.generate = true }
+      end
+
+      after do
+        RequestId.configure { |c| c.generate = false }
+      end
+
+      it 'generates a request id if none is present' do
+        status, headers, body = middleware.call({})
+        expect(headers['X-Request-Id']).to_not be_empty
+      end
+    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,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: request_id
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Eric J. Holmes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !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
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -107,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Classes for tracking request id