paranoia 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e9ddf3be1c331ce833d233557bdf81876c68768
-  data.tar.gz: 8fb6cc8d861471436bbddda7331923395650eadb
+  metadata.gz: 3024de08e3ab1e77b80e2f9ad7b975f0b642d204
+  data.tar.gz: 05e1fa475bbc9a4db39cec410375d7f33d8f09b4
 SHA512:
-  metadata.gz: 086ef0efc989048c0c41c1f00127664cfedf49a4c356e3315f1e87bf7b5d4bdd48bf1d299580d31126e8fc54de84ca231318511c199ec1c4be502068a44dc060
-  data.tar.gz: ce2574eaf67cf0d570e7139f3ea5f3bd09090449f55d577f955182661cc6204b62a7188d24dbf44422ca423ed6da126e654a6bd5bf1a005ab978f33e0a092c48
+  metadata.gz: f03869fc8a9c06d6fe005db5deaea540240b05aa65b707698e4a47bcaabef77fc24541777c90e3401060340afa1fc26940ef49e2ac3d0df66b8f6d2d7bf56389
+  data.tar.gz: d60317d533c98f1ca9cf157467fb122a969dc530f022f59a1a98006f4a6b2adef0e741993dd65ab84fb61d3fd63abed36bacffddded47dcfdc6c8a1eb3b13e5c

data/README.md

@@ -4,12 +4,28 @@ Paranoia is a re-implementation of [acts\_as\_paranoid](http://github.com/techno
 
 You would use either plugin / gem if you wished that when you called `destroy` on an Active Record object that it didn't actually destroy it, but just "hid" the record. Paranoia does this by setting a `deleted_at` field to the current time when you `destroy` a record, and hides it by scoping all queries on your model to only include records which do not have a `deleted_at` field.
 
+If you wish to actually destroy an object you may call destroy! on it or simply call destroy twice on the same object.
+
 ## Installation & Usage
 
-Put this in your Gemfile:
+For Rails 3, please use version 1 of Paranoia:
+
+```ruby
+gem 'paranoia', '~> 1.0'
+```
+
+For Rails 4, please use version 2 of Paranoia:
+
+```ruby
+gem 'paranoia', '~> 2.0'
+```
+
+Of course you can install this from GitHub as well:
 
 ```ruby
-gem 'paranoia'
+gem 'paranoia', :github => 'radar/paranoia', :branch => 'master'
+# or
+gem 'paranoia', :github => 'radar/paranoia', :branch => 'rails4'
 ```
 
 Then run:

data/lib/paranoia.rb

@@ -1,17 +1,45 @@
 module Paranoia
   def self.included(klazz)
     klazz.extend Query
+    klazz.extend Callbacks
   end
 
   module Query
     def paranoid? ; true ; end
 
+    def with_deleted
+      all.tap { |x| x.default_scoped = false }
+    end
+
     def only_deleted
-      all.tap { |x| x.default_scoped = false }.where.not(deleted_at: nil)
+      with_deleted.where.not(deleted_at: nil)
     end
+    alias :deleted :only_deleted
 
-    def with_deleted
-      all.tap { |x| x.default_scoped = false }
+    def restore(id)
+      if id.is_a?(Array)
+        id.map { |one_id| restore(one_id) }
+      else
+        only_deleted.find(id).restore!
+      end
+    end
+  end
+
+  module Callbacks
+    def self.extended(klazz)
+      klazz.define_callbacks :restore
+
+      klazz.define_singleton_method("before_restore") do |*args, &block|
+        set_callback(:restore, :before, *args, &block)
+      end
+
+      klazz.define_singleton_method("around_restore") do |*args, &block|
+        set_callback(:restore, :around, *args, &block)
+      end
+
+      klazz.define_singleton_method("after_restore") do |*args, &block|
+        set_callback(:restore, :after, *args, &block)
+      end
     end
   end
 
@@ -20,16 +48,16 @@ module Paranoia
   end
 
   def delete
-    return if new_record? or destroyed?
-    update_column :deleted_at, Time.now
+    return if new_record?
+    destroyed? ? destroy! : update_column(:deleted_at, Time.now)
   end
 
   def restore!
-    update_column :deleted_at, nil
+    run_callbacks(:restore) { update_column :deleted_at, nil }
   end
 
   def destroyed?
-    !self.deleted_at.nil?
+    !!deleted_at
   end
   alias :deleted? :destroyed?
 end
@@ -39,7 +67,7 @@ class ActiveRecord::Base
     alias :destroy! :destroy
     alias :delete!  :delete
     include Paranoia
-    default_scope { where(:deleted_at => nil) }
+    default_scope { where(self.quoted_table_name + '.deleted_at IS NULL') }
   end
 
   def self.paranoid? ; false ; end

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/test/paranoia_test.rb

@@ -71,7 +71,7 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal 0, model.class.count
     assert_equal 1, model.class.unscoped.count
   end
-  
+
   def test_scoping_behavior_for_paranoid_models
     ParanoidModel.unscoped.delete_all
     parent1 = ParentModel.create
@@ -82,6 +82,7 @@ class ParanoiaTest < Test::Unit::TestCase
     p2.destroy
     assert_equal 0, parent1.paranoid_models.count
     assert_equal 1, parent1.paranoid_models.only_deleted.count
+    assert_equal 1, parent1.paranoid_models.deleted.count
     p3 = ParanoidModel.create(:parent_model => parent1)
     assert_equal 2, parent1.paranoid_models.with_deleted.count
     assert_equal [p1,p3], parent1.paranoid_models.with_deleted
@@ -188,6 +189,30 @@ class ParanoiaTest < Test::Unit::TestCase
     assert_equal false, model.destroyed?
   end
 
+  def test_destroy_twice
+    model = ParanoidModel.new
+    model.save
+    model.destroy
+    model.destroy
+
+    assert_equal 0, ParanoidModel.unscoped.where(id: model.id).count
+  end
+
+  def test_restore_behavior_for_callbacks
+    model = CallbackModel.new
+    model.save
+    id = model.id
+    model.destroy
+
+    assert model.destroyed?
+
+    model = CallbackModel.only_deleted.find(id)
+    model.restore!
+    model.reload
+
+    assert model.instance_variable_get(:@restore_callback_called)
+  end
+
   def test_real_destroy
     model = ParanoidModel.new
     model.save
@@ -204,6 +229,33 @@ class ParanoiaTest < Test::Unit::TestCase
     refute ParanoidModel.unscoped.exists?(model.id)
   end
 
+  def test_multiple_restore
+    a = ParanoidModel.new
+    a.save
+    a_id = a.id
+    a.destroy
+
+    b = ParanoidModel.new
+    b.save
+    b_id = b.id
+    b.destroy
+
+    c = ParanoidModel.new
+    c.save
+    c_id = c.id
+    c.destroy
+
+    ParanoidModel.restore([a_id, c_id])
+
+    a.reload
+    b.reload
+    c.reload
+
+    refute a.destroyed?
+    assert b.destroyed?
+    refute c.destroyed?
+  end
+
   private
   def get_featureful_model
     FeaturefulModel.new(:name => "not empty")
@@ -232,6 +284,7 @@ end
 class CallbackModel < ActiveRecord::Base
   acts_as_paranoid
   before_destroy {|model| model.instance_variable_set :@callback_called, true }
+  before_restore {|model| model.instance_variable_set :@restore_callback_called, true }
 end
 
 class ParentModel < ActiveRecord::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: paranoia
-rubygems_version: 2.0.0
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, using much,