active_interaction 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 965fd20ed2231b6cb6a86c1849e11138cb694a77e05cb24e0091674964bbbd51
-  data.tar.gz: b86949412bf7a60d767fa27dec8b0092f0c0b053afb11bd50a5a5f09f83dc921
+  metadata.gz: 557de518b6e1a33937d70d31e6c29dd6179384372e082595f8087b3efcdae784
+  data.tar.gz: 2ba312b6ddc61043acbc8bcb48dbbc4a60010be6701a5a368325d0a14fc4c557
 SHA512:
-  metadata.gz: 31878456f6b33fb902254fd44cc532d411a97db32ff347ca8bc8164166897d54cd0eae31e0add30f4f130f4e744a16cdb8970859d8bf79a842258b4c0ec38c0f
-  data.tar.gz: 17addfece52ce88fe5757eae06e14930508d209747caba20bd3e1d9b1aff140d2525e9548ec4a19dd1388dc7ef7e780706e35850351e8b487cda36c3f5b10bd9
+  metadata.gz: 28674a0400c7bd8dafaae7430f1609fdbd3cd93e3ca5c60a07d2df2970b825a7e218d2482026f0a6365ba11fdd6518830fdfb96f496909ee7d8cb63154c5b8e7
+  data.tar.gz: e527210922d3e9af79ff3c61f2e5d1ba873fe9eb31be543ffd640d255f69de19b40d0621ff9900db19e3cf3f553c8cfbcf583954385d2c8a3db2f24a747037f7

data/CHANGELOG.md

@@ -1,19 +1,44 @@
+# [4.1.0][] (2021-12-30)
+
+## Added
+
+- [#518][] - Add Rails 7 support
+
+# [4.0.6][] (2021-10-13)
+
+## Fixed
+
+- [#515][] - Filters nested in arrays should accept default values as indicated in the documentation.
+
+# [4.0.5][] (2021-07-11)
+
+## Fixed
+
+- [#480][] - Interfaces used inside hashes failed to recognize `nil` as a non-value.
+
+# [4.0.4][] (2021-07-03)
+
+## Fixed
+
+- [#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
+## Fixed
 
 - [#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
+## Fixed
 
 - [#505][] - Nested Interface filters using the `:methods` option threw an error.
 
 # [4.0.1][] (2021-05-26)
 
-## Fix
+## Fixed
 
 - Fix regression of filter name relaxing.
 - [#495][] - Fix time filter ignoring time zones
@@ -77,7 +102,7 @@ class Example < ActiveInteraction::Base
 
   validates :first_name,
     presence: true,
-    unless: 'first_name.nil?'
+    unless: -> { first_name.nil? }
 
   def execute
     # ...
@@ -176,13 +201,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)
 
@@ -951,7 +976,11 @@ Example.run
 
 - Initial release.
 
-  [4.0.2]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.2...v4.0.3
+  [4.1.0]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.6...v4.1.0
+  [4.0.6]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.5...v4.0.6
+  [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
@@ -1163,3 +1192,9 @@ Example.run
   [#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
+  [#515]: https://github.com/AaronLasseigne/active_interaction/issues/515
+  [#518]: https://github.com/AaronLasseigne/active_interaction/issues/518

data/README.md

@@ -5,8 +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,20 +56,20 @@ handles your verbs.
   - [Translations](#translations)
 - [Credits](#credits)
 
-[Full Documentation][]
+[API Documentation][]
 
 ## Installation
 
 Add it to your Gemfile:
 
 ``` rb
-gem 'active_interaction', '~> 4.0'
+gem 'active_interaction', '~> 4.1'
 ```
 
 Or install it manually:
 
 ``` sh
-$ gem install active_interaction --version '~> 4.0'
+$ gem install active_interaction --version '~> 4.1'
 ```
 
 This project uses [Semantic Versioning][]. Check out [GitHub releases][] for a
@@ -977,10 +975,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?
@@ -1021,9 +1019,9 @@ end
 
 ### Callbacks
 
-ActiveModel provides a powerful framework for defining callbacks.
-ActiveInteraction hooks into that framework to allow hooking into various parts
-of an interaction's lifecycle.
+[ActiveSupport::Callbacks][] provides a powerful framework for defining callbacks.
+ActiveInteraction uses that framework to allow hooking into various parts of an
+interaction's lifecycle.
 
 ``` rb
 class Increment < ActiveInteraction::Base
@@ -1448,8 +1446,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 +1456,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 +1469,5 @@ 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
+[ActiveSupport::Callbacks]: https://api.rubyonrails.org/classes/ActiveSupport/Callbacks.html

data/lib/active_interaction/filters/array_filter.rb

@@ -73,7 +73,7 @@ module ActiveInteraction
     end
 
     def add_option_in_place_of_name(klass, options)
-      if (keys = FILTER_NAME_OR_OPTION[klass.to_s]) && (keys && options.keys).empty?
+      if (keys = FILTER_NAME_OR_OPTION[klass.to_s]) && (keys & options.keys).empty?
         options.merge(
           "#{keys.first}": name.to_s.singularize.camelize.to_sym
         )
@@ -91,7 +91,7 @@ module ActiveInteraction
 
         filters[filters.size.to_s.to_sym] = filter
 
-        validate!(filter, names)
+        validate!(names)
       end
     end
     # rubocop:enable Style/MissingRespondToMissing
@@ -100,13 +100,11 @@ module ActiveInteraction
     # @param names [Array<Symbol>]
     #
     # @raise [InvalidFilterError]
-    def validate!(filter, names)
+    def validate!(names)
       raise InvalidFilterError, 'multiple filters in array block' if filters.size > 1
 
       raise InvalidFilterError, 'attribute names in array block' unless names.empty?
 
-      raise InvalidDefaultError, 'default values in array block' if filter.default?
-
       nil
     end
   end

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

@@ -73,48 +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
-    # @private
-    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.
-    # @private
-    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.3')
+  VERSION = Gem::Version.new('4.1.0')
 end

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/spec/active_interaction/filters/array_filter_spec.rb

@@ -25,14 +25,6 @@ describe ActiveInteraction::ArrayFilter, :filter do
     end
   end
 
-  context 'with a nested default' do
-    let(:block) { proc { array default: nil } }
-
-    it 'raises an error' do
-      expect { filter }.to raise_error ActiveInteraction::InvalidDefaultError
-    end
-  end
-
   describe '#cast' do
     let(:result) { filter.send(:cast, value, nil) }
 
@@ -137,6 +129,18 @@ describe ActiveInteraction::ArrayFilter, :filter do
           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
 

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/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/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.3
+  version: 4.1.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -20,7 +20,7 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,23 +30,29 @@ dependencies:
         version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !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: '8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !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,42 +141,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +309,7 @@ metadata:
   homepage_uri: https://github.com/AaronLasseigne/active_interaction
   source_code_uri: https://github.com/AaronLasseigne/active_interaction
   changelog_uri: https://github.com/AaronLasseigne/active_interaction/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -318,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Manage application specific business logic.