active_interaction 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b90b2dc28188b224ed0aa986afb739056dbd2407061da2dfee81b825c5674ca9
-  data.tar.gz: 755707a0f9554cee89a08567245f3d78d597a8b7ae7ec671c3eb572f4dd5a881
+  metadata.gz: 9b454bfd8df636194b206bcac24dba1e52dd88b6cd5b45322e6d769c7eeebe8d
+  data.tar.gz: 8624a4b45f3f198528a24e7994af331fde5d66c7c7b732db2e1efeb63a72c9cc
 SHA512:
-  metadata.gz: d24433ef35282b38531e2e18c1e426f69f9cc71692fdb2d96e21f3c420b56a6bb42c3f473b255890b457ab3d1764d6b132ec7f30260437d732ced70b083d217a
-  data.tar.gz: dd2ce32a0c59afa9f5fe1a8134aa82e98404b1e0d5a3a3801b8dd7a726f75f28d16de46c72687c3e5f807db0576936e0a34abe3b26201dd2c58c90c798df10d5
+  metadata.gz: cc07f6e2d9b5cea926350d72a061be59b0101a301ba1bee2a6cfab10485a4b83bed85445efc02f919936f2e3b34edc7bdf7890ca04869db5a58cc88cc2bb1d6e
+  data.tar.gz: 4b582ae18497b4abb6f3a287ec3bfaff08fbc0cbef7e0ab33c35a9345ebd1fd9fd437f96b870e88760dfa82a056467df17b18b326698310e711ced0c4b5a0996

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [5.3.0][] (2023-05-06)
+
+## Added
+
+ - Added predicate methods for boolean values. Thanks @heka1024
+
+## Fixed
+
+ - [#554][] - Non-detailed error should not lose options when merged.
+ - [#553][] - Improve error handling and documentation for hash filter defaults.
+
 # [5.2.0][] (2022-10-22)
 
 ## Added
@@ -1361,3 +1372,5 @@ Example.run
   [#537]: https://github.com/AaronLasseigne/active_interaction/issues/537
   [#539]: https://github.com/AaronLasseigne/active_interaction/issues/539
   [#545]: https://github.com/AaronLasseigne/active_interaction/issues/545
+  [#554]: https://github.com/AaronLasseigne/active_interaction/issues/554
+  [#553]: https://github.com/AaronLasseigne/active_interaction/issues/553

data/README.md

@@ -2,16 +2,11 @@
 
 ActiveInteraction manages application-specific business logic.
 It's an implementation of service objects designed to blend seamlessly into Rails.
+It also helps you write safer code by validating that your inputs conform to your expectations.
+If ActiveModel deals with your nouns, then ActiveInteraction handles your verbs.
 
 [![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)
-
----
-
-ActiveInteraction gives you a place to put your business logic. It also helps
-you write safer code by validating that your inputs conform to your
-expectations. If ActiveModel deals with your nouns, then ActiveInteraction
-handles your verbs.
+[![Test](https://img.shields.io/github/actions/workflow/status/AaronLasseigne/active_interaction/test.yml?label=Test&style=flat-square&branch=main)](https://github.com/AaronLasseigne/active_interaction/actions?query=workflow%3ATest)
 
 - [Installation](#installation)
 - [Basic usage](#basic-usage)
@@ -65,13 +60,13 @@ handles your verbs.
 Add it to your Gemfile:
 
 ``` rb
-gem 'active_interaction', '~> 5.2'
+gem 'active_interaction', '~> 5.3'
 ```
 
 Or install it manually:
 
 ``` sh
-$ gem install active_interaction --version '~> 5.2'
+$ gem install active_interaction --version '~> 5.3'
 ```
 
 This project uses [Semantic Versioning][]. Check out [GitHub releases][] for a
@@ -296,12 +291,15 @@ Boolean filters convert the strings `"1"`, `"true"`, and `"on"`
 (case-insensitive) into `true`. They also convert `"0"`, `"false"`, and `"off"`
 into `false`. Blank strings will be treated as `nil`.
 
+Boolean values can be accessed using the filter name but can also be checked
+using a predicate method of the same name.
+
 ``` rb
 class BooleanInteraction < ActiveInteraction::Base
   boolean :kool_aid
 
   def execute
-    'Oh yeah!' if kool_aid
+    'Oh yeah!' if kool_aid? # could also use `kool_aid`
   end
 end
 
@@ -360,7 +358,8 @@ HashInteraction.run!(preferences: { newsletter: true, 'sweepstakes' => false })
 
 Setting default hash values can be tricky. The default value has to be either
 `nil` or `{}`. Use `nil` to make the hash optional. Use `{}` if you want to set
-some defaults for values inside the hash.
+some defaults for values inside the hash. If any nested filter uses a
+[lazy default](#defaults) then the hash must also use a lazy default.
 
 ``` rb
 hash :optional,

data/lib/active_interaction/base.rb

@@ -147,6 +147,8 @@ module ActiveInteraction
 
         attr_accessor attribute
 
+        alias_method "#{attribute}?", attribute if filter.is_a?(BooleanFilter)
+
         eagerly_evaluate_default(filter)
       end
 

data/lib/active_interaction/errors.rb

@@ -11,7 +11,15 @@ module ActiveInteraction
     #
     # @return [Errors]
     def merge!(other)
-      merge_details!(other)
+      other.messages.each do |attribute, messages|
+        messages.zip(other.details[attribute]) do |message, detail|
+          if detailed_error?(detail)
+            merge_detail!(attribute, detail, message)
+          else
+            merge_message!(attribute, detail, message)
+          end
+        end
+      end
 
       self
     end
@@ -31,24 +39,16 @@ module ActiveInteraction
       detail[:error].is_a?(Symbol)
     end
 
-    def merge_message!(attribute, message)
+    def merge_message!(attribute, detail, message)
+      options = detail.dup
+      options.delete(:error)
+
       unless attribute?(attribute)
         message = full_message(attribute, message)
         attribute = :base
       end
-      add(attribute, message) unless added?(attribute, message)
-    end
 
-    def merge_details!(other)
-      other.messages.each do |attribute, messages|
-        messages.zip(other.details[attribute]) do |message, detail|
-          if detailed_error?(detail)
-            merge_detail!(attribute, detail, message)
-          else
-            merge_message!(attribute, message)
-          end
-        end
-      end
+      add(attribute, message, **options) unless added?(attribute, message, **options)
     end
 
     def merge_detail!(attribute, detail, message)
@@ -58,7 +58,7 @@ module ActiveInteraction
 
         add(attribute, error, **options.merge(message: message)) unless added?(attribute, error, **options)
       else
-        merge_message!(attribute, message)
+        merge_message!(attribute, detail, message)
       end
     end
   end

data/lib/active_interaction/filters/hash_filter.rb

@@ -25,7 +25,7 @@ module ActiveInteraction
 
     register :hash
 
-    def process(value, context)
+    def process(value, context) # rubocop:disable Metrics/AbcSize
       input = super
 
       return HashInput.new(self, value: input.value, error: input.errors.first) if input.errors.first
@@ -36,6 +36,10 @@ module ActiveInteraction
       children = {}
 
       filters.each do |name, filter|
+        if filter.options[:default].is_a?(Proc) && !options[:default].is_a?(Proc)
+          raise InvalidDefaultError, "#{self.name}: must use a lazy default if any nested filter uses a lazy default"
+        end
+
         filter.process(input.value[name], context).tap do |result|
           value[name] = result.value
           children[name.to_sym] = result

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/array_input_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::ArrayInput do
+RSpec.describe ActiveInteraction::ArrayInput do
   subject(:input) do
     described_class.new(filter,
       value: value,

data/spec/active_interaction/base_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'action_controller'
 require 'active_support/core_ext/kernel/reporting'
 
@@ -34,7 +33,7 @@ InterruptInteraction = Class.new(TestInteraction) do
   end
 end
 
-describe ActiveInteraction::Base do
+RSpec.describe ActiveInteraction::Base do
   subject(:interaction) { described_class.new(inputs) }
 
   include_context 'interactions'

data/spec/active_interaction/concerns/active_modelable_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-shared_examples_for 'ActiveModel' do
+RSpec.shared_examples_for 'ActiveModel' do
   it 'includes ActiveModel::Conversion' do
     expect(subject).to be_a_kind_of ActiveModel::Conversion
   end
@@ -14,7 +12,7 @@ shared_examples_for 'ActiveModel' do
   end
 end
 
-describe ActiveInteraction::ActiveModelable do
+RSpec.describe ActiveInteraction::ActiveModelable do
   include_context 'concerns', described_class
 
   it_behaves_like 'ActiveModel'

data/spec/active_interaction/concerns/active_recordable_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-
 InteractionWithFloatFilter = Class.new(TestInteraction) do
   float :thing
 end
 
-describe ActiveInteraction::ActiveRecordable do
+RSpec.describe ActiveInteraction::ActiveRecordable do
   include_context 'interactions'
 
   let(:described_class) { InteractionWithFloatFilter }

data/spec/active_interaction/concerns/hashable_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::Hashable do
+RSpec.describe ActiveInteraction::Hashable do
   include_context 'concerns', described_class
 
   describe '#hash(*args, &block)' do

data/spec/active_interaction/concerns/missable_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::Missable do
+RSpec.describe ActiveInteraction::Missable do
   include_context 'concerns', described_class
 
   describe '#respond_to?(slug, include_all = false)' do

data/spec/active_interaction/concerns/runnable_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::Runnable do
+RSpec.describe ActiveInteraction::Runnable do
   include_context 'concerns', described_class
 
   class WrappableFailingInteraction # rubocop:disable Lint/ConstantDefinitionInBlock

data/spec/active_interaction/errors_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'active_record'
 require 'sqlite3'
 
@@ -7,7 +6,7 @@ ActiveRecord::Base.establish_connection(
   database: ':memory:'
 )
 
-describe ActiveInteraction::Errors do
+RSpec.describe ActiveInteraction::Errors do
   subject(:errors) { described_class.new(klass.new) }
 
   let(:klass) do
@@ -39,6 +38,20 @@ describe ActiveInteraction::Errors do
         errors.merge!(other)
         expect(errors.messages[:attribute]).to eql ['is invalid']
       end
+
+      context 'that provides other options' do
+        let(:value) { SecureRandom.hex }
+        let(:error_name) { 'Some error' }
+
+        before do
+          other.add(:base, error_name, value: value)
+        end
+
+        it 'adds the error' do
+          errors.merge!(other)
+          expect(errors.details[:base]).to eql [{ error: error_name, value: value }]
+        end
+      end
     end
 
     context 'with a detailed error' do
@@ -91,6 +104,20 @@ describe ActiveInteraction::Errors do
           expect(errors.messages[:base]).to eql [message]
         end
       end
+
+      context 'that provides other options' do
+        let(:value) { SecureRandom.hex }
+        let(:error_name) { :some_error }
+
+        before do
+          other.add(:base, error_name, value: value)
+        end
+
+        it 'adds the error' do
+          errors.merge!(other)
+          expect(errors.details[:base]).to eql [{ error: error_name, value: value }]
+        end
+      end
     end
 
     context 'with an interpolated detailed error' do

data/spec/active_interaction/filter/column_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::Filter::Column do
+RSpec.describe ActiveInteraction::Filter::Column do
   subject(:column) { described_class.intern(type) }
 
   let(:type) { :float }

data/spec/active_interaction/filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::Filter, :filter do
+RSpec.describe ActiveInteraction::Filter, :filter do
   include_context 'filters'
 
   describe '#database_column_type' do

data/spec/active_interaction/filters/abstract_date_time_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::AbstractDateTimeFilter, :filter do
+RSpec.describe ActiveInteraction::AbstractDateTimeFilter, :filter do
   include_context 'filters'
 
   describe '#process' do

data/spec/active_interaction/filters/abstract_numeric_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::AbstractNumericFilter, :filter do
+RSpec.describe ActiveInteraction::AbstractNumericFilter, :filter do
   include_context 'filters'
 
   describe '#process' do

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::ArrayFilter, :filter do
+RSpec.describe ActiveInteraction::ArrayFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/boolean_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::BooleanFilter, :filter do
+RSpec.describe ActiveInteraction::BooleanFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/date_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::DateFilter, :filter do
+RSpec.describe ActiveInteraction::DateFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/date_time_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::DateTimeFilter, :filter do
+RSpec.describe ActiveInteraction::DateTimeFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/decimal_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::DecimalFilter, :filter do
+RSpec.describe ActiveInteraction::DecimalFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/file_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::FileFilter, :filter do
+RSpec.describe ActiveInteraction::FileFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/float_filter_spec.rb

@@ -1,7 +1,6 @@
 require 'bigdecimal'
-require 'spec_helper'
 
-describe ActiveInteraction::FloatFilter, :filter do
+RSpec.describe ActiveInteraction::FloatFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::HashFilter, :filter do
+RSpec.describe ActiveInteraction::HashFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/integer_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::IntegerFilter, :filter do
+RSpec.describe ActiveInteraction::IntegerFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/interface_filter_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-
 module InterfaceModule; end
 
 class InterfaceClass; end # rubocop:disable Lint/EmptyClass
 
-describe ActiveInteraction::InterfaceFilter, :filter do
+RSpec.describe ActiveInteraction::InterfaceFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter' do
     let(:name) { :interface_module }

data/spec/active_interaction/filters/object_filter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class ObjectThing
   def self.converter(_)
     @converter ||= new
@@ -13,7 +11,7 @@ end
 class ObjectThings; end # rubocop:disable Lint/EmptyClass
 BackupObjectThing = ObjectThing
 
-describe ActiveInteraction::ObjectFilter, :filter do
+RSpec.describe ActiveInteraction::ObjectFilter, :filter do
   include_context 'filters'
   before do
     options[:class] = ObjectThing

data/spec/active_interaction/filters/record_filter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class RecordThing
   def self.find(_)
     raise 'error'
@@ -21,7 +19,7 @@ end
 class RecordThings; end # rubocop:disable Lint/EmptyClass
 BackupRecordThing = RecordThing
 
-describe ActiveInteraction::RecordFilter, :filter do
+RSpec.describe ActiveInteraction::RecordFilter, :filter do
   include_context 'filters'
   before do
     options[:class] = RecordThing

data/spec/active_interaction/filters/string_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::StringFilter, :filter do
+RSpec.describe ActiveInteraction::StringFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/symbol_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::SymbolFilter, :filter do
+RSpec.describe ActiveInteraction::SymbolFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/filters/time_filter_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::TimeFilter, :filter do
+RSpec.describe ActiveInteraction::TimeFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 

data/spec/active_interaction/grouped_input_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::GroupedInput do
+RSpec.describe ActiveInteraction::GroupedInput do
   subject(:grouped_input) { described_class.new }
 
   it 'subclasses OpenStruct' do

data/spec/active_interaction/hash_input_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::HashInput do
+RSpec.describe ActiveInteraction::HashInput do
   subject(:input) do
     described_class.new(filter,
       value: value,

data/spec/active_interaction/i18n_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction do
+RSpec.describe ActiveInteraction do
   context 'I18n.load_path' do
     it 'contains localization file paths' do
       expect(I18n.load_path)
@@ -20,7 +18,7 @@ TYPES = ActiveInteraction::Filter
   .keys
   .map(&:to_s)
 
-describe I18nInteraction do
+RSpec.describe I18nInteraction do
   include_context 'interactions'
 
   shared_examples 'translation' do |locale|

data/spec/active_interaction/inputs_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::Inputs do
+RSpec.describe ActiveInteraction::Inputs do
   subject(:inputs) { described_class.new(args, base_class.new) }
 
   let(:args) { {} }

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'active_record'
 require 'sqlite3'
 
@@ -29,7 +28,7 @@ ArrayInteraction = Class.new(TestInteraction) do
   end
 end
 
-describe ArrayInteraction do
+RSpec.describe ArrayInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction', :array, -> { [] }
   it_behaves_like 'an interaction', :array, -> { Element.where('1 = 1') }, ->(result) { result.to_a }

data/spec/active_interaction/integration/boolean_interaction_spec.rb

@@ -1,5 +1,11 @@
-require 'spec_helper'
+BooleanInteraction = Class.new(TestInteraction) do
+  boolean :x
+end
 
-describe 'BooleanInteraction' do
+RSpec.describe BooleanInteraction do
   it_behaves_like 'an interaction', :boolean, -> { [false, true].sample }
+
+  it 'responds to #x?' do
+    expect(described_class.new).to respond_to(:x?)
+  end
 end

data/spec/active_interaction/integration/date_interaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe 'DateInteraction' do
+RSpec.describe 'DateInteraction' do
   it_behaves_like 'an interaction', :date, -> { Date.today }
 end

data/spec/active_interaction/integration/date_time_interaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe 'DateTimeInteraction' do
+RSpec.describe 'DateTimeInteraction' do
   it_behaves_like 'an interaction', :date_time, -> { DateTime.now }
 end

data/spec/active_interaction/integration/file_interaction_spec.rb

@@ -1,11 +1,10 @@
-require 'spec_helper'
 require 'action_dispatch'
 
 FileInteraction = Class.new(TestInteraction) do
   file :a
 end
 
-describe FileInteraction do
+RSpec.describe FileInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction', :file, -> { File.open(__FILE__) }
 

data/spec/active_interaction/integration/float_interaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe 'FloatInteraction' do
+RSpec.describe 'FloatInteraction' do
   it_behaves_like 'an interaction', :float, -> { rand }
 end

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 HashInteraction = Class.new(TestInteraction) do
   hash :a do
     hash :x
@@ -9,7 +7,7 @@ HashInteraction = Class.new(TestInteraction) do
   end
 end
 
-describe HashInteraction do
+RSpec.describe HashInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction', :hash, -> { {} }
 
@@ -73,4 +71,36 @@ describe HashInteraction do
       end.to raise_error ActiveInteraction::InvalidDefaultError
     end
   end
+
+  context 'with a default' do
+    context 'with a lazy nested default' do
+      it 'raises an error' do
+        expect do
+          Class.new(ActiveInteraction::Base) do
+            hash :b, default: {} do
+              hash :x, default: -> { {} }
+            end
+          end
+        end.to raise_error ActiveInteraction::InvalidDefaultError
+      end
+    end
+  end
+
+  context 'with a lazy default' do
+    context 'with a lazy nested default' do
+      it 'returns the correct value' do
+        klass = Class.new(ActiveInteraction::Base) do
+          hash :b, default: -> { {} } do
+            hash :x, default: -> { {} }
+          end
+
+          def execute
+            b
+          end
+        end
+
+        expect(klass.run!).to eql('x' => {})
+      end
+    end
+  end
 end

data/spec/active_interaction/integration/integer_interaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe 'IntegerInteraction' do
+RSpec.describe 'IntegerInteraction' do
   it_behaves_like 'an interaction', :integer, -> { rand(1 << 16) }
 end

data/spec/active_interaction/integration/interface_interaction_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'json'
 require 'yaml'
 
@@ -6,7 +5,7 @@ InterfaceInteraction = Class.new(TestInteraction) do
   interface :anything, methods: []
 end
 
-describe InterfaceInteraction do
+RSpec.describe InterfaceInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction',
     :interface,

data/spec/active_interaction/integration/object_interaction_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-
 ObjectInteraction = Class.new(TestInteraction) do
   object :object
 end
 
-describe ObjectInteraction do
+RSpec.describe ObjectInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction', :object, -> { // }, class: Regexp
 

data/spec/active_interaction/integration/record_integration_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe 'RecordIntegration' do
+RSpec.describe 'RecordIntegration' do
   it_behaves_like 'an interaction', :record, -> { Encoding::US_ASCII }, class: Encoding
 end

data/spec/active_interaction/integration/string_interaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe 'StringInteraction' do
+RSpec.describe 'StringInteraction' do
   it_behaves_like 'an interaction', :string, -> { SecureRandom.hex }
 end

data/spec/active_interaction/integration/symbol_interaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe 'SymbolInteraction' do
+RSpec.describe 'SymbolInteraction' do
   it_behaves_like 'an interaction', :symbol, -> { SecureRandom.hex.to_sym }
 end

data/spec/active_interaction/integration/time_interaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 TimeWithZone = Class.new do
   attr_reader :time
 
@@ -26,7 +24,7 @@ TimeInteraction = Class.new(TestInteraction) do
   time :a
 end
 
-describe TimeInteraction do
+RSpec.describe TimeInteraction do
   include_context 'interactions'
   it_behaves_like 'an interaction', :time, -> { Time.now }
 

data/spec/active_interaction/modules/validation_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ActiveInteraction::Validation do
+RSpec.describe ActiveInteraction::Validation do
   describe '.validate(context, filters, inputs)' do
     let(:inputs) { {} }
     let(:filter) { ActiveInteraction::Filter.new(:name, {}) }

data/spec/spec_helper.rb

@@ -10,6 +10,8 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run_including :focus
 
+  config.disable_monkey_patching!
+
   config.before(:suite) do
     if ActiveRecord.respond_to?(:index_nested_attribute_errors)
       ActiveRecord.index_nested_attribute_errors = false

data/spec/support/concerns.rb

@@ -1,4 +1,4 @@
-shared_context 'concerns' do |concern|
+RSpec.shared_context 'concerns' do |concern|
   subject(:instance) { klass.new }
 
   let(:klass) do

data/spec/support/filters.rb

@@ -1,4 +1,4 @@
-shared_context 'filters' do
+RSpec.shared_context 'filters' do
   subject(:filter) { described_class.new(name, options, &block) }
 
   let(:block) { nil }
@@ -18,7 +18,7 @@ shared_context 'filters' do
   end
 end
 
-shared_examples_for 'a filter' do
+RSpec.shared_examples_for 'a filter' do
   include_context 'filters'
 
   describe '.factory' do

data/spec/support/interactions.rb

@@ -8,13 +8,13 @@ TestInteraction = Class.new(ActiveInteraction::Base) do
   end
 end
 
-shared_context 'interactions' do
+RSpec.shared_context 'interactions' do
   let(:inputs) { {} }
   let(:outcome) { described_class.run(inputs) }
   let(:result) { outcome.result }
 end
 
-shared_examples_for 'an interaction' do |type, generator, adjust_output = nil, **filter_options|
+RSpec.shared_examples_for 'an interaction' do |type, generator, adjust_output = nil, **filter_options|
   include_context 'interactions'
 
   let(:described_class) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -322,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Manage application specific business logic.