rails3_acts_as_paranoid 0.0.9 → 0.1.4

data/README.markdown

@@ -2,7 +2,7 @@
 
 A simple plugin which hides records instead of deleting them, being able to recover them.
 
-This branch targets Rails 3.0.X. If you're working with another version, switch to the corresponding branch.
+This branch targets Rails 3.1.X. If you're working with another version, switch to the corresponding branch.
 
 ## Credits
 

data/lib/rails3_acts_as_paranoid.rb

@@ -1,6 +1,58 @@
 require 'active_record'
 require 'validations/uniqueness_without_deleted'
 
+
+module ActiveRecord
+  class Relation
+    def paranoid?
+      klass.try(:paranoid?) ? true : false
+    end
+    
+    def paranoid_deletion_attributes
+      { klass.paranoid_column => klass.delete_now_value }
+    end
+    
+    alias_method :destroy!, :destroy
+    def destroy(id)
+      if paranoid?
+        update_all(paranoid_deletion_attributes, {:id => id})
+      else
+        destroy!(id)
+      end
+    end
+    
+    alias_method :really_delete_all!, :delete_all
+    
+    def delete_all!(conditions = nil)
+      if conditions
+        # This idea comes out of Rails 3.1 ActiveRecord::Record.delete_all
+        where(conditions).delete_all!
+      else
+        really_delete_all!
+      end
+    end
+    
+    def delete_all(conditions = nil)
+      if paranoid?
+        update_all(paranoid_deletion_attributes, conditions)
+      else
+        delete_all!(conditions)
+      end
+    end
+    
+    def arel=(a)
+      @arel = a
+    end
+    
+    def with_deleted
+      wd = self.clone
+      wd.default_scoped = false
+      wd.arel = self.build_arel
+      wd
+    end
+  end
+end
+
 module ActsAsParanoid
   
   def paranoid?
@@ -25,16 +77,7 @@ module ActsAsParanoid
     self.paranoid_column_reference = "#{self.table_name}.#{paranoid_configuration[:column]}"
     
     return if paranoid?
-
-    ActiveRecord::Relation.class_eval do
-      alias_method :delete_all!, :delete_all
-      alias_method :destroy!, :destroy
-    end
     
-    ActiveRecord::Reflection::AssociationReflection.class_eval do
-      alias_method :foreign_key, :primary_key_name unless respond_to?(:foreign_key)
-    end
-
     # Magic!
     default_scope where("#{paranoid_column_reference} IS ?", nil)
     
@@ -72,6 +115,18 @@ module ActsAsParanoid
     def only_deleted
       self.unscoped.where("#{paranoid_column_reference} IS NOT ?", nil)
     end
+    
+    def deletion_conditions(id_or_array)
+      ["id in (?)", [id_or_array].flatten]
+    end
+    
+    def delete!(id_or_array)
+      delete_all!(deletion_conditions(id_or_array))
+    end
+    
+    def delete(id_or_array)
+      delete_all(deletion_conditions(id_or_array))
+    end
 
     def delete_all!(conditions = nil)
       self.unscoped.delete_all!(conditions)
@@ -133,6 +188,27 @@ module ActsAsParanoid
       end
     end
     
+    def delete!
+      with_transaction_returning_status do
+        act_on_dependent_destroy_associations
+        self.class.delete_all!(self.class.primary_key.to_sym => self.id)
+        self.paranoid_value = self.class.delete_now_value
+        freeze
+      end
+    end
+    
+    def delete
+      if paranoid_value.nil?
+        with_transaction_returning_status do
+          self.class.delete_all(self.class.primary_key.to_sym => self.id)
+          self.paranoid_value = self.class.delete_now_value
+          self
+        end
+      else
+        delete!
+      end
+    end
+    
     def recover(options={})
       options = {
                   :recursive => self.class.paranoid_configuration[:recover_dependent_associations],
@@ -196,6 +272,7 @@ module ActsAsParanoid
   
 end
 
+
 # Extend ActiveRecord's functionality
 ActiveRecord::Base.send :extend, ActsAsParanoid
 

data/lib/validations/uniqueness_without_deleted.rb

@@ -9,7 +9,8 @@ module ParanoidValidations
         value = YAML.dump value
       end
 
-      sql, params = mount_sql_and_params(finder_class, record.class.quoted_table_name, attribute, value)
+      table = Arel::Table.new(record.class.table_name)
+      sql, params = build_relation(finder_class, table, attribute, value)
 
       # This is the only changed line from the base class version - it does finder_class.unscoped
       relation = finder_class.where(sql, *params)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails3_acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,16 +13,16 @@ date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70156244254600 !ruby/object:Gem::Requirement
+  requirement: &70234162146040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70156244254600
-description: Active Record (~>3.0) plugin which allows you to hide and restore records
+  version_requirements: *70234162146040
+description: Active Record (~>3.1) plugin which allows you to hide and restore records
   without actually deleting them. Check its GitHub page for more in-depth information.
 email:
 - goncalossilva@gmail.com
@@ -34,7 +34,7 @@ files:
 - lib/validations/uniqueness_without_deleted.rb
 - LICENSE
 - README.markdown
-homepage: http://github.com/goncalossilva/rails3_acts_as_paranoid
+homepage: https://github.com/softcraft-development/rails3_acts_as_paranoid
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -48,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -960527913778585172
+      hash: -2074595129237887781
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -60,6 +60,6 @@ rubyforge_project: rails3_acts_as_paranoid
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Active Record (~>3.0) plugin which allows you to hide and restore records
+summary: Active Record (~>3.1) plugin which allows you to hide and restore records
   without actually deleting them.
 test_files: []