rails3_acts_as_paranoid 0.2.4 → 0.2.5

data/README.markdown

@@ -33,7 +33,7 @@ The values shown are the defaults. While *column* can be anything (as long as it
 - `time` or
 - `string`
 
-If your column type is a `string`, you can also specify which value to use when marking an object as deleted by passing `:deleted_value` (default is "deleted").
+If your column type is a `string`, you can also specify which value to use when marking an object as deleted by passing `:deleted_value` (default is "deleted"). Any records with a non-matching value in this column will be treated normally (ie: not deleted).
 
 ### Filtering
 

data/lib/acts_as_paranoid/associations.rb

@@ -14,15 +14,17 @@ module ActsAsParanoid
 
         if with_deleted
           result.options[:with_deleted] = with_deleted
-          class_eval <<-RUBY, __FILE__, __LINE__
-            def #{target}_with_unscoped(*args)
-              association = association(:#{target})
-              return nil if association.options[:polymorphic] && association.klass.nil?
-              return #{target}_without_unscoped(*args) unless association.klass.paranoid?
-              association.klass.with_deleted.scoping { #{target}_without_unscoped(*args) }
-            end
-            alias_method_chain :#{target}, :unscoped
-          RUBY
+          unless method_defined? "#{target}_with_unscoped"
+            class_eval <<-RUBY, __FILE__, __LINE__
+              def #{target}_with_unscoped(*args)
+                association = association(:#{target})
+                return nil if association.options[:polymorphic] && association.klass.nil?
+                return #{target}_without_unscoped(*args) unless association.klass.paranoid?
+                association.klass.with_deleted.scoping { #{target}_without_unscoped(*args) }
+              end
+              alias_method_chain :#{target}, :unscoped
+            RUBY
+          end
         end
 
         result

data/lib/acts_as_paranoid/core.rb

@@ -22,7 +22,11 @@ module ActsAsParanoid
       end
 
       def only_deleted
-        without_paranoid_default_scope.where("#{paranoid_column_reference} IS NOT ?", nil)
+        if string_type_with_deleted_value?
+          without_paranoid_default_scope.where("#{paranoid_column_reference} IS ?", paranoid_configuration[:deleted_value])
+        else
+          without_paranoid_default_scope.where("#{paranoid_column_reference} IS NOT ?", nil)
+        end
       end
 
       def delete_all!(conditions = nil)
@@ -34,7 +38,17 @@ module ActsAsParanoid
       end
 
       def paranoid_default_scope_sql
-        self.scoped.table[paranoid_column].eq(nil).to_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])).
+            to_sql
+        else
+          self.scoped.table[paranoid_column].eq(nil).to_sql
+        end
+      end
+
+      def string_type_with_deleted_value?
+        paranoid_column_type == :string && !paranoid_configuration[:deleted_value].nil?
       end
 
       def paranoid_column
@@ -67,6 +81,10 @@ module ActsAsParanoid
       end
     end
 
+    def persisted?
+      !(new_record? || @destroyed)
+    end
+
     def paranoid_value
       self.send(self.class.paranoid_column)
     end
@@ -75,7 +93,8 @@ module ActsAsParanoid
       with_transaction_returning_status do
         run_callbacks :destroy do
           destroy_dependent_associations!
-          self.class.delete_all!(self.class.primary_key.to_sym => self.id)
+          # 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.paranoid_value = self.class.delete_now_value
           freeze
         end
@@ -83,10 +102,11 @@ module ActsAsParanoid
     end
 
     def destroy
-      if paranoid_value.nil?
+      if !deleted?
         with_transaction_returning_status do
           run_callbacks :destroy do
-            self.class.delete_all(self.class.primary_key.to_sym => self.id)
+            # 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.paranoid_value = self.class.delete_now_value
             self
           end
@@ -117,7 +137,7 @@ module ActsAsParanoid
         next unless reflection.klass.paranoid?
 
         scope = reflection.klass.only_deleted
-        
+
         # Merge in the association's scope
         scope = scope.merge(association(reflection.name).association_scope)
 
@@ -132,13 +152,13 @@ module ActsAsParanoid
         end
       end
     end
-    
+
     def destroy_dependent_associations!
       self.class.dependent_associations.each do |reflection|
         next unless reflection.klass.paranoid?
 
         scope = reflection.klass.only_deleted
-       
+
         # Merge in the association's scope
         scope = scope.merge(association(reflection.name).association_scope)
 
@@ -149,8 +169,10 @@ module ActsAsParanoid
     end
 
     def deleted?
-      !paranoid_value.nil?
+      !(paranoid_value.nil? ||
+        (self.class.string_type_with_deleted_value? && paranoid_value != self.class.delete_now_value))
     end
+
     alias_method :destroyed?, :deleted?
 
     private

data/lib/acts_as_paranoid/validations.rb

@@ -18,7 +18,9 @@ module ActsAsParanoid
         end
 
         relation = build_relation(finder_class, table, attribute, value)
-        relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.send(:id))) if record.persisted?
+        [Array(finder_class.primary_key), Array(record.send(:id))].transpose.each do |pk_key, pk_value|
+          relation = relation.and(table[pk_key.to_sym].not_eq(pk_value))
+        end if record.persisted?
 
         Array.wrap(options[:scope]).each do |scope_item|
           scope_value = record.send(scope_item)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails3_acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70118109527820 !ruby/object:Gem::Requirement
+  requirement: &70338444648540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70118109527820
+  version_requirements: *70338444648540
 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:
@@ -39,7 +39,8 @@ files:
 - README.markdown
 homepage: https://github.com/goncalossilva/rails3_acts_as_paranoid
 licenses: []
-post_install_message: 
+post_install_message: ! "\n=======================================\n\n  This gem has
+  moved!\n\n  To stay up to date, run:\n\n    $ gem install 'acts_as_paranoid'\"\n\n=======================================\n\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -51,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -893378719868361513
+      hash: 375772570073154179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: