active_interaction 3.8.2 → 4.0.3

data/lib/active_interaction.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'active_model'
@@ -7,8 +6,6 @@ require 'active_model'
 #
 # @author Aaron Lasseigne <aaron.lasseigne@gmail.com>
 # @author Taylor Fausak <taylor@fausak.me>
-#
-# @since 1.0.0
 module ActiveInteraction
 end
 
@@ -22,13 +19,12 @@ require 'active_interaction/concerns/missable'
 require 'active_interaction/concerns/runnable'
 
 require 'active_interaction/grouped_input'
+require 'active_interaction/inputs'
 
-require 'active_interaction/modules/input_processor'
 require 'active_interaction/modules/validation'
 
 require 'active_interaction/filter_column'
 require 'active_interaction/filter'
-require 'active_interaction/filters/abstract_filter'
 require 'active_interaction/filters/interface_filter'
 require 'active_interaction/filters/abstract_date_time_filter'
 require 'active_interaction/filters/abstract_numeric_filter'
@@ -49,8 +45,6 @@ require 'active_interaction/filters/time_filter'
 
 require 'active_interaction/base'
 
-require 'active_interaction/backports'
-
 I18n.load_path.unshift(
   *Dir.glob(
     File.expand_path(

data/lib/active_interaction/base.rb

@@ -1,8 +1,5 @@
-# coding: utf-8
 # 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.
@@ -28,7 +25,7 @@ module ActiveInteraction
   #   else
   #     outcome.errors
   #   end
-  class Base # rubocop:disable Metrics/ClassLength
+  class Base
     include ActiveModelable
     include ActiveRecordable
     include Runnable
@@ -46,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]
 
@@ -74,9 +71,7 @@ module ActiveInteraction
       # @return [String, nil] The description.
       def desc(desc = nil)
         if desc.nil?
-          unless instance_variable_defined?(:@_interaction_desc)
-            @_interaction_desc = nil
-          end
+          @_interaction_desc = nil unless instance_variable_defined?(:@_interaction_desc)
         else
           @_interaction_desc = desc
         end
@@ -88,17 +83,21 @@ module ActiveInteraction
       #
       # @return [Hash{Symbol => Filter}]
       def filters
+        # rubocop:disable Naming/MemoizedInstanceVariableName
         @_interaction_filters ||= {}
+        # rubocop:enable Naming/MemoizedInstanceVariableName
       end
 
       # @private
-      def method_missing(*args, &block) # rubocop:disable Style/MethodMissing
+      # rubocop:disable Style/MissingRespondToMissing
+      def method_missing(*args, &block)
         super do |klass, names, options|
           raise InvalidFilterError, 'missing attribute name' if names.empty?
 
           names.each { |name| add_filter(klass, name, options, &block) }
         end
       end
+      # rubocop:enable Style/MissingRespondToMissing
 
       private
 
@@ -106,9 +105,7 @@ module ActiveInteraction
       # @param name [Symbol]
       # @param options [Hash]
       def add_filter(klass, name, options, &block)
-        if InputProcessor.reserved?(name)
-          raise InvalidFilterError, %("#{name}" is a reserved name)
-        end
+        raise InvalidFilterError, %("#{name}" is a reserved name) if Inputs.reserved?(name)
 
         initialize_filter(klass.new(name, options, &block))
       end
@@ -133,7 +130,7 @@ module ActiveInteraction
         other_filters.select! { |k, _| [*only].include?(k) } if only
         other_filters.reject! { |k, _| [*except].include?(k) } if except
 
-        other_filters.values.each { |filter| initialize_filter(filter) }
+        other_filters.each_value { |filter| initialize_filter(filter) }
       end
 
       # @param klass [Class]
@@ -146,13 +143,10 @@ module ActiveInteraction
       # @param filter [Filter]
       def initialize_filter(filter)
         attribute = filter.name
-        if filters.key?(attribute)
-          warn "WARNING: Redefining #{name}##{attribute} filter"
-        end
+        warn "WARNING: Redefining #{name}##{attribute} filter" if filters.key?(attribute)
         filters[attribute] = filter
 
         attr_accessor attribute
-        define_method("#{attribute}?") { !public_send(attribute).nil? }
 
         eagerly_evaluate_default(filter)
       end
@@ -164,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 = {})
@@ -195,9 +188,7 @@ module ActiveInteraction
     #
     # @return [Hash{Symbol => Object}] All inputs passed to {.run} or {.run!}.
     def inputs
-      self.class.filters.keys.each_with_object({}) do |name, h|
-        h[name] = public_send(name)
-      end
+      @_interaction_inputs
     end
 
     # Returns `true` if the given key was in the hash passed to {.run}.
@@ -241,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
@@ -274,50 +271,30 @@ 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
+    def populate_filters_and_inputs(inputs)
+      @_interaction_inputs = Inputs.new
 
-    # @param inputs [Hash{Symbol => Object}]
-    def process_inputs(inputs)
-      @_interaction_inputs = inputs
+      self.class.filters.each do |name, filter|
+        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
 
-      inputs.each do |key, value|
-        populate_reader(key, value) unless InputProcessor.reserved?(key)
+        @_interaction_inputs[name] = value
+        public_send("#{name}=", value)
       end
 
-      populate_filters(InputProcessor.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|
-        begin
-          public_send("#{name}=", filter.clean(inputs[name], self))
-        rescue InvalidValueError, MissingValueError, NoDefaultError
-          nil # #type_check will add errors if appropriate.
-        end
-      end
+      @_interaction_inputs.freeze
     end
 
     def type_check
       run_callbacks(:type_check) do
-        Validation.validate(self, self.class.filters, inputs).each do |error|
-          errors.add(*error)
+        Validation.validate(self, self.class.filters, inputs).each do |attr, type, kwargs = {}|
+          errors.add(attr, type, **kwargs)
         end
       end
     end

data/lib/active_interaction/concerns/active_modelable.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 module ActiveInteraction
@@ -34,8 +33,7 @@ module ActiveInteraction
       false
     end
 
-    #
-    module ClassMethods
+    module ClassMethods # rubocop:disable Style/Documentation
       # @return [Symbol]
       #
       # @see ActiveModel::Translation#i18n_scope

data/lib/active_interaction/concerns/active_recordable.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 module ActiveInteraction
@@ -24,8 +23,6 @@ module ActiveInteraction
     #   # => nil
     #
     # @return [FilterColumn, nil]
-    #
-    # @since 1.2.0
     def column_for_attribute(name)
       filter = self.class.filters[name]
       FilterColumn.intern(filter.database_column_type) if filter
@@ -49,9 +46,7 @@ module ActiveInteraction
     #   # => false
     #
     # @return [Boolean]
-    #
-    # @since 1.5.0
-    def has_attribute?(name) # rubocop:disable Style/PredicateName
+    def has_attribute?(name) # rubocop:disable Naming/PredicateName
       self.class.filters.key?(name.to_sym)
     end
   end

data/lib/active_interaction/concerns/hashable.rb

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

data/lib/active_interaction/concerns/missable.rb

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

data/lib/active_interaction/concerns/runnable.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 module ActiveInteraction
@@ -46,9 +45,7 @@ module ActiveInteraction
 
     # @return [Boolean]
     def valid?(*)
-      if instance_variable_defined?(:@_interaction_valid)
-        return @_interaction_valid
-      end
+      return @_interaction_valid if instance_variable_defined?(:@_interaction_valid)
 
       super
     end
@@ -74,14 +71,11 @@ module ActiveInteraction
     def run
       return self.result = nil unless valid?
 
-      run_callbacks(:execute) do
-        self.result =
-          begin
-            execute
-          rescue Interrupt => interrupt
-            errors.backtrace = interrupt.errors.backtrace || interrupt.backtrace
-            errors.merge!(interrupt.errors)
-          end
+      self.result = run_callbacks(:execute) do
+        execute
+      rescue Interrupt => e
+        errors.backtrace = e.errors.backtrace || e.backtrace
+        errors.merge!(e.errors)
       end
     end
 
@@ -99,8 +93,7 @@ module ActiveInteraction
       raise e
     end
 
-    #
-    module ClassMethods
+    module ClassMethods # rubocop:disable Style/Documentation
       def new(*)
         super.tap do |instance|
           {

data/lib/active_interaction/errors.rb

@@ -1,17 +1,15 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-#
 module ActiveInteraction
   # Top-level error class. All other errors subclass this.
   #
   # @return [Class]
   Error = Class.new(StandardError)
 
-  # Raised if a class name is invalid.
+  # Raised if a constant name is invalid.
   #
   # @return [Class]
-  InvalidClassError = Class.new(Error)
+  InvalidNameError = Class.new(Error)
 
   # Raised if a converter is invalid.
   #
@@ -100,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
@@ -119,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)
@@ -151,9 +137,8 @@ module ActiveInteraction
       if attribute?(attribute) || attribute == :base
         options = detail.dup
         error = options.delete(:error)
-        options[:message] = message
 
-        add(attribute, error, options) unless added?(attribute, error, options)
+        add(attribute, error, **options.merge(message: message)) unless added?(attribute, error, **options)
       else
         merge_message!(attribute, message)
       end

data/lib/active_interaction/filter.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'active_support/inflector'
@@ -78,16 +77,16 @@ module ActiveInteraction
     #   to the default value.
     #
     # @example
-    #   ActiveInteraction::Filter.new(:example).clean(nil)
+    #   ActiveInteraction::Filter.new(:example).clean(nil, nil)
     #   # => ActiveInteraction::MissingValueError: example
     # @example
-    #   ActiveInteraction::Filter.new(:example).clean(0)
+    #   ActiveInteraction::Filter.new(:example).clean(0, nil)
     #   # => ActiveInteraction::InvalidValueError: example: 0
     # @example
-    #   ActiveInteraction::Filter.new(:example, default: nil).clean(nil)
+    #   ActiveInteraction::Filter.new(:example, default: nil).clean(nil, nil)
     #   # => nil
     # @example
-    #   ActiveInteraction::Filter.new(:example, default: 0).clean(nil)
+    #   ActiveInteraction::Filter.new(:example, default: 0).clean(nil, nil)
     #   # => ActiveInteraction::InvalidDefaultError: example: 0
     #
     # @param value [Object]
@@ -95,7 +94,9 @@ module ActiveInteraction
     #
     # @return [Object]
     #
-    # @raise (see #cast)
+    # @raise [MissingValueError] If the value is missing and there is no
+    #   default.
+    # @raise [InvalidValueError] If the value is invalid.
     # @raise (see #default)
     def clean(value, context)
       value = cast(value, context)
@@ -120,7 +121,7 @@ module ActiveInteraction
     #
     # @param context [Base, nil]
     #
-    # @return (see #raw_default)
+    # @return [Object]
     #
     # @raise [NoDefaultError] If the default is missing.
     # @raise [InvalidDefaultError] If the default is invalid.
@@ -131,8 +132,8 @@ module ActiveInteraction
       raise InvalidValueError if value.is_a?(GroupedInput)
 
       cast(value, context)
-    rescue InvalidNestedValueError => error
-      raise InvalidDefaultError, "#{name}: #{value.inspect} (#{error})"
+    rescue InvalidNestedValueError => e
+      raise InvalidDefaultError, "#{name}: #{value.inspect} (#{e})"
     rescue InvalidValueError, MissingValueError
       raise InvalidDefaultError, "#{name}: #{value.inspect}"
     end
@@ -162,27 +163,6 @@ module ActiveInteraction
       options.key?(:default)
     end
 
-    # @param value [Object]
-    # @param _interaction [Base, nil]
-    #
-    # @return [Object]
-    #
-    # @raise [MissingValueError] If the value is missing and there is no
-    #   default.
-    # @raise [InvalidValueError] If the value is invalid.
-    #
-    # @private
-    def cast(value, _interaction)
-      case value
-      when NilClass
-        raise MissingValueError, name unless default?
-
-        nil
-      else
-        raise InvalidValueError, "#{name}: #{describe(value)}"
-      end
-    end
-
     # Gets the type of database column that would represent the filter data.
     #
     # @example
@@ -194,25 +174,74 @@ module ActiveInteraction
     #
     # @return [Symbol] A database column type. If no sensible mapping exists,
     #   returns `:string`.
-    #
-    # @since 1.2.0
     def database_column_type
       :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
 
-    # @param value [Object]
-    # @return [String]
+    # rubocop:disable Metrics/MethodLength
+    def cast(value, context, convert: true, reconstantize: true)
+      if matches?(value)
+        adjust_output(value, context)
+      # we can't use `nil?` because BasicObject doesn't have it
+      elsif value == nil # rubocop:disable Style/NilComparison
+        raise MissingValueError, name unless default?
+
+        nil
+      elsif reconstantize
+        send(__method__, value, context,
+          convert: convert,
+          reconstantize: false
+        )
+      elsif convert
+        send(__method__, convert(value), context,
+          convert: false,
+          reconstantize: reconstantize
+        )
+      else
+        raise InvalidValueError, "#{name}: #{describe(value)}"
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    def matches?(_value)
+      false
+    end
+
+    def adjust_output(value, _context)
+      value
+    end
+
+    def convert(value)
+      value
+    end
+
+    def klass
+      @klass ||= Object.const_get(self.class.slug.to_s.camelize, false)
+    end
+
     def describe(value)
       value.inspect
     rescue NoMethodError
       "(Object doesn't support #inspect)"
     end
 
-    # @param context [Base, nil]
-    #
-    # @return [Object]
     def raw_default(context)
       value = options.fetch(:default)
       return value unless value.is_a?(Proc)