Switching to using a :grouped_scope option on the generated grouped s…

…cope association to trigger off in the has_many_association sql method chain.

lib/grouped_scope/class_methods.rb

@@ -6,29 +6,33 @@ def grouped_scopes
     end
 
     def grouped_scope(*args)
-      belongs_to_grouped_scope_grouping
+      create_belongs_to_grouped_scope_grouping
       args.each do |association|
         existing_assoc = reflect_on_association(association)
         unless existing_assoc && existing_assoc.macro == :has_many
           raise ArgumentError, "Cannot create a group scope for :#{association} because it is not a has_many " + 
                                "association. Make sure to call grouped_scope after the has_many associations."
         end
-        grouped_scope_method = :"grouped_scope_#{association}"
-        grouped_scopes[grouped_scope_method] = true
-        has_many grouped_scope_method, existing_assoc.options
+        grouped_scopes[association] = true
+        grouped_assoc = grouped_scope_for(association)
+        has_many grouped_assoc, existing_assoc.options
+        reflect_on_association(grouped_assoc).options[:grouped_scope] = true
       end
       include InstanceMethods
     end
 
     private
 
-    def belongs_to_grouped_scope_grouping
+    def grouped_scope_for(association)
+      :"grouped_scope_#{association}"
+    end
+
+    def create_belongs_to_grouped_scope_grouping
       grouping_class_name = 'GroupedScope::Grouping'
       existing_grouping = reflect_on_association(:grouping)
       return false if existing_grouping && existing_grouping.macro == :belongs_to && existing_grouping.options[:class_name] == grouping_class_name
       belongs_to :grouping, :foreign_key => 'group_id', :class_name => grouping_class_name
     end
 
-
   end
 end

lib/grouped_scope/group.rb

@@ -5,13 +5,16 @@ def initialize(owner)
       super
     end
 
+    def respond_to?(method, include_private=false)
+      super || !proxy_class.grouped_scopes[method].blank?
+    end
 
     protected
 
     def method_missing(method, *args, &block)
-      group_method = "group_#{method}".to_sym
       if proxy_class.grouped_scopes[method]
-        proxy_owner.send(group_method, *args, &block)
+        grouped_assoc = proxy_owner.class.grouped_scope_for(method)
+        proxy_owner.send(grouped_assoc, *args, &block)
       else
         super
       end

lib/grouped_scope/has_many_association.rb

@@ -8,7 +8,7 @@ def self.included(klass)
     end
 
     def construct_sql_with_group_scope
-      if @owner.class.grouped_scopes[@reflection.name]
+      if @reflection.options[:grouped_scope]
         @finder_sql = "#{@reflection.quoted_table_name}.#{@reflection.primary_key_name} IN (#{@owner.group.quoted_ids})"
         @finder_sql << " AND (#{conditions})" if conditions
         @counter_sql = @finder_sql

test/grouped_scope/class_methods_test.rb

@@ -15,7 +15,7 @@ def setup
     should 'add to inheritable attributes with new grouped_scope' do
       assert_nil Employee.grouped_scopes[:foobars]
       Employee.class_eval { has_many(:foobars) ; grouped_scope(:foobars) }
-      assert Employee.grouped_scopes[:grouped_scope_foobars]
+      assert Employee.grouped_scopes[:foobars]
     end
 
   end