imprint 1.0.1 → 1.1.0

data/lib/imprint.rb

@@ -8,14 +8,14 @@ module Imprint
 
     TRACE_CHARS = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
 
-    def self.set_trace_id(id, rails_env, rack_env)
-      rails_env[TRACER_KEY] = id
+    def self.set_trace_id(id, rack_env = {})
+      Thread.current[TRACER_KEY] = id
+      # setting to the rack_env, gives error tracking support in some systems
       rack_env[TRACER_KEY] = id
     end
 
-    #this assumes the rails ENV is available at ENV
-    def self.get_trace_id(rails_env = ENV)
-      rails_env[TRACER_KEY]
+    def self.get_trace_id
+      Thread.current[TRACER_KEY]
     end
 
     def self.rand_trace_id

data/lib/imprint/middleware.rb

@@ -1,10 +1,10 @@
 module Imprint
   class Middleware
     
-    def self.set_trace_id(rails_env, rack_env)
+    def self.set_request_trace_id(rack_env)
       existing_id = rack_env[Imprint::Tracer::TRACER_HEADER]
       existing_id ||= "#{Time.now.to_i}_#{Imprint::Tracer.rand_trace_id}"
-      Imprint::Tracer.set_trace_id(existing_id, rails_env, rack_env)
+      Imprint::Tracer.set_trace_id(existing_id, rack_env)
     end
     
     def initialize(app, opts = {})
@@ -12,7 +12,7 @@ module Imprint
     end
     
     def call(env)
-      ::Imprint::Middleware.set_trace_id(ENV, env)
+      ::Imprint::Middleware.set_request_trace_id(env)
       @app.call(env)
     end
 

data/lib/imprint/version.rb

@@ -1,3 +1,3 @@
 module Imprint
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/unit/middleware_test.rb

@@ -20,8 +20,8 @@ class MiddlewareTest < Test::Unit::TestCase
     middleware = Imprint::Middleware.new(fake_app)
     results = middleware.call(request)
     assert_equal "/anything.json", results.last
-    assert_not_nil ::Imprint::Tracer.get_trace_id(ENV)
-    assert ::Imprint::Tracer.get_trace_id(ENV)!='-1'
+    assert_not_nil ::Imprint::Tracer.get_trace_id
+    assert ::Imprint::Tracer.get_trace_id!='-1'
   end
 
   private

data/test/unit/tracer_test.rb

@@ -4,12 +4,14 @@ class TracerTest < Test::Unit::TestCase
 
   should "set trace id" do
     fake_trace = "tracer"
-    Imprint::Tracer.set_trace_id(fake_trace, ENV, {})
-    assert_equal fake_trace, Imprint::Tracer.get_trace_id(ENV)
+    Imprint::Tracer.set_trace_id(fake_trace, fake_rack_env)
+    assert_equal fake_trace, Imprint::Tracer.get_trace_id
   end
 
   should "get trace id defaults" do
-    assert_not_nil Imprint::Tracer.get_trace_id(ENV)
+    assert_not_nil Imprint::Tracer.get_trace_id
+    Imprint::Tracer.set_trace_id(nil, fake_rack_env)
+    assert_equal nil, Imprint::Tracer.get_trace_id
   end
 
   should "generate rand trace id" do
@@ -19,4 +21,10 @@ class TracerTest < Test::Unit::TestCase
     assert trace_id.match(/[A-Za-z]/)
   end
 
+  protected
+
+  def fake_rack_env
+    {}
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imprint
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2134087639551202536
+      hash: -3002848166108194027
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2134087639551202536
+      hash: -3002848166108194027
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23