paranoia 2.0.5 → 2.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd7736219b3968e111105e25de4553f328a744c
-  data.tar.gz: 3df48b961122c079b3565a2b3cc1f48b7b940fea
+  metadata.gz: 6b11cd914e35d9fcb7f01a85d9d9e5be2eddcc44
+  data.tar.gz: 095902bb8c728930c4058153cae56080074ca7c8
 SHA512:
-  metadata.gz: 1df4bb3d86bcf7dcb932a11139acc9d68b8edadea446f64acdf370e9cde9b455684bf261f839949a826fcba3a77490252c6b15d027ad1cc4dc7853ca6ad702a7
-  data.tar.gz: 61751265887e6a270b906433b9b3b03688344d683492abb2cbf4d91fa03f10f2b3db9c02b9e506b66175366e0581702671d2c54311b960dcdcba93238d2e9856
+  metadata.gz: 805b2fd483083762d26a1e4caa796c5af936f6a2e585e71753fc822326aa0978552746b236cd2f752d1f1591a37b8e171beb9dbd204010f985d979605a797b2c
+  data.tar.gz: d10fbd300d9ddf5e969c81f78a97312aac7160d46f7545351617fe6deb35c4e00b5b12ddb05a0ae1c4a2803683f5ecfbbd740a94bb4bc1c1ab3a6ead85e8db97

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
   - jruby-19mode
 
 env:

data/README.md

@@ -139,7 +139,7 @@ Client.only_deleted
 If you want to check if a record is soft-deleted:
 
 ``` ruby
-client.destroyed?
+client.paranoia_destroyed?
 # or
 client.deleted?
 ```

data/lib/paranoia.rb

@@ -57,27 +57,15 @@ module Paranoia
   end
 
   def destroy
-    callbacks_result = transaction do
+    transaction do
       run_callbacks(:destroy) do
         touch_paranoia_column
       end
     end
-    callbacks_result ? self : false
-  end
-
-  # As of Rails 4.1.0 +destroy!+ will no longer remove the record from the db
-  # unless you touch the paranoia column before.
-  # We need to override it here otherwise children records might be removed
-  # when they shouldn't
-  if ActiveRecord::VERSION::STRING >= "4.1"
-    def destroy!
-      destroyed? ? super : destroy || raise(ActiveRecord::RecordNotDestroyed)
-    end
   end
 
   def delete
-    return if new_record?
-    touch_paranoia_column(false)
+    touch_paranoia_column
   end
 
   def restore!(opts = {})
@@ -98,10 +86,10 @@ module Paranoia
   end
   alias :restore :restore!
 
-  def destroyed?
+  def paranoia_destroyed?
     send(paranoia_column) != paranoia_sentinel_value
   end
-  alias :deleted? :destroyed?
+  alias :deleted? :paranoia_destroyed?
 
   private
 
@@ -109,16 +97,13 @@ module Paranoia
   # insert time to paranoia column.
   # @param with_transaction [Boolean] exec with ActiveRecord Transactions.
   def touch_paranoia_column(with_transaction=false)
-    # This method is (potentially) called from really_destroy
-    # The object the method is being called on may be frozen
-    # Let's not touch it if it's frozen.
-    unless self.frozen?
-      if with_transaction
-        with_transaction_returning_status { touch(paranoia_column) }
-      else
-        touch(paranoia_column)
-      end
+    raise ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
+    if persisted?
+      touch(paranoia_column)
+    elsif !frozen?
+      write_attribute(paranoia_column, current_time_from_proper_timezone)
     end
+    self
   end
 
   # restore associated records that have been soft deleted when
@@ -165,27 +150,30 @@ end
 
 class ActiveRecord::Base
   def self.acts_as_paranoid(options={})
-    alias :destroy! :destroy
-    alias :delete! :delete
+    alias :really_destroyed? :destroyed?
+    alias :really_delete :delete
+
+    alias :destroy_without_paranoia :destroy
     def really_destroy!
       dependent_reflections = self.class.reflections.select do |name, reflection|
         reflection.options[:dependent] == :destroy
       end
       if dependent_reflections.any?
-        dependent_reflections.each do |name, _|
-          associated_records = self.send(name)
+        dependent_reflections.each do |name, reflection|
+          association_data = self.send(name)
           # has_one association can return nil
-          if associated_records && associated_records.respond_to?(:with_deleted)
-            # Paranoid models will have this method, non-paranoid models will not
-            associated_records.with_deleted.each(&:really_destroy!)
-            self.send(name).reload
-          elsif associated_records && !associated_records.respond_to?(:each) # single record
-            associated_records.really_destroy!
+          # .paranoid? will work for both instances and classes
+          if association_data && association_data.paranoid?
+            if reflection.collection?
+              association_data.with_deleted.each(&:really_destroy!)
+            else
+              association_data.really_destroy!
+            end
           end
         end
       end
-      touch_paranoia_column if ActiveRecord::VERSION::STRING >= "4.1"
-      destroy!
+      write_attribute(paranoia_column, current_time_from_proper_timezone)
+      destroy_without_paranoia
     end
 
     include Paranoia
@@ -220,13 +208,6 @@ class ActiveRecord::Base
   def self.paranoid? ; false ; end
   def paranoid? ; self.class.paranoid? ; end
 
-  # Override the persisted method to allow for the paranoia gem.
-  # If a paranoid record is selected, then we only want to check
-  # if it's a new record, not if it is "destroyed".
-  def persisted?
-    paranoid? ? !new_record? : super
-  end
-
   private
 
   def paranoia_column

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "2.0.5"
+  VERSION = "2.1.0.pre"
 end

data/test/paranoia_test.rb

@@ -1,13 +1,9 @@
 require 'active_record'
 ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::VERSION::STRING >= '4.2'
 
-test_framework = if ActiveRecord::VERSION::STRING >= "4.1"
-  require 'minitest/autorun'
-  MiniTest::Test
-else
-  require 'test/unit'
-  Test::Unit::TestCase
-end
+require 'minitest/autorun'
+test_framework = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
+
 require File.expand_path(File.dirname(__FILE__) + "/../lib/paranoia")
 
 def connect!
@@ -136,6 +132,13 @@ class ParanoiaTest < test_framework
     assert_equal 1, model.class.unscoped.count
   end
 
+  def test_update_columns_on_paranoia_destroyed
+    record = ParentModel.create
+    record.destroy
+
+    assert record.update_columns deleted_at: Time.now
+  end
+
   def test_scoping_behavior_for_paranoid_models
     parent1 = ParentModel.create
     parent2 = ParentModel.create
@@ -160,7 +163,7 @@ class ParanoiaTest < test_framework
     model.destroy
 
     assert_equal false, model.destroyed_at.nil?
-    assert model.destroyed?
+    assert model.paranoia_destroyed?
 
     assert_equal 0, model.class.count
     assert_equal 1, model.class.unscoped.count
@@ -181,7 +184,7 @@ class ParanoiaTest < test_framework
     model.destroy
 
     assert DateTime.new(0) != model.deleted_at
-    assert model.destroyed?
+    assert model.paranoia_destroyed?
 
     assert_equal 0, model.class.count
     assert_equal 1, model.class.unscoped.count
@@ -284,19 +287,61 @@ class ParanoiaTest < test_framework
     assert model.instance_variable_get(:@destroy_callback_called)
   end
 
+  def test_destroy_on_readonly_record
+    # Just to demonstrate the AR behaviour
+    model = NonParanoidModel.create!
+    model.readonly!
+    assert_raises ActiveRecord::ReadOnlyRecord do
+      model.destroy
+    end
+
+    # Mirrors behaviour above
+    model = ParanoidModel.create!
+    model.readonly!
+    assert_raises ActiveRecord::ReadOnlyRecord do
+      model.destroy
+    end
+  end
+
+  def test_destroy_on_really_destroyed_record
+    model = ParanoidModel.create!
+    model.really_destroy!
+    assert model.really_destroyed?
+    assert model.paranoia_destroyed?
+    model.destroy
+    assert model.really_destroyed?
+    assert model.paranoia_destroyed?
+  end
+
+  def test_destroy_on_unsaved_record
+    # Just to demonstrate the AR behaviour
+    model = NonParanoidModel.new
+    model.destroy!
+    assert model.really_destroyed?
+    model.destroy!
+    assert model.really_destroyed?
+
+    # Mirrors behaviour above
+    model = ParanoidModel.new
+    model.destroy!
+    assert model.paranoia_destroyed?
+    model.destroy!
+    assert model.paranoia_destroyed?
+  end
+
   def test_restore
     model = ParanoidModel.new
     model.save
     id = model.id
     model.destroy
 
-    assert model.destroyed?
+    assert model.paranoia_destroyed?
 
     model = ParanoidModel.only_deleted.find(id)
     model.restore!
     model.reload
 
-    assert_equal false, model.destroyed?
+    assert_equal false, model.paranoia_destroyed?
   end
 
   def test_restore_on_object_return_self
@@ -316,6 +361,16 @@ class ParanoiaTest < test_framework
     assert_equal 1, ParanoidModel.unscoped.where(id: model.id).count
   end
 
+  # Regression test for #92
+  def test_destroy_bang_twice
+    model = ParanoidModel.new
+    model.save!
+    model.destroy!
+    model.destroy!
+
+    assert_equal 1, ParanoidModel.unscoped.where(id: model.id).count
+  end
+
   def test_destroy_return_value_on_success
     model = ParanoidModel.create
     return_value = model.destroy
@@ -336,7 +391,7 @@ class ParanoiaTest < test_framework
     id = model.id
     model.destroy
 
-    assert model.destroyed?
+    assert model.paranoia_destroyed?
 
     model = CallbackModel.only_deleted.find(id)
     model.restore!
@@ -354,9 +409,15 @@ class ParanoiaTest < test_framework
 
   def test_real_destroy_dependent_destroy
     parent = ParentModel.create
-    child = parent.very_related_models.create
+    child1 = parent.very_related_models.create
+    child2 = parent.non_paranoid_models.create
+    child3 = parent.create_non_paranoid_model
+
     parent.really_destroy!
-    refute RelatedModel.unscoped.exists?(child.id)
+
+    refute RelatedModel.unscoped.exists?(child1.id)
+    refute NonParanoidModel.unscoped.exists?(child2.id)
+    refute NonParanoidModel.unscoped.exists?(child3.id)
   end
 
   def test_real_destroy_dependent_destroy_after_normal_destroy
@@ -378,19 +439,10 @@ class ParanoiaTest < test_framework
     assert RelatedModel.unscoped.exists?(child_2.id)
   end
 
-  if ActiveRecord::VERSION::STRING < "4.1"
-    def test_real_destroy
-      model = ParanoidModel.new
-      model.save
-      model.destroy!
-      refute ParanoidModel.unscoped.exists?(model.id)
-    end
-  end
-
-  def test_real_delete
+  def test_really_delete
     model = ParanoidModel.new
     model.save
-    model.delete!
+    model.really_delete
 
     refute ParanoidModel.unscoped.exists?(model.id)
   end
@@ -417,9 +469,9 @@ class ParanoiaTest < test_framework
     b.reload
     c.reload
 
-    refute a.destroyed?
-    assert b.destroyed?
-    refute c.destroyed?
+    refute a.paranoia_destroyed?
+    assert b.paranoia_destroyed?
+    refute c.paranoia_destroyed?
   end
 
   def test_restore_with_associations
@@ -750,6 +802,7 @@ class ParentModel < ActiveRecord::Base
   has_many :related_models
   has_many :very_related_models, :class_name => 'RelatedModel', dependent: :destroy
   has_many :non_paranoid_models, dependent: :destroy
+  has_one :non_paranoid_model, dependent: :destroy
   has_many :asplode_models, dependent: :destroy
   has_one :polymorphic_model, as: :parent, dependent: :destroy
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0.pre
 platform: ruby
 authors:
 - radarlistener@gmail.com