is_paranoid_ext 0.0.3 → 0.0.4

data/is_paranoid_ext.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{is_paranoid_ext}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Neill"]

data/lib/is_paranoid_ext.rb

@@ -16,33 +16,29 @@ module IsParanoidExt
     merge_paranoid_options!(association_id, options)
     has_one association_id, options, &extension
   end
-  
+
   private
   
   def merge_paranoid_options!(association_id, options)
-    through_id = options[:through]
-    @paranoid_conditions, @paranoid_values = nil, nil
+    @paranoid_conditions = []
     apply_paranoid_conditions_for(options[:class_name] || association_id)
-    apply_paranoid_conditions_for through_id if through_id
-    options.merge!(:conditions => merged_paranoid_conditions) unless @paranoid_conditions.nil?
+    apply_paranoid_conditions_for options[:through] if options[:through]
+    unless @paranoid_conditions.empty?
+      options.merge!( :conditions => merge_conditions( @paranoid_conditions + [sanitize_sql(options.delete(:conditions) || [])] ) ) 
+      @paranoid_conditions = []
+    end
   end
   
   def apply_paranoid_conditions_for(association_id)
     reflection = reflections[association_id.to_sym]
     association_klass = ( reflection.try(:klass) || association_id.to_s.classify.constantize )
     if association_klass && association_klass.respond_to?(:restore)
-      @paranoid_conditions ||= []
-      @paranoid_conditions << "#{association_klass.quoted_table_name}.#{association_klass.destroyed_field} IS ?"
-      @paranoid_values ||= []
-      @paranoid_values << association_klass.field_not_destroyed
+      sql_array = ["#{association_klass.quoted_table_name}.#{association_klass.destroyed_field} IS ?"]
+      sql_array << association_klass.field_not_destroyed
+      @paranoid_conditions <<  sanitize_sql_array(sql_array)
     end
   end
   
-  def merged_paranoid_conditions
-    @merged_paranoid_conditions ||= if @paranoid_conditions.any? && @paranoid_values.any?
-      [@paranoid_conditions.map{|c|"(#{c})"}.join(' AND ')] + @paranoid_values
-    else nil end
-  end
 end
 
 ActiveRecord::Base.send(:extend, IsParanoidExt)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alex Neill