active_interaction 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a54101dfa80812134a34c6977fa538e23d67c7f
-  data.tar.gz: 3a3d21348e1f37a649ca23801a1b01f5974c9399
+  metadata.gz: 6ab0b6acaa850b033873f57885ab405bd0617fb1
+  data.tar.gz: fa8014160f12647a93e6630e740a7caea0b6e866
 SHA512:
-  metadata.gz: 04fe6f23d9235893ca47203481f9f4a7709acffebb0d8f24f3769ccfe07dc8b52133e3e82f2f1be039eaf8a4859572536c106d0bc5fffcf96fffb767c3a4226a
-  data.tar.gz: df1cf833864649ddb7d402a3da8b657987863da264728f755657625d3cda9293c58968509608b2ae6a12831a71d91141d5c638e7650d10050c666407b0c71945
+  metadata.gz: 7c3ba3db8d3d3f6886e0badc849f80036d7633bdc2e4cfef8da3fcf07c556167181bd182757f0b0aae8fd9fc8d273b75a3bcf88d320310f5f7bc41ea6f8d0490
+  data.tar.gz: 9b0588c2945678a31fbf315bf2b44f2168d5dbfad1e4398e2c07a558f91ae0fa66ac15622a3b4b049ee103b863ed290091963098cccc1c35e74f64a361b8ee22

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [2.2.0][] (2015-12-18)
+
+## Added
+
+- [#336][]: Added frozen string pragma for Ruby 2.3.
+
+## Changed
+
+- [#332][]: Changed default lambdas to be evaluated in the interaction's
+  binding.
+
 # [2.1.5][] (2015-12-11)
 
 ## Added
@@ -482,6 +493,7 @@ For help upgrading to version 2, please read [the announcement post][].
 
 - Initial release.
 
+  [2.2.0]: https://github.com/orgsync/active_interaction/compare/v2.1.5...v2.2.0
   [2.1.5]: https://github.com/orgsync/active_interaction/compare/v2.1.4...v2.1.5
   [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
@@ -631,5 +643,7 @@ For help upgrading to version 2, please read [the announcement post][].
   [#311]: https://github.com/orgsync/active_interaction/issues/311
   [#320]: https://github.com/orgsync/active_interaction/issues/320
   [#330]: https://github.com/orgsync/active_interaction/pull/330
+  [#332]: https://github.com/orgsync/active_interaction/pull/332
+  [#336]: https://github.com/orgsync/active_interaction/pull/336
 
   [the announcement post]: http://devblog.orgsync.com/2015/05/06/announcing-active-interaction-2/

data/README.md

@@ -52,6 +52,7 @@ Read more on [the project page][] or check out [the full documentation][].
 - [Advanced usage](#advanced-usage)
   - [Callbacks](#callbacks)
   - [Composition](#composition)
+  - [Defaults](#defaults)
   - [Descriptions](#descriptions)
   - [Errors](#errors)
   - [Forms](#forms)
@@ -66,13 +67,13 @@ Read more on [the project page][] or check out [the full documentation][].
 Add it to your Gemfile:
 
 ``` rb
-gem 'active_interaction', '~> 2.1'
+gem 'active_interaction', '~> 2.2'
 ```
 
 Or install it manually:
 
 ``` sh
-$ gem install active_interaction --version '~> 2.1'
+$ gem install active_interaction --version '~> 2.2'
 ```
 
 This project uses [Semantic Versioning][]. Check out [the change log][] for a
@@ -980,6 +981,28 @@ class AddAndDouble < ActiveInteraction::Base
 end
 ```
 
+### Defaults
+
+The default value for an input can take on many different forms. Setting the
+default to `nil` makes the input optional. Setting it to some value makes that
+the default value for that input. Setting it to a lambda will lazily set the
+default value for that input. That means the value will be computed when the
+interaction is run, as opposed to when it is defined.
+
+Lambda defaults are evaluated in the context of the interaction, so you can use
+the values of other inputs in them.
+
+``` rb
+# This input is optional.
+time :a, default: nil
+# This input defaults to `Time.at(123)`.
+time :b, default: Time.at(123)
+# This input lazily defaults to `Time.now`.
+time :c, default: -> { Time.now }
+# This input defaults to the value of `c` plus 10 seconds.
+time :d, default: -> { c + 10 }
+```
+
 ### Descriptions
 
 Use the `desc` option to provide human-readable descriptions of filters. You
@@ -1192,7 +1215,7 @@ class UpdateUser < ActiveInteraction::Base
 
   def execute
     user.birthday = birthday if given?(:birthday)
-    errors.merge!(user) unless user.save
+    errors.merge!(user.errors) unless user.save
     user
   end
 end

data/lib/active_interaction.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'active_model'
 
@@ -8,8 +9,6 @@ require 'active_model'
 # @author Taylor Fausak <taylor@fausak.me>
 #
 # @since 1.0.0
-#
-# @version 2.1.5
 module ActiveInteraction
 end
 

data/lib/active_interaction/backports.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'active_support/core_ext'
 

data/lib/active_interaction/base.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'active_support/core_ext/hash/indifferent_access'
 require 'set'
@@ -251,7 +252,7 @@ module ActiveInteraction
     def populate_filters(inputs)
       self.class.filters.each do |name, filter|
         begin
-          public_send("#{name}=", filter.clean(inputs[name]))
+          public_send("#{name}=", filter.clean(inputs[name], self))
         rescue InvalidValueError, MissingValueError, NoDefaultError
           # #type_check will add errors if appropriate.
         end
@@ -260,7 +261,7 @@ module ActiveInteraction
 
     def type_check
       run_callbacks(:type_check) do
-        Validation.validate(self.class.filters, inputs).each do |error|
+        Validation.validate(self, self.class.filters, inputs).each do |error|
           errors.add(*error)
         end
       end

data/lib/active_interaction/concerns/active_modelable.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # Implement the minimal ActiveModel interface.

data/lib/active_interaction/concerns/active_recordable.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # Implement the minimal ActiveRecord interface.

data/lib/active_interaction/concerns/hashable.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # Allow `hash` to be overridden when given arguments and/or a block.

data/lib/active_interaction/concerns/missable.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # Handle common `method_missing` functionality.

data/lib/active_interaction/concerns/runnable.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # @abstract Include and override {#execute} to implement a custom Runnable

data/lib/active_interaction/errors.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 #
 module ActiveInteraction

data/lib/active_interaction/filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'active_support/inflector'
 
@@ -90,15 +91,16 @@ module ActiveInteraction
     #   # => ActiveInteraction::InvalidDefaultError: example: 0
     #
     # @param value [Object]
+    # @param context [Base, nil]
     #
     # @return [Object]
     #
     # @raise (see #cast)
     # @raise (see #default)
-    def clean(value)
-      value = cast(value)
+    def clean(value, context)
+      value = cast(value, context)
       if value.nil?
-        default
+        default(context)
       else
         value
       end
@@ -116,17 +118,19 @@ module ActiveInteraction
     #   ActiveInteraction::Filter.new(:example, default: 0).default
     #   # => ActiveInteraction::InvalidDefaultError: example: 0
     #
+    # @param context [Base, nil]
+    #
     # @return (see #raw_default)
     #
     # @raise [NoDefaultError] If the default is missing.
     # @raise [InvalidDefaultError] If the default is invalid.
-    def default
+    def default(context = nil)
       fail NoDefaultError, name unless default?
 
-      value = raw_default
+      value = raw_default(context)
       fail InvalidValueError if value.is_a?(GroupedInput)
 
-      cast(value)
+      cast(value, context)
     rescue InvalidNestedValueError => error
       raise InvalidDefaultError, "#{name}: #{value.inspect} (#{error})"
     rescue InvalidValueError, MissingValueError
@@ -159,6 +163,7 @@ module ActiveInteraction
     end
 
     # @param value [Object]
+    # @param _interaction [Base, nil]
     #
     # @return [Object]
     #
@@ -167,7 +172,7 @@ module ActiveInteraction
     # @raise [InvalidValueError] If the value is invalid.
     #
     # @private
-    def cast(value)
+    def cast(value, _interaction)
       case value
       when NilClass
         fail MissingValueError, name unless default?
@@ -205,12 +210,14 @@ module ActiveInteraction
       "(Object doesn't support #inspect)"
     end
 
+    # @param context [Base, nil]
+    #
     # @return [Object]
-    def raw_default
+    def raw_default(context)
       value = options.fetch(:default)
 
       if value.is_a?(Proc)
-        value.call
+        context.instance_exec(&value)
       else
         value
       end

data/lib/active_interaction/filter_column.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # A minimal implementation of an `ActiveRecord::ConnectionAdapters::Column`.

data/lib/active_interaction/filters/abstract_date_time_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # @abstract
@@ -11,12 +12,12 @@ module ActiveInteraction
     alias_method :_cast, :cast
     private :_cast
 
-    def cast(value)
+    def cast(value, context)
       case value
       when String
-        convert(value)
+        convert(value, context)
       when GroupedInput
-        convert(stringify(value))
+        convert(stringify(value), context)
       when *klasses
         value
       else
@@ -30,7 +31,7 @@ module ActiveInteraction
 
     private
 
-    def convert(value)
+    def convert(value, context)
       if format?
         klass.strptime(value, format)
       else
@@ -38,7 +39,7 @@ module ActiveInteraction
           (fail ArgumentError, "no time information in #{value.inspect}")
       end
     rescue ArgumentError
-      _cast(value)
+      _cast(value, context)
     end
 
     # @return [String]

data/lib/active_interaction/filters/abstract_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # @abstract

data/lib/active_interaction/filters/abstract_numeric_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # @abstract
@@ -10,12 +11,12 @@ module ActiveInteraction
     alias_method :_cast, :cast
     private :_cast
 
-    def cast(value)
+    def cast(value, context)
       case value
       when klass
         value
       when Numeric, String
-        convert(value)
+        convert(value, context)
       else
         super
       end
@@ -27,10 +28,10 @@ module ActiveInteraction
 
     private
 
-    def convert(value)
+    def convert(value, context)
       Kernel.public_send(klass.name, value)
     rescue ArgumentError
-      _cast(value)
+      _cast(value, context)
     end
   end
 end

data/lib/active_interaction/filters/array_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base
@@ -27,13 +28,13 @@ module ActiveInteraction
 
     register :array
 
-    def cast(value)
+    def cast(value, context)
       case value
       when *classes
         return value if filters.empty?
 
         filter = filters.values.first
-        value.map { |e| filter.clean(e) }
+        value.map { |e| filter.clean(e, context) }
       else
         super
       end

data/lib/active_interaction/filters/boolean_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base
@@ -18,7 +19,7 @@ module ActiveInteraction
   class BooleanFilter < Filter
     register :boolean
 
-    def cast(value)
+    def cast(value, _interaction)
       case value
       when FalseClass, '0', /\Afalse\z/i
         false

data/lib/active_interaction/filters/date_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base

data/lib/active_interaction/filters/date_time_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base

data/lib/active_interaction/filters/decimal_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'bigdecimal'
 
@@ -21,7 +22,7 @@ module ActiveInteraction
   class DecimalFilter < AbstractNumericFilter
     register :decimal
 
-    def cast(value)
+    def cast(value, _interaction)
       case value
       when Numeric
         BigDecimal.new(value, digits)

data/lib/active_interaction/filters/file_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base

data/lib/active_interaction/filters/float_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base

data/lib/active_interaction/filters/hash_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base
@@ -25,14 +26,14 @@ module ActiveInteraction
 
     register :hash
 
-    def cast(value)
+    def cast(value, context)
       case value
       when Hash
         value = value.with_indifferent_access
         initial = strip? ? ActiveSupport::HashWithIndifferentAccess.new : value
 
         filters.each_with_object(initial) do |(name, filter), h|
-          clean_value(h, name.to_s, filter, value)
+          clean_value(h, name.to_s, filter, value, context)
         end
       else
         super
@@ -51,13 +52,13 @@ module ActiveInteraction
 
     private
 
-    def clean_value(h, name, filter, value)
-      h[name] = filter.clean(value[name])
+    def clean_value(h, name, filter, value, context)
+      h[name] = filter.clean(value[name], context)
     rescue InvalidValueError, MissingValueError
       raise InvalidNestedValueError.new(name, value[name])
     end
 
-    def raw_default
+    def raw_default(*)
       value = super
 
       if value.is_a?(Hash) && !value.empty?

data/lib/active_interaction/filters/integer_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base

data/lib/active_interaction/filters/interface_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base
@@ -21,7 +22,7 @@ module ActiveInteraction
   class InterfaceFilter < Filter
     register :interface
 
-    def cast(value)
+    def cast(value, _interaction)
       matches?(value) ? value : super
     end
 

data/lib/active_interaction/filters/object_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base
@@ -20,16 +21,16 @@ module ActiveInteraction
   class ObjectFilter < Filter
     register :object
 
-    def cast(value, reconstantize = true)
+    def cast(value, context, reconstantize = true)
       @klass ||= klass
 
       if matches?(value)
         value
       else
-        return super(value) unless reconstantize
+        return super(value, context) unless reconstantize
 
         @klass = klass
-        cast(value, false)
+        cast(value, context, false)
       end
     end
 

data/lib/active_interaction/filters/string_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base
@@ -20,7 +21,7 @@ module ActiveInteraction
   class StringFilter < Filter
     register :string
 
-    def cast(value)
+    def cast(value, _interaction)
       case value
       when String
         strip? ? value.strip : value

data/lib/active_interaction/filters/symbol_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base
@@ -16,7 +17,7 @@ module ActiveInteraction
   class SymbolFilter < Filter
     register :symbol
 
-    def cast(value)
+    def cast(value, _interaction)
       case value
       when Symbol
         value

data/lib/active_interaction/filters/time_filter.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   class Base
@@ -34,7 +35,7 @@ module ActiveInteraction
       super
     end
 
-    def cast(value)
+    def cast(value, _interaction)
       case value
       when Numeric
         klass.at(value)

data/lib/active_interaction/grouped_input.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 require 'ostruct'
 

data/lib/active_interaction/modules/input_processor.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # Groups inputs ending in "(*N*i)" into {GroupedInput}.

data/lib/active_interaction/modules/validation.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module ActiveInteraction
   # Validates inputs using filters.
@@ -6,12 +7,13 @@ module ActiveInteraction
   # @private
   module Validation
     class << self
+      # @param context [Base]
       # @param filters [Hash{Symbol => Filter}]
       # @param inputs [Hash{Symbol => Object}]
-      def validate(filters, inputs)
+      def validate(context, filters, inputs)
         filters.each_with_object([]) do |(name, filter), errors|
           begin
-            filter.cast(inputs[name])
+            filter.cast(inputs[name], context)
           rescue InvalidNestedValueError,
                  InvalidValueError,
                  MissingValueError => e

data/lib/active_interaction/version.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 #
 module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('2.1.5')
+  VERSION = Gem::Version.new('2.2.0')
 end

data/spec/active_interaction/filters/abstract_date_time_filter_spec.rb

@@ -9,7 +9,7 @@ describe ActiveInteraction::AbstractDateTimeFilter, :filter do
     let(:value) { nil }
 
     it 'raises an error' do
-      expect { filter.cast(value) }.to raise_error NameError
+      expect { filter.cast(value, nil) }.to raise_error NameError
     end
   end
 end

data/spec/active_interaction/filters/abstract_numeric_filter_spec.rb

@@ -9,7 +9,7 @@ describe ActiveInteraction::AbstractNumericFilter, :filter do
     let(:value) { nil }
 
     it 'raises an error' do
-      expect { filter.cast(value) }.to raise_error NameError
+      expect { filter.cast(value, nil) }.to raise_error NameError
     end
   end
 end

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -36,7 +36,7 @@ describe ActiveInteraction::ArrayFilter, :filter do
   end
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with an Array' do
       let(:value) { [] }

data/spec/active_interaction/filters/boolean_filter_spec.rb

@@ -10,7 +10,7 @@ describe ActiveInteraction::BooleanFilter, :filter do
     context 'falsey' do
       [false, '0', 'false', 'FALSE'].each do |value|
         it "returns false for #{value.inspect}" do
-          expect(filter.cast(value)).to be_falsey
+          expect(filter.cast(value, nil)).to be_falsey
         end
       end
     end
@@ -18,7 +18,7 @@ describe ActiveInteraction::BooleanFilter, :filter do
     context 'truthy' do
       [true, '1', 'true', 'TRUE'].each do |value|
         it "returns true for #{value.inspect}" do
-          expect(filter.cast(value)).to be_truthy
+          expect(filter.cast(value, nil)).to be_truthy
         end
       end
     end

data/spec/active_interaction/filters/date_filter_spec.rb

@@ -15,7 +15,7 @@ describe ActiveInteraction::DateFilter, :filter do
   end
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a Date' do
       let(:value) { Date.new }
@@ -127,7 +127,7 @@ describe ActiveInteraction::DateFilter, :filter do
 
       it 'raises an error' do
         expect do
-          filter.default
+          filter.default(nil)
         end.to raise_error ActiveInteraction::InvalidDefaultError
       end
     end

data/spec/active_interaction/filters/date_time_filter_spec.rb

@@ -15,7 +15,7 @@ describe ActiveInteraction::DateTimeFilter, :filter do
   end
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a Datetime' do
       let(:value) { DateTime.new }
@@ -138,7 +138,7 @@ describe ActiveInteraction::DateTimeFilter, :filter do
 
       it 'raises an error' do
         expect do
-          filter.default
+          filter.default(nil)
         end.to raise_error ActiveInteraction::InvalidDefaultError
       end
     end

data/spec/active_interaction/filters/decimal_filter_spec.rb

@@ -15,7 +15,7 @@ describe ActiveInteraction::DecimalFilter, :filter do
   end
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a Float' do
       let(:value) { rand }

data/spec/active_interaction/filters/file_filter_spec.rb

@@ -7,7 +7,7 @@ describe ActiveInteraction::FileFilter, :filter do
   it_behaves_like 'a filter'
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a File' do
       let(:value) { File.new(__FILE__) }

data/spec/active_interaction/filters/float_filter_spec.rb

@@ -7,7 +7,7 @@ describe ActiveInteraction::FloatFilter, :filter do
   it_behaves_like 'a filter'
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a Float' do
       let(:value) { rand }

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -25,7 +25,7 @@ describe ActiveInteraction::HashFilter, :filter do
   end
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a Hash' do
       let(:value) { {} }
@@ -94,7 +94,7 @@ describe ActiveInteraction::HashFilter, :filter do
       end
 
       it 'returns the Hash' do
-        expect(filter.default).to eql options[:default]
+        expect(filter.default(nil)).to eql options[:default]
       end
     end
 
@@ -105,7 +105,7 @@ describe ActiveInteraction::HashFilter, :filter do
 
       it 'raises an error' do
         expect do
-          filter.default
+          filter.default(nil)
         end.to raise_error ActiveInteraction::InvalidDefaultError
       end
     end

data/spec/active_interaction/filters/integer_filter_spec.rb

@@ -7,7 +7,7 @@ describe ActiveInteraction::IntegerFilter, :filter do
   it_behaves_like 'a filter'
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with an Integer' do
       let(:value) { rand(1 << 16) }

data/spec/active_interaction/filters/interface_filter_spec.rb

@@ -11,7 +11,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
   before { options[:methods] = [:dump, :load] }
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a BasicObject' do
       let(:value) { BasicObject.new }

data/spec/active_interaction/filters/object_filter_spec.rb

@@ -15,7 +15,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
 
   describe '#cast' do
     let(:value) { Thing.new }
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with class as a Class' do
       it 'returns the instance' do
@@ -29,7 +29,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
         class Thing; end
         value = Thing.new
 
-        expect(filter.cast(value)).to eql value
+        expect(filter.cast(value, nil)).to eql value
       end
 
       it 'handles reconstantizing subclasses' do
@@ -40,7 +40,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
         class SubThing < Thing; end
         value = SubThing.new
 
-        expect(filter.cast(value)).to eql value
+        expect(filter.cast(value, nil)).to eql value
       end
 
       it 'does not overflow the stack' do
@@ -51,7 +51,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
         end
 
         expect do
-          filter.cast(klass.new)
+          filter.cast(klass.new, nil)
         end.to raise_error ActiveInteraction::InvalidValueError
       end
 

data/spec/active_interaction/filters/string_filter_spec.rb

@@ -13,7 +13,7 @@ describe ActiveInteraction::StringFilter, :filter do
   end
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a String' do
       let(:value) { SecureRandom.hex }

data/spec/active_interaction/filters/symbol_filter_spec.rb

@@ -7,7 +7,7 @@ describe ActiveInteraction::SymbolFilter, :filter do
   it_behaves_like 'a filter'
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a Symbol' do
       let(:value) { SecureRandom.hex.to_sym }

data/spec/active_interaction/filters/time_filter_spec.rb

@@ -37,7 +37,7 @@ describe ActiveInteraction::TimeFilter, :filter do
   end
 
   describe '#cast' do
-    let(:result) { filter.cast(value) }
+    let(:result) { filter.cast(value, nil) }
 
     context 'with a Time' do
       let(:value) { Time.new }
@@ -160,7 +160,7 @@ describe ActiveInteraction::TimeFilter, :filter do
 
       it 'raises an error' do
         expect do
-          filter.default
+          filter.default(nil)
         end.to raise_error ActiveInteraction::InvalidDefaultError
       end
     end

data/spec/active_interaction/modules/validation_spec.rb

@@ -3,14 +3,21 @@
 require 'spec_helper'
 
 describe ActiveInteraction::Validation do
-  describe '.validate(filters, inputs)' do
+  describe '.validate(context, filters, inputs)' do
     let(:inputs) { {} }
     let(:filter) { ActiveInteraction::Filter.new(:name, {}) }
-    let(:filters) { { filter.name => filter } }
-    let(:result) { described_class.validate(filters, inputs) }
+    let(:interaction) do
+      name = filter.name
+      klass = Class.new(ActiveInteraction::Base) { attr_writer(name) }
+      klass.filters[name] = filter
+      klass.new
+    end
+    let(:result) do
+      described_class.validate(interaction, interaction.class.filters, inputs)
+    end
 
     context 'no filters are given' do
-      let(:filters) { {} }
+      let(:interaction) { Class.new(ActiveInteraction::Base).new }
 
       it 'returns no errors' do
         expect(result).to eql []

data/spec/support/filters.rb

@@ -54,7 +54,7 @@ shared_examples_for 'a filter' do
       include_context 'optional'
 
       it 'returns nil' do
-        expect(filter.cast(value)).to be_nil
+        expect(filter.cast(value, nil)).to be_nil
       end
     end
 
@@ -63,7 +63,7 @@ shared_examples_for 'a filter' do
 
       it 'raises an error' do
         expect do
-          filter.cast(value)
+          filter.cast(value, nil)
         end.to raise_error ActiveInteraction::MissingValueError
       end
 
@@ -72,7 +72,7 @@ shared_examples_for 'a filter' do
 
         it 'raises an error' do
           expect do
-            filter.cast(value)
+            filter.cast(value, nil)
           end.to raise_error ActiveInteraction::InvalidValueError
         end
       end
@@ -86,7 +86,7 @@ shared_examples_for 'a filter' do
       include_context 'optional'
 
       it 'returns the default' do
-        expect(filter.clean(value)).to eql options[:default]
+        expect(filter.clean(value, nil)).to eql options[:default]
       end
     end
 
@@ -95,7 +95,7 @@ shared_examples_for 'a filter' do
 
       it 'raises an error' do
         expect do
-          filter.clean(value)
+          filter.clean(value, nil)
         end.to raise_error ActiveInteraction::MissingValueError
       end
 
@@ -104,7 +104,7 @@ shared_examples_for 'a filter' do
 
         it 'raises an error' do
           expect do
-            filter.clean(value)
+            filter.clean(value, nil)
           end.to raise_error ActiveInteraction::InvalidValueError
         end
       end
@@ -117,7 +117,7 @@ shared_examples_for 'a filter' do
 
       it 'raises an error' do
         expect do
-          filter.clean(value)
+          filter.clean(value, nil)
         end.to raise_error ActiveInteraction::InvalidDefaultError
       end
     end
@@ -128,7 +128,7 @@ shared_examples_for 'a filter' do
       include_context 'optional'
 
       it 'returns the default' do
-        expect(filter.default).to eql options[:default]
+        expect(filter.default(nil)).to eql options[:default]
       end
     end
 
@@ -137,7 +137,7 @@ shared_examples_for 'a filter' do
 
       it 'raises an error' do
         expect do
-          filter.default
+          filter.default(nil)
         end.to raise_error ActiveInteraction::NoDefaultError
       end
     end
@@ -149,7 +149,7 @@ shared_examples_for 'a filter' do
 
       it 'raises an error' do
         expect do
-          filter.default
+          filter.default(nil)
         end.to raise_error ActiveInteraction::InvalidDefaultError
       end
     end
@@ -163,7 +163,7 @@ shared_examples_for 'a filter' do
       end
 
       it 'returns the default' do
-        expect(filter.default).to eql options[:default].call
+        expect(filter.default(nil)).to eql options[:default].call
       end
     end
   end

data/spec/support/interactions.rb

@@ -27,6 +27,8 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
         filter_options.merge(default: generator.call))
       public_send(type, :defaults_1, :defaults_2,
         filter_options.merge(default: generator.call))
+      public_send(type, :defaults_3,
+        filter_options.merge(default: -> { required }))
     end
   end
 
@@ -83,6 +85,10 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
       expect(result[:defaults_2]).to_not be_nil
     end
 
+    it 'evaluates :defaults_3 in the interaction binding' do
+      expect(result[:defaults_3]).to eql result[:required]
+    end
+
     context 'with inputs[:optional]' do
       let(:optional) { generator.call }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -51,6 +51,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.