paranoia 1.0.3 → 1.1.0

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    paranoia (1.1.0)
+      activerecord (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.8)
+      activesupport (= 3.0.8)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.8)
+    arel (2.0.10)
+    builder (2.1.2)
+    i18n (0.5.0)
+    rake (0.8.7)
+    sqlite3 (1.3.3)
+    tzinfo (0.3.28)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  paranoia!
+  rake (= 0.8.7)
+  sqlite3

data/README.md

@@ -34,13 +34,25 @@ Then run:
 
     rake gems:install
 
+#### Run your migrations for the desired models
+
+    class AddDeletedAtToClient < ActiveRecord::Migration
+      def self.up
+        add_column :clients, :deleted_at, :datetime
+      end
+
+      def self.down
+        remove_column :clients, :deleted_at
+      end
+    end
+    
 ### Usage
 
 #### In your model:
 
     class Client < ActiveRecord::Base
       acts_as_paranoid
-      
+
       ...
     end
 
@@ -60,6 +72,16 @@ If you want a method to be called on destroy, simply provide a _before\_destroy_
       ...
     end
 
+You can replace the older acts_as_paranoid methods as follows:
+
+    find_with_deleted(:all)       # => unscoped
+    find_with_deleted(:first)     # => unscoped.first
+    find_with_deleted(id)         # => unscoped.find(id)
+
+    find_only_deleted(:all)       # => only_deleted
+    find_only_deleted(:first)     # => only_deleted.first
+    find_only_deleted(id)         # => only_deleted.find(id)
+
 ## License
 
 This gem is released under the MIT license.

data/Rakefile

@@ -3,6 +3,6 @@ Bundler::GemHelper.install_tasks
 
 task :test do
   Dir['test/*_test.rb'].each do |testfile|
-      load testfile
+    load testfile
   end
 end

data/lib/paranoia.rb

@@ -5,24 +5,38 @@ module Paranoia
 
   module Query
     def paranoid? ; true ; end
+
+    def only_deleted
+      unscoped {
+        where("deleted_at is not null")
+      }
+    end
   end
 
   def destroy
-    _run_destroy_callbacks
+    _run_destroy_callbacks { delete }
+  end
+
+  def delete    
     self.update_attribute(:deleted_at, Time.now) if !deleted? && persisted?
     freeze
   end
-  alias :delete :destroy
+  
+  def restore!
+    update_attribute :deleted_at, nil
+  end
 
   def destroyed?
-    !self[:deleted_at].nil?
+    !self.deleted_at.nil?
   end
   alias :deleted? :destroyed?
 end
 
 class ActiveRecord::Base
   def self.acts_as_paranoid
-    self.send(:include, Paranoia)
+    alias_method :destroy!, :destroy
+    alias_method :delete!,  :delete
+    include Paranoia
     default_scope :conditions => { :deleted_at => nil }
   end
 

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/paranoia.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "paranoia"
   s.version     = Paranoia::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = []
+  s.authors     = ["radarlistener@gmail.com"]
   s.email       = []
   s.homepage    = "http://rubygems.org/gems/paranoia"
   s.summary     = "acts_as_paranoid, without the clusterfuck"

data/test/paranoia_test.rb

@@ -11,6 +11,7 @@ ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => DB_F
 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)'
+ActiveRecord::Base.connection.execute 'CREATE TABLE callback_models (id INTEGER NOT NULL PRIMARY KEY, deleted_at DATETIME)'
 
 class ParanoiaTest < Test::Unit::TestCase
   def test_plain_model_class_is_not_paranoid
@@ -29,26 +30,26 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal true, ParanoidModel.new.paranoid?
   end
 
-  def test_delete_behavior_for_plain_models
+  def test_destroy_behavior_for_plain_models
     model = PlainModel.new
     assert_equal 0, model.class.count
     model.save!
     assert_equal 1, model.class.count
-    model.delete
+    model.destroy
 
     assert_equal true, model.deleted_at.nil?
     assert model.frozen?
-    
+
     assert_equal 0, model.class.count
     assert_equal 0, model.class.unscoped.count
   end
 
-  def test_delete_behavior_for_paranoid_models
+  def test_destroy_behavior_for_paranoid_models
     model = ParanoidModel.new
     assert_equal 0, model.class.count
     model.save!
     assert_equal 1, model.class.count
-    model.delete
+    model.destroy
 
     assert_equal false, model.deleted_at.nil?
     assert model.frozen?
@@ -58,19 +59,74 @@ class ParanoiaTest < Test::Unit::TestCase
 
   end
 
-  def test_delete_behavior_for_featureful_paranoid_models
+  def test_destroy_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
+    model.destroy
 
     assert_equal false, model.deleted_at.nil?
-    
+
     assert_equal 0, model.class.count
     assert_equal 1, model.class.unscoped.count
   end
 
+  def test_only_destroyed_scope_for_paranoid_models
+    model = ParanoidModel.new
+    model.save
+    model.destroy
+    model2 = ParanoidModel.new
+    model2.save
+
+    assert_equal model, ParanoidModel.only_deleted.last
+    assert_equal false, ParanoidModel.only_deleted.include?(model2)
+  end
+  
+  def test_delete_behavior_for_callbacks
+    model = CallbackModel.new
+    model.save
+    model.delete
+    assert_equal nil, model.instance_variable_get(:@callback_called)
+  end
+  
+  def test_destroy_behavior_for_callbacks
+    model = CallbackModel.new
+    model.save
+    model.destroy
+    assert model.instance_variable_get(:@callback_called)
+  end
+  
+  def test_restore
+    model = ParanoidModel.new
+    model.save
+    id = model.id
+    model.destroy
+    
+    assert model.destroyed?
+    
+    model = ParanoidModel.only_deleted.find(id)
+    model.restore!
+    
+    assert_equal false, model.destroyed?
+  end
+  
+  def test_real_destroy
+    model = ParanoidModel.new
+    model.save
+    model.destroy!
+    
+    assert_equal false, ParanoidModel.unscoped.exists?(model.id)
+  end
+  
+  def test_real_delete
+    model = ParanoidModel.new
+    model.save
+    model.delete!
+    
+    assert_equal false, ParanoidModel.unscoped.exists?(model.id)
+  end
+
   private
   def get_featureful_model
     FeaturefulModel.new(:name => "not empty")
@@ -90,3 +146,8 @@ end
 
 class PlainModel < ActiveRecord::Base
 end
+
+class CallbackModel < ActiveRecord::Base
+  acts_as_paranoid
+  before_destroy {|model| model.instance_variable_set :@callback_called, true }
+end

metadata

@@ -2,15 +2,15 @@
 name: paranoia
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
-authors: []
-
+authors: 
+- radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +10:00
+date: 2011-07-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - lib/paranoia.rb