paper_trail 1.4.1 → 1.4.3

data/README.md

@@ -18,6 +18,7 @@ PaperTrail lets you track changes to your models' data.  It's good for auditing
 * No configuration necessary.
 * Stores everything in a single database table (generates migration for you).
 * Thoroughly tested.
+* Threadsafe.
 
 
 ## Rails Version
@@ -206,7 +207,7 @@ And on again like this:
 
 ## Testing
 
-PaperTrail has a thorough suite of tests.  Thanks to [Zachery Hostens](http://github.com/zacheryph) for making them able to run standalone, i.e. without needing PaperTrail to be sitting in a Rails app.
+PaperTrail has a thorough suite of tests.
 
 
 ## Articles
@@ -225,6 +226,8 @@ Many thanks to:
 
 * [Zachery Hostens](http://github.com/zacheryph)
 * [Jeremy Weiskotten](http://github.com/jeremyw)
+* [Phan Le](http://github.com/revo)
+* [jdrucza](http://github.com/jdrucza)
 
 
 ## Inspirations

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.3

data/lib/paper_trail.rb

@@ -3,26 +3,29 @@ require 'paper_trail/has_paper_trail'
 require 'paper_trail/version'
 
 module PaperTrail
-  @@whodunnit = nil
 
   def self.included(base)
     base.before_filter :set_whodunnit
   end
 
   def self.whodunnit
-    @@whodunnit.respond_to?(:call) ? @@whodunnit.call : @@whodunnit
+    Thread.current[:whodunnit]
   end
 
+  # Sets who is responsible for any changes that occur.
+  # You would normally use this in a migration or on the console,
+  # when working with models directly.  In a controller it is set
+  # automatically to the `current_user`.
   def self.whodunnit=(value)
-    @@whodunnit = value
+    Thread.current[:whodunnit] = value
   end
 
-  private
+  protected
 
+  # Sets who is responsible for any changes that occur: the controller's
+  # `current_user`.
   def set_whodunnit
-    @@whodunnit = lambda {
-      self.send :current_user rescue nil
-    }
+    Thread.current[:whodunnit] = self.send :current_user rescue nil
   end
 end
 

data/paper_trail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paper_trail}
-  s.version = "1.4.1"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Stewart"]
-  s.date = %q{2010-03-18}
+  s.date = %q{2010-03-19}
   s.email = %q{boss@airbladesoftware.com}
   s.extra_rdoc_files = [
     "README.md"
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "test/schema.rb",
      "test/schema_change.rb",
      "test/test_helper.rb",
+     "test/thread_safe_test.rb",
      "uninstall.rb"
   ]
   s.homepage = %q{http://github.com/airblade/paper_trail}
@@ -49,7 +50,8 @@ Gem::Specification.new do |s|
      "test/paper_trail_schema_test.rb",
      "test/schema.rb",
      "test/schema_change.rb",
-     "test/test_helper.rb"
+     "test/test_helper.rb",
+     "test/thread_safe_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/paper_trail_controller_test.rb

@@ -1,5 +1,9 @@
 require 'test_helper'
 
+ActionController::Routing::Routes.draw do |map|
+  map.resources :widgets
+end
+
 class ApplicationController < ActionController::Base
   def rescue_action(e)
     raise e
@@ -30,18 +34,8 @@ class WidgetsController < ApplicationController
   end
 end
 
-
-class PaperTrailControllerTest < ActionController::TestCase #Test::Unit::TestCase
+class PaperTrailControllerTest < ActionController::TestCase
   tests WidgetsController
-  def setup
-    #@controller = WidgetsController.new
-    #@request = ActionController::TestRequest.new
-    #@response = ActionController::TestResponse.new
-
-    ActionController::Routing::Routes.draw do |map|
-      map.resources :widgets
-    end
-  end
 
   test 'create' do
     post :create, :widget => { :name => 'Flugel' }
@@ -68,4 +62,3 @@ class PaperTrailControllerTest < ActionController::TestCase #Test::Unit::TestCas
     assert_equal 153, widget.versions.last.whodunnit.to_i
   end
 end
-

data/test/thread_safe_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class TestController < ActionController::Base
+  def current_user
+    Thread.current.object_id
+  end
+end
+
+class ThreadSafeTest < Test::Unit::TestCase
+  should "be thread safe" do
+    blocked = true
+
+    slow_thread = Thread.new do
+      controller = TestController.new
+      controller.send :set_whodunnit
+      begin
+        sleep 0.001
+      end while blocked
+      PaperTrail.whodunnit
+    end
+
+    fast_thread = Thread.new do
+      controller = TestController.new
+      controller.send :set_whodunnit
+      who = PaperTrail.whodunnit
+      blocked = false
+      who
+    end
+
+    assert_not_equal slow_thread.value, fast_thread.value
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paper_trail
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors: 
 - Andy Stewart
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +00:00
+date: 2010-03-19 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - test/schema.rb
 - test/schema_change.rb
 - test/test_helper.rb
+- test/thread_safe_test.rb
 - uninstall.rb
 has_rdoc: true
 homepage: http://github.com/airblade/paper_trail
@@ -79,3 +80,4 @@ test_files:
 - test/schema.rb
 - test/schema_change.rb
 - test/test_helper.rb
+- test/thread_safe_test.rb