active_interaction 4.0.0 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc5f59cdd588429a58556cea7b70aa0c43a6a13c523a682cac266cfc7ab76a1
-  data.tar.gz: 9a58db1735b436ae91a70baf9c2eab9ef4851a20a9e51c05c6f243af6e3c282b
+  metadata.gz: cc966bbcee80b29757efdf5bf0b6b0357b8d24610dca49017f4a8cdca64bfaa3
+  data.tar.gz: fe255f995b77c90c935fb14ae05660fcc973a3e7ef3e26209d5e1e187624ca21
 SHA512:
-  metadata.gz: c78b1f82d8593a238a2076f7351146e51079d163d963cc830d9e086bbc82bd791fbc95527d4fc829e3c38039bb77ce06fefe82520f5b6f2148a64384a8e3a339
-  data.tar.gz: 362a8b86512c8ef05d9582a377000e06e2b8b0855c112458020911fa77477c3c98cd10555e81d259cfc767f79c1eb8b03e9ec12124cfca38c552208006e1a70a
+  metadata.gz: 233b8b4334a5f4d34d12607c054a47aa4839f9c734cd251b682f30173aaa5115e0d8292c0074efd21137a966831b635d2a4e4f3c55f6cb282bb78ed6f795450e
+  data.tar.gz: a5fef4055b48c4c72f3f297f52260f0fe4055a2299961d0fd70ebfd7fcfadc2814628a01cec947259e4b99620fc9a2ee313baaa373449aadeba62829eea7be00

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+# [4.0.5][] (2021-07-11)
+
+## Fix
+
+- [#480][] - Interfaces used inside hashes failed to recognize `nil` as a non-value.
+
+# [4.0.4][] (2021-07-03)
+
+## Fix
+
+- [#510][] - Hash parameters failed when working outside of Rails.
+- [#511][] - Nested filters with options but no `:class` failed to have `:class` automatically added.
+
+# [4.0.3][] (2021-06-24)
+
+## Fix
+
+- [#499][] - `given?` now recognizes multi-part date inputs by their primary key name
+- [#493][] - `compose` now properly accepts `Inputs`
+
+# [4.0.2][] (2021-06-22)
+
+## Fix
+
+- [#505][] - Nested Interface filters using the `:methods` option threw an error.
+
+# [4.0.1][] (2021-05-26)
+
+## Fix
+
+- Fix regression of filter name relaxing.
+- [#495][] - Fix time filter ignoring time zones
+
 # [4.0.0][] (2021-01-10)
 
 ## Changed
@@ -57,7 +90,7 @@ class Example < ActiveInteraction::Base
 
   validates :first_name,
     presence: true,
-    unless: 'first_name.nil?'
+    unless: -> { first_name.nil? }
 
   def execute
     # ...
@@ -156,13 +189,13 @@ has a particular module included, you'll need to use the newly expanded
 
 ## Fixed
 
-- [486][] `valid?` returns true if block not called and error added in execute around callback.
+- [#486][] `valid?` returns true if block not called and error added in execute around callback.
 
 # [3.8.2][] (2020-04-22)
 
 ## Fixed
 
-- [479][] Composed interactions that throw errors now show a complete backtrace instead of ending at the `run!` of the outermost interaction.
+- [#479][] Composed interactions that throw errors now show a complete backtrace instead of ending at the `run!` of the outermost interaction.
 
 # [3.8.1][] (2020-04-04)
 
@@ -931,6 +964,11 @@ Example.run
 
 - Initial release.
 
+  [4.0.5]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.4...v4.0.5
+  [4.0.4]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.3...v4.0.4
+  [4.0.3]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.2...v4.0.3
+  [4.0.2]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.1...v4.0.2
+  [4.0.1]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.0...v4.0.1
   [4.0.0]: https://github.com/AaronLasseigne/active_interaction/compare/v3.8.3...v4.0.0
   [3.8.3]: https://github.com/AaronLasseigne/active_interaction/compare/v3.8.2...v3.8.3
   [3.8.2]: https://github.com/AaronLasseigne/active_interaction/compare/v3.8.1...v3.8.2
@@ -1136,3 +1174,11 @@ Example.run
   [#486]: https://github.com/AaronLasseigne/active_interaction/issues/486
   [#392]: https://github.com/AaronLasseigne/active_interaction/issues/392
   [#398]: https://github.com/AaronLasseigne/active_interaction/issues/398
+  [#495]: https://github.com/AaronLasseigne/active_interaction/issues/495
+  [#505]: https://github.com/AaronLasseigne/active_interaction/issues/505
+  [#499]: https://github.com/AaronLasseigne/active_interaction/issues/499
+  [#493]: https://github.com/AaronLasseigne/active_interaction/issues/493
+  [#510]: https://github.com/AaronLasseigne/active_interaction/issues/510
+  [#511]: https://github.com/AaronLasseigne/active_interaction/issues/511
+  [#412]: https://github.com/AaronLasseigne/active_interaction/issues/412
+  [#480]: https://github.com/AaronLasseigne/active_interaction/issues/480

data/README.md

@@ -5,7 +5,6 @@ It's an implementation of the command pattern in Ruby.
 
 [![Version](https://img.shields.io/gem/v/active_interaction.svg?style=flat-square)](https://rubygems.org/gems/active_interaction)
 [![Test](https://img.shields.io/github/workflow/status/AaronLasseigne/active_interaction/Test?label=Test&style=flat-square)](https://github.com/AaronLasseigne/active_interaction/actions?query=workflow%3ATest)
-[![Coverage](https://img.shields.io/coveralls/github/AaronLasseigne/active_interaction.svg?style=flat-square)](https://coveralls.io/r/orgsync/active_interaction)
 [![Climate](https://img.shields.io/codeclimate/maintainability/orgsync/active_interaction.svg?style=flat-square)](https://codeclimate.com/github/orgsync/active_interaction)
 
 ---
@@ -58,7 +57,7 @@ handles your verbs.
   - [Translations](#translations)
 - [Credits](#credits)
 
-[Full Documentation][]
+[API Documentation][]
 
 ## Installation
 
@@ -977,10 +976,10 @@ class UpdateAccount < ActiveInteraction::Base
 
   validates :first_name,
     presence: true,
-    unless: 'first_name.nil?'
+    unless: -> { first_name.nil? }
   validates :last_name,
     presence: true,
-    unless: 'last_name.nil?'
+    unless: -> { last_name.nil? }
 
   def execute
     account.first_name = first_name if first_name.present?
@@ -1448,8 +1447,8 @@ I18nInteraction.run(name: false).errors.messages[:name]
 
 ## Credits
 
-ActiveInteraction is brought to you by [Aaron Lasseigne][] and
-[Taylor Fausak][] and was originally built at [OrgSync][].
+ActiveInteraction is brought to you by [Aaron Lasseigne][].
+Along with Aaron, [Taylor Fausak][] helped create and maintain ActiveInteraction but has since moved on.
 
 If you want to contribute to ActiveInteraction, please read
 [our contribution guidelines][]. A [complete list of contributors][] is
@@ -1458,14 +1457,11 @@ available on GitHub.
 ActiveInteraction is licensed under [the MIT License][].
 
 [activeinteraction]: https://github.com/AaronLasseigne/active_interaction
-[Full Documentation]: http://rubydoc.info/github/orgsync/active_interaction
+[API Documentation]: http://rubydoc.info/github/AaronLasseigne/active_interaction
 [semantic versioning]: http://semver.org/spec/v2.0.0.html
 [GitHub releases]: https://github.com/AaronLasseigne/active_interaction/releases
-[the announcement post]: http://devblog.orgsync.com/2015/05/06/announcing-active-interaction-2/
-[active_model-errors_details]: https://github.com/cowbell/active_model-errors_details
 [aaron lasseigne]: https://github.com/AaronLasseigne
 [taylor fausak]: https://github.com/tfausak
-[orgsync]: https://github.com/orgsync
 [our contribution guidelines]: CONTRIBUTING.md
 [complete list of contributors]: https://github.com/AaronLasseigne/active_interaction/graphs/contributors
 [the mit license]: LICENSE.md
@@ -1474,5 +1470,4 @@ ActiveInteraction is licensed under [the MIT License][].
 [the filters section]: #filters
 [the errors section]: #errors
 [the optional inputs section]: #optional-inputs
-[aire]: example
 [`with_options`]: http://api.rubyonrails.org/classes/Object.html#method-i-with_options

data/lib/active_interaction.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_model'
+require 'active_support/hash_with_indifferent_access'
 
 # Manage application specific business logic.
 #

data/lib/active_interaction/base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/indifferent_access'
-
 module ActiveInteraction
   # @abstract Subclass and override {#execute} to implement a custom
   #   ActiveInteraction::Base class.
@@ -45,7 +43,7 @@ module ActiveInteraction
       #
       #   Runs validations and if there are no errors it will call {#execute}.
       #
-      #   @param (see ActiveInteraction::Base#initialize)
+      #   @param (see ActiveInteraction::Inputs.process)
       #
       #   @return [Base]
 
@@ -107,7 +105,7 @@ module ActiveInteraction
       # @param name [Symbol]
       # @param options [Hash]
       def add_filter(klass, name, options, &block)
-        raise InvalidFilterError, %("#{name}" is a reserved name) if ActiveInteraction::Inputs.reserved?(name)
+        raise InvalidFilterError, %("#{name}" is a reserved name) if Inputs.reserved?(name)
 
         initialize_filter(klass.new(name, options, &block))
       end
@@ -160,12 +158,11 @@ module ActiveInteraction
       end
     end
 
-    # @param inputs [Hash{Symbol => Object}] Attribute values to set.
-    #
     # @private
     def initialize(inputs = {})
-      inputs = normalize_inputs!(inputs)
-      process_inputs(inputs.symbolize_keys)
+      @_interaction_raw_inputs = inputs
+
+      populate_filters_and_inputs(Inputs.process(inputs))
     end
 
     # @!method compose(other, inputs = {})
@@ -191,10 +188,7 @@ module ActiveInteraction
     #
     # @return [Hash{Symbol => Object}] All inputs passed to {.run} or {.run!}.
     def inputs
-      @inputs ||= self.class.filters
-        .each_key.with_object(ActiveInteraction::Inputs.new) do |name, h|
-          h[name] = public_send(name)
-        end.freeze
+      @_interaction_inputs
     end
 
     # Returns `true` if the given key was in the hash passed to {.run}.
@@ -238,24 +232,30 @@ module ActiveInteraction
     # rubocop:disable all
     def given?(input, *rest)
       filter_level = self.class
-      input_level = @_interaction_inputs
+      input_level = @_interaction_raw_inputs
 
       [input, *rest].each do |key_or_index|
         if key_or_index.is_a?(Symbol) || key_or_index.is_a?(String)
-          key_or_index = key_or_index.to_sym
-          filter_level = filter_level.filters[key_or_index]
+          key = key_or_index.to_sym
+          key_to_s = key_or_index.to_s
+          filter_level = filter_level.filters[key]
 
           break false if filter_level.nil? || input_level.nil?
-          break false unless input_level.key?(key_or_index) || input_level.key?(key_or_index.to_s)
+          if filter_level.accepts_grouped_inputs?
+            break false unless input_level.key?(key) || input_level.key?(key_to_s) || Inputs.keys_for_group?(input_level.keys, key)
+          else
+            break false unless input_level.key?(key) || input_level.key?(key_to_s)
+          end
 
-          input_level = input_level[key_or_index] || input_level[key_or_index.to_s]
+          input_level = input_level[key] || input_level[key_to_s]
         else
+          index = key_or_index
           filter_level = filter_level.filters.first.last
 
           break false if filter_level.nil? || input_level.nil?
-          break false unless key_or_index.between?(-input_level.size, input_level.size - 1)
+          break false unless index.between?(-input_level.size, input_level.size - 1)
 
-          input_level = input_level[key_or_index]
+          input_level = input_level[index]
         end
       end && true
     end
@@ -271,44 +271,24 @@ module ActiveInteraction
 
     private
 
-    # We want to allow both `Hash` objects and `ActionController::Parameters`
-    # objects. In Rails < 5, parameters are a subclass of hash and calling
-    # `#symbolize_keys` returns the entire hash, not just permitted values. In
-    # Rails >= 5, parameters are not a subclass of hash but calling
-    # `#to_unsafe_h` returns the entire hash.
-    def normalize_inputs!(inputs)
-      return inputs if inputs.is_a?(Hash)
-
-      parameters = 'ActionController::Parameters'
-      klass = parameters.safe_constantize
-      return inputs.to_unsafe_h if klass && inputs.is_a?(klass)
-
-      raise ArgumentError, "inputs must be a hash or #{parameters}"
-    end
-
-    # @param inputs [Hash{Symbol => Object}]
-    def process_inputs(inputs)
-      @_interaction_inputs = inputs
-
-      inputs.each do |key, value|
-        next if ActiveInteraction::Inputs.reserved?(key)
+    def populate_filters_and_inputs(inputs)
+      @_interaction_inputs = Inputs.new
 
-        populate_reader(key, value)
-      end
-
-      populate_filters(ActiveInteraction::Inputs.process(inputs))
-    end
-
-    def populate_reader(key, value)
-      instance_variable_set("@#{key}", value) if respond_to?(key)
-    end
-
-    def populate_filters(inputs)
       self.class.filters.each do |name, filter|
-        public_send("#{name}=", filter.clean(inputs[name], self))
-      rescue InvalidValueError, MissingValueError, NoDefaultError
-        nil # #type_check will add errors if appropriate.
+        value =
+          begin
+            filter.clean(inputs[name], self)
+          rescue InvalidValueError, MissingValueError, NoDefaultError
+            # #type_check will add errors if appropriate.
+            # We'll get the original value for the error.
+            inputs[name]
+          end
+
+        @_interaction_inputs[name] = value
+        public_send("#{name}=", value)
       end
+
+      @_interaction_inputs.freeze
     end
 
     def type_check

data/lib/active_interaction/errors.rb

@@ -98,11 +98,7 @@ module ActiveInteraction
     #
     # @return [Errors]
     def merge!(other)
-      if other.respond_to?(:details)
-        merge_details!(other)
-      else
-        merge_messages!(other)
-      end
+      merge_details!(other)
 
       self
     end
@@ -117,14 +113,6 @@ module ActiveInteraction
       detail[:error].is_a?(Symbol)
     end
 
-    def merge_messages!(other)
-      other.messages.each do |attribute, messages|
-        messages.each do |message|
-          merge_message!(attribute, message)
-        end
-      end
-    end
-
     def merge_message!(attribute, message)
       unless attribute?(attribute)
         message = full_message(attribute, message)

data/lib/active_interaction/filter.rb

@@ -178,6 +178,21 @@ module ActiveInteraction
       :string
     end
 
+    # Tells whether or not the filter accepts a group of parameters to form a
+    # single input.
+    #
+    # @example
+    #   ActiveInteraction::TimeFilter.new(Time.now).accepts_grouped_inputs?
+    #   # => true
+    # @example
+    #   ActiveInteraction::Filter.new(:example).accepts_grouped_inputs?
+    #   # => false
+    #
+    # @return [Boolean]
+    def accepts_grouped_inputs?
+      false
+    end
+
     private
 
     # rubocop:disable Metrics/MethodLength

data/lib/active_interaction/filters/abstract_date_time_filter.rb

@@ -12,6 +12,10 @@ module ActiveInteraction
       self.class.slug
     end
 
+    def accepts_grouped_inputs?
+      true
+    end
+
     private
 
     def klasses

data/lib/active_interaction/filters/array_filter.rb

@@ -25,10 +25,12 @@ module ActiveInteraction
   class ArrayFilter < Filter
     include Missable
 
+    # The array starts with the class override key and then contains any
+    # additional options which halt explicit setting of the class.
     FILTER_NAME_OR_OPTION = {
-      'ActiveInteraction::ObjectFilter' => :class,
-      'ActiveInteraction::RecordFilter' => :class,
-      'ActiveInteraction::InterfaceFilter' => :from
+      'ActiveInteraction::ObjectFilter' => [:class].freeze,
+      'ActiveInteraction::RecordFilter' => [:class].freeze,
+      'ActiveInteraction::InterfaceFilter' => %i[from methods].freeze
     }.freeze
     private_constant :FILTER_NAME_OR_OPTION
 
@@ -71,9 +73,9 @@ module ActiveInteraction
     end
 
     def add_option_in_place_of_name(klass, options)
-      if (key = FILTER_NAME_OR_OPTION[klass.to_s]) && !options.key?(key)
+      if (keys = FILTER_NAME_OR_OPTION[klass.to_s]) && (keys & options.keys).empty?
         options.merge(
-          "#{key}": name.to_s.singularize.camelize.to_sym
+          "#{keys.first}": name.to_s.singularize.camelize.to_sym
         )
       else
         options

data/lib/active_interaction/filters/hash_filter.rb

@@ -44,7 +44,7 @@ module ActiveInteraction
     end
 
     def adjust_output(value, context)
-      value = value.to_hash.with_indifferent_access
+      value = ActiveSupport::HashWithIndifferentAccess.new(value.to_hash)
 
       initial = strip? ? ActiveSupport::HashWithIndifferentAccess.new : value
 

data/lib/active_interaction/filters/interface_filter.rb

@@ -48,6 +48,7 @@ module ActiveInteraction
     end
 
     def matches?(object)
+      return false if object.nil?
       return matches_methods?(object) if options.key?(:methods)
 
       const = from
@@ -61,7 +62,7 @@ module ActiveInteraction
     end
 
     def matches_methods?(object)
-      options.fetch(:methods, []).all? { |method| object.respond_to?(method) }
+      options[:methods].all? { |method| object.respond_to?(method) }
     end
 
     def checking_class_inheritance?(object, from)

data/lib/active_interaction/filters/time_filter.rb

@@ -39,9 +39,17 @@ module ActiveInteraction
       Time.respond_to?(:zone) && !Time.zone.nil?
     end
 
+    def klass
+      if time_with_zone?
+        Time.zone
+      else
+        super
+      end
+    end
+
     def klasses
       if time_with_zone?
-        super + [Time.zone.class]
+        [Time.zone.at(0).class, Time]
       else
         super
       end

data/lib/active_interaction/inputs.rb

@@ -13,29 +13,58 @@ module ActiveInteraction
       /x.freeze
       private_constant :GROUPED_INPUT_PATTERN
 
+      # @private
+      def keys_for_group?(keys, group_key)
+        search_key = /\A#{group_key}\(\d+i\)\z/
+        keys.any? { |key| search_key.match?(key) }
+      end
+
       # Checking `syscall` is the result of what appears to be a bug in Ruby.
       # https://bugs.ruby-lang.org/issues/15597
+      # @private
       def reserved?(name)
         name.to_s.start_with?('_interaction_') ||
           name == :syscall ||
-          Base.method_defined?(name) ||
-          Base.private_method_defined?(name)
+          (
+            Base.method_defined?(name) &&
+            !Object.method_defined?(name)
+          ) ||
+          (
+            Base.private_method_defined?(name) &&
+            !Object.private_method_defined?(name)
+          )
       end
 
+      # @param inputs [Hash, ActionController::Parameters, ActiveInteraction::Inputs] Attribute values to set.
+      #
+      # @private
       def process(inputs)
-        inputs.stringify_keys.sort.each_with_object({}) do |(k, v), h|
-          next if reserved?(k)
+        normalize_inputs!(inputs)
+          .stringify_keys
+          .sort
+          .each_with_object({}) do |(k, v), h|
+            next if reserved?(k)
 
-          if (group = GROUPED_INPUT_PATTERN.match(k))
-            assign_to_grouped_input!(h, group[:key], group[:index], v)
-          else
-            h[k.to_sym] = v
+            if (group = GROUPED_INPUT_PATTERN.match(k))
+              assign_to_grouped_input!(h, group[:key], group[:index], v)
+            else
+              h[k.to_sym] = v
+            end
           end
-        end
       end
 
       private
 
+      def normalize_inputs!(inputs)
+        return inputs if inputs.is_a?(Hash) || inputs.is_a?(Inputs)
+
+        parameters = 'ActionController::Parameters'
+        klass = parameters.safe_constantize
+        return inputs.to_unsafe_h if klass && inputs.is_a?(klass)
+
+        raise ArgumentError, "inputs must be a hash or #{parameters}"
+      end
+
       def assign_to_grouped_input!(inputs, key, index, value)
         key = key.to_sym
 
@@ -44,46 +73,8 @@ module ActiveInteraction
       end
     end
 
-    def initialize
-      @groups = {}
-      @groups.default_proc = ->(hash, key) { hash[key] = [] }
-
-      super(@inputs = {})
-    end
-
-    # Associates the `value` with the `key`. Allows the `key`/`value` pair to
-    #   be associated with one or more groups.
-    #
-    # @example
-    #   inputs.store(:key, :value)
-    #   # => :value
-    #   inputs.store(:key, :value, %i[a b])
-    #   # => :value
-    #
-    # @param key [Object] The key to store the value under.
-    # @param value [Object] The value to store.
-    # @param groups [Array<Object>] The groups to store the pair under.
-    #
-    # @return [Object] value
-    def store(key, value, groups = [])
-      groups.each do |group|
-        @groups[group] << key
-      end
-
-      super(key, value)
-    end
-
-    # Returns inputs from the group name given.
-    #
-    # @example
-    #   inputs.group(:a)
-    #   # => {key: :value}
-    #
-    # @param name [Object] Name of the group to return.
-    #
-    # @return [Hash] Inputs from the group name given.
-    def group(name)
-      @inputs.select { |k, _| @groups[name].include?(k) }
+    def initialize(inputs = {})
+      super(inputs)
     end
   end
 end

data/lib/active_interaction/modules/validation.rb

@@ -14,26 +14,17 @@ module ActiveInteraction
           filter.clean(inputs[name], context)
         rescue NoDefaultError
           nil
-        rescue InvalidNestedValueError,
-               InvalidValueError,
-               MissingValueError => e
-          errors << error_args(filter, e)
+        rescue InvalidNestedValueError => e
+          errors << [filter.name, :invalid_nested, { name: e.filter_name.inspect, value: e.input_value.inspect }]
+        rescue InvalidValueError
+          errors << [filter.name, :invalid_type, { type: type(filter) }]
+        rescue MissingValueError
+          errors << [filter.name, :missing]
         end
       end
 
       private
 
-      def error_args(filter, error)
-        case error
-        when InvalidNestedValueError
-          [filter.name, :invalid_nested, { name: error.filter_name.inspect, value: error.input_value.inspect }]
-        when InvalidValueError
-          [filter.name, :invalid_type, { type: type(filter) }]
-        when MissingValueError
-          [filter.name, :missing]
-        end
-      end
-
       # @param filter [Filter]
       def type(filter)
         I18n.translate("#{Base.i18n_scope}.types.#{filter.class.slug}")

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -46,65 +46,6 @@ describe ActiveInteraction::Base do
       expect(interaction.instance_variable_defined?(:"@#{key}")).to be false
     end
 
-    context 'with invalid inputs' do
-      let(:inputs) { nil }
-
-      it 'raises an error' do
-        expect { interaction }.to raise_error ArgumentError
-      end
-    end
-
-    context 'with non-hash inputs' do
-      let(:inputs) { [%i[k v]] }
-
-      it 'raises an error' do
-        expect { interaction }.to raise_error ArgumentError
-      end
-    end
-
-    context 'with ActionController::Parameters inputs' do
-      let(:inputs) { ActionController::Parameters.new }
-
-      it 'does not raise an error' do
-        expect { interaction }.to_not raise_error
-      end
-    end
-
-    context 'with a reader' do
-      let(:described_class) do
-        Class.new(TestInteraction) do
-          attr_reader :thing
-
-          validates :thing, presence: true
-        end
-      end
-
-      context 'validation' do
-        context 'failing' do
-          it 'returns an invalid outcome' do
-            expect(interaction).to be_invalid
-          end
-        end
-
-        context 'passing' do
-          before { inputs[:thing] = SecureRandom.hex }
-
-          it 'returns a valid outcome' do
-            expect(interaction).to be_valid
-          end
-        end
-      end
-
-      context 'with a single input' do
-        let(:thing) { SecureRandom.hex }
-        before { inputs[:thing] = thing }
-
-        it 'sets the attribute' do
-          expect(interaction.thing).to eql thing
-        end
-      end
-    end
-
     context 'with a filter' do
       let(:described_class) { InteractionWithFilter }
 
@@ -589,6 +530,32 @@ describe ActiveInteraction::Base do
         expect(result).to be false
       end
     end
+
+    context 'multi-part date values' do
+      let(:described_class) do
+        Class.new(TestInteraction) do
+          date :thing,
+            default: nil
+
+          def execute
+            given?(:thing)
+          end
+        end
+      end
+
+      it 'returns true when the input is given' do
+        inputs.merge!(
+          'thing(1i)' => '2020',
+          'thing(2i)' => '12',
+          'thing(3i)' => '31'
+        )
+        expect(result).to be true
+      end
+
+      it 'returns false if not found' do
+        expect(result).to be false
+      end
+    end
   end
 
   context 'inheritance' do

data/spec/active_interaction/concerns/hashable_spec.rb

@@ -25,7 +25,7 @@ describe ActiveInteraction::Hashable do
       end
 
       context 'with a block' do
-        let(:block) { proc {} } # rubocop:disable Lint/EmptyBlock
+        let(:block) { proc {} }
         let(:hash) { subject.hash(*arguments, &block) }
 
         it 'calls method_missing' do

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -127,6 +127,29 @@ describe ActiveInteraction::ArrayFilter, :filter do
         end
       end
     end
+
+    context 'with a nested interface type' do
+      context 'with the methods option set' do
+        let(:block) { proc { public_send(:interface, methods: %i[to_s]) } }
+
+        it 'has a filter with the right option' do
+          expect(filter.filters[:'0'].options).to have_key(:methods)
+          expect(filter.filters[:'0'].options[:methods]).to eql %i[to_s]
+        end
+      end
+
+      context 'with another option set' do
+        let(:block) { proc { public_send(:object, converter: :new) } }
+        let(:name) { :objects }
+
+        it 'has a filter with the right options' do
+          expect(filter.filters[:'0'].options).to have_key(:class)
+          expect(filter.filters[:'0'].options[:class]).to eql :Object
+          expect(filter.filters[:'0'].options).to have_key(:converter)
+          expect(filter.filters[:'0'].options[:converter]).to eql :new
+        end
+      end
+    end
   end
 
   describe '#database_column_type' do

data/spec/active_interaction/filters/interface_filter_spec.rb

@@ -61,6 +61,17 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
         end
 
+        context 'that is nil' do
+          let(:name) { :interface_module }
+          let(:value) { nil }
+
+          it 'raises an error' do
+            expect do
+              result
+            end.to raise_error ActiveInteraction::MissingValueError
+          end
+        end
+
         context 'with the class itself' do
           let(:name) { :interface_class }
           let(:value) do

data/spec/active_interaction/inputs_spec.rb

@@ -26,6 +26,38 @@ describe ActiveInteraction::Inputs do
     let(:inputs) { {} }
     let(:result) { described_class.process(inputs) }
 
+    context 'with invalid inputs' do
+      let(:inputs) { nil }
+
+      it 'raises an error' do
+        expect { result }.to raise_error ArgumentError
+      end
+    end
+
+    context 'with non-hash inputs' do
+      let(:inputs) { [%i[k v]] }
+
+      it 'raises an error' do
+        expect { result }.to raise_error ArgumentError
+      end
+    end
+
+    context 'with ActionController::Parameters inputs' do
+      let(:inputs) { ActionController::Parameters.new }
+
+      it 'does not raise an error' do
+        expect { result }.to_not raise_error
+      end
+    end
+
+    context 'with Inputs inputs' do
+      let(:inputs) { ActiveInteraction::Inputs.new }
+
+      it 'does not raise an error' do
+        expect { result }.to_not raise_error
+      end
+    end
+
     context 'with simple inputs' do
       before { inputs[:key] = :value }
 

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -19,7 +19,7 @@ describe HashInteraction do
     before { inputs[:a] = a }
 
     it 'returns the correct value for :a' do
-      expect(result[:a]).to eql a.with_indifferent_access
+      expect(result[:a]).to eql ActiveSupport::HashWithIndifferentAccess.new(a)
     end
 
     it 'returns the correct value for :b' do

data/spec/active_interaction/integration/time_interaction_spec.rb

@@ -12,11 +12,11 @@ TimeWithZone = Class.new do
   end
 
   def at(*args)
-    Time.at(*args)
+    TimeWithZone.new(Time.at(*args) + 1)
   end
 
   def parse(*args)
-    Time.parse(*args)
+    TimeWithZone.new(Time.parse(*args) + 1)
   rescue ArgumentError
     nil
   end
@@ -43,7 +43,7 @@ describe TimeInteraction do
       let(:a) { rand(1 << 16) }
 
       it 'returns the correct value' do
-        expect(result[:a]).to eq Time.zone.at(a)
+        expect(result[:a]).to eq TimeWithZone.new(0).at(a)
       end
     end
 
@@ -51,7 +51,7 @@ describe TimeInteraction do
       let(:a) { '2011-12-13T14:15:16Z' }
 
       it 'returns the correct value' do
-        expect(result[:a]).to eq Time.zone.parse(a)
+        expect(result[:a]).to eq TimeWithZone.new(0).parse(a)
       end
     end
 

data/spec/spec_helper.rb

@@ -1,9 +1,3 @@
-# Disable code coverage for JRuby because it always reports 0% coverage.
-if RUBY_ENGINE != 'jruby'
-  require 'coveralls'
-  Coveralls.wear!
-end
-
 require 'i18n'
 I18n.config.enforce_available_locales = true if I18n.config.respond_to?(:enforce_available_locales)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.5
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -32,21 +32,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -60,33 +66,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +253,6 @@ files:
 - lib/active_interaction/locale/it.yml
 - lib/active_interaction/locale/ja.yml
 - lib/active_interaction/locale/pt-BR.yml
-- lib/active_interaction/modules/input_processor.rb
 - lib/active_interaction/modules/validation.rb
 - lib/active_interaction/version.rb
 - spec/active_interaction/base_spec.rb

data/lib/active_interaction/modules/input_processor.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveInteraction
-  # Groups inputs ending in "(*N*i)" into {GroupedInput}.
-  #
-  # @private
-  module InputProcessor
-    class << self
-      GROUPED_INPUT_PATTERN = /\A(.+)\((\d+)i\)\z/.freeze
-      private_constant :GROUPED_INPUT_PATTERN
-
-      # Checking `syscall` is the result of what appears to be a bug in Ruby.
-      # https://bugs.ruby-lang.org/issues/15597
-      def reserved?(name)
-        name.to_s.start_with?('_interaction_') ||
-          name == :syscall ||
-          (
-            Base.method_defined?(name) &&
-            !Object.method_defined?(name)
-          ) ||
-          (
-            Base.private_method_defined?(name) &&
-            !Object.private_method_defined?(name)
-          )
-      end
-
-      def process(inputs)
-        inputs.stringify_keys.sort.each_with_object({}) do |(k, v), h|
-          next if reserved?(k)
-
-          if (match = GROUPED_INPUT_PATTERN.match(k))
-            assign_to_group!(h, *match.captures, v)
-          else
-            h[k.to_sym] = v
-          end
-        end
-      end
-
-      private
-
-      def assign_to_group!(inputs, key, index, value)
-        key = key.to_sym
-
-        inputs[key] = GroupedInput.new unless inputs[key].is_a?(GroupedInput)
-        inputs[key][index] = value
-      end
-    end
-  end
-end