acts_as_paranoid 0.5.0.beta1 → 0.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e4085cb11f666dff4eb490e4214f010f46216ab
-  data.tar.gz: 7c694f1b21233c47299c523696111a7fc4454194
+  metadata.gz: e64b4e62e3467e6208b4b06d4f6f6f45b5758888
+  data.tar.gz: 1bf27545571d18596daa573546c84811da6fc5dd
 SHA512:
-  metadata.gz: 2910ee9bdae09c7e52d7c7157c57192dda2b6b72fb7ef4b5cbf2055c47ba40f7f7505bc26f781a46acd55a2d079ee5ac0dc8c6c0225e5367173e3db0c7b7d70b
-  data.tar.gz: d0c8fbaffa54e3052f031c1e3bb94d6baefb186277386674da739a9d3e288d670e4c6c7a7afa3c760c492cd03680fa6845c1ca0f13f120564f773c343a477821
+  metadata.gz: 8b4cc3ccb8a881344891c1ded817044c805d3dada173b769725504679c7ab377ce2c078a2f950f093339a8ecd1892532d35777fc8f02231a0fdb8c39e33a5feb
+  data.tar.gz: 15d82db6a8ec57720936cbba69dad58ceb98369d7b273610a7594e40d2ba77d08565603676670591e6c1e8c46ff01b02e6fc869215c0f68a8d5f84a0c0c0a689

data/README.md

@@ -230,5 +230,6 @@ Watch out for these caveats:
 * 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
+* To [Matijs van Zuijlen](https://github.com/mvz) for Rails 4.1 and 4.2 support
 
 See `LICENSE`.

data/lib/acts_as_paranoid/associations.rb

@@ -13,7 +13,12 @@ module ActsAsParanoid
         result = belongs_to_without_deleted(target, scope, options)
 
         if with_deleted
-          result.options[:with_deleted] = with_deleted
+          if result.is_a? Hash
+            result.values.last.options[:with_deleted] = with_deleted
+          else
+            result.options[:with_deleted] = with_deleted
+          end
+
           unless method_defined? "#{target}_with_unscoped"
             class_eval <<-RUBY, __FILE__, __LINE__
               def #{target}_with_unscoped(*args)

data/lib/acts_as_paranoid/core.rb

@@ -74,8 +74,14 @@ module ActsAsParanoid
     protected
 
       def without_paranoid_default_scope
-        scope = self.all.with_default_scope
-        scope.where_values.delete(paranoid_default_scope_sql)
+        scope = self.all
+        if scope.where_values.include? paranoid_default_scope_sql
+          # ActiveRecord 4.1
+          scope.where_values.delete(paranoid_default_scope_sql)
+        else
+          scope = scope.with_default_scope
+          scope.where_values.delete(paranoid_default_scope_sql)
+        end
 
         scope
       end
@@ -89,7 +95,7 @@ module ActsAsParanoid
       self.send(self.class.paranoid_column)
     end
 
-    def destroy!
+    def destroy_fully!
       with_transaction_returning_status do
         run_callbacks :destroy do
           destroy_dependent_associations!
@@ -101,7 +107,7 @@ module ActsAsParanoid
       end
     end
 
-    def destroy
+    def destroy!
       if !deleted?
         with_transaction_returning_status do
           run_callbacks :destroy do
@@ -112,10 +118,14 @@ module ActsAsParanoid
           end
         end
       else
-        destroy!
+        destroy_fully!
       end
     end
 
+    def destroy
+      destroy!
+    end
+
     def recover(options={})
       options = {
         :recursive => self.class.paranoid_configuration[:recover_dependent_associations],
@@ -144,7 +154,7 @@ module ActsAsParanoid
         # We can only recover by window if both parent and dependant have a
         # paranoid column type of :time.
         if self.class.paranoid_column_type == :time && klass.paranoid_column_type == :time
-          scope = scope.merge(klass.deleted_inside_time_window(paranoid_value, window))
+          scope = scope.deleted_inside_time_window(paranoid_value, window)
         end
 
         scope.each do |object|

data/lib/acts_as_paranoid/validations.rb

@@ -11,10 +11,15 @@ module ActsAsParanoid
         finder_class = find_finder_class_for(record)
         table = finder_class.arel_table
 
-        coder = record.class.serialized_attributes[attribute.to_s]
+        # TODO: Use record.class.column_types[attribute.to_s].coder ?
+        coder = record.class.column_types[attribute.to_s]
 
         if value && coder
-          value = coder.dump value
+          value = if coder.respond_to? :type_cast_for_database
+                    coder.type_cast_for_database value
+                  else
+                    coder.type_cast_for_write value
+                  end
         end
 
         relation = build_relation(finder_class, table, attribute, value)

data/lib/acts_as_paranoid/version.rb

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

data/test/test_associations.rb

@@ -2,8 +2,6 @@ require 'test_helper'
 
 class AssociationsTest < ParanoidBaseTest
   def test_removal_with_associations
-    # This test shows that the current implementation doesn't handle
-    # assciation deletion correctly (when hard deleting via parent-object)
     paranoid_company_1 = ParanoidDestroyCompany.create! :name => "ParanoidDestroyCompany #1"
     paranoid_company_2 = ParanoidDeleteCompany.create! :name => "ParanoidDestroyCompany #1"
     paranoid_company_1.paranoid_products.create! :name => "ParanoidProduct #1"
@@ -19,13 +17,19 @@ class AssociationsTest < ParanoidBaseTest
     assert_equal 1, ParanoidDestroyCompany.with_deleted.count
     assert_equal 2, ParanoidProduct.with_deleted.count
 
-    ParanoidDestroyCompany.with_deleted.first.destroy!
+    ParanoidDestroyCompany.with_deleted.first.destroy
     assert_equal 0, ParanoidDestroyCompany.count
     assert_equal 1, ParanoidProduct.count
     assert_equal 0, ParanoidDestroyCompany.with_deleted.count
     assert_equal 1, ParanoidProduct.with_deleted.count
 
-    ParanoidDeleteCompany.with_deleted.first.destroy!
+    ParanoidDeleteCompany.first.destroy
+    assert_equal 0, ParanoidDeleteCompany.count
+    assert_equal 0, ParanoidProduct.count
+    assert_equal 1, ParanoidDeleteCompany.with_deleted.count
+    assert_equal 1, ParanoidProduct.with_deleted.count
+
+    ParanoidDeleteCompany.with_deleted.first.destroy
     assert_equal 0, ParanoidDeleteCompany.count
     assert_equal 0, ParanoidProduct.count
     assert_equal 0, ParanoidDeleteCompany.with_deleted.count
@@ -79,19 +83,19 @@ class AssociationsTest < ParanoidBaseTest
   end
 
   def test_belongs_to_options
-    paranoid_time = ParanoidHasManyDependant.reflections[:paranoid_time]
+    paranoid_time = ParanoidHasManyDependant.reflections.with_indifferent_access[:paranoid_time]
     assert_equal :belongs_to, paranoid_time.macro
     assert_nil paranoid_time.options[:with_deleted]
   end
 
   def test_belongs_to_with_deleted_options
-    paranoid_time_with_deleted = ParanoidHasManyDependant.reflections[:paranoid_time_with_deleted]
+    paranoid_time_with_deleted = ParanoidHasManyDependant.reflections.with_indifferent_access[:paranoid_time_with_deleted]
     assert_equal :belongs_to, paranoid_time_with_deleted.macro
     assert paranoid_time_with_deleted.options[:with_deleted]
   end
 
   def test_belongs_to_polymorphic_with_deleted_options
-    paranoid_time_polymorphic_with_deleted = ParanoidHasManyDependant.reflections[:paranoid_time_polymorphic_with_deleted]
+    paranoid_time_polymorphic_with_deleted = ParanoidHasManyDependant.reflections.with_indifferent_access[:paranoid_time_polymorphic_with_deleted]
     assert_equal :belongs_to, paranoid_time_polymorphic_with_deleted.macro
     assert paranoid_time_polymorphic_with_deleted.options[:with_deleted]
   end
@@ -108,6 +112,9 @@ class AssociationsTest < ParanoidBaseTest
     child.destroy
     assert_paranoid_deletion(child)
 
+    parent.reload
+
+    assert_equal [], parent.paranoid_has_many_dependants.to_a
     assert_equal [child], parent.paranoid_has_many_dependants.with_deleted.to_a
   end
 

data/test/test_core.rb

@@ -40,9 +40,9 @@ class ParanoidTest < ParanoidBaseTest
   end
 
   def test_real_removal
-    ParanoidTime.first.destroy!
+    ParanoidTime.first.destroy_fully!
     ParanoidBoolean.delete_all!("name = 'extremely paranoid' OR name = 'really paranoid'")
-    ParanoidString.first.destroy!
+    ParanoidString.first.destroy_fully!
     assert_equal 2, ParanoidTime.count
     assert_equal 1, ParanoidBoolean.count
     assert_equal 0, ParanoidString.count
@@ -144,12 +144,18 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 0, ParanoidHasOneDependant.count
     assert_equal 1, NotParanoid.count
     assert_equal 0, HasOneNotParanoid.count
+
+    assert_equal 3, ParanoidTime.with_deleted.count
+    assert_equal 4, ParanoidHasManyDependant.with_deleted.count
+    assert_equal 3, ParanoidBelongsDependant.with_deleted.count
+    assert_equal @paranoid_boolean_count + 3, ParanoidBoolean.with_deleted.count
+    assert_equal 3, ParanoidHasOneDependant.with_deleted.count
   end
 
   def test_recursive_real_removal
     setup_recursive_tests
 
-    @paranoid_time_object.destroy!
+    @paranoid_time_object.destroy_fully!
 
     assert_equal 0, ParanoidTime.only_deleted.count
     assert_equal 1, ParanoidHasManyDependant.only_deleted.count

data/test/test_default_scopes.rb

@@ -37,7 +37,7 @@ class MultipleDefaultScopesTest < ParanoidBaseTest
     assert_equal 0, ParanoidHuman.only_deleted.count
     assert_equal 3, ParanoidHuman.unscoped.count
 
-    ParanoidHuman.first.destroy!
+    ParanoidHuman.first.destroy_fully!
     assert_equal 1, ParanoidHuman.count
     assert_equal 1, ParanoidHuman.with_deleted.count
     assert_equal 0, ParanoidHuman.only_deleted.count

data/test/test_helper.rb

@@ -24,7 +24,7 @@ def setup_db
       t.integer   :paranoid_belongs_dependant_id
       t.integer   :not_paranoid_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_booleans do |t|
@@ -32,7 +32,7 @@ def setup_db
       t.boolean   :is_deleted
       t.integer   :paranoid_time_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_strings do |t|
@@ -44,14 +44,14 @@ def setup_db
       t.string    :name
       t.integer   :paranoid_time_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :has_one_not_paranoids do |t|
       t.string    :name
       t.integer   :paranoid_time_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_has_many_dependants do |t|
@@ -61,14 +61,14 @@ def setup_db
       t.string    :paranoid_time_polymorphic_with_deleted_type
       t.integer   :paranoid_belongs_dependant_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_belongs_dependants do |t|
       t.string    :name
       t.datetime  :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_has_one_dependants do |t|
@@ -76,28 +76,28 @@ def setup_db
       t.datetime  :deleted_at
       t.integer   :paranoid_boolean_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_with_callbacks do |t|
       t.string    :name
       t.datetime  :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_destroy_companies do |t|
       t.string :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_delete_companies do |t|
       t.string :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_products do |t|
@@ -106,7 +106,7 @@ def setup_db
       t.string :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :super_paranoids do |t|
@@ -114,38 +114,38 @@ def setup_db
       t.references :has_many_inherited_super_paranoidz
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :has_many_inherited_super_paranoidzs do |t|
       t.references :super_paranoidz
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_many_many_parent_lefts do |t|
       t.string :name
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_many_many_parent_rights do |t|
       t.string :name
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_many_many_children do |t|
       t.integer :paranoid_many_many_parent_left_id
       t.integer :paranoid_many_many_parent_right_id
       t.datetime :deleted_at
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_with_scoped_validations do |t|
       t.string :name
       t.string :category
       t.datetime :deleted_at
-      t.timestamps
+      timestamps t
     end
 
    create_table :paranoid_forests do |t|
@@ -153,7 +153,7 @@ def setup_db
       t.boolean  :rainforest
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_trees do |t|
@@ -161,14 +161,14 @@ def setup_db
       t.string   :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_humen do |t|
       t.string   :gender
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_androids do |t|
@@ -184,6 +184,11 @@ def setup_db
   end
 end
 
+def timestamps(table)
+  table.column  :created_at , :timestamp, :null => false
+  table.column  :updated_at , :timestamp, :null => false
+end
+
 def teardown_db
   ActiveRecord::Base.connection.tables.each do |table|
     ActiveRecord::Base.connection.drop_table(table)
@@ -389,8 +394,6 @@ end
 class ParanoidForest < ActiveRecord::Base
   acts_as_paranoid
 
-  # HACK: scope throws an error on 1.8.7 because the logger isn't initialized (see https://github.com/Casecommons/pg_search/issues/26)
-  require "active_support/core_ext/logger.rb"
   ActiveRecord::Base.logger = Logger.new(StringIO.new)
 
   scope :rainforest, lambda{ where(:rainforest => true) }

data/test/test_relations.rb

@@ -75,7 +75,7 @@ class RelationsTest < ParanoidBaseTest
 
   def test_fake_removal_through_relation
     # destroy: through a relation.
-    ParanoidForest.rainforest.destroy(@paranoid_forest_3)
+    ParanoidForest.rainforest.destroy(@paranoid_forest_3.id)
     assert_equal 1, ParanoidForest.rainforest.count
     assert_equal 2, ParanoidForest.rainforest.with_deleted.count
     assert_equal 1, ParanoidForest.rainforest.only_deleted.count
@@ -95,8 +95,8 @@ class RelationsTest < ParanoidBaseTest
 
     # destroy: two-step through a relation
     paranoid_tree = @paranoid_forest_1.paranoid_trees.first
-    @paranoid_forest_1.paranoid_trees.order(:id).destroy(paranoid_tree)
-    @paranoid_forest_1.paranoid_trees.only_deleted.destroy(paranoid_tree)
+    @paranoid_forest_1.paranoid_trees.order(:id).destroy(paranoid_tree.id)
+    @paranoid_forest_1.paranoid_trees.only_deleted.destroy(paranoid_tree.id)
     assert_equal 1, @paranoid_forest_1.paranoid_trees(true).count
     assert_equal 1, @paranoid_forest_1.paranoid_trees(true).with_deleted.count
     assert_equal 0, @paranoid_forest_1.paranoid_trees(true).only_deleted.count

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0.beta2
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,92 +10,98 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   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: 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'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: Check the home page for more in-depth information.
 email:
 - e@zzak.io
@@ -128,17 +134,17 @@ 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.4.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without