is_paranoid_ext 0.0.5 → 0.0.6

data/is_paranoid_ext.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{is_paranoid_ext}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Neill"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-06-08}
   s.description = %q{}
   s.email = %q{alex@featureless.co.uk}
   s.extra_rdoc_files = [

data/lib/is_paranoid_ext.rb

@@ -2,31 +2,40 @@ require 'activerecord'
 
 module IsParanoidExt
   
-  def preload_has_one_association(records, reflection, preload_options = {})
-    super(records, reflection, paranoid_preload_options(reflection, preload_options))
-  end
-  
-  def preload_has_many_association(records, reflection, preload_options = {})
-    super(records, reflection, paranoid_preload_options(reflection, preload_options))
-  end
-  
-  def preload_has_and_belongs_to_many_association(records, reflection, preload_options = {})
-    super(records, reflection, paranoid_preload_options(reflection, preload_options))
-  end
-
   private
 
-  def paranoid_preload_options(reflection, preload_options)
-    paranoid_preload_opts = preload_options.dup
-    if reflection.klass.respond_to?(:restore)
-      sql_array  = ["#{reflection.klass.quoted_table_name}.#{reflection.klass.destroyed_field} IS ?"]
-      sql_array << reflection.klass.field_not_destroyed
-      preload_conditions = paranoid_preload_opts.delete(:conditions) || []
-      paranoid_preload_opts.merge(:conditions => merge_conditions(sql_array, preload_conditions))
+    def construct_finder_sql_with_included_associations(options, join_dependency)
+      preload_options = options.dup
+      join_dependency.reflections.each do |reflection|
+        preload_options = paranoid_preload_options(reflection, preload_options)
+      end
+      super(preload_options, join_dependency)
+    end
+    
+    def preload_has_one_association(records, reflection, preload_options = {})
+      super(records, reflection, paranoid_preload_options(reflection, preload_options))
+    end
+    
+    def preload_has_many_association(records, reflection, preload_options = {})
+      super(records, reflection, paranoid_preload_options(reflection, preload_options))
+    end
+    
+    def preload_has_and_belongs_to_many_association(records, reflection, preload_options = {})
+      super(records, reflection, paranoid_preload_options(reflection, preload_options))
+    end
+    
+    def paranoid_preload_options(reflection, preload_options)
+      paranoid_preload_opts = preload_options.dup
+      if reflection.klass.respond_to?(:restore)
+        sql_array  = ["#{reflection.klass.quoted_table_name}.#{reflection.klass.destroyed_field} IS ?"]
+        sql_array << reflection.klass.field_not_destroyed
+        preload_conditions = paranoid_preload_opts.delete(:conditions) || []
+        paranoid_preload_opts.merge!(:conditions => merge_conditions(sql_array, preload_conditions))
+      end
+      paranoid_preload_opts
     end
-    paranoid_preload_opts
-  end
 
 end
 
 ActiveRecord::Base.send(:extend, IsParanoidExt)
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Alex Neill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +01:00
+date: 2010-06-08 00:00:00 +01:00
 default_executable: 
 dependencies: []