@@ -20,9 +20,9 @@ module NestedHasManyThrough "#{@nested_join_attributes[:remote_key]} = #{@owner.quoted_id} #{@nested_join_attributes[:conditions]}" end - def construct_joins + def construct_joins(custom_joins = nil) @nested_join_attributes ||= construct_nested_join_attributes - @nested_join_attributes[:joins] + "#{@nested_join_attributes[:joins]} #{custom_joins}" end end end @@ -39,11 +39,9 @@ module NestedHasManyThrough # take part in the join # * <tt>:conditions</tt>: any additional conditions (e.g. filtering by type for a polymorphic association, # or a :conditions clause explicitly given in the association), including a leading AND - def construct_nested_join_attributes( - reflection = @reflection, - association_class = reflection.klass, - table_ids = {association_class.table_name => 1}) - + def construct_nested_join_attributes( reflection = @reflection, + association_class = reflection.klass, + table_ids = {association_class.table_name => 1}) if reflection.macro == :has_many && reflection.through_reflection construct_has_many_through_attributes(reflection, table_ids) else lib/nested_has_many_through.rb @@ -66,7 +66,7 @@ class Post < ActiveRecord::Base end # only test named_scope in edge - named_scope(:inflamatory) if respond_to?(:named_scope) + named_scope(:inflamatory, :conditions => {:inflamatory => true}) if respond_to?(:named_scope) belongs_to :author belongs_to :category spec/app.rb 50d47663286883e23e39d605cc99dfc9d3163747 Ian White ian.w.white@gmail.com http://github.com/ianwhite/nested_has_many_through/commit/944581b7a08c4421507779042a085e8e5038e310 944581b7a08c4421507779042a085e8e5038e310 2008-04-30T05:00:39-07:00 2008-04-30T05:00:39-07:00 Fixed failing named_scope specs e3215b4f5f2bac922624ebe38c1b70f94464fb08 Ian White ian.w.white@gmail.com