active_interaction 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ca7dc31a385a251040b047f2ebbd4021b66e42
-  data.tar.gz: e7b0bccef0972305632647ea92a7900befce5b8d
+  metadata.gz: 9a82290d24f562e44617bf6deba80d915d78113f
+  data.tar.gz: c6e08917700fe184b5bfe9acd9443fce727f5138
 SHA512:
-  metadata.gz: 0b59c1e221db8a9ac461ed422c35d1b0df70991cb7202c7c29f4e3d6da258db91e520d839cb2fdc442e43a21d4f56c575e677ed192adbe7e1c98c78b64da197f
-  data.tar.gz: 2a418966e8f5d576a610d96aec2b79242398fcab79c55c624317eab94509099d8d0fe3eaba92a4804320fff299bf7786ce15d571755918c005d61b937989dac3
+  metadata.gz: 804a4044b041fa61133131811df899bc7c934fb153662f4438cb21e18f780624e76e30ecb6fa0b4894ad24dbfd89050a437a9e712972460e490939b859ad1d99
+  data.tar.gz: a896550485474632bf0111ba1665eac326091b025e79c9ea1f0826bc079d8a0cde2000e5692884058a85ed37a15d001452e5b09a9f4bed9d24036255ccfc30d5

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [2.1.4][] (2015-11-03)
+
+## Fixed
+
+- [#320][]: Stopped requiring ActiveRecord.
+
+## Added
+
+- [#310][]: Added a warning when a filter is redefined.
+
+## Changed
+
+- [#311][]: Changed the error message when defining the default value for a
+  hash.
+
 # [2.1.3][] (2015-10-02)
 
 ## Fixed
@@ -57,6 +72,12 @@ For help upgrading to version 2, please read [the announcement post][].
 - [#215][]: Rather than symbolizing keys all hashes now use indifferent access.
   This takes care of potential but unlikely DoS attacks noted in [#163][].
 
+# [1.6.1][] (2015-10-02)
+
+## Fixed
+
+- [#303][]: Allowed ActiveRecord associations as inputs to array filters.
+
 # [1.6.0][] (2015-05-06)
 
 ## Added
@@ -455,12 +476,14 @@ For help upgrading to version 2, please read [the announcement post][].
 
 - Initial release.
 
+  [2.1.4]: https://github.com/orgsync/active_interaction/compare/v2.1.3...v2.1.4
   [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
   [2.0.1]: https://github.com/orgsync/active_interaction/compare/v2.0.0...v2.0.1
   [2.0.0]: https://github.com/orgsync/active_interaction/compare/v1.6.0...v2.0.0
+  [1.6.1]: https://github.com/orgsync/active_interaction/compare/v1.6.0...v1.6.1
   [1.6.0]: https://github.com/orgsync/active_interaction/compare/v1.5.1...v1.6.0
   [1.5.1]: https://github.com/orgsync/active_interaction/compare/v1.5.0...v1.5.1
   [1.5.0]: https://github.com/orgsync/active_interaction/compare/v1.4.1...v1.5.0
@@ -597,5 +620,8 @@ For help upgrading to version 2, please read [the announcement post][].
   [#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
+  [#310]: https://github.com/orgsync/active_interaction/issues/310
+  [#311]: https://github.com/orgsync/active_interaction/issues/311
+  [#320]: https://github.com/orgsync/active_interaction/issues/320
 
   [the announcement post]: http://devblog.orgsync.com/2015/05/06/announcing-active-interaction-2/

data/README.md

@@ -285,7 +285,7 @@ BooleanInteraction.run!(kool_aid: true)
 
 ### File
 
-File filters also accept `TempFile`s and anything that responds to `#tempfile`.
+File filters also accept `TempFile`s and anything that responds to `#rewind`.
 That means that you can pass the `params` from uploading files via forms in
 Rails.
 
@@ -614,7 +614,8 @@ IntegerInteraction.run!(limit: 10)
 ActiveInteraction plays nicely with Rails. You can use interactions to handle
 your business logic instead of models or controllers. To see how it all works,
 let's take a look at a complete example of a controller with the typical
-resourceful actions.
+resourceful actions. For a complete working example, check out [Aire][], our
+example Rails application.
 
 ### Controller
 
@@ -1167,7 +1168,7 @@ input type.
 ### Optional inputs
 
 Optional inputs can be defined by using the `:default` option as described in
-[the Filters section][]. Within the interaction, provided and default values
+[the filters section][]. Within the interaction, provided and default values
 are merged to create `inputs`. There are times where it is useful to know
 whether a value was passed to `run` or the result of a filter default. In
 particular, it is useful when `nil` is an acceptable value. For example, you
@@ -1194,17 +1195,23 @@ And if you want to update it, pass in the new value as usual.
 
 ``` rb
 user = User.find(...)
+
 # Don't update their birthday.
 UpdateUser.run!(user: user)
+
 # Remove their birthday.
 UpdateUser.run!(user: user, birthday: nil)
+
 # Update their birthday.
 UpdateUser.run!(user: user, birthday: Date.new(2000, 1, 2))
 ```
 
 ### Predicates
 
-ActiveInteraction creates a predicate method for every input defined by a filter. So if you have an input called `foo`, there will be a predicate method called `#foo?`. That method will tell you if the input was given (that is, if it was not `nil`).
+ActiveInteraction creates a predicate method for every input defined by a
+filter. So if you have an input called `foo`, there will be a predicate method
+called `#foo?`. That method will tell you if the input was given (that is, if
+it was not `nil`).
 
 ``` rb
 class SayHello < ActiveInteraction::Base
@@ -1226,6 +1233,9 @@ SayHello.run!(name: 'Taylor')
 # => "Hello, Taylor!"
 ```
 
+See [the optional inputs section][] for help on determining if an input was
+present in the input hash instead of just `nil`.
+
 ### Translations
 
 ActiveInteraction is i18n aware out of the box! All you have to do is add
@@ -1288,8 +1298,6 @@ available on GitHub.
 
 ActiveInteraction is licensed under [the MIT License][].
 
-Logo design by [Tyler Lee][].
-
 [the project page]: http://orgsync.github.io/active_interaction/
 [the full documentation]: http://rubydoc.info/github/orgsync/active_interaction
 [semantic versioning]: http://semver.org/spec/v2.0.0.html
@@ -1307,4 +1315,5 @@ Logo design by [Tyler Lee][].
 [formtastic]: https://rubygems.org/gems/formtastic
 [simple_form]: https://rubygems.org/gems/simple_form
 [the filters section]: #filters
-[tyler lee]: https://github.com/tylerlee
+[the optional inputs section]: #optional-inputs
+[aire]: example

data/lib/active_interaction.rb

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

data/lib/active_interaction/backports.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'active_support/core_ext'
+
 module ActiveInteraction
   class GroupedInput # rubocop:disable Style/Documentation
     # Required for Ruby <= 1.9.3.

data/lib/active_interaction/base.rb

@@ -143,10 +143,14 @@ module ActiveInteraction
 
       # @param filter [Filter]
       def initialize_filter(filter)
-        filters[filter.name] = filter
+        attribute = filter.name
+        if filters.key?(attribute)
+          warn "WARNING: Redefining #{name}##{attribute} filter"
+        end
+        filters[attribute] = filter
 
-        attr_accessor filter.name
-        define_method("#{filter.name}?") { !public_send(filter.name).nil? }
+        attr_accessor attribute
+        define_method("#{attribute}?") { !public_send(attribute).nil? }
 
         eagerly_evaluate_default(filter)
       end

data/lib/active_interaction/filter.rb

@@ -127,6 +127,8 @@ module ActiveInteraction
       fail InvalidValueError if value.is_a?(GroupedInput)
 
       cast(value)
+    rescue InvalidNestedValueError => error
+      raise InvalidDefaultError, "#{name}: #{value.inspect} (#{error})"
     rescue InvalidValueError, MissingValueError
       raise InvalidDefaultError, "#{name}: #{value.inspect}"
     end

data/lib/active_interaction/filters/array_filter.rb

@@ -1,10 +1,5 @@
 # coding: utf-8
 
-begin
-  require 'active_record'
-rescue LoadError
-end
-
 module ActiveInteraction
   class Base
     # @!method self.array(*attributes, options = {}, &block)

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -226,6 +226,12 @@ describe ActiveInteraction::Base do
     let(:described_class) { InteractionWithFilter }
     let(:thing) { rand }
 
+    it 'warns when redefining a filter' do
+      klass = Class.new(described_class)
+      expect(klass).to receive(:warn).with(/\AWARNING:/)
+      klass.boolean :thing
+    end
+
     describe '.run(inputs = {})' do
       it "returns an instance of #{described_class}" do
         expect(outcome).to be_a described_class

data/spec/active_interaction/errors_spec.rb

@@ -17,6 +17,25 @@ describe ActiveInteraction::Errors do
 
   subject(:errors) { described_class.new(klass.new) }
 
+  context 'backports' do
+    describe '#delete' do
+      it 'deletes the detailed error' do
+        errors.add(:attribute)
+        errors.delete(:attribute)
+        expect(errors.details).to_not have_key :attribute
+      end
+    end
+
+    describe '#initialize_dup' do
+      it 'duplicates the detailed errors' do
+        errors.add(:attribute)
+        other = errors.dup
+        expect(other.details).to eql errors.details
+        expect(other.details).to_not be errors.details
+      end
+    end
+  end
+
   describe '#merge!' do
     let(:other) { described_class.new(klass.new) }
 

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -6,6 +6,16 @@ describe ActiveInteraction::HashFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 
+  context 'backports' do
+    describe '.transform_keys' do
+      it 'transforms keys' do
+        original = { 'key' => 'value' }
+        transformed = described_class.transform_keys(original, &:to_sym)
+        expect(transformed).to eql(key: 'value')
+      end
+    end
+  end
+
   context 'with a nested nameless filter' do
     let(:block) { proc { hash } }
 

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -55,7 +55,7 @@ describe HashInteraction do
   end
 
   context 'with an invalid nested default' do
-    it 'raises an error' do
+    it 'raises an error with a non-empty hash' do
       expect do
         Class.new(ActiveInteraction::Base) do
           hash :a, default: { x: Object.new } do
@@ -64,5 +64,15 @@ describe HashInteraction do
         end
       end.to raise_error ActiveInteraction::InvalidDefaultError
     end
+
+    it 'raises an error' do
+      expect do
+        Class.new(ActiveInteraction::Base) do
+          hash :a, default: {} do
+            hash :x
+          end
+        end
+      end.to raise_error ActiveInteraction::InvalidDefaultError
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -155,14 +155,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.34'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement