activeinteractor 1.0.0.beta.6 → 1.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2607fe1a40ac6e082fa6d3bb2ffb59c0987226c8e88a01cfd9f66329bf2439d3
-  data.tar.gz: 2fc83930cd1bc7f011e63b78028d0ba658f29dcbfc9001469b5168b15a6c25de
+  metadata.gz: 6fc8ba19ece1da4ceed9d40d07e248dd77294c23c0b90b4a4012f74bce2726f9
+  data.tar.gz: f785b96877bab8eaed1f7cc612aad65d75bfa723170221cd54d46270e820f152
 SHA512:
-  metadata.gz: 1a6d8e00458fce9b81929008eadd2a8d0c83a1dde70c0ca4cd65130fb8d3ab6b51a1c123db707baa777af618fb8c86924a067b5eb8c3baba6463e095b3abd21c
-  data.tar.gz: 1e9e136432675755607b891c54d9a2d50cfbd67b79ab17bd48e63981331da099a223009b3e40d8067b05049a00258cac406190adf221cf178df2d4be47d63cc5
+  metadata.gz: 589bd2fe219fc23e75eb2319242de9692ff17b157c09987495ee5931ee66137415b9c9d8291a6cd1dbcd8dc3bb7a8df8c206ecfec93c01249296c49ba590ccde
+  data.tar.gz: d699de2f8be391922a8d26ca96767ca654547760724f732a2396e367d3cf903fac8c6d6b4c6d3a704f928d94671c3beec6292747c202020507a92e96dadba8d5

data/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [v1.0.0-beta.7] - 2020-01-21
+
+### Added
+
+- [#127] `ActiveInteractor::Rails::Models`
+
+### Fixed
+
+- [#127] #126 `act_as_context` not working
+
+### Removed
+
+- [#127] `ActiveInteractor::Rails::ActiveRecord`
+
 ## [v1.0.0-beta.6] - 2020-01-21
 
 ### Added
@@ -194,7 +208,8 @@ and this project adheres to [Semantic Versioning].
 
 <!-- versions -->
 
-[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.0-beta.6...HEAD
+[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.0-beta.7...HEAD
+[v1.0.0-beta.7]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.0-beta.6...v1.0.0-beta.7
 [v1.0.0-beta.6]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.0-beta.5...v1.0.0-beta.6
 [v1.0.0-beta.5]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.0-beta.4...v1.0.0-beta.5
 [v1.0.0-beta.4]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.0-beta.3...v1.0.0-beta.4
@@ -235,3 +250,4 @@ and this project adheres to [Semantic Versioning].
 [#115]: https://github.com/aaronmallen/activeinteractor/pull/115
 [#122]: https://github.com/aaronmallen/activeinteractor/pull/122
 [#124]: https://github.com/aaronmallen/activeinteractor/pull/124
+[#127]: https://github.com/aaronmallen/activeinteractor/pull/127

data/README.md

@@ -51,7 +51,7 @@ see [v0.1.7](https://github.com/aaronmallen/activeinteractor/tree/0-1-stable)**
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'activeinteractor', '~> 1.0.0.beta.6'
+gem 'activeinteractor', '~> 1.0.0.beta.7'
 ```
 
 And then execute:

data/lib/active_interactor/rails/{active_record.rb → models.rb}

@@ -2,18 +2,11 @@
 
 module ActiveInteractor
   module Rails
-    # ActiveRecord helper methods
+    # Model helper methods
     # @author Aaron Allen <hello@aaronmallen.me>
     # @since 1.0.0
-    module ActiveRecord
-      # Include ActiveRecord helper methods on load
-      def self.include_helpers
-        ActiveSupport.on_load(:active_record_base) do
-          extend ClassMethods
-        end
-      end
-
-      # ActiveRecord class helper methods
+    module Models
+      # Model class helper methods
       # @author Aaron Allen <hello@aaronmallen.me>
       # @since 1.0.0
       module ClassMethods
@@ -27,19 +20,21 @@ module ActiveInteractor
         end
       end
 
+      # Model instance helper methods
+      # @author Aaron Allen <hello@aaronmallen.me>
+      # @since 1.0.0
       module InstanceMethods
-        # Override ActiveRecord's initialize method to ensure
+        # Override initialize method to ensure
         #  context flags are copied to the new instance
-        # @param context [Hash|nil] attributes to assign to the class
-        # @param options [Hash|nil] options for the class
-        def initialize(context = nil, options = {})
-          copy_flags!(context) if context
-          copy_called!(context) if context
-          attributes = context.to_h if context
-          super(attributes, options)
+        # @param attributes [Hash|nil] attributes to assign to the class
+        def initialize(attributes = nil)
+          copy_flags!(attributes) if attributes
+          copy_called!(attributes) if attributes
+          attributes_as_hash = attributes_as_hash(attributes)
+          super(attributes_as_hash)
         end
 
-        # Merge an ActiveRecord::Base instance and ensure
+        # Merge an instance and ensure
         #  context flags are copied to the new instance
         # @param context [*] the instance to be merged
         # @return [*] the merged instance
@@ -50,6 +45,13 @@ module ActiveInteractor
           end
           self
         end
+
+        private
+
+        def attributes_as_hash(attributes)
+          return attributes.to_h if attributes&.respond_to?(:to_h)
+          return attributes.attributes.to_h if attributes.respond_to?(:attributes)
+        end
       end
     end
   end

data/lib/active_interactor/rails/orm/active_record.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+ActiveSupport.on_load(:active_record) do
+  extend ActiveInteractor::Rails::Models::ClassMethods
+end

data/lib/active_interactor/rails/railtie.rb

@@ -14,10 +14,6 @@ module ActiveInteractor
 
       config.eager_load_namespaces << ActiveInteractor
 
-      initializer 'active_interactor.active_record_helpers' do
-        ActiveInteractor::Rails::ActiveRecord.include_helpers
-      end
-
       config.to_prepare do
         ActiveInteractor.configure do |c|
           c.logger = ::Rails.logger

data/lib/active_interactor/rails.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'active_interactor'
-require 'active_interactor/rails/active_record'
 require 'active_interactor/rails/config'
+require 'active_interactor/rails/models'
 require 'active_interactor/rails/railtie'
 
 module ActiveInteractor

data/lib/active_interactor/version.rb

@@ -2,5 +2,5 @@
 
 module ActiveInteractor
   # @return [String] the ActiveInteractor version
-  VERSION = '1.0.0.beta.6'
+  VERSION = '1.0.0.beta.7'
 end

data/lib/rails/generators/active_interactor/install_generator.rb

@@ -6,7 +6,9 @@ module ActiveInteractor
   module Generators
     class InstallGenerator < Base
       source_root File.expand_path('templates', __dir__)
+
       desc 'Install ActiveInteractor'
+      class_option :orm
       argument :directory, type: :string, default: 'interactors', banner: 'directory'
 
       def create_initializer

data/lib/rails/generators/active_interactor/templates/initializer.erb

@@ -3,6 +3,14 @@
 require 'active_interactor'
 
 ActiveInteractor::Rails.configure do |config|
+  # ORM configuration
+  # Load and configure the ORM. Supports :active_record (default)
+  # Other ORMs may be available as additional gems.
+<%- if options[:orm] -%>
+  require 'active_interactor/rails/orm/<%= options[:orm] %>'
+<%- else -%>
+  # require 'active_interactor/rails/orm/<MY_ORM>'
+<%- end -%>
 
   # set the default directory for interactors
 <%- if directory != 'interactors' -%>

data/spec/integration/active_record_integration_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 begin
   require 'active_interactor/rails'
+  require 'active_interactor/rails/orm/active_record'
 
   RSpec.describe 'ActiveRecord Integration', type: :integration do
     let!(:active_record_base_mock) do
@@ -42,321 +43,317 @@ begin
       end
     end
 
-    context 'after ActiveInteractor::Rails::ActiveRecord.include_helpers has been invoked' do
-      before { ActiveInteractor::Rails::ActiveRecord.include_helpers }
+    context 'after ActiveSupport.run_load_hooks has been invoked with :active_record' do
+      before { ActiveSupport.run_load_hooks(:active_record, active_record_base_mock) }
 
-      context 'after ActiveSupport.run_load_hooks has been invoked with :active_record_base' do
-        before { ActiveSupport.run_load_hooks(:active_record_base, active_record_base_mock) }
+      describe 'an ActiveRecord model class with .acts_as_context' do
+        let(:model_mock) do
+          build_class('ModelMock', active_record_base_mock) do
+            attr_accessor :foo
+            acts_as_context
+          end
+        end
 
-        describe 'an ActiveRecord model class with .acts_as_context' do
-          let(:model_mock) do
-            build_class('ModelMock', active_record_base_mock) do
-              attr_accessor :foo
-              acts_as_context
-            end
+        describe 'as an instance' do
+          subject { model_mock.new }
+
+          it { is_expected.to respond_to :called! }
+          it { is_expected.to respond_to :fail! }
+          it { is_expected.to respond_to :fail? }
+          it { is_expected.to respond_to :failure? }
+          it { is_expected.to respond_to :merge! }
+          it { is_expected.to respond_to :rollback! }
+          it { is_expected.to respond_to :success? }
+          it { is_expected.to respond_to :successful? }
+        end
+
+        describe '.new' do
+          subject { model_mock.new(attributes) }
+          let(:attributes) { nil }
+
+          it 'is expected not to receive #copy_flags!' do
+            expect_any_instance_of(model_mock).not_to receive(:copy_flags!)
+            subject
+          end
+
+          it 'is expected not to receive #copy_called!' do
+            expect_any_instance_of(model_mock).not_to receive(:copy_called!)
+            subject
           end
 
-          describe 'as an instance' do
-            subject { model_mock.new }
-
-            it { is_expected.to respond_to :called! }
-            it { is_expected.to respond_to :fail! }
-            it { is_expected.to respond_to :fail? }
-            it { is_expected.to respond_to :failure? }
-            it { is_expected.to respond_to :merge! }
-            it { is_expected.to respond_to :rollback! }
-            it { is_expected.to respond_to :success? }
-            it { is_expected.to respond_to :successful? }
+          it 'is expected to invoke super on parent class with nil attributes' do
+            expect(active_record_base_mock).to receive(:new).with(nil)
+            subject
           end
 
-          describe '.new' do
-            subject { model_mock.new(attributes) }
-            let(:attributes) { nil }
+          context 'with attributes { :foo => "foo" }' do
+            let(:attributes) { { foo: 'foo' } }
 
-            it 'is expected not to receive #copy_flags!' do
-              expect_any_instance_of(model_mock).not_to receive(:copy_flags!)
+            it { expect { subject }.not_to raise_error }
+
+            it 'is expected to receive #copy_flags!' do
+              expect_any_instance_of(model_mock).to receive(:copy_flags!).with(foo: 'foo')
               subject
             end
 
-            it 'is expected not to receive #copy_called!' do
-              expect_any_instance_of(model_mock).not_to receive(:copy_called!)
+            it 'is expected to receive #copy_called!' do
+              expect_any_instance_of(model_mock).to receive(:copy_called!).with(foo: 'foo')
               subject
             end
 
-            it 'is expected to invoke super on parent class with nil attributes' do
-              expect(active_record_base_mock).to receive(:new).with(nil)
+            it 'is expected to invoke super on parent class with { :foo => "foo" }' do
+              expect(active_record_base_mock).to receive(:new).with(foo: 'foo')
               subject
             end
+          end
+
+          context 'with attributes being an instance of ModelMock having attributes { :foo => "foo" }' do
+            let(:previous_instance) { model_mock.new(foo: 'foo') }
+            let(:attributes) { previous_instance }
 
-            context 'with attributes { :foo => "foo" }' do
-              let(:attributes) { { foo: 'foo' } }
+            it { is_expected.to have_attributes(foo: 'foo') }
 
-              it { expect { subject }.not_to raise_error }
+            context 'with _failed equal to true on previous instance' do
+              before { previous_instance.instance_variable_set('@_failed', true) }
 
-              it 'is expected to receive #copy_flags!' do
-                expect_any_instance_of(model_mock).to receive(:copy_flags!).with(foo: 'foo')
-                subject
-              end
+              it { is_expected.to be_failure }
+            end
 
-              it 'is expected to receive #copy_called!' do
-                expect_any_instance_of(model_mock).to receive(:copy_called!).with(foo: 'foo')
-                subject
+            context 'with _rolled_back equal to true on previous instance' do
+              before { previous_instance.instance_variable_set('@_rolled_back', true) }
+
+              it 'is expected to have instance_variable @_rolled_back eq to true' do
+                expect(subject.instance_variable_get('@_rolled_back')).to eq true
               end
+            end
 
-              it 'is expected to invoke super on parent class with { :foo => "foo" }' do
-                expect(active_record_base_mock).to receive(:new).with(foo: 'foo')
-                subject
+            context 'with _called eq to ["foo"] on previous instance' do
+              before { previous_instance.instance_variable_set('@_called', %w[foo]) }
+
+              it 'is expected to have instance_variable @_called eq to ["foo"]' do
+                expect(subject.instance_variable_get('@_called')).to eq %w[foo]
               end
             end
+          end
+        end
+
+        describe '#merge!' do
+          subject { model_mock.new(attributes).merge!(merge_instance) }
+          context 'having attributes { :foo => nil }' do
+            let(:attributes) { { foo: nil } }
 
-            context 'with attributes being an instance of ModelMock having attributes { :foo => "foo" }' do
-              let(:previous_instance) { model_mock.new(foo: 'foo') }
-              let(:attributes) { previous_instance }
+            context 'with merging instance having attributes { :foo => "foo" }' do
+              let(:merge_instance) { model_mock.new(foo: 'foo') }
 
               it { is_expected.to have_attributes(foo: 'foo') }
 
-              context 'with _failed equal to true on previous instance' do
-                before { previous_instance.instance_variable_set('@_failed', true) }
+              context 'with _failed equal to true on merging instance' do
+                before { merge_instance.instance_variable_set('@_failed', true) }
 
                 it { is_expected.to be_failure }
               end
 
-              context 'with _rolled_back equal to true on previous instance' do
-                before { previous_instance.instance_variable_set('@_rolled_back', true) }
+              context 'with _rolled_back equal to true on merging instance' do
+                before { merge_instance.instance_variable_set('@_rolled_back', true) }
 
                 it 'is expected to have instance_variable @_rolled_back eq to true' do
                   expect(subject.instance_variable_get('@_rolled_back')).to eq true
                 end
               end
-
-              context 'with _called eq to ["foo"] on previous instance' do
-                before { previous_instance.instance_variable_set('@_called', %w[foo]) }
-
-                it 'is expected to have instance_variable @_called eq to ["foo"]' do
-                  expect(subject.instance_variable_get('@_called')).to eq %w[foo]
-                end
-              end
             end
           end
 
-          describe '#merge!' do
-            subject { model_mock.new(attributes).merge!(merge_instance) }
-            context 'having attributes { :foo => nil }' do
-              let(:attributes) { { foo: nil } }
+          context 'having attributes { :foo => "foo"}' do
+            let(:attributes) { { foo: 'foo' } }
 
-              context 'with merging instance having attributes { :foo => "foo" }' do
-                let(:merge_instance) { model_mock.new(foo: 'foo') }
+            context 'with merging instance having attributes { :foo => "bar" }' do
+              let(:merge_instance) { model_mock.new(foo: 'bar') }
 
-                it { is_expected.to have_attributes(foo: 'foo') }
+              it { is_expected.to have_attributes(foo: 'bar') }
 
-                context 'with _failed equal to true on merging instance' do
-                  before { merge_instance.instance_variable_set('@_failed', true) }
+              context 'with _failed equal to true on merging instance' do
+                before { merge_instance.instance_variable_set('@_failed', true) }
 
-                  it { is_expected.to be_failure }
-                end
+                it { is_expected.to be_failure }
+              end
 
-                context 'with _rolled_back equal to true on merging instance' do
-                  before { merge_instance.instance_variable_set('@_rolled_back', true) }
+              context 'with _rolled_back equal to true on merging instance' do
+                before { merge_instance.instance_variable_set('@_rolled_back', true) }
 
-                  it 'is expected to have instance_variable @_rolled_back eq to true' do
-                    expect(subject.instance_variable_get('@_rolled_back')).to eq true
-                  end
+                it 'is expected to have instance_variable @_rolled_back eq to true' do
+                  expect(subject.instance_variable_get('@_rolled_back')).to eq true
                 end
               end
             end
+          end
+        end
+      end
 
-            context 'having attributes { :foo => "foo"}' do
-              let(:attributes) { { foo: 'foo' } }
+      describe 'a basic interactor using an ActiveRecord model class as context' do
+        let!(:model_mock) do
+          require 'active_model'
+          build_class('ModelMock', active_record_base_mock) do
+            include ActiveModel::Validations
+            attr_accessor :foo
+            acts_as_context
+          end
+        end
 
-              context 'with merging instance having attributes { :foo => "bar" }' do
-                let(:merge_instance) { model_mock.new(foo: 'bar') }
+        let(:interactor_class) do
+          build_interactor do
+            contextualize_with :model_mock
 
-                it { is_expected.to have_attributes(foo: 'bar') }
+            def perform
+              context.foo = 'foo'
+            end
+          end
+        end
 
-                context 'with _failed equal to true on merging instance' do
-                  before { merge_instance.instance_variable_set('@_failed', true) }
+        include_examples 'a class with interactor methods'
+        include_examples 'a class with interactor callback methods'
+        include_examples 'a class with interactor context methods'
 
-                  it { is_expected.to be_failure }
-                end
+        describe '.context_class' do
+          subject { interactor_class.context_class }
 
-                context 'with _rolled_back equal to true on merging instance' do
-                  before { merge_instance.instance_variable_set('@_rolled_back', true) }
+          it { is_expected.to eq model_mock }
+        end
 
-                  it 'is expected to have instance_variable @_rolled_back eq to true' do
-                    expect(subject.instance_variable_get('@_rolled_back')).to eq true
-                  end
-                end
-              end
-            end
-          end
+        describe '.perform' do
+          subject { interactor_class.perform }
+
+          it { is_expected.to be_a model_mock }
+          it { is_expected.to be_successful }
+          it { is_expected.to have_attributes(foo: 'foo') }
         end
 
-        describe 'a basic interactor using an ActiveRecord model class as context' do
-          let!(:model_mock) do
-            require 'active_model'
-            build_class('ModelMock', active_record_base_mock) do
-              include ActiveModel::Validations
-              attr_accessor :foo
-              acts_as_context
-            end
-          end
+        describe '.perform!' do
+          subject { interactor_class.perform! }
+
+          it { expect { subject }.not_to raise_error }
+          it { is_expected.to be_a model_mock }
+          it { is_expected.to be_successful }
+          it { is_expected.to have_attributes(foo: 'foo') }
+        end
 
+        context 'failing the context on #perform' do
           let(:interactor_class) do
             build_interactor do
               contextualize_with :model_mock
 
               def perform
-                context.foo = 'foo'
+                context.fail!
               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'
-
-          describe '.context_class' do
-            subject { interactor_class.context_class }
-
-            it { is_expected.to eq model_mock }
-          end
-
           describe '.perform' do
             subject { interactor_class.perform }
 
+            it { expect { subject }.not_to raise_error }
             it { is_expected.to be_a model_mock }
-            it { is_expected.to be_successful }
-            it { is_expected.to have_attributes(foo: 'foo') }
+            it { is_expected.to be_failure }
+            it 'is expected to #rollback' do
+              expect_any_instance_of(interactor_class).to receive(:rollback)
+              subject
+            end
           end
 
           describe '.perform!' do
             subject { interactor_class.perform! }
 
-            it { expect { subject }.not_to raise_error }
-            it { is_expected.to be_a model_mock }
-            it { is_expected.to be_successful }
-            it { is_expected.to have_attributes(foo: 'foo') }
-          end
-
-          context 'failing the context on #perform' do
-            let(:interactor_class) do
-              build_interactor do
-                contextualize_with :model_mock
-
-                def perform
-                  context.fail!
-                end
-              end
-            end
-
-            describe '.perform' do
-              subject { interactor_class.perform }
-
-              it { expect { subject }.not_to raise_error }
-              it { is_expected.to be_a model_mock }
-              it { is_expected.to be_failure }
-              it 'is expected to #rollback' do
-                expect_any_instance_of(interactor_class).to receive(:rollback)
-                subject
-              end
-            end
-
-            describe '.perform!' do
-              subject { interactor_class.perform! }
-
-              it { expect { subject }.to raise_error(ActiveInteractor::Error::ContextFailure) }
-            end
+            it { expect { subject }.to raise_error(ActiveInteractor::Error::ContextFailure) }
           end
         end
+      end
 
-        describe 'a basic organizer using an ActiveRecord model class as context' do
-          let!(:model_mock) do
-            require 'active_model'
-            build_class('ModelMock', active_record_base_mock) do
-              include ActiveModel::Validations
-              attr_accessor :first_name, :last_name
-              acts_as_context
-            end
+      describe 'a basic organizer using an ActiveRecord model class as context' do
+        let!(:model_mock) do
+          require 'active_model'
+          build_class('ModelMock', active_record_base_mock) do
+            include ActiveModel::Validations
+            attr_accessor :first_name, :last_name
+            acts_as_context
           end
+        end
 
-          context 'with each organized interactor using the model' do
-            let!(:test_interactor_1) do
-              build_interactor('TestInteractor1') do
-                contextualize_with :model_mock
+        context 'with each organized interactor using the model' do
+          let!(:test_interactor_1) do
+            build_interactor('TestInteractor1') do
+              contextualize_with :model_mock
 
-                def perform
-                  context.first_name = 'Test'
-                end
+              def perform
+                context.first_name = 'Test'
               end
             end
+          end
 
-            let!(:test_interactor_2) do
-              build_interactor('TestInteractor2') do
-                contextualize_with :model_mock
+          let!(:test_interactor_2) do
+            build_interactor('TestInteractor2') do
+              contextualize_with :model_mock
 
-                def perform
-                  context.last_name = 'User'
-                end
+              def perform
+                context.last_name = 'User'
               end
             end
+          end
 
-            let(:interactor_class) do
-              build_organizer do
-                contextualize_with :model_mock
-                organize :test_interactor_1, :test_interactor_2
-              end
+          let(:interactor_class) do
+            build_organizer do
+              contextualize_with :model_mock
+              organize :test_interactor_1, :test_interactor_2
             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'
+          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 }
+          describe '.perform' do
+            subject { interactor_class.perform }
 
-              it { is_expected.to be_a model_mock }
-              it { is_expected.to be_successful }
-              it { is_expected.to have_attributes(first_name: 'Test', last_name: 'User') }
-            end
+            it { is_expected.to be_a model_mock }
+            it { is_expected.to be_successful }
+            it { is_expected.to have_attributes(first_name: 'Test', last_name: 'User') }
           end
+        end
 
-          context 'with each organized interactor using their default context' do
-            let!(:test_interactor_1) do
-              build_interactor('TestInteractor1') do
-                def perform
-                  context.first_name = 'Test'
-                end
+        context 'with each organized interactor using their default context' do
+          let!(:test_interactor_1) do
+            build_interactor('TestInteractor1') do
+              def perform
+                context.first_name = 'Test'
               end
             end
+          end
 
-            let!(:test_interactor_2) do
-              build_interactor('TestInteractor2') do
-                def perform
-                  context.last_name = 'User'
-                end
+          let!(:test_interactor_2) do
+            build_interactor('TestInteractor2') do
+              def perform
+                context.last_name = 'User'
               end
             end
+          end
 
-            let(:interactor_class) do
-              build_organizer do
-                contextualize_with :model_mock
-                organize :test_interactor_1, :test_interactor_2
-              end
+          let(:interactor_class) do
+            build_organizer do
+              contextualize_with :model_mock
+              organize :test_interactor_1, :test_interactor_2
             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'
+          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 }
+          describe '.perform' do
+            subject { interactor_class.perform }
 
-              it { is_expected.to be_a model_mock }
-              it { is_expected.to be_successful }
-              it { is_expected.to have_attributes(first_name: 'Test', last_name: 'User') }
-            end
+            it { is_expected.to be_a model_mock }
+            it { is_expected.to be_successful }
+            it { is_expected.to have_attributes(first_name: 'Test', last_name: 'User') }
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.6
+  version: 1.0.0.beta.7
 platform: ruby
 authors:
 - Aaron Allen
@@ -122,8 +122,9 @@ files:
 - lib/active_interactor/organizer/interactor_interface.rb
 - lib/active_interactor/organizer/interactor_interface_collection.rb
 - lib/active_interactor/rails.rb
-- lib/active_interactor/rails/active_record.rb
 - lib/active_interactor/rails/config.rb
+- lib/active_interactor/rails/models.rb
+- lib/active_interactor/rails/orm/active_record.rb
 - lib/active_interactor/rails/railtie.rb
 - lib/active_interactor/version.rb
 - lib/rails/generators/active_interactor.rb
@@ -156,7 +157,6 @@ files:
 - spec/active_interactor/organizer/interactor_interface_collection_spec.rb
 - spec/active_interactor/organizer/interactor_interface_spec.rb
 - spec/active_interactor/organizer_spec.rb
-- spec/active_interactor/rails/active_record_spec.rb
 - spec/active_interactor/rails/config_spec.rb
 - spec/active_interactor/rails_spec.rb
 - spec/active_interactor_spec.rb
@@ -177,10 +177,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/aaronmallen/activeinteractor/issues
-  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v1.0.0.beta.6/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/1.0.0.beta.6
+  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v1.0.0.beta.7/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/1.0.0.beta.7
   hompage_uri: https://github.com/aaronmallen/activeinteractor
-  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v1.0.0.beta.6
+  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v1.0.0.beta.7
   wiki_uri: https://github.com/aaronmallen/activeinteractor/wiki
 post_install_message: 
 rdoc_options: []
@@ -221,7 +221,6 @@ test_files:
 - spec/active_interactor/organizer_spec.rb
 - spec/active_interactor/organizer/interactor_interface_spec.rb
 - spec/active_interactor/organizer/interactor_interface_collection_spec.rb
-- spec/active_interactor/rails/active_record_spec.rb
 - spec/active_interactor/rails/config_spec.rb
 - spec/active_interactor/rails_spec.rb
 - spec/active_interactor/interactor/worker_spec.rb

data/spec/active_interactor/rails/active_record_spec.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-begin
-  require 'active_interactor/rails'
-
-  RSpec.describe ActiveInteractor::Rails::ActiveRecord do
-    describe '.include_helpers' do
-      subject { described_class.include_helpers }
-      let!(:active_record_mock) { build_class('ActiveRecordBaseMock') }
-
-      it 'is expected to extend ClassMethods' do
-        subject
-        ActiveSupport.run_load_hooks(:active_record_base, active_record_mock)
-        expect(active_record_mock).to respond_to :acts_as_context
-      end
-    end
-  end
-rescue LoadError
-  RSpec.describe 'ActiveInteractor::Rails::ActiveRecord' do
-    pending 'Rails not found skipping specs...'
-  end
-end