paranoid_fu 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+* (5 Nov 2009) 0.4.2
+Fix conditions for associations when without_deleted is used
+
 * (5 Nov 2009) 0.4.1
 Add without_deleted option for has_one and has_and_belongs_to_many
 Fix testing without application

data/lib/paranoid_fu/reflection_conditions.rb

@@ -10,15 +10,16 @@ module ParanoidFu
     # option of the macro, if given, or +nil+ otherwise.
     def sanitized_conditions_with_paranoid_fu
       sanitized_conditions_without_paranoid_fu
-      if !self.options[:polymorphic] && self.options.delete(:without_deleted)
+      if !self.options[:polymorphic] && self.options[:without_deleted]
         klass = if self.through_reflection
           self.through_reflection.klass
         else
           self.klass
         end
-        @sanitized_conditions = klass.merge_conditions(@sanitized_conditions, klass.without_deleted_conditions(klass.table_name)) if klass
+        klass.merge_conditions(@sanitized_conditions, klass.without_deleted_conditions(klass.table_name)) if klass
+      else
+      	@sanitized_conditions
       end
-      @sanitized_conditions
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paranoid_fu
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Sergio Cambra