Back port #303 to 2.0.x

AaronLasseigne · Oct 2, 2015 · b07c6fe · b07c6fe
1 parent cebba64
commit b07c6fe
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/active_interaction/filters/array_filter.rb b/lib/active_interaction/filters/array_filter.rb
@@ -59,10 +59,16 @@ def method_missing(*, &block)
  # @return [Array<Class>]
  def classes
  result = [Array]
- return result unless Object.const_defined?(:ActiveRecord)
- return result unless ActiveRecord.const_defined?(:Relation)
 
- result.push(ActiveRecord::Relation)
+ %w[
+ ActiveRecord::Relation
+ ActiveRecord::Associations::CollectionProxy
+ ].each do |name|
+ next unless (klass = name.safe_constantize)
+ result.push(klass)
+ end
+
+ result
  end
 
  # @param filter [Filter]