activeinteractor 1.0.0.beta.7 → 1.0.0

data/lib/rails/generators/interactor/context/test_unit_generator.rb

@@ -1,22 +1,15 @@
 # frozen_string_literal: true
 
-require_relative '../../active_interactor'
+require 'rails/generators/active_interactor/base'
 
 module Interactor
   module Context
     module Generators
       class TestUnitGenerator < ActiveInteractor::Generators::NamedBase
-        source_root File.expand_path('templates', __dir__)
-        desc 'Generate an interactor unit test'
+        desc 'Generate an interactor context unit test'
 
-        def create_test
-          template 'test_unit.erb', file_path
-        end
-
-        private
-
-        def file_path
-          File.join('test', interactor_directory, File.join(class_path), "#{file_name}_context_test.rb")
+        def create_spec
+          template 'context_test_unit.erb', active_interactor_file(parent_dir: 'test', suffix: 'context_test')
         end
       end
     end

data/lib/rails/generators/interactor/context_generator.rb

@@ -1,25 +1,22 @@
 # frozen_string_literal: true
 
-require_relative '../active_interactor'
+require 'rails/generators/active_interactor/base'
 
 module Interactor
   module Generators
     class ContextGenerator < ActiveInteractor::Generators::NamedBase
-      include ActiveInteractor::Generators::GeneratesContext
-      source_root File.expand_path('templates', __dir__)
       desc 'Generate an interactor context'
+      argument :context_attributes, type: :array, default: [], banner: 'attribute attribute'
+
+      def generate_application_context
+        generate :'active_interactor:application_context'
+      end
 
       def create_context
-        template 'context.erb', file_path
+        template 'context.erb', active_interactor_file(suffix: 'context')
       end
 
       hook_for :test_framework, in: :'interactor:context'
-
-      private
-
-      def file_path
-        File.join('app', interactor_directory, File.join(class_path), "#{file_name}_context.rb")
-      end
     end
   end
 end

data/lib/rails/generators/interactor/generates_context.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Interactor
+  module Generators
+    module GeneratesContext
+      module WithArguments
+        def self.included(base)
+          base.class_eval do
+            include GeneratesContext
+            argument :context_attributes, type: :array, default: [], banner: 'attribute attribute'
+          end
+        end
+      end
+
+      def self.included(base)
+        base.class_eval do
+          class_option :skip_context, type: :boolean, desc: 'Whether or not to generate a context class'
+        end
+      end
+
+      private
+
+      def skip_context?
+        options[:skip_context] == true || active_interactor_options.fetch(:generate_context, true) == false
+      end
+    end
+  end
+end

data/lib/rails/generators/interactor/interactor_generator.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
-require_relative '../active_interactor'
+require 'rails/generators/active_interactor/base'
+require 'rails/generators/interactor/generates_context'
 
 class InteractorGenerator < ActiveInteractor::Generators::NamedBase
-  include ActiveInteractor::Generators::GeneratesContext
-  source_root File.expand_path('templates', __dir__)
+  include Interactor::Generators::GeneratesContext::WithArguments
   desc 'Generate an interactor'
 
+  def generate_application_interactor
+    generate :'active_interactor:application_interactor'
+  end
+
   def create_interactor
-    template 'interactor.erb', file_path
+    template 'interactor.erb', active_interactor_file
   end
 
   def create_context
@@ -18,10 +22,4 @@ class InteractorGenerator < ActiveInteractor::Generators::NamedBase
   end
 
   hook_for :test_framework, in: :interactor
-
-  private
-
-  def file_path
-    File.join('app', interactor_directory, File.join(class_path), "#{file_name}.rb")
-  end
 end

data/lib/rails/generators/interactor/organizer_generator.rb

@@ -1,20 +1,24 @@
 # frozen_string_literal: true
 
-require_relative '../active_interactor'
+require 'rails/generators/active_interactor/base'
+require 'rails/generators/interactor/generates_context'
 
 module Interactor
   module Generators
     class OrganizerGenerator < ActiveInteractor::Generators::NamedBase
-      source_root File.expand_path('templates', __dir__)
+      include GeneratesContext
       desc 'Generate an interactor organizer'
       argument :interactors, type: :array, default: [], banner: 'interactor interactor'
 
       class_option :context_attributes, type: :array, default: [], banner: 'attribute attribute',
                                         desc: 'Attributes for the context'
-      class_option :skip_context, type: :boolean, desc: 'Whether or not to generate a context class'
+
+      def generate_application_organizer
+        generate :'active_interactor:application_organizer'
+      end
 
       def create_organizer
-        template 'organizer.erb', file_path
+        template 'organizer.erb', active_interactor_file
       end
 
       def create_context
@@ -30,14 +34,6 @@ module Interactor
       def context_attributes
         options[:context_attributes]
       end
-
-      def file_path
-        File.join('app', interactor_directory, File.join(class_path), "#{file_name}.rb")
-      end
-
-      def skip_context?
-        options[:skip_context] == true || ActiveInteractor::Rails.config.generate_context_classes == false
-      end
     end
   end
 end

data/lib/rails/generators/interactor/rspec_generator.rb

@@ -1,21 +1,14 @@
 # frozen_string_literal: true
 
-require_relative '../active_interactor'
+require 'rails/generators/active_interactor/base'
 
 module Interactor
   module Generators
     class RspecGenerator < ActiveInteractor::Generators::NamedBase
-      source_root File.expand_path('templates', __dir__)
       desc 'Generate an interactor spec'
 
       def create_spec
-        template 'rspec.erb', file_path
-      end
-
-      private
-
-      def file_path
-        File.join('spec', interactor_directory, File.join(class_path), "#{file_name}_spec.rb")
+        template 'interactor_spec.erb', active_interactor_file(parent_dir: 'spec', suffix: 'spec')
       end
     end
   end

data/lib/rails/generators/interactor/test_unit_generator.rb

@@ -1,21 +1,14 @@
 # frozen_string_literal: true
 
-require_relative '../active_interactor'
+require 'rails/generators/active_interactor/base'
 
 module Interactor
   module Generators
     class TestUnitGenerator < ActiveInteractor::Generators::NamedBase
-      source_root File.expand_path('templates', __dir__)
       desc 'Generate an interactor unit test'
 
-      def create_test
-        template 'test_unit.erb', file_path
-      end
-
-      private
-
-      def file_path
-        File.join('test', interactor_directory, File.join(class_path), "#{file_name}_test.rb")
+      def create_spec
+        template 'interactor_test_unit.erb', active_interactor_file(parent_dir: 'test', suffix: 'test')
       end
     end
   end

data/lib/rails/generators/{active_interactor/templates/initializer.erb → templates/active_interactor.erb}

@@ -2,7 +2,7 @@
 
 require 'active_interactor'
 
-ActiveInteractor::Rails.configure do |config|
+ActiveInteractor.configure do |config|
   # ORM configuration
   # Load and configure the ORM. Supports :active_record (default)
   # Other ORMs may be available as additional gems.
@@ -12,14 +12,6 @@ ActiveInteractor::Rails.configure do |config|
   # require 'active_interactor/rails/orm/<MY_ORM>'
 <%- end -%>
 
-  # set the default directory for interactors
-<%- if directory != 'interactors' -%>
-  config.directory = '<%= directory %>'
-<%- else -%>
-  # config.directory = 'interactors'
-<%- end -%>
-
-  # do not automatically generate context classes
-  # when interactors are generated
-  # config.generate_context_classes = false
+  # Set the ActiveInteractor.logger
+  config.logger = ::Rails.logger
 end

data/lib/rails/generators/templates/application_organizer.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class ApplicationOrganizer < ActiveInteractor::Organizer::Base
+end

data/spec/active_interactor/base_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe ActiveInteractor::Base do
       context 'when passed as a string' do
         let(:klass) { 'TestContext' }
 
-        it 'assigns the context class' do
+        it 'is expected to assign the appropriate context class' do
           subject
           expect(described_class.context_class).to eq TestContext
         end
@@ -32,7 +32,7 @@ RSpec.describe ActiveInteractor::Base do
       context 'when passed as a symbol' do
         let(:klass) { :test_context }
 
-        it 'assigns the context class' do
+        it 'is expected to assign the appropriate context class' do
           subject
           expect(described_class.context_class).to eq TestContext
         end
@@ -41,7 +41,7 @@ RSpec.describe ActiveInteractor::Base do
       context 'when passed as a constant' do
         let(:klass) { TestContext }
 
-        it 'assigns the context class' do
+        it 'is expected to assign the appropriate context class' do
           subject
           expect(described_class.context_class).to eq TestContext
         end

data/spec/active_interactor/interactor/{perform_options_spec.rb → perform/options_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ActiveInteractor::Interactor::PerformOptions do
+RSpec.describe ActiveInteractor::Interactor::Perform::Options do
   subject { described_class.new }
 
   it { is_expected.to respond_to :skip_each_perform_callbacks }

data/spec/active_interactor/interactor/worker_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require 'active_interactor/interactor/worker'
 
 RSpec.describe ActiveInteractor::Interactor::Worker do
   context 'with interactor class TestInteractor' do
@@ -12,7 +11,7 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
       context 'when interactor has options :skip_perform_callbacks eq to true' do
         let(:interactor) { TestInteractor.new.with_options(skip_perform_callbacks: true) }
 
-        it 'is expected not to invoke #run_callbacks with :perform' do
+        it 'is expected not to receive #run_callbacks with :perform' do
           allow_any_instance_of(TestInteractor).to receive(:run_callbacks)
             .with(:validation).and_call_original
           expect_any_instance_of(TestInteractor).not_to receive(:run_callbacks)
@@ -24,7 +23,7 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
       context 'when interactor has options :validate eq to false' do
         let(:interactor) { TestInteractor.new.with_options(validate: false) }
 
-        it 'is expected not to invoke #run_callbacks with :validation' do
+        it 'is expected not to receive #run_callbacks with :validation' do
           expect_any_instance_of(TestInteractor).not_to receive(:run_callbacks)
             .with(:validation)
           subject
@@ -39,13 +38,13 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
             .with(:called).and_return(true)
         end
 
-        it 'is expected not to invoke #context_valid? with :calling' do
+        it 'is expected not to receive #context_valid? with :calling' do
           expect_any_instance_of(TestInteractor).not_to receive(:context_valid?)
             .with(:calling)
           subject
         end
 
-        it 'is expected to invoke #context_valid? with :called' do
+        it 'is expected to receive #context_valid? with :called' do
           expect_any_instance_of(TestInteractor).to receive(:context_valid?)
             .with(:called)
           subject
@@ -60,13 +59,13 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
             .with(:calling).and_return(true)
         end
 
-        it 'is expected to invoke #context_valid? with :calling' do
+        it 'is expected to receive #context_valid? with :calling' do
           expect_any_instance_of(TestInteractor).to receive(:context_valid?)
             .with(:calling)
           subject
         end
 
-        it 'is expected not to invoke #context_valid? with :called' do
+        it 'is expected not to receive #context_valid? with :called' do
           expect_any_instance_of(TestInteractor).not_to receive(:context_valid?)
             .with(:called)
           subject
@@ -103,7 +102,7 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
         subject
       end
 
-      it 'calls #perform on interactor instance' do
+      it 'is expected to receive #perform on interactor instance' do
         expect_any_instance_of(TestInteractor).to receive(:perform)
         subject
       end
@@ -119,7 +118,7 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
         end
 
         it { expect { subject }.to raise_error(ActiveInteractor::Error::ContextFailure) }
-        it 'rollsback the interactor context' do
+        it 'is expected to rollback the interactor context' do
           expect_any_instance_of(TestInteractor).to receive(:context_rollback!)
           expect { subject }.to raise_error(ActiveInteractor::Error::ContextFailure)
         end
@@ -136,7 +135,7 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
         end
 
         it { expect { subject }.to raise_error(ActiveInteractor::Error::ContextFailure) }
-        it 'rollsback the interactor context' do
+        it 'is expected to rollback the interactor context' do
           expect_any_instance_of(TestInteractor).to receive(:context_rollback!)
           expect { subject }.to raise_error(ActiveInteractor::Error::ContextFailure)
         end
@@ -148,13 +147,13 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
     describe '#execute_rollback' do
       subject { described_class.new(interactor).execute_rollback }
 
-      it 'is expected to run rollback callbacks on interactor' do
+      it 'is expected to receive #run_callbacks on interactor with :rollback' do
         expect_any_instance_of(TestInteractor).to receive(:run_callbacks)
           .with(:rollback)
         subject
       end
 
-      it 'is expected to invoke #context_rollback on interactor instance' do
+      it 'is expected to receive #context_rollback on interactor instance' do
         expect_any_instance_of(TestInteractor).to receive(:context_rollback!)
         subject
       end
@@ -162,7 +161,7 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
       context 'when interactor has options :skip_rollback eq to true' do
         let(:interactor) { TestInteractor.new.with_options(skip_rollback: true) }
 
-        it 'is expected not to invoke #context_rollback on interactor instance' do
+        it 'is expected not to receive #context_rollback on interactor instance' do
           expect_any_instance_of(TestInteractor).not_to receive(:context_rollback!)
           subject
         end
@@ -171,12 +170,12 @@ RSpec.describe ActiveInteractor::Interactor::Worker do
       context 'when interactor has options :skip_rollback_callbacks eq to true' do
         let(:interactor) { TestInteractor.new.with_options(skip_rollback_callbacks: true) }
 
-        it 'is expected to invoke #context_rollback on interactor instance' do
+        it 'is expected to receive #context_rollback on interactor instance' do
           expect_any_instance_of(TestInteractor).to receive(:context_rollback!)
           subject
         end
 
-        it 'is expected not to run rollback callbacks on interactor' do
+        it 'is expected not to receive #run_callbacks on interactor with :rollback' do
           expect_any_instance_of(TestInteractor).not_to receive(:run_callbacks)
             .with(:rollback)
           subject

data/spec/active_interactor/{organizer_spec.rb → organizer/base_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ActiveInteractor::Organizer do
+RSpec.describe ActiveInteractor::Organizer::Base do
   let(:interactor_class) { described_class }
   include_examples 'a class with interactor methods'
   include_examples 'a class with interactor callback methods'
@@ -24,7 +24,7 @@ RSpec.describe ActiveInteractor::Organizer do
       context 'when passed as a string' do
         let(:klass) { 'TestContext' }
 
-        it 'assigns the context class' do
+        it 'is expected to assign the appropriate context class' do
           subject
           expect(described_class.context_class).to eq TestContext
         end
@@ -33,7 +33,7 @@ RSpec.describe ActiveInteractor::Organizer do
       context 'when passed as a symbol' do
         let(:klass) { :test_context }
 
-        it 'assigns the context class' do
+        it 'is expected to assign the appropriate context class' do
           subject
           expect(described_class.context_class).to eq TestContext
         end
@@ -42,7 +42,7 @@ RSpec.describe ActiveInteractor::Organizer do
       context 'when passed as a constant' do
         let(:klass) { TestContext }
 
-        it 'assigns the context class' do
+        it 'is expected to assign the appropriate context class' do
           subject
           expect(described_class.context_class).to eq TestContext
         end
@@ -96,6 +96,16 @@ RSpec.describe ActiveInteractor::Organizer do
     end
   end
 
+  describe '.perform_in_parallel' do
+    subject do
+      build_organizer do
+        perform_in_parallel
+      end
+    end
+
+    it { should have_attributes(parallel: true) }
+  end
+
   describe '#perform' do
     subject { interactor_class.perform }
     context 'with two existing interactors' do
@@ -108,7 +118,7 @@ RSpec.describe ActiveInteractor::Organizer do
       end
 
       it { is_expected.to be_a interactor_class.context_class }
-      it 'is expected to call #perform on both interactors' do
+      it 'is expected to receive #perform on both interactors' do
         expect_any_instance_of(interactor1).to receive(:perform)
         expect_any_instance_of(interactor2).to receive(:perform)
         subject
@@ -118,12 +128,12 @@ RSpec.describe ActiveInteractor::Organizer do
         subject { interactor_class.perform({}, skip_each_perform_callbacks: true) }
 
         it { is_expected.to be_a interactor_class.context_class }
-        it 'is expected to invoke #perform on both interactors' do
+        it 'is expected to receive #perform on both interactors' do
           expect_any_instance_of(interactor1).to receive(:perform)
           expect_any_instance_of(interactor2).to receive(:perform)
           subject
         end
-        it 'is expected not to invoke #run_callbacks with :each_perform' do
+        it 'is expected not to receive #run_callbacks with :each_perform' do
           expect_any_instance_of(interactor_class).not_to receive(:run_callbacks)
             .with(:each_perform)
           subject
@@ -142,15 +152,15 @@ RSpec.describe ActiveInteractor::Organizer do
         it { expect { subject }.not_to raise_error }
         it { is_expected.to be_failure }
         it { is_expected.to be_a interactor_class.context_class }
-        it 'is expected to call #perform on the first interactor' do
+        it 'is expected to receive #perform on the first interactor' do
           expect_any_instance_of(interactor1).to receive(:perform)
           subject
         end
-        it 'is expected to not call #perform on the second interactor' do
+        it 'is expected not to receive #perform on the second interactor' do
           expect_any_instance_of(interactor2).not_to receive(:perform)
           subject
         end
-        it 'is expected to call #rollback on the first interactor' do
+        it 'is expected to receive #rollback on the first interactor' do
           expect_any_instance_of(interactor1).to receive(:rollback)
           subject
         end
@@ -168,12 +178,12 @@ RSpec.describe ActiveInteractor::Organizer do
         it { expect { subject }.not_to raise_error }
         it { is_expected.to be_failure }
         it { is_expected.to be_a interactor_class.context_class }
-        it 'is expected to call #perform on both interactors' do
+        it 'is expected to receive #perform on both interactors' do
           expect_any_instance_of(interactor1).to receive(:perform)
           expect_any_instance_of(interactor2).to receive(:perform)
           subject
         end
-        it 'is expected to call #rollback on both interactors' do
+        it 'is expected to receive #rollback on both interactors' do
           expect_any_instance_of(interactor1).to receive(:rollback)
           expect_any_instance_of(interactor2).to receive(:rollback)
           subject
@@ -190,7 +200,7 @@ RSpec.describe ActiveInteractor::Organizer do
         end
 
         it { is_expected.to be_a interactor_class.context_class }
-        it 'is expected to call #perform on both interactors' do
+        it 'is expected to receive #perform on both interactors' do
           expect_any_instance_of(interactor1).to receive(:perform)
           expect_any_instance_of(interactor2).to receive(:perform)
           subject
@@ -208,12 +218,12 @@ RSpec.describe ActiveInteractor::Organizer do
           it { expect { subject }.not_to raise_error }
           it { is_expected.to be_failure }
           it { is_expected.to be_a interactor_class.context_class }
-          it 'is expected to call #perform on both interactors' do
+          it 'is expected to receive #perform on both interactors' do
             expect_any_instance_of(interactor1).to receive(:perform)
             expect_any_instance_of(interactor2).to receive(:perform)
             subject
           end
-          it 'is expected to call #rollback both interactors' do
+          it 'is expected to receive #rollback both interactors' do
             expect_any_instance_of(interactor1).to receive(:rollback)
             expect_any_instance_of(interactor2).to receive(:rollback)
             subject
@@ -232,12 +242,12 @@ RSpec.describe ActiveInteractor::Organizer do
           it { expect { subject }.not_to raise_error }
           it { is_expected.to be_failure }
           it { is_expected.to be_a interactor_class.context_class }
-          it 'is expected to call #perform on both interactors' do
+          it 'is expected to receive #perform on both interactors' do
             expect_any_instance_of(interactor1).to receive(:perform)
             expect_any_instance_of(interactor2).to receive(:perform)
             subject
           end
-          it 'is expected to call #rollback on both interactors' do
+          it 'is expected to receive #rollback on both interactors' do
             expect_any_instance_of(interactor1).to receive(:rollback)
             expect_any_instance_of(interactor2).to receive(:rollback)
             subject