active_interaction 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 965fd20ed2231b6cb6a86c1849e11138cb694a77e05cb24e0091674964bbbd51
-  data.tar.gz: b86949412bf7a60d767fa27dec8b0092f0c0b053afb11bd50a5a5f09f83dc921
+  metadata.gz: 24af31782cca3b666b2f211506cb3ca39e362ffcb665ae509bda892b13e65934
+  data.tar.gz: 3a139e271e9d19ac23cdea62a5bbe882889f50483647951289623b8f3aaaf97f
 SHA512:
-  metadata.gz: 31878456f6b33fb902254fd44cc532d411a97db32ff347ca8bc8164166897d54cd0eae31e0add30f4f130f4e744a16cdb8970859d8bf79a842258b4c0ec38c0f
-  data.tar.gz: 17addfece52ce88fe5757eae06e14930508d209747caba20bd3e1d9b1aff140d2525e9548ec4a19dd1388dc7ef7e780706e35850351e8b487cda36c3f5b10bd9
+  metadata.gz: 574d84a7a67526dcb2b7f64ca885d6cccb3115612e731b4091bd1bb122446a88ce81ad791196c6bd33555122e9b2c8b07ac1924cecbe400f4d541906274fcd3c
+  data.tar.gz: 1260eae401d19342ef4b8e2ada334553e7b99672b3257ec9b5880d0c6566eb8dc86e8de9fc5c5a3d0ed37485f86fc88cdb3adc2abe6299ac60d049f1d0713474

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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
@@ -77,7 +84,7 @@ class Example < ActiveInteraction::Base
 
   validates :first_name,
     presence: true,
-    unless: 'first_name.nil?'
+    unless: -> { first_name.nil? }
 
   def execute
     # ...
@@ -951,7 +958,8 @@ Example.run
 
 - Initial release.
 
-  [4.0.2]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.2...v4.0.3
+  [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 +1171,4 @@ 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

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/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
         )

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/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.0.4')
 end

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -137,6 +137,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/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.0.4
 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-07-03 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