active_interaction 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b6d048d5a1bc4790a7852753a5bb79b74ddcef73e88603692fc0c580a28247c
-  data.tar.gz: 62091b8494eee0cd2d90b64fb9540067e0b98446403af42e21ddb45df2891f9c
+  metadata.gz: 965fd20ed2231b6cb6a86c1849e11138cb694a77e05cb24e0091674964bbbd51
+  data.tar.gz: b86949412bf7a60d767fa27dec8b0092f0c0b053afb11bd50a5a5f09f83dc921
 SHA512:
-  metadata.gz: bf7ba20068a6d5aee70730136d891d1bc4ce94d49ec8d7558805e3c6e017ba8560943581c31a99760890572a5b8d4121ec4ec8c8d639c3a29878505d56f09221
-  data.tar.gz: 12a9fb539e434435065fde8671905b34fa742e4ebe5b030992b2d0ed58c17040cbaa9b2125a7a391311bd64659aa24416aa6c2d2b3ab151cadde018be1ff86fb
+  metadata.gz: 31878456f6b33fb902254fd44cc532d411a97db32ff347ca8bc8164166897d54cd0eae31e0add30f4f130f4e744a16cdb8970859d8bf79a842258b4c0ec38c0f
+  data.tar.gz: 17addfece52ce88fe5757eae06e14930508d209747caba20bd3e1d9b1aff140d2525e9548ec4a19dd1388dc7ef7e780706e35850351e8b487cda36c3f5b10bd9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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
@@ -944,6 +951,7 @@ Example.run
 
 - Initial release.
 
+  [4.0.2]: 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
@@ -1153,3 +1161,5 @@ Example.run
   [#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

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 = {})
@@ -239,20 +236,26 @@ module ActiveInteraction
 
       [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
@@ -268,30 +271,8 @@ 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_raw_inputs = inputs
-
-      populate_filters_and_inputs(ActiveInteraction::Inputs.process(inputs))
-    end
-
     def populate_filters_and_inputs(inputs)
-      @_interaction_inputs = ActiveInteraction::Inputs.new
+      @_interaction_inputs = Inputs.new
 
       self.class.filters.each do |name, filter|
         value =

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/inputs.rb

@@ -13,8 +13,15 @@ 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 ||
@@ -28,20 +35,36 @@ module ActiveInteraction
           )
       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
 
@@ -71,6 +94,7 @@ module ActiveInteraction
     # @param groups [Array<Object>] The groups to store the pair under.
     #
     # @return [Object] value
+    # @private
     def store(key, value, groups = [])
       groups.each do |group|
         @groups[group] << key
@@ -88,6 +112,7 @@ module ActiveInteraction
     # @param name [Object] Name of the group to return.
     #
     # @return [Hash] Inputs from the group name given.
+    # @private
     def group(name)
       @inputs.select { |k, _| @groups[name].include?(k) }
     end

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -46,30 +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 filter' do
       let(:described_class) { InteractionWithFilter }
 
@@ -554,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/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 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -135,14 +135,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