@@ -89,7 +89,7 @@ module Ddb #:nodoc: before_create :set_creator_attribute if defined?(Caboose::Acts::Paranoid) - belongs_to :deleter, :class_name => self.stamper_class_name, + belongs_to :deleter, :class_name => self.stamper_class_name.to_s.singularize.camelize, :foreign_key => self.deleter_attribute before_destroy :set_deleter_attribute end @@ -118,27 +118,27 @@ module Ddb #:nodoc: module InstanceMethods #:nodoc: private def has_stamper? - !self.class.stamper_class.nil? && !self.class.stamper_class.stamper.nil? + !self.class.stamper_class.nil? && !self.class.stamper_class.stamper.nil? rescue false end def set_creator_attribute return unless self.record_userstamp if respond_to?(self.creator_attribute.to_sym) && has_stamper? - self.creator = self.class.stamper_class.stamper + self.send("#{self.creator_attribute}=".to_sym, self.class.stamper_class.stamper) end end def set_updater_attribute return unless self.record_userstamp if respond_to?(self.updater_attribute.to_sym) && has_stamper? - self.updater = self.class.stamper_class.stamper + self.send("#{self.updater_attribute}=".to_sym, self.class.stamper_class.stamper) end end def set_deleter_attribute return unless self.record_userstamp if respond_to?(self.deleter_attribute.to_sym) && has_stamper? - self.deleter = self.class.stamper_class.stamper + self.send("#{self.deleter_attribute}=".to_sym, self.class.stamper_class.stamper) save end end lib/stampable.rb @@ -28,7 +28,7 @@ module Ddb #:nodoc: # Retrieves the existing stamper for the current request. def stamper - find(Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"]) + Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"] end # Sets the stamper back to +nil+ to prepare for the next request. lib/stamper.rb @@ -15,7 +15,7 @@ class CompatibilityStampingTests< Test::Unit::TestCase # :nodoc: end def test_comment_creation_with_stamped_object - assert_equal @delynn, Person.stamper + assert_equal @delynn.id, Person.stamper comment = Comment.create(:comment => "Test Comment") assert_equal @delynn.id, comment.created_by @@ -26,7 +26,7 @@ class CompatibilityStampingTests< Test::Unit::TestCase # :nodoc: def test_comment_creation_with_stamped_integer Person.stamper = 2 - assert_equal 2, Person.stamper.id + assert_equal 2, Person.stamper comment = Comment.create(:comment => "Test Comment - 2") assert_equal @nicole.id, comment.created_by @@ -37,7 +37,7 @@ class CompatibilityStampingTests< Test::Unit::TestCase # :nodoc: def test_comment_updating_with_stamped_object Person.stamper = @nicole - assert_equal @nicole, Person.stamper + assert_equal @nicole.id, Person.stamper @first_comment.comment << " - Updated" @first_comment.save @@ -50,7 +50,7 @@ class CompatibilityStampingTests< Test::Unit::TestCase # :nodoc: def test_comment_updating_with_stamped_integer Person.stamper = 2 - assert_equal 2, Person.stamper.id + assert_equal 2, Person.stamper @first_comment.comment << " - Updated" @first_comment.save test/compatibility_stamping_test.rb @@ -1,5 +1,5 @@ class UserstampController < ActionController::Base - include Userstamp + include Ddb::Controller::Userstamp protected def current_user test/controllers/userstamp_controller.rb @@ -15,7 +15,7 @@ class StampingTests < Test::Unit::TestCase # :nodoc: end def test_person_creation_with_stamped_object - assert_equal @zeus, User.stamper + assert_equal @zeus.id, User.stamper person = Person.create(:name => "David") assert_equal @zeus.id, person.creator_id @@ -26,7 +26,7 @@ class StampingTests < Test::Unit::TestCase # :nodoc: def test_person_creation_with_stamped_integer User.stamper = 2 - assert_equal 2, User.stamper.id + assert_equal 2, User.stamper person = Person.create(:name => "Daniel") assert_equal @hera.id, person.creator_id @@ -36,7 +36,7 @@ class StampingTests < Test::Unit::TestCase # :nodoc: end def test_post_creation_with_stamped_object - assert_equal @delynn, Person.stamper + assert_equal @delynn.id, Person.stamper post = Post.create(:title => "Test Post - 1") assert_equal @delynn.id, post.creator_id @@ -47,7 +47,7 @@ class StampingTests < Test::Unit::TestCase # :nodoc: def test_post_creation_with_stamped_integer Person.stamper = 2 - assert_equal 2, Person.stamper.id + assert_equal 2, Person.stamper post = Post.create(:title => "Test Post - 2") assert_equal @nicole.id, post.creator_id @@ -58,7 +58,7 @@ class StampingTests < Test::Unit::TestCase # :nodoc: def test_person_updating_with_stamped_object User.stamper = @hera - assert_equal @hera, User.stamper + assert_equal @hera.id, User.stamper @delynn.name << " Berry" @delynn.save @@ -71,7 +71,7 @@ class StampingTests < Test::Unit::TestCase # :nodoc: def test_person_updating_with_stamped_integer User.stamper = 2 - assert_equal 2, User.stamper.id + assert_equal 2, User.stamper @delynn.name << " Berry" @delynn.save @@ -84,7 +84,7 @@ class StampingTests < Test::Unit::TestCase # :nodoc: def test_post_updating_with_stamped_object Person.stamper = @nicole - assert_equal @nicole, Person.stamper + assert_equal @nicole.id, Person.stamper @first_post.title << " - Updated" @first_post.save @@ -97,7 +97,7 @@ class StampingTests < Test::Unit::TestCase # :nodoc: def test_post_updating_with_stamped_integer Person.stamper = 2 - assert_equal 2, Person.stamper.id + assert_equal 2, Person.stamper @first_post.title << " - Updated" @first_post.save test/stamping_test.rb 6218f5b63098902d4950eb2d1848ef44c174c918 DeLynn Berry delynn@gmail.com http://github.com/delynn/userstamp/commit/210dad9ad56f80fd2eee4959578687755c4afdd2 210dad9ad56f80fd2eee4959578687755c4afdd2 2008-04-16T20:04:09-07:00 2008-04-16T20:04:09-07:00 Decided to not use AR#find in the stamper method as it could cause strange behavior. Thanks to Aaron Eisenberger for pointing this out. 8ac76e51641af1581061303989926533efb44507 DeLynn Berry delynn@gmail.com