activeinteractor 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47d39868b8ed69a4ae27d9cf931e42ed6e5a5daa893a7adc0c6b696bd0b4035d
-  data.tar.gz: 9e4ae3e6102d6f6ead6d8fb4af150dc8d67124adfba1afd26420a54e57708cc7
+  metadata.gz: 764c2b65284b79d85ff2a20f7c5d9a3c3983dd06a869c7cc961b530ef77a7d28
+  data.tar.gz: 02cdcb760098151105d1b9d1367ee2cefca765353b0ebcd302141dcea009c198
 SHA512:
-  metadata.gz: 06e1686b7e98a6ed13f136e5f847c836a4f018ba4a89c1b42e6666a4063600c22c2b6b7ad48a378462a9b0fc18f3dd28d88325bd7344c9a9647c2274804d1e01
-  data.tar.gz: 925e3b0ab0a9562efe52d4d30d55b71b327d9169f02eed1ab1b22b9c72caa00ca5c72b1a587782f0d7c9e820465739538240666263dc9a2c999037e00e060710
+  metadata.gz: 8a87326136160d7d3fe3cbea58b42b42b80206249938d7adf9496f000c260c490c902f32d1dc78983e67e05d1559a190a4738cb73dfa166c7f5deafb9a637547
+  data.tar.gz: cc3789900b6a46067a51944f1d8280455e41b014ceb31b5d9e1819fe2e7836f84e9bc5c79871a4fd72f7ad4d85146cf18b9554dd7f15955c8c0f4d7b017aa20a

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [v1.2.2] - 2023-09-30
+
+### Fixed
+
+- [\#366] Fixes a minor timing issue for when deferred after_perform callbacks are run.
+
 ## [v1.2.1] - 2022-09-26
 
 ### Fixed
@@ -21,7 +27,7 @@ and this project adheres to [Semantic Versioning].
 
 ## [v1.2.0] - 2022-09-08
 
-### Added
+
 
 - `ActiveInteractor::Base.defer_after_callbacks_when_organized`
 - `ActiveInteractor::Organizer::Base.after_all_perform`
@@ -270,9 +276,10 @@ and this project adheres to [Semantic Versioning].
 
 <!-- versions -->
 
-[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v1.2.1...HEAD
+[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v1.2.2...HEAD
+[v1.2.2]: https://github.com/aaronmallen/activeinteractor/compare/v1.2.1...v1.2.2
 [v1.2.1]: https://github.com/aaronmallen/activeinteractor/compare/v1.2.0...v1.2.1
-[v1.2.0]: https://github.com/aaronmallen/activeinteractor/compare/v1.1.6...v1.2.0
+[v1.2.0]: https://github.com/aaronmallen/activeinteractor/compare/v1.1.7...v1.2.0
 [v1.1.7]: https://github.com/aaronmallen/activeinteractor/compare/v1.1.6...v1.1.7
 [v1.1.6]: https://github.com/aaronmallen/activeinteractor/compare/v1.1.4...v1.1.6
 [v1.1.4]: https://github.com/aaronmallen/activeinteractor/compare/v1.1.3...v1.1.4

data/lib/active_interactor/interactor/worker.rb

@@ -60,10 +60,16 @@ module ActiveInteractor
       end
 
       def execute_context_with_callbacks!
-        interactor.run_callbacks :perform do
+        result = interactor.run_callbacks :perform do
           execute_context_with_validation_check!
           @context = interactor.finalize_context!
         end
+
+        if context&.success? && interactor.respond_to?(:run_deferred_after_perform_callbacks_on_children)
+          interactor.run_deferred_after_perform_callbacks_on_children
+        end
+
+        result
       end
 
       def execute_context_with_validation!

data/lib/active_interactor/organizer/perform.rb

@@ -53,7 +53,14 @@ module ActiveInteractor
             perform_in_order
           end
         end
-        run_after_perform_callbacks_on_interactors if context.success?
+      end
+
+      def run_deferred_after_perform_callbacks_on_children
+        self.class.organized.each do |interface|
+          next unless interface.interactor_class.after_callbacks_deferred_when_organized
+
+          context.merge!(interface.execute_deferred_after_perform_callbacks(context))
+        end
       end
 
       private
@@ -100,14 +107,6 @@ module ActiveInteractor
         end
         merge_contexts(results.map(&:value))
       end
-
-      def run_after_perform_callbacks_on_interactors
-        self.class.organized.each do |interface|
-          next unless interface.interactor_class.after_callbacks_deferred_when_organized
-
-          context.merge!(interface.execute_deferred_after_perform_callbacks(context))
-        end
-      end
     end
   end
 end

data/lib/active_interactor/version.rb

@@ -16,7 +16,7 @@ module ActiveInteractor
 
     # The ActiveInterctor patch version number
     # @return [Integer] The ActiveInteractor patch version number
-    PATCH = 1
+    PATCH = 2
 
     # The ActiveInterctor pre-release version
     # @return [String | nil] The ActiveInteractor pre-release version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Aaron Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -64,34 +64,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.11'
 description: |
   An implementation of the Command Pattern for Ruby with ActiveModel::Validations inspired by the interactor gem.
   Rich support for attributes, callbacks, and validations, and thread safe performance methods.
@@ -158,61 +130,15 @@ files:
 - lib/rails/generators/templates/interactor_spec.erb
 - lib/rails/generators/templates/interactor_test_unit.erb
 - lib/rails/generators/templates/organizer.erb
-- spec/active_interactor/base_spec.rb
-- spec/active_interactor/config_spec.rb
-- spec/active_interactor/context/base_spec.rb
-- spec/active_interactor/error_spec.rb
-- spec/active_interactor/interactor/perform/options_spec.rb
-- spec/active_interactor/interactor/worker_spec.rb
-- spec/active_interactor/organizer/base_spec.rb
-- spec/active_interactor/organizer/interactor_interface_collection_spec.rb
-- spec/active_interactor/organizer/interactor_interface_spec.rb
-- spec/active_interactor/version_spec.rb
-- spec/active_interactor_spec.rb
-- spec/integration/a_basic_interactor_spec.rb
-- spec/integration/a_basic_organizer_spec.rb
-- spec/integration/a_failing_interactor_spec.rb
-- spec/integration/active_record_integration_spec.rb
-- spec/integration/an_interactor_with_after_context_validation_callbacks_spec.rb
-- spec/integration/an_interactor_with_after_perform_callbacks_spec.rb
-- spec/integration/an_interactor_with_after_rollback_callbacks_spec.rb
-- spec/integration/an_interactor_with_an_existing_context_class_spec.rb
-- spec/integration/an_interactor_with_around_perform_callbacks_spec.rb
-- spec/integration/an_interactor_with_around_rollback_callbacks_spec.rb
-- spec/integration/an_interactor_with_before_perform_callbacks_spec.rb
-- spec/integration/an_interactor_with_before_rollback_callbacks_spec.rb
-- spec/integration/an_interactor_with_deferred_after_callbacks.rb
-- spec/integration/an_interactor_with_validations_on_called_spec.rb
-- spec/integration/an_interactor_with_validations_on_calling_spec.rb
-- spec/integration/an_interactor_with_validations_spec.rb
-- spec/integration/an_organizer_containing_organizer_with_after_callbacks_deferred_spec.rb
-- spec/integration/an_organizer_performing_in_parallel_spec.rb
-- spec/integration/an_organizer_with_after_callbacks_deferred_spec.rb
-- spec/integration/an_organizer_with_after_each_callbacks_spec.rb
-- spec/integration/an_organizer_with_all_perform_callbacks.rb
-- spec/integration/an_organizer_with_around_each_callbacks_spec.rb
-- spec/integration/an_organizer_with_before_each_callbacks_spec.rb
-- spec/integration/an_organizer_with_conditionally_organized_interactors_spec.rb
-- spec/integration/an_organizer_with_failing_nested_organizer_spec.rb
-- spec/integration/an_organizer_with_options_callbacks_spec.rb
-- spec/spec_helper.rb
-- spec/support/coverage.rb
-- spec/support/helpers/factories.rb
-- spec/support/shared_examples/a_class_that_extends_active_interactor_models_example.rb
-- spec/support/shared_examples/a_class_with_interactor_callback_methods_example.rb
-- spec/support/shared_examples/a_class_with_interactor_context_methods_example.rb
-- spec/support/shared_examples/a_class_with_interactor_methods_example.rb
-- spec/support/shared_examples/a_class_with_organizer_callback_methods_example.rb
-- spec/support/spec_helpers.rb
 homepage: https://github.com/aaronmallen/activeinteractor
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/aaronmallen/activeinteractor/issues
-  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v1.2.1/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/1.2.1
+  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v1.2.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/1.2.2
   hompage_uri: https://github.com/aaronmallen/activeinteractor
-  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v1.2.1
+  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v1.2.2
   wiki_uri: https://github.com/aaronmallen/activeinteractor/wiki
 post_install_message: 
 rdoc_options: []
@@ -229,54 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby interactors with ActiveModel::Validations
-test_files:
-- spec/integration/a_basic_organizer_spec.rb
-- spec/integration/an_organizer_with_failing_nested_organizer_spec.rb
-- spec/integration/an_organizer_with_after_callbacks_deferred_spec.rb
-- spec/integration/an_interactor_with_before_perform_callbacks_spec.rb
-- spec/integration/an_organizer_with_after_each_callbacks_spec.rb
-- spec/integration/an_organizer_with_conditionally_organized_interactors_spec.rb
-- spec/integration/active_record_integration_spec.rb
-- spec/integration/an_organizer_with_before_each_callbacks_spec.rb
-- spec/integration/an_organizer_with_all_perform_callbacks.rb
-- spec/integration/a_failing_interactor_spec.rb
-- spec/integration/an_organizer_with_around_each_callbacks_spec.rb
-- spec/integration/an_interactor_with_validations_on_called_spec.rb
-- spec/integration/an_interactor_with_after_context_validation_callbacks_spec.rb
-- spec/integration/an_interactor_with_before_rollback_callbacks_spec.rb
-- spec/integration/an_organizer_performing_in_parallel_spec.rb
-- spec/integration/an_interactor_with_around_rollback_callbacks_spec.rb
-- spec/integration/an_interactor_with_an_existing_context_class_spec.rb
-- spec/integration/an_organizer_with_options_callbacks_spec.rb
-- spec/integration/an_interactor_with_after_rollback_callbacks_spec.rb
-- spec/integration/an_interactor_with_validations_on_calling_spec.rb
-- spec/integration/an_interactor_with_validations_spec.rb
-- spec/integration/an_interactor_with_around_perform_callbacks_spec.rb
-- spec/integration/an_interactor_with_after_perform_callbacks_spec.rb
-- spec/integration/an_interactor_with_deferred_after_callbacks.rb
-- spec/integration/a_basic_interactor_spec.rb
-- spec/integration/an_organizer_containing_organizer_with_after_callbacks_deferred_spec.rb
-- spec/active_interactor_spec.rb
-- spec/support/helpers/factories.rb
-- spec/support/shared_examples/a_class_with_interactor_methods_example.rb
-- spec/support/shared_examples/a_class_with_interactor_callback_methods_example.rb
-- spec/support/shared_examples/a_class_that_extends_active_interactor_models_example.rb
-- spec/support/shared_examples/a_class_with_interactor_context_methods_example.rb
-- spec/support/shared_examples/a_class_with_organizer_callback_methods_example.rb
-- spec/support/coverage.rb
-- spec/support/spec_helpers.rb
-- spec/active_interactor/base_spec.rb
-- spec/active_interactor/error_spec.rb
-- spec/active_interactor/config_spec.rb
-- spec/active_interactor/interactor/worker_spec.rb
-- spec/active_interactor/interactor/perform/options_spec.rb
-- spec/active_interactor/context/base_spec.rb
-- spec/active_interactor/version_spec.rb
-- spec/active_interactor/organizer/base_spec.rb
-- spec/active_interactor/organizer/interactor_interface_spec.rb
-- spec/active_interactor/organizer/interactor_interface_collection_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/active_interactor/base_spec.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ActiveInteractor::Base do
-  let(:interactor_class) { described_class }
-
-  include_examples 'a class with interactor methods'
-  include_examples 'a class with interactor callback methods'
-  include_examples 'a class with interactor context methods'
-
-  describe '.contextualize_with' do
-    subject { described_class.contextualize_with(klass) }
-
-    context 'with an class that does not exist' do
-      let(:klass) { 'SomeClassThatDoesNotExist' }
-
-      it { expect { subject }.to raise_error(ActiveInteractor::Error::InvalidContextClass) }
-    end
-
-    context 'with context class TestContext' do
-      before { build_context }
-
-      context 'when passed as a string' do
-        let(:klass) { 'TestContext' }
-
-        it 'is expected to assign the appropriate context class' do
-          subject
-          expect(described_class.context_class).to eq TestContext
-        end
-
-        # https://github.com/aaronmallen/activeinteractor/issues/168
-        context 'when singularized' do
-          let!(:singularized_class) { build_context('PlaceData') }
-          let(:klass) { 'PlaceData' }
-
-          it 'is expected to assign the appropriate context class' do
-            subject
-            expect(described_class.context_class).to eq PlaceData
-          end
-        end
-      end
-
-      context 'when passed as a symbol' do
-        let(:klass) { :test_context }
-
-        it 'is expected to assign the appropriate context class' do
-          subject
-          expect(described_class.context_class).to eq TestContext
-        end
-
-        # https://github.com/aaronmallen/activeinteractor/issues/168
-        context 'when singularized' do
-          let!(:singularized_class) { build_context('PlaceData') }
-          let(:klass) { :place_data }
-
-          it 'is expected to assign the appropriate context class' do
-            subject
-            expect(described_class.context_class).to eq PlaceData
-          end
-        end
-      end
-
-      context 'when passed as a constant' do
-        let(:klass) { TestContext }
-
-        it 'is expected to assign the appropriate context class' do
-          subject
-          expect(described_class.context_class).to eq TestContext
-        end
-
-        # https://github.com/aaronmallen/activeinteractor/issues/168
-        context 'when singularized' do
-          let!(:singularized_class) { build_context('PlaceData') }
-          let(:klass) { PlaceData }
-
-          it 'is expected to assign the appropriate context class' do
-            subject
-            expect(described_class.context_class).to eq PlaceData
-          end
-        end
-      end
-    end
-  end
-end

data/spec/active_interactor/config_spec.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ActiveInteractor::Config do
-  subject { described_class.new }
-
-  it { is_expected.to respond_to :logger }
-
-  describe '.defaults' do
-    subject { described_class.defaults }
-
-    it 'is expected to have attributes :logger => Logger.new' do
-      expect(subject[:logger]).to be_a Logger
-    end
-  end
-end