activeinteractor 1.0.5 → 1.1.3

data/spec/integration/an_organizer_with_failing_nested_organizer_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'An organizer with failing nested organizer', type: :integration do
+  let!(:parent_interactor1) { build_interactor('TestParentInteractor1') }
+  let!(:parent_interactor2) { build_interactor('TestParentInteractor2') }
+  let!(:child_interactor1) { build_interactor('TestChildInteractor1') }
+  let!(:child_interactor2) do
+    build_interactor('TestChildInteractor2') do
+      def perform
+        context.fail!
+      end
+    end
+  end
+
+  let!(:child_interactor_class) do
+    build_organizer('TestChildOrganizer') do
+      organize TestChildInteractor1, TestChildInteractor2
+    end
+  end
+
+  let(:parent_interactor_class) do
+    build_organizer('TestParentOrganizer') do
+      organize TestParentInteractor1, TestChildOrganizer, TestParentInteractor2
+    end
+  end
+
+  describe '.perform' do
+    subject { parent_interactor_class.perform }
+
+    before do
+      expect_any_instance_of(child_interactor_class).to receive(:perform).exactly(:once).and_call_original
+      expect_any_instance_of(child_interactor1).to receive(:perform).exactly(:once).and_call_original
+      expect_any_instance_of(child_interactor2).to receive(:perform).exactly(:once).and_call_original
+      expect_any_instance_of(child_interactor2).to receive(:rollback).exactly(:once).and_call_original
+      expect_any_instance_of(child_interactor1).to receive(:rollback).exactly(:once).and_call_original
+      expect_any_instance_of(parent_interactor1).to receive(:rollback).exactly(:once).and_call_original
+      expect_any_instance_of(parent_interactor2).not_to receive(:perform).exactly(:once).and_call_original
+      expect_any_instance_of(parent_interactor2).not_to receive(:rollback).exactly(:once).and_call_original
+    end
+
+    it { is_expected.to be_a parent_interactor_class.context_class }
+
+    it { is_expected.to be_failure }
+  end
+end

data/spec/integration/an_organizer_with_options_callbacks_spec.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'An organizer with options callbacks', type: :integration do
+  let!(:interactor1) do
+    build_interactor('TestInteractor1') do
+      def perform
+        context.step = 3 if context.step == 2
+        context.step = 6 if context.step == 5
+      end
+    end
+  end
+
+  let(:interactor_class) do
+    build_organizer do
+      organize do
+        add TestInteractor1, before: :test_before_method, after: :test_after_method
+        add TestInteractor1, before: lambda {
+          context.step = 5 if context.step == 4
+        }, after: lambda {
+          context.step = 7 if context.step == 6
+        }
+      end
+
+      private
+
+      def test_before_method
+        context.step = 2 if context.step == 1
+      end
+
+      def test_after_method
+        context.step = 4 if context.step == 3
+      end
+    end
+  end
+
+  include_examples 'a class with interactor methods'
+  include_examples 'a class with interactor callback methods'
+  include_examples 'a class with interactor context methods'
+  include_examples 'a class with organizer callback methods'
+
+  describe '.perform' do
+    subject { interactor_class.perform(step: 1) }
+
+    it { is_expected.to be_a interactor_class.context_class }
+
+    it 'is expected to receive #test_before_method once' do
+      expect_any_instance_of(interactor_class).to receive(:test_before_method)
+        .exactly(:once)
+      subject
+    end
+
+    it 'is expected to receive #test_after_method once' do
+      expect_any_instance_of(interactor_class).to receive(:test_after_method)
+        .exactly(:once)
+      subject
+    end
+
+    it 'runs callbacks in sequence' do
+      expect(subject.step).to eq(7)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-begin
-  require 'simplecov'
-  require 'simplecov-lcov'
-
-  SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
-
-  SimpleCov.start do
-    enable_coverage :branch
-    add_filter '/spec/'
-    add_filter '/lib/rails/**/*.rb'
-    track_files '/lib/**/*.rb'
-    formatter SimpleCov::Formatter::MultiFormatter.new([
-                                                         SimpleCov::Formatter::HTMLFormatter,
-                                                         SimpleCov::Formatter::LcovFormatter
-                                                       ])
-  end
-rescue LoadError
-  puts 'Skipping coverage...'
-end
+require_relative 'support/coverage'
+ActiveInteractor::Spec::Coverage.start
 
 require 'bundler/setup'
 require 'active_interactor'
@@ -32,7 +15,7 @@ RSpec.configure do |config|
     allow(ActiveInteractor.logger).to receive(:error).and_return(true)
   end
 
-  config.after(:each) do
+  config.after do
     clean_factories!
   end
 

data/spec/support/coverage.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+require 'simplecov-lcov'
+
+module ActiveInteractor
+  module Spec
+    class Coverage
+      DEFAULT_COVERAGE_TYPE = 'unit'
+      EXCLUDED_FILES_PATTERN = '/spec/'
+      TRACKED_FILES_PATTERN = 'lib/**/*.rb'
+
+      FORMATTERS = [
+        SimpleCov::Formatter::HTMLFormatter,
+        SimpleCov::Formatter::LcovFormatter
+      ].freeze
+
+      class << self
+        def start
+          setup_lcov_formatter
+          start_simplecov
+        end
+
+        private
+
+        def simplecov_formatter
+          @simplecov_formatter ||= SimpleCov::Formatter::MultiFormatter.new(FORMATTERS)
+        end
+
+        def setup_lcov_formatter
+          coverage_type = ENV.fetch('COVERAGE_TYPE', DEFAULT_COVERAGE_TYPE)
+
+          SimpleCov::Formatter::LcovFormatter.config do |config|
+            config.report_with_single_file = true
+            config.single_report_path = "coverage/#{coverage_type}_lcov.info"
+          end
+        end
+
+        def start_simplecov
+          SimpleCov.start do
+            add_filter EXCLUDED_FILES_PATTERN
+            enable_coverage :branch
+            track_files TRACKED_FILES_PATTERN
+            formatter simplecov_formatter
+          end
+        end
+      end
+    end
+  end
+end

data/spec/support/shared_examples/a_class_with_interactor_callback_methods_example.rb

@@ -3,6 +3,7 @@
 RSpec.shared_examples 'a class with interactor callback methods' do
   describe '.after_context_validation' do
     subject { interactor_class.after_context_validation(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :validation, :after, :some_method, { :prepend => true }' do
@@ -15,6 +16,7 @@ RSpec.shared_examples 'a class with interactor callback methods' do
 
   describe '.after_perform' do
     subject { interactor_class.after_perform(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :perform, :after, :some_method' do
@@ -27,6 +29,7 @@ RSpec.shared_examples 'a class with interactor callback methods' do
 
   describe '.after_rollback' do
     subject { interactor_class.after_rollback(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :rollback, :after, :some_method' do
@@ -39,6 +42,7 @@ RSpec.shared_examples 'a class with interactor callback methods' do
 
   describe '.around_perform' do
     subject { interactor_class.around_perform(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :perform, :around, :some_method' do
@@ -51,6 +55,7 @@ RSpec.shared_examples 'a class with interactor callback methods' do
 
   describe '.around_rollback' do
     subject { interactor_class.around_rollback(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :rollback, :around, :some_method' do
@@ -63,6 +68,7 @@ RSpec.shared_examples 'a class with interactor callback methods' do
 
   describe '.before_context_validation' do
     subject { interactor_class.before_context_validation(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :validation, :before, :some_method' do
@@ -75,6 +81,7 @@ RSpec.shared_examples 'a class with interactor callback methods' do
 
   describe '.before_perform' do
     subject { interactor_class.before_perform(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :perform, :before, :some_method' do
@@ -87,6 +94,7 @@ RSpec.shared_examples 'a class with interactor callback methods' do
 
   describe '.before_rollback' do
     subject { interactor_class.before_rollback(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :rollback, :before, :some_method' do

data/spec/support/shared_examples/a_class_with_interactor_context_methods_example.rb

@@ -3,6 +3,7 @@
 RSpec.shared_examples 'a class with interactor context methods' do
   describe '.context_attributes' do
     subject { interactor_class.context_attributes(attributes) }
+
     let(:attributes) { :some_attribute }
 
     it 'is expected to receive #attributes on .context_class with :some_attribute' do
@@ -45,6 +46,7 @@ RSpec.shared_examples 'a class with interactor context methods' do
 
   describe '#finalize_context!' do
     subject { instance.finalize_context! }
+
     let(:instance) { interactor_class.new }
 
     it 'is expected to receive #called! on instance of .context_class' do

data/spec/support/shared_examples/a_class_with_organizer_callback_methods_example.rb

@@ -3,6 +3,7 @@
 RSpec.shared_examples 'a class with organizer callback methods' do
   describe '.after_each_perform' do
     subject { interactor_class.after_each_perform(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :each_perform, :after, :some_method' do
@@ -15,6 +16,7 @@ RSpec.shared_examples 'a class with organizer callback methods' do
 
   describe '.around_each_perform' do
     subject { interactor_class.around_each_perform(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :each_perform, :around, :some_method' do
@@ -27,6 +29,7 @@ RSpec.shared_examples 'a class with organizer callback methods' do
 
   describe '.before_each_perform' do
     subject { interactor_class.before_each_perform(*args) }
+
     let(:args) { :some_method }
 
     it 'is expected to receive #set_callback with :each_perform, :before, :some_method' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.3
 platform: ruby
 authors:
 - Aaron Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,9 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.1.4.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.1.4.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,7 @@ files:
 - 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
@@ -188,7 +189,10 @@ files:
 - 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
@@ -201,10 +205,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/aaronmallen/activeinteractor/issues
-  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v1.0.5/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/1.0.5
+  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v1.1.3/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/1.1.3
   hompage_uri: https://github.com/aaronmallen/activeinteractor
-  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v1.0.5
+  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v1.1.3
   wiki_uri: https://github.com/aaronmallen/activeinteractor/wiki
 post_install_message: 
 rdoc_options: []
@@ -221,46 +225,50 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby interactors with ActiveModel::Validations
 test_files:
+- spec/support/coverage.rb
+- spec/support/spec_helpers.rb
 - spec/support/shared_examples/a_class_that_extends_active_interactor_models_example.rb
 - spec/support/shared_examples/a_class_with_interactor_methods_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/shared_examples/a_class_with_interactor_context_methods_example.rb
 - spec/support/shared_examples/a_class_with_interactor_callback_methods_example.rb
-- spec/support/spec_helpers.rb
 - spec/support/helpers/factories.rb
-- spec/integration/an_interactor_with_validations_on_calling_spec.rb
+- spec/active_interactor_spec.rb
+- spec/integration/an_interactor_with_after_rollback_callbacks_spec.rb
+- spec/integration/an_interactor_with_around_rollback_callbacks_spec.rb
 - spec/integration/a_basic_interactor_spec.rb
-- spec/integration/a_basic_organizer_spec.rb
-- spec/integration/an_organizer_with_conditionally_organized_interactors_spec.rb
 - spec/integration/an_interactor_with_validations_spec.rb
+- spec/integration/an_interactor_with_after_context_validation_callbacks_spec.rb
+- spec/integration/an_organizer_with_failing_nested_organizer_spec.rb
+- spec/integration/a_basic_organizer_spec.rb
+- spec/integration/an_organizer_with_options_callbacks_spec.rb
 - spec/integration/an_interactor_with_an_existing_context_class_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_around_perform_callbacks_spec.rb
-- spec/integration/an_interactor_with_before_rollback_callbacks_spec.rb
-- spec/integration/an_interactor_with_before_perform_callbacks_spec.rb
-- spec/integration/an_interactor_with_around_rollback_callbacks_spec.rb
+- spec/integration/active_record_integration_spec.rb
+- spec/integration/an_interactor_with_validations_on_calling_spec.rb
 - spec/integration/an_interactor_with_after_perform_callbacks_spec.rb
-- spec/integration/an_interactor_with_after_context_validation_callbacks_spec.rb
+- spec/integration/an_organizer_performing_in_parallel_spec.rb
 - spec/integration/an_organizer_with_after_each_callbacks_spec.rb
-- spec/integration/active_record_integration_spec.rb
 - spec/integration/a_failing_interactor_spec.rb
+- spec/integration/an_interactor_with_before_rollback_callbacks_spec.rb
+- spec/integration/an_interactor_with_around_perform_callbacks_spec.rb
+- spec/integration/an_interactor_with_before_perform_callbacks_spec.rb
+- spec/integration/an_organizer_with_conditionally_organized_interactors_spec.rb
 - spec/integration/an_organizer_with_before_each_callbacks_spec.rb
-- spec/integration/an_organizer_performing_in_parallel_spec.rb
-- spec/integration/an_interactor_with_after_rollback_callbacks_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/config_spec.rb
+- spec/integration/an_interactor_with_validations_on_called_spec.rb
+- spec/integration/an_organizer_with_around_each_callbacks_spec.rb
+- spec/spec_helper.rb
 - spec/active_interactor/error_spec.rb
-- spec/active_interactor/base_spec.rb
+- spec/active_interactor/organizer/interactor_interface_spec.rb
 - spec/active_interactor/organizer/interactor_interface_collection_spec.rb
 - spec/active_interactor/organizer/base_spec.rb
-- spec/active_interactor/organizer/interactor_interface_spec.rb
-- spec/spec_helper.rb
-- spec/active_interactor_spec.rb
+- spec/active_interactor/config_spec.rb
+- spec/active_interactor/context/base_spec.rb
+- spec/active_interactor/interactor/perform/options_spec.rb
+- spec/active_interactor/interactor/worker_spec.rb
+- spec/active_interactor/version_spec.rb
+- spec/active_interactor/base_spec.rb