nested_has_many_through 0.0.1 → 0.0.2

data/lib/nested_has_many_through/association.rb

@@ -58,7 +58,7 @@ module NestedHasManyThrough
       # Any subsequent joins / filters on owner attributes will act on the through association,
       # so that's what we return for the conditions/keys of the overall association.
       conditions = through_attrs[:conditions]
-      conditions += " AND #{interpolate_sql(reflection.klass.send(:sanitize_sql, reflection.options[:conditions]))}" if reflection.options[:conditions]
+      conditions += " AND #{reflection.klass.send(:sanitize_sql, reflection.options[:conditions])}" if reflection.options[:conditions]
 
       {
         :joins => "%s INNER JOIN %s ON ( %s = %s.%s %s) %s %s" % [
@@ -98,7 +98,7 @@ module NestedHasManyThrough
       # Add type_condition, if applicable
       conditions += " AND #{association_class.send(:type_condition).to_sql}" if association_class.finder_needs_type_condition?
       # Add custom conditions
-      conditions += " AND (#{interpolate_sql(association_class.send(:sanitize_sql, reflection.options[:conditions]))})" if reflection.options[:conditions]
+      conditions += " AND (#{association_class.send(:sanitize_sql, reflection.options[:conditions])})" if reflection.options[:conditions]
 
       if reflection.macro == :belongs_to
         if reflection.options[:polymorphic]

data/lib/nested_has_many_through/version.rb

@@ -1,3 +1,3 @@
 module NestedHasManyThrough
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/rails_app/app/models/user.rb

@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
-  has_many :comments
-  has_many :commented_posts, :through => :comments, :source => :post, :uniq => true
+  has_many :comments, :conditions => {:id => 0..1000}
+  has_many :commented_posts, :through => :comments, :source => :post, :uniq => true, :conditions => '1=1'
   has_many :commented_authors, :through => :commented_posts, :source => :author, :uniq => true
   has_many :posts_of_interest, :through => :commented_authors, :source => :posts_of_similar_authors, :uniq => true
   has_many :categories_of_interest, :through => :posts_of_interest, :source => :category, :uniq => true

metadata

@@ -2,7 +2,7 @@
 name: nested_has_many_through
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ian White
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 +03:00
+date: 2011-04-16 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency