paranoia 1.0.1 → 1.0.2

data/lib/paranoia.rb

@@ -9,8 +9,7 @@ module Paranoia
 
   def destroy
     _run_destroy_callbacks
-    self[:deleted_at] ||= Time.now
-    self.save    
+    self.update_attribute(:deleted_at, Time.now) if !deleted? && persisted?
   end
   alias :delete :destroy
 

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/paranoia.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.add_dependency "activerecord", ">= 3.0.0"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "rake", "0.8.7"
   
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/test/paranoia_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'active_record'
-require 'lib/paranoia'
+require File.expand_path(File.dirname(__FILE__) + "/../lib/paranoia")
 
 DB_FILE = 'tmp/test_db'
 
@@ -8,8 +8,9 @@ FileUtils.mkdir_p File.dirname(DB_FILE)
 FileUtils.rm_f DB_FILE
 
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => DB_FILE
-ActiveRecord::Base.connection.execute 'CREATE TABLE paranoid_models (id INTEGER NOT NULL PRIMARY KEY)'
-ActiveRecord::Base.connection.execute 'CREATE TABLE plain_models (id INTEGER NOT NULL PRIMARY KEY)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE paranoid_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE featureful_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME, name VARCHAR(32))'
+ActiveRecord::Base.connection.execute 'CREATE TABLE plain_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
 
 class ParanoiaTest < Test::Unit::TestCase
   def test_plain_model_class_is_not_paranoid
@@ -28,6 +29,50 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal true, ParanoidModel.new.paranoid?
   end
 
+  def test_delete_behavior_for_plain_models
+    model = PlainModel.new
+    assert_equal 0, model.class.count
+    model.save!
+    assert_equal 1, model.class.count
+    model.delete
+
+    assert_equal true, model.deleted_at.nil?
+    
+    assert_equal 0, model.class.count
+    assert_equal 0, model.class.unscoped.count
+  end
+
+  def test_delete_behavior_for_paranoid_models
+    model = ParanoidModel.new
+    assert_equal 0, model.class.count
+    model.save!
+    assert_equal 1, model.class.count
+    model.delete
+
+    assert_equal false, model.deleted_at.nil?
+
+    assert_equal 0, model.class.count
+    assert_equal 1, model.class.unscoped.count
+
+  end
+
+  def test_delete_behavior_for_featureful_paranoid_models
+    model = get_featureful_model
+    assert_equal 0, model.class.count
+    model.save!
+    assert_equal 1, model.class.count
+    model.delete
+
+    assert_equal false, model.deleted_at.nil?
+    
+    assert_equal 0, model.class.count
+    assert_equal 1, model.class.unscoped.count
+  end
+
+  private
+  def get_featureful_model
+    FeaturefulModel.new(:name => "not empty")
+  end
 end
 
 # Helper classes
@@ -36,5 +81,10 @@ class ParanoidModel < ActiveRecord::Base
   acts_as_paranoid
 end
 
+class FeaturefulModel < ActiveRecord::Base
+  acts_as_paranoid
+  validates :name, :presence => true, :uniqueness => true
+end
+
 class PlainModel < ActiveRecord::Base
 end

metadata

@@ -2,7 +2,7 @@
 name: paranoia
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 +10:00
+date: 2011-05-25 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,28 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  version_requirements: *id004
 description: acts_as_paranoid, without the clusterfuck
 email: []