nay-record_with_operator 0.0.4 → 0.0.5

data/Rakefile

@@ -12,7 +12,7 @@ DESCRIPTION = "Rails plugin to set created_by, updated_by, deleted_by to ActiveR
 GITHUB_PROJECT = "record_with_operator"
 HOMEPAGE = "http://github.com/nay/#{GITHUB_PROJECT}/tree"
 BIN_FILES = %w( )
-VER = "0.0.4"
+VER = "0.0.5"
 CLEAN.include ['pkg']
 
 desc 'Default: run unit tests.'

data/lib/record_with_operator.rb

@@ -141,7 +141,8 @@ module RecordWithOperator
 
   def set_deleted_by
     return unless respond_to?(:deleted_by=) && operator
-    self.updated_by = operator.id
+    self.deleted_by = operator.id
+    save!
   end
 
 end

data/test/record_with_operator_test.rb

@@ -9,16 +9,25 @@ class NoteWithUser < ActiveRecord::Base
 
   named_scope :new_arrivals, {:order => "updated_at desc"}
 
-  def destroy_with_deleted_at
-    NoteWithUser.update_all("deleted_at = '#{Time.now.to_s(:db)}'", "id = #{self.id}")
+  def destroy_without_callbacks
+    unless new_record?
+      self.class.update_all self.class.send(:sanitize_sql, ["deleted_at = ?", (self.deleted_at = default_timezone == :utc ? Time.now.utc : Time.now)]), ["#{self.class.primary_key} = ?", id]
+    end
+    freeze
   end
-  alias_method_chain :destroy, :deleted_at
-  def destory!
-    destory_without_deleted_at
+
+  def destroy_with_callbacks!
+    return false if callback(:before_destroy) == false
+    result = destroy_without_callbacks!
+    callback(:after_destroy)
+    result
+  end
+  def destroy!
+    transaction { destroy_with_callbacks! }
   end
 
   def deleted?
-    self.deleted_at <= Time.now
+    self.deleted_at.to_time <= Time.now
   end
 end
 
@@ -46,7 +55,9 @@ class RecordWithOperatorTest < ActiveSupport::TestCase
   def setup
     RecordWithOperator.config[:user_class_name] = "User"
     @user1 = User.create!(:name => "user1")
+    raise "@user1.id is nil" unless @user1.id
     @user2 = User.create!(:name => "user2")
+    raise "@user2.id is nil" unless @user2.id
     @note_created_by_user1 = NoteWithUser.create!(:body => "test", :operator => @user1)
   end
 
@@ -137,9 +148,9 @@ class RecordWithOperatorTest < ActiveSupport::TestCase
   def test_note_should_be_destroyed_with_deleted_by
     note = NoteWithUser.find(@note_created_by_user1.id, :for => @user2)
     note.destroy # logically
-    note.reload
+    note = NoteWithUser.find(@note_created_by_user1.id)
     raise "not deleted" unless note.deleted?
-    assert @user2.id, note.deleted_by
+    assert_equal @user2.id, note.deleted_by
   end
 
   # reload

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nay-record_with_operator
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Yasuko Ohba
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - lib/record_with_operator.rb
 - tasks/record_with_operator_tasks.rake
 - test/database.yml
+- test/debug.log
 - test/record_with_operator_belongs_to_association_test.rb
 - test/record_with_operator_has_one_association_test.rb
 - test/record_with_operator_test.rb
@@ -78,6 +79,7 @@ specification_version: 2
 summary: Rails plugin to set created_by, updated_by, deleted_by to ActiveRecord objects. Supports associations.
 test_files: 
 - test/database.yml
+- test/debug.log
 - test/record_with_operator_belongs_to_association_test.rb
 - test/record_with_operator_has_one_association_test.rb
 - test/record_with_operator_test.rb