lib/acts_as.rb in acts_as-0.2.2 vs lib/acts_as.rb in acts_as-0.3.0

@@ -23,16 +23,12 @@
     else
       super
     end
   end
 
-  private
-
   def acts_as_field_match?(method)
-    @association_match = self.class.acts_as_fields.select do |association, fields|
-      fields.select { |f| method.to_s.include?(f) }.any?
-    end.keys.first
+    @association_match = self.class.acts_as_fields_match(method)
     @association_match && send(@association_match).respond_to?(method)
   end
 
   module ClassMethods
     def acts_as(association, with: [], prefix: [], **options)
@@ -45,9 +41,40 @@
       end
     end
 
     def acts_as_fields
       @acts_as_fields ||= {}
+    end
+
+    def acts_as_fields_match(method)
+      acts_as_fields.select do |association, fields|
+        fields.select { |f| method.to_s.include?(f) }.any?
+      end.keys.first
+    end
+
+    def where(opts, *rest)
+      return self if opts.blank?
+      relation = super
+      #TODO support nested attribute joins like Guns.where(rebels: {strength: 10}))
+      # for now, only first level joins will happen automagically
+      detected_associations = opts.keys.map {|attr| acts_as_fields_match(attr) }
+                                       .reject {|attr| attr.nil?}
+      return relation.joins(detected_associations) if detected_associations.any?
+      relation
+    end
+
+    def expand_hash_conditions_for_aggregates(attrs)
+      attrs = super(attrs)
+      expanded_attrs = {}
+
+      attrs.each do |attr, value|
+        if (association = acts_as_fields_match(attr))
+          expanded_attrs[new.send(association).class.table_name] = { attr => value }
+        else
+          expanded_attrs[attr] = value
+        end
+      end
+      expanded_attrs
     end
 
     private
 
     def override_method_missing