acts_as_paranoid 0.4.5 → 0.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57c69c6d7676bda21b0f8da016bd556f77003894
-  data.tar.gz: 5293e8a3b417fecdfe117aefddcd8e2a0d2f4b09
+  metadata.gz: 6e4085cb11f666dff4eb490e4214f010f46216ab
+  data.tar.gz: 7c694f1b21233c47299c523696111a7fc4454194
 SHA512:
-  metadata.gz: 8ae49e59c2f487c80243bb42c4d6e33c4f1676ecd0d039ba420c1e1e49e02b83a4c6635515d1ef53dd4ba0c68ebce427b386ce684992d4139ef2e4c638f61dd5
-  data.tar.gz: f449a10feae541515688ed6c55446aa815025982f293a2375c44ec74b68a8cfe7928abc1dffee3758a868bca4d6d92eb13632642bb0dc40279d47e5973a7bfb0
+  metadata.gz: 2910ee9bdae09c7e52d7c7157c57192dda2b6b72fb7ef4b5cbf2055c47ba40f7f7505bc26f781a46acd55a2d079ee5ac0dc8c6c0225e5367173e3db0c7b7d70b
+  data.tar.gz: d0c8fbaffa54e3052f031c1e3bb94d6baefb186277386674da739a9d3e288d670e4c6c7a7afa3c760c492cd03680fa6845c1ca0f13f120564f773c343a477821

data/README.md

@@ -1,10 +1,16 @@
 # ActsAsParanoid
 
-[![Build Status](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid.png?branch=0-4-stable)](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid)
+[![Build Status](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid.png?branch=master)](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid)
 
-A simple plugin which hides records instead of deleting them, being able to recover them.
+A Rails plugin to add soft delete.
 
-**This branch targets Rails 3.2.** If you're working with another version, switch to the corresponding branch.
+This gem can be used to hide records instead of deleting them, making them recoverable later.
+
+## Support
+
+**This branch targets Rails 4.x.**
+
+If you're working with another version, switch to the corresponding branch, or require an older version of the acts_as_paranoid gem.
 
 ## Usage
 
@@ -212,32 +218,9 @@ Watch out for these caveats:
 -   You cannot name association `*_with_deleted`
 -   `unscoped` will return all records, deleted or not
 
-# Support
-
-This gem supports the most recent versions of Rails and Ruby.
-
-## Rails
-
-For Rails 3.2 check the README at the [rails3.2](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.2) branch and add this to your Gemfile:
-
-    gem "acts_as_paranoid", "~> 0.4.0"
-
-For Rails 3.1 check the README at the [rails3.1](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.1) branch and add this to your Gemfile:
-
-    gem "rails3_acts_as_paranoid", "~>0.1.4"
-
-For Rails 3.0 check the README at the [rails3.0](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.0) branch and add this to your Gemfile:
-
-    gem "rails3_acts_as_paranoid", "~>0.0.9"
-
-
-## Ruby
-
-This gem is tested on Ruby 1.9, JRuby and Rubinius (both in 1.9 mode).
-
-
 # Acknowledgements
 
+* To [Rick Olson](https://github.com/technoweenie) for creating acts_as_paranoid
 * To [cheerfulstoic](https://github.com/cheerfulstoic) for adding recursive recovery
 * To [Jonathan Vaught](https://github.com/gravelpup) for adding paranoid validations
 * To [Geoffrey Hichborn](https://github.com/phene) for improving the overral code quality and adding support for after_commit
@@ -245,12 +228,7 @@ This gem is tested on Ruby 1.9, JRuby and Rubinius (both in 1.9 mode).
 * To [vikramdhillon](https://github.com/vikramdhillon) for the idea and initial implementation of support for string column type
 * To [Craig Walker](https://github.com/softcraft-development) for Rails 3.1 support and fixing various pending issues
 * To [Charles G.](https://github.com/chuckg) for Rails 3.2 support and for making a desperately needed global code refactoring
+* To [Gonçalo Silva](https://github.com/goncalossilva) for supporting this gem prior to v0.4.3
+* To [Jean Boussier](https://github.com/byroot) for initial Rails 4.0.0 support
 
-## Credits
-
-This plugin was inspired by [acts_as_paranoid](http://github.com/technoweenie/acts_as_paranoid) and [acts_as_active](http://github.com/fernandoluizao/acts_as_active).
-
-While porting it to Rails 3, I decided to apply the ideas behind those plugins to an unified solution while removing a **lot** of the complexity found in them. I eventually ended up writing a new plugin from scratch.
-
-
-Copyright © 2014 Zachary Scott, Gonçalo Silva, Rick Olson, released under the MIT license
+See `LICENSE`.

data/lib/acts_as_paranoid.rb

@@ -38,8 +38,8 @@ module ActsAsParanoid
         deleted_after_time((time - window)).deleted_before_time((time + window))
       }
 
-      scope :deleted_after_time, lambda  { |time| where("#{self.table_name}.#{paranoid_column} > ?", time) }
-      scope :deleted_before_time, lambda { |time| where("#{self.table_name}.#{paranoid_column} < ?", time) }
+      scope :deleted_after_time, lambda  { |time| where("#{paranoid_column} > ?", time) }
+      scope :deleted_before_time, lambda { |time| where("#{paranoid_column} < ?", time) }
     end
   end
 end

data/lib/acts_as_paranoid/associations.rb

@@ -8,9 +8,9 @@ module ActsAsParanoid
     end
 
     module ClassMethods
-      def belongs_to_with_deleted(target, options = {})
-        with_deleted = options.delete(:with_deleted)
-        result = belongs_to_without_deleted(target, options)
+      def belongs_to_with_deleted(target, scope = nil, options = {})
+        with_deleted = (scope.is_a?(Hash) ? scope : options).delete(:with_deleted)
+        result = belongs_to_without_deleted(target, scope, options)
 
         if with_deleted
           result.options[:with_deleted] = with_deleted

data/lib/acts_as_paranoid/core.rb

@@ -34,16 +34,16 @@ module ActsAsParanoid
       end
 
       def delete_all(conditions = nil)
-        update_all ["#{paranoid_configuration[:column]} = ?", delete_now_value], conditions
+        where(conditions).update_all(["#{paranoid_configuration[:column]} = ?", delete_now_value])
       end
 
       def paranoid_default_scope_sql
         if string_type_with_deleted_value?
-          self.scoped.table[paranoid_column].eq(nil).
-            or(self.scoped.table[paranoid_column].not_eq(paranoid_configuration[:deleted_value])).
+          self.all.table[paranoid_column].eq(nil).
+            or(self.all.table[paranoid_column].not_eq(paranoid_configuration[:deleted_value])).
             to_sql
         else
-          self.scoped.table[paranoid_column].eq(nil).to_sql
+          self.all.table[paranoid_column].eq(nil).to_sql
         end
       end
 
@@ -74,7 +74,7 @@ module ActsAsParanoid
     protected
 
       def without_paranoid_default_scope
-        scope = self.scoped.with_default_scope
+        scope = self.all.with_default_scope
         scope.where_values.delete(paranoid_default_scope_sql)
 
         scope

data/lib/acts_as_paranoid/relation.rb

@@ -21,7 +21,7 @@ module ActsAsParanoid
 
         def delete_all(conditions = nil)
           if paranoid?
-            update_all(paranoid_deletion_attributes, conditions)
+            where(conditions).update_all(paranoid_deletion_attributes)
           else
             delete_all!(conditions)
           end

data/lib/acts_as_paranoid/version.rb

@@ -1,3 +1,3 @@
 module ActsAsParanoid
-  VERSION = "0.4.5"
+  VERSION = "0.5.0.beta1"
 end

data/test/test_associations.rb

@@ -32,6 +32,13 @@ class AssociationsTest < ParanoidBaseTest
     assert_equal 0, ParanoidProduct.with_deleted.count
   end
 
+  def test_belongs_to_with_scope_option
+    paranoid_has_many_dependant = ParanoidHasManyDependant.new
+    includes_values = ParanoidTime.includes(:not_paranoid).includes_values
+
+    assert_equal includes_values, paranoid_has_many_dependant.association(:paranoid_time_with_scope).scope.includes_values
+  end
+
   def test_belongs_to_with_deleted
     paranoid_time = ParanoidTime.first
     paranoid_has_many_dependant = paranoid_time.paranoid_has_many_dependants.create(:name => 'dependant!')

data/test/test_core.rb

@@ -4,7 +4,6 @@ class ParanoidTest < ParanoidBaseTest
   def test_paranoid?
     assert !NotParanoid.paranoid?
     assert_raise(NoMethodError) { NotParanoid.delete_all! }
-    assert_raise(NoMethodError) { NotParanoid.first.destroy! }
     assert_raise(NoMethodError) { NotParanoid.with_deleted }
     assert_raise(NoMethodError) { NotParanoid.only_deleted }
 
@@ -60,7 +59,7 @@ class ParanoidTest < ParanoidBaseTest
 
     ParanoidTime.delete_all!
     assert_empty ParanoidTime.all
-    assert_empty ParanoidTime.with_deleted.all
+    assert_empty ParanoidTime.with_deleted
   end
 
   def test_non_persisted_destroy
@@ -77,6 +76,10 @@ class ParanoidTest < ParanoidBaseTest
     assert_not_nil pt.paranoid_value
   end
 
+  def test_removal_not_persisted
+    assert ParanoidTime.new.destroy
+  end
+
   def test_recovery
     assert_equal 3, ParanoidBoolean.count
     ParanoidBoolean.first.destroy

data/test/test_helper.rb

@@ -233,6 +233,7 @@ end
 class ParanoidHasManyDependant < ActiveRecord::Base
   acts_as_paranoid
   belongs_to :paranoid_time
+  belongs_to :paranoid_time_with_scope, -> { includes(:not_paranoid) }, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id
   belongs_to :paranoid_time_with_deleted, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id, :with_deleted => true
   belongs_to :paranoid_time_polymorphic_with_deleted, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id, :polymorphic => true, :with_deleted => true
 
@@ -323,25 +324,6 @@ class InheritedParanoid < SuperParanoid
   acts_as_paranoid
 end
 
-class ParanoidObserver < ActiveRecord::Observer
-  observe :paranoid_with_callback
-
-  attr_accessor :called_before_recover, :called_after_recover
-
-  def before_recover(paranoid_object)
-    self.called_before_recover = paranoid_object
-  end
-
-  def after_recover(paranoid_object)
-    self.called_after_recover = paranoid_object
-  end
-
-  def reset
-    self.called_before_recover = nil
-    self.called_after_recover = nil
-  end
-end
-
 
 class ParanoidManyManyParentLeft < ActiveRecord::Base
   has_many :paranoid_many_many_children
@@ -364,8 +346,6 @@ class ParanoidWithScopedValidation < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => :category
 end
 
-ParanoidWithCallback.add_observer(ParanoidObserver.instance)
-
 class ParanoidBaseTest < ActiveSupport::TestCase
   def setup
     setup_db
@@ -378,8 +358,6 @@ class ParanoidBaseTest < ActiveSupport::TestCase
     ParanoidString.create! :name => "strings can be paranoid"
     NotParanoid.create! :name => "no paranoid goals"
     ParanoidWithCallback.create! :name => "paranoid with callbacks"
-
-    ParanoidObserver.instance.reset
   end
 
   def teardown
@@ -415,7 +393,7 @@ class ParanoidForest < ActiveRecord::Base
   require "active_support/core_ext/logger.rb"
   ActiveRecord::Base.logger = Logger.new(StringIO.new)
 
-  scope :rainforest, where(:rainforest => true)
+  scope :rainforest, lambda{ where(:rainforest => true) }
 
   has_many :paranoid_trees, :dependent => :destroy
 end
@@ -428,7 +406,7 @@ end
 
 class ParanoidHuman < ActiveRecord::Base
   acts_as_paranoid
-  default_scope where('gender = ?', 'male')
+  default_scope { where('gender = ?', 'male') }
 end
 
 class ParanoidAndroid < ActiveRecord::Base

metadata

@@ -1,87 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0.beta1
 platform: ruby
 authors:
 - Zachary Scott
-- André Medeiros
 - Goncalo Silva
-- Charles G.
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Check the home page for more in-depth information.
@@ -104,10 +116,9 @@ files:
 - test/test_default_scopes.rb
 - test/test_helper.rb
 - test/test_inheritance.rb
-- test/test_observers.rb
 - test/test_relations.rb
 - test/test_validations.rb
-homepage: https://github.com/zzak/acts_as_paranoid
+homepage: https://github.com/ActsAsParanoid/acts_as_paranoid
 licenses:
 - MIT
 metadata: {}
@@ -117,28 +128,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without
   actually deleting them.
 test_files:
+- test/test_associations.rb
+- test/test_core.rb
+- test/test_default_scopes.rb
+- test/test_helper.rb
 - test/test_inheritance.rb
-- test/test_observers.rb
 - test/test_relations.rb
-- test/test_core.rb
 - test/test_validations.rb
-- test/test_associations.rb
-- test/test_helper.rb
-- test/test_default_scopes.rb
-has_rdoc: 

data/test/test_observers.rb

@@ -1,16 +0,0 @@
-require 'test_helper'
-
-class ParanoidObserverTest < ParanoidBaseTest
-  def test_called_observer_methods
-    @subject = ParanoidWithCallback.new
-    @subject.save
-
-    assert_nil ParanoidObserver.instance.called_before_recover
-    assert_nil ParanoidObserver.instance.called_after_recover
-
-    ParanoidWithCallback.find(@subject.id).recover
-
-    assert_equal @subject, ParanoidObserver.instance.called_before_recover
-    assert_equal @subject, ParanoidObserver.instance.called_after_recover
-  end
-end