@@ -27,7 +27,7 @@ UserStamp.updater_attribute = :updater_id UserStamp.current_user_method = :current_user class UserStampSweeper < ActionController::Caching::Sweeper - def before_save(record) + def before_validation(record) return unless current_user if record.respond_to?(UserStamp.creator_assignment_method) && record.new_record? lib/user_stamp.rb @@ -6,7 +6,7 @@ class PostsController end end -describe UserStampSweeper, "#before_save" do +describe UserStampSweeper, "#before_validation" do before do UserStamp.creator_attribute = :creator_id UserStamp.updater_attribute = :updater_id @@ -19,14 +19,14 @@ describe UserStampSweeper, "#before_save" do it "should set creator_id if attribute exists" do record = mock('Record', :creator_id= => nil, :updater_id= => nil, :new_record? => true) record.should_receive(:creator_id=).with(220).once - @sweeper.before_save(record) + @sweeper.before_validation(record) end it "should NOT set creator_id if attribute does not exist" do record = mock('Record', :new_record? => true, :updater_id= => nil, :respond_to? => false) record.should_receive(:respond_to?).with("creator_id=").and_return(false) record.should_not_receive(:creator_id=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end end @@ -34,31 +34,31 @@ describe UserStampSweeper, "#before_save" do it "should NOT set creator_id if attribute exists" do record = mock('Record', :creator_id= => nil, :updater_id= => nil, :new_record? => false) record.should_not_receive(:creator_id=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end it "should NOT set creator_id if attribute does not exist" do record = mock('Record', :updater_id= => nil, :new_record? => false) record.should_not_receive(:creator_id=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end end it "should set updater_id if attribute exists" do record = mock('Record', :creator_id= => nil, :updater_id= => nil, :new_record? => :false) record.should_receive(:updater_id=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end it "should NOT set updater_id if attribute does not exist" do record = mock('Record', :creator_id= => nil, :updater_id= => nil, :new_record? => :false, :respond_to? => false) record.should_receive(:respond_to?).with("updater_id=").and_return(false) record.should_not_receive(:updater_id=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end end -describe UserStampSweeper, "#before_save (with custom attribute names)" do +describe UserStampSweeper, "#before_validation (with custom attribute names)" do before do UserStamp.creator_attribute = :created_by UserStamp.updater_attribute = :updated_by @@ -71,14 +71,14 @@ describe UserStampSweeper, "#before_save (with custom attribute names)" do it "should set created_by if attribute exists" do record = mock('Record', :created_by= => nil, :updated_by= => nil, :new_record? => true) record.should_receive(:created_by=).with(220).once - @sweeper.before_save(record) + @sweeper.before_validation(record) end it "should NOT set created_by if attribute does not exist" do record = mock('Record', :new_record? => true, :updated_by= => nil, :respond_to? => false) record.should_receive(:respond_to?).with("created_by=").and_return(false) record.should_not_receive(:created_by=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end end @@ -86,27 +86,27 @@ describe UserStampSweeper, "#before_save (with custom attribute names)" do it "should NOT set created_by if attribute exists" do record = mock('Record', :created_by= => nil, :updated_by= => nil, :new_record? => false) record.should_not_receive(:created_by=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end it "should NOT set created_by if attribute does not exist" do record = mock('Record', :updated_by= => nil, :new_record? => false) record.should_not_receive(:created_by=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end end it "should set updated_by if attribute exists" do record = mock('Record', :created_by= => nil, :updated_by= => nil, :new_record? => :false) record.should_receive(:updated_by=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end it "should NOT set updated_by if attribute does not exist" do record = mock('Record', :created_by= => nil, :updated_by= => nil, :new_record? => :false, :respond_to? => false) record.should_receive(:respond_to?).with("updated_by=").and_return(false) record.should_not_receive(:updated_by=) - @sweeper.before_save(record) + @sweeper.before_validation(record) end end spec/user_stamp_sweeper_spec.rb 97f0a85f9241112182d6f43341e06aa3631b67d2 John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/user_stamp/commit/93d38c83c18919220a83914e4ae5c930c2548ca8 93d38c83c18919220a83914e4ae5c930c2548ca8 2009-03-11T11:03:54-07:00 2009-03-11T11:03:54-07:00 Changed sweeper from before_save to before_validation. This allows using the stamped users in validations which is handy for simple authorization stuff. d6266945e5757244668726e0867ec0b6e4b20995 John Nunemaker nunemaker@gmail.com