active_interaction 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9329a7a03500b2df126c515a11207fa2857aa369
-  data.tar.gz: b4435673bededceaf5b4fc71bbe025d032b126d9
+  metadata.gz: 12ca7dc31a385a251040b047f2ebbd4021b66e42
+  data.tar.gz: e7b0bccef0972305632647ea92a7900befce5b8d
 SHA512:
-  metadata.gz: baef9f6307c852cba7b5bba252fa567641fccdab1840211abfb73fb88f537367f2305cdd00ffa4f8fac6c692e8f9dbe7d42ecd8a5b27cfa81db479dcc72c012d
-  data.tar.gz: 9f6fa9fb6e2049ea8bbf9c5770132fd991b2644dffea2472530870676955185039010b6b193d5294338da9d8677e17aadd8a1f91764abfbfe43f9634590c5dd1
+  metadata.gz: 0b59c1e221db8a9ac461ed422c35d1b0df70991cb7202c7c29f4e3d6da258db91e520d839cb2fdc442e43a21d4f56c575e677ed192adbe7e1c98c78b64da197f
+  data.tar.gz: 2a418966e8f5d576a610d96aec2b79242398fcab79c55c624317eab94509099d8d0fe3eaba92a4804320fff299bf7786ce15d571755918c005d61b937989dac3

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [2.1.3][] (2015-10-02)
+
+## Fixed
+
+- [#303][]: Allowed ActiveRecord associations as inputs to array filters.
+
+## Changed
+
+- [#304][]: Improved the error message for object filters when the class does
+  not exist.
+
 # [2.1.2][] (2015-09-03)
 
 ## Fixed
@@ -444,6 +455,7 @@ For help upgrading to version 2, please read [the announcement post][].
 
 - Initial release.
 
+  [2.1.3]: https://github.com/orgsync/active_interaction/compare/v2.1.2...v2.1.3
   [2.1.2]: https://github.com/orgsync/active_interaction/compare/v2.1.1...v2.1.2
   [2.1.1]: https://github.com/orgsync/active_interaction/compare/v2.1.0...v2.1.1
   [2.1.0]: https://github.com/orgsync/active_interaction/compare/v2.0.1...v2.1.0
@@ -583,5 +595,7 @@ For help upgrading to version 2, please read [the announcement post][].
   [#295]: https://github.com/orgsync/active_interaction/issues/295
   [#296]: https://github.com/orgsync/active_interaction/issues/296
   [#298]: https://github.com/orgsync/active_interaction/issues/298
+  [#303]: https://github.com/orgsync/active_interaction/issues/303
+  [#304]: https://github.com/orgsync/active_interaction/issues/304
 
   [the announcement post]: http://devblog.orgsync.com/2015/05/06/announcing-active-interaction-2/

data/lib/active_interaction.rb

@@ -9,7 +9,7 @@ require 'active_model'
 #
 # @since 1.0.0
 #
-# @version 2.1.2
+# @version 2.1.3
 module ActiveInteraction
 end
 

data/lib/active_interaction/filters/abstract_date_time_filter.rb

@@ -13,12 +13,12 @@ module ActiveInteraction
 
     def cast(value)
       case value
-      when *klasses
-        value
       when String
         convert(value)
       when GroupedInput
         convert(stringify(value))
+      when *klasses
+        value
       else
         super
       end

data/lib/active_interaction/filters/array_filter.rb

@@ -59,10 +59,16 @@ module ActiveInteraction
     # @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]

data/lib/active_interaction/filters/object_filter.rb

@@ -42,7 +42,7 @@ module ActiveInteraction
       klass_name = options.fetch(:class, name).to_s.camelize
       Object.const_get(klass_name)
     rescue NameError
-      raise InvalidClassError, klass_name.inspect
+      raise InvalidClassError, "class #{klass_name.inspect} does not exist"
     end
 
     # @param value [Object]

data/lib/active_interaction/version.rb

@@ -5,5 +5,5 @@ module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('2.1.2')
+  VERSION = Gem::Version.new('2.1.3')
 end

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -2,6 +2,16 @@
 
 require 'spec_helper'
 
+module ActiveRecord
+  class Relation
+  end
+
+  module Associations
+    class CollectionProxy
+    end
+  end
+end
+
 ArrayInteraction = Class.new(TestInteraction) do
   array :a do
     array
@@ -14,6 +24,9 @@ end
 describe ArrayInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction', :array, -> { [] }
+  it_behaves_like 'an interaction', :array, -> { ActiveRecord::Relation.new }
+  it_behaves_like 'an interaction', :array,
+    -> { ActiveRecord::Associations::CollectionProxy.new }
 
   context 'with inputs[:a]' do
     let(:a) { [[]] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel