active_interaction 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65047712d1df9c67700202a27f83054c30fccbdf3d7bf7e0478c01e5bea07fc8
-  data.tar.gz: b39bb6c7d8784cf842eb266e3955fdbc1082c5a4f96c30bdcbdd10074294ea6d
+  metadata.gz: 1b6d048d5a1bc4790a7852753a5bb79b74ddcef73e88603692fc0c580a28247c
+  data.tar.gz: 62091b8494eee0cd2d90b64fb9540067e0b98446403af42e21ddb45df2891f9c
 SHA512:
-  metadata.gz: 5ca04e342b3b82a29724e113600ca12bebdc303de3c66c51299fc490cd8686e3a062c77498ccd53e33f02a9dc0e05dc5a44ee26be911af6e59bfcca1b2d41d65
-  data.tar.gz: a09744ecbd57a5c69ee845235942c2f2063bfb70f509a9bd6384f45690a35218e6c48c632b2388701f910746614b43b040803329e5310e24ea291267eddd3234
+  metadata.gz: bf7ba20068a6d5aee70730136d891d1bc4ce94d49ec8d7558805e3c6e017ba8560943581c31a99760890572a5b8d4121ec4ec8c8d639c3a29878505d56f09221
+  data.tar.gz: 12a9fb539e434435065fde8671905b34fa742e4ebe5b030992b2d0ed58c17040cbaa9b2125a7a391311bd64659aa24416aa6c2d2b3ab151cadde018be1ff86fb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [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
@@ -938,6 +944,8 @@ Example.run
 
 - Initial release.
 
+  [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
@@ -1143,3 +1151,5 @@ 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

data/lib/active_interaction/base.rb

@@ -191,10 +191,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,7 +235,7 @@ 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)
@@ -288,27 +285,29 @@ module ActiveInteraction
 
     # @param inputs [Hash{Symbol => Object}]
     def process_inputs(inputs)
-      @_interaction_inputs = inputs
+      @_interaction_raw_inputs = inputs
 
-      inputs.each do |key, value|
-        next if ActiveInteraction::Inputs.reserved?(key)
-
-        populate_reader(key, value)
-      end
-
-      populate_filters(ActiveInteraction::Inputs.process(inputs))
+      populate_filters_and_inputs(ActiveInteraction::Inputs.process(inputs))
     end
 
-    def populate_reader(key, value)
-      instance_variable_set("@#{key}", value) if respond_to?(key)
-    end
+    def populate_filters_and_inputs(inputs)
+      @_interaction_inputs = ActiveInteraction::Inputs.new
 
-    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/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/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -70,41 +70,6 @@ describe ActiveInteraction::Base do
       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 }
 

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -127,6 +127,17 @@ 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
+    end
   end
 
   describe '#database_column_type' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel