acts_as_paranoid 0.4.1 → 0.4.2

data/README.markdown

@@ -186,29 +186,32 @@ Paranoiac.pretty.only_deleted.count #=> 1
 Associations are also supported. From the simplest behaviors you'd expect to more nifty things like the ones mentioned previously or the usage of the `:with_deleted` option with `belongs_to`
 
 ```ruby
-class ParanoiacParent < ActiveRecord::Base
+class Parent < ActiveRecord::Base
 	has_many :children, :class_name => "ParanoiacChild"
 end
 
 class ParanoiacChild < ActiveRecord::Base
-	belongs_to :parent, :class_name => "ParanoiacParent"
-	belongs_to :parent_with_deleted, :class_name => "ParanoiacParent", :with_deleted => true
+	belongs_to :parent
+  belongs_to :parent_including_deleted, :class_name => "Parent", :with_deleted => true
+  # You cannot name association *_with_deleted
 end
 
-parent = ParanoiacParent.first
+parent = Parent.first
 child = parent.children.create
 parent.destroy
 
 child.parent #=> nil
-child.parent_with_deleted #=> ParanoiacParent (it works!)
+child.parent_including_deleted #=> Parent (it works!)
 ```
 
 ## Caveats
 
 Watch out for these caveats:
 
+
 -   You cannot use scopes named `with_deleted` and `only_deleted`
 -   You cannot use scopes named `deleted_inside_time_window`, `deleted_before_time`, `deleted_after_time` **if** your paranoid column's type is `time`
+-   You cannot name association `*_with_deleted`
 -   `unscoped` will return all records, deleted or not
 
 # Support

data/lib/acts_as_paranoid.rb

@@ -37,6 +37,9 @@ module ActsAsParanoid
     # Magic!
     default_scope { where(paranoid_default_scope_sql) }
 
+    # The paranoid column should not be mass-assignable
+    attr_protected paranoid_configuration[:column]
+
     if paranoid_configuration[:column_type] == 'time'
       scope :deleted_inside_time_window, lambda {|time, window|
         deleted_after_time((time - window)).deleted_before_time((time + window))

data/lib/acts_as_paranoid/core.rb

@@ -94,7 +94,7 @@ module ActsAsParanoid
         run_callbacks :destroy do
           destroy_dependent_associations!
           # Handle composite keys, otherwise we would just use `self.class.primary_key.to_sym => self.id`.
-          self.class.delete_all!(Hash[[Array(self.class.primary_key), Array(self.id)].transpose])
+          self.class.delete_all!(Hash[[Array(self.class.primary_key), Array(self.id)].transpose]) if persisted?
           self.paranoid_value = self.class.delete_now_value
           freeze
         end
@@ -106,7 +106,7 @@ module ActsAsParanoid
         with_transaction_returning_status do
           run_callbacks :destroy do
             # Handle composite keys, otherwise we would just use `self.class.primary_key.to_sym => self.id`.
-            self.class.delete_all(Hash[[Array(self.class.primary_key), Array(self.id)].transpose])
+            self.class.delete_all(Hash[[Array(self.class.primary_key), Array(self.id)].transpose]) if persisted?
             self.paranoid_value = self.class.delete_now_value
             self
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70150388871560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,7 +23,12 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70150388871560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: Active Record (~>3.2) plugin which allows you to hide and restore records
   without actually deleting them. Check its GitHub page for more in-depth information.
 email:
@@ -53,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1045242170192102573
+      hash: 713582617655354259
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -62,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: acts_as_paranoid
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Active Record (~>3.2) plugin which allows you to hide and restore records