activeinteractor 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83ff894cc3ce150f3a97ab2b006035acf9f27c181040f02c04e0058b3d3dd49
-  data.tar.gz: fd8d75ec724d1b35eec4b7cd2017c74a9fb61c54209f58830a7ffd5b780b5ba8
+  metadata.gz: bb760f4036450f632f5734d8575389462d80019152811ea20479754b04754aa2
+  data.tar.gz: ebc3326b09daec0e2b654a29014794aedf9e3d508d869d3b4aa1e180bf9b2fc8
 SHA512:
-  metadata.gz: '085c0039e71216c6c3dc734a4aad4bb30fc0bf5fa5babe8a9b72e2b961c5066732c5bdfbc5eb1566ababc42cbcf38e1b5e3d87e61a94251e08eec2c13a99c524'
-  data.tar.gz: fa572ba8068e8856bfbc405500cffd4b398f47c67d7b665a02ead9a5d701cdb62983f17e6eb6df7c13f7b29b981c58054a7613b6eb4970a488c45d15acc7bc40
+  metadata.gz: 1358b3923eb46838102b5e5e6c84021465cd3ade38954e9a36432019491e598f1d4b6aa2a1467816d81753a59d47d5205a10f5fa1fad2212110d926266ef20ae
+  data.tar.gz: 6318ca357ceba0628cbc13dec29bfe7971b8c5341a31f11c1b930ba060bc311b79813548fe73b99a4a689bb10019f9b02ea4e2c62d8753e260a47521a57c63f1

data/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [v1.0.3] - 2020-02-10
+
+### Added
+
+- `ActiveInteractor::Context::Errors`
+- `ActiveInteractor::Context::Status#resolve`
+
+### Fixed
+
+- [\#168](https://github.com/aaronmallen/activeinteractor/issues/168) `#classify` is called on const arguments
+- [\#169](https://github.com/aaronmallen/activeinteractor/issues/169) If some of the interactors of the organizer fail
+  error message is not persisted.
+
 ## [v1.0.2] - 2020-02-04
 
 ### Added
@@ -175,7 +188,8 @@ and this project adheres to [Semantic Versioning].
 
 <!-- versions -->
 
-[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.3...HEAD
+[v1.0.3]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.2...v1.0.3
 [v1.0.2]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.1...v1.0.2
 [v1.0.1]: https://github.com/aaronmallen/activeinteractor/compare/v1.0.0...v1.0.1
 [v1.0.0]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.7...v1.0.0

data/lib/active_interactor.rb

@@ -64,6 +64,7 @@ module ActiveInteractor
 
     autoload :Attributes
     autoload :Base
+    autoload :Errors
     autoload :Loader
     autoload :Status
   end

data/lib/active_interactor/context/attributes.rb

@@ -50,7 +50,7 @@ module ActiveInteractor
       # @param context [Hash, Base, Class] attributes to assign to the {Base context}
       # @return [Base] a new instance of {Base}
       def initialize(context = {})
-        merge_errors!(context.errors) if context.respond_to?(:errors)
+        merge_errors!(context) if context.respond_to?(:errors)
         copy_flags!(context)
         copy_called!(context)
         context = context_attributes_as_hash(context) || {}
@@ -105,7 +105,7 @@ module ActiveInteractor
       # @param context [Class] a {Base context} instance to be merged
       # @return [self] the {Base context} instance
       def merge!(context)
-        merge_errors!(context.errors) if context.respond_to?(:errors)
+        merge_errors!(context) if context.respond_to?(:errors)
         copy_flags!(context)
         context.each_pair do |key, value|
           public_send("#{key}=", value) unless value.nil?
@@ -143,14 +143,6 @@ module ActiveInteractor
           public_send("#{key}=", value)
         end
       end
-
-      def merge_errors!(errors)
-        if errors.is_a? String
-          self.errors.add(:context, errors)
-        else
-          self.errors.merge!(errors)
-        end
-      end
     end
   end
 end

data/lib/active_interactor/context/base.rb

@@ -326,6 +326,7 @@ module ActiveInteractor
       include ActiveModel::Attributes
       include ActiveModel::Validations
       include ActiveInteractor::Context::Attributes
+      include ActiveInteractor::Context::Errors
       include ActiveInteractor::Context::Status
     end
   end

data/lib/active_interactor/context/errors.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Context
+    # Context error methods. Because {Errors} is a module classes should include {Errors} rather than
+    # inherit from it.
+    #
+    # @api private
+    # @author Aaron Allen <hello@aaronmallen.me>
+    # @since 1.0.3
+    module Errors
+      # Generic errors generated outside of validation.
+      #
+      # @return [ActiveModel::Errors] an instance of `ActiveModel::Errors`
+      def failure_errors
+        @failure_errors ||= ActiveModel::Errors.new(self)
+      end
+
+      private
+
+      def handle_errors(errors)
+        if errors.is_a?(String)
+          failure_errors.add(:context, errors)
+        else
+          failure_errors.merge!(errors)
+        end
+      end
+
+      def merge_errors!(other)
+        errors.merge!(other.errors)
+        failure_errors.merge!(other.errors)
+        failure_errors.merge!(other.failure_errors)
+      end
+
+      def resolve_errors
+        errors.merge!(failure_errors)
+      end
+    end
+  end
+end

data/lib/active_interactor/context/loader.rb

@@ -22,7 +22,7 @@ module ActiveInteractor
       # @param interactor_class [Const] an {ActiveInteractor::Base interactor} class
       # @return [Const] a class that inherits from {Base}
       def self.create(context_class_name, interactor_class)
-        interactor_class.const_set(context_class_name.to_s.classify, Class.new(BASE_CONTEXT))
+        interactor_class.const_set(context_class_name.to_s.camelize, Class.new(BASE_CONTEXT))
       end
 
       # Find or create a {Base context} class for a given {ActiveInteractor::Base interactor}. If a class exists

data/lib/active_interactor/context/status.rb

@@ -37,8 +37,9 @@ module ActiveInteractor
       # @see https://api.rubyonrails.org/classes/ActiveModel/Errors.html ActiveModel::Errors
       # @raise [Error::ContextFailure]
       def fail!(errors = nil)
-        merge_errors!(errors) if errors
+        handle_errors(errors) if errors
         @_failed = true
+        resolve
         raise ActiveInteractor::Error::ContextFailure, self
       end
 
@@ -59,6 +60,16 @@ module ActiveInteractor
       end
       alias fail? failure?
 
+      # Resolve an instance of {Base context}.  Called when an interactor
+      #  is finished with it's context.
+      #
+      # @since 1.0.3
+      # @return [self] the instance of {Base context}
+      def resolve
+        resolve_errors
+        self
+      end
+
       # {#rollback! Rollback} an instance of {Base context}. Any {ActiveInteractor::Base interactors} the instance has
       # been passed via the {#called!} method are asked to roll themselves back by invoking their
       # {Interactor::Perform#rollback #rollback} methods. The instance is also flagged as rolled back.

data/lib/active_interactor/interactor/context.rb

@@ -211,7 +211,7 @@ module ActiveInteractor
         # @return [Const] the {Base interactor} class' {ActiveInteractor::Context::Base context} class
         def contextualize_with(klass)
           @context_class = begin
-            context_class = klass.to_s.classify.safe_constantize
+            context_class = klass.to_s.camelize.safe_constantize
             raise(ActiveInteractor::Error::InvalidContextClass, klass) unless context_class
 
             context_class
@@ -366,6 +366,7 @@ module ActiveInteractor
       # @return [Class] the {ActiveInteractor::Context::Base context} instance
       def finalize_context!
         context.called!(self)
+        context.resolve
         context
       end
 

data/lib/active_interactor/models.rb

@@ -40,6 +40,7 @@ module ActiveInteractor
         extend ActiveInteractor::Context::Attributes::ClassMethods
 
         include ActiveInteractor::Context::Attributes
+        include ActiveInteractor::Context::Errors
         include ActiveInteractor::Context::Status
         include ActiveInteractor::Models::InstanceMethods
         delegate :each_pair, to: :attributes

data/lib/active_interactor/organizer/interactor_interface.rb

@@ -40,7 +40,7 @@ module ActiveInteractor
       #  {Interactor::Perform::ClassMethods#perform .perform}. See {Interactor::Perform::Options}.
       # @return [InteractorInterface] a new instance of {InteractorInterface}
       def initialize(interactor_class, options = {})
-        @interactor_class = interactor_class.to_s.classify.safe_constantize
+        @interactor_class = interactor_class.to_s.camelize.safe_constantize
         @filters = options.select { |key, _value| CONDITIONAL_FILTERS.include?(key) }
         @perform_options = options.reject { |key, _value| CONDITIONAL_FILTERS.include?(key) }
       end

data/lib/active_interactor/version.rb

@@ -3,5 +3,5 @@
 module ActiveInteractor
   # The ActiveInteractor version
   # @return [String] the ActiveInteractor version
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/rails/generators/templates/organizer.erb

@@ -6,8 +6,8 @@ class <%= class_name %> < ApplicationOrganizer
 
 <%- end -%>
 <%- if interactors.any? -%>
-  organize <%= interactors.map(&:classify).join(", ") %>
+  organize <%= interactors.join(", ") %>
 <%- else -%>
-  # organize Interactor1, Interactor2
+  # organize :interactor_1, :interactor_2
 <%- end -%>
 end

data/spec/active_interactor/base_spec.rb

@@ -27,6 +27,17 @@ RSpec.describe ActiveInteractor::Base 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
@@ -36,6 +47,17 @@ RSpec.describe ActiveInteractor::Base 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
@@ -45,6 +67,17 @@ RSpec.describe ActiveInteractor::Base 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

data/spec/active_interactor/context/base_spec.rb

@@ -127,7 +127,7 @@ RSpec.describe ActiveInteractor::Context::Base do
       it { expect { subject }.to raise_error(ActiveInteractor::Error::ContextFailure) }
 
       it 'is expected not to merge errors' do
-        expect(instance.errors).not_to receive(:merge!)
+        expect(instance.errors).not_to receive(:merge!).with(nil)
         subject
       rescue ActiveInteractor::Error::ContextFailure # rubocop:disable Lint/SuppressedException
       end

data/spec/integration/a_basic_organizer_spec.rb

@@ -69,6 +69,25 @@ RSpec.describe 'A basic organizer', type: :integration do
         expect_any_instance_of(test_interactor_2).not_to receive(:perform!)
         subject
       end
+
+      # https://github.com/aaronmallen/activeinteractor/issues/169
+      context 'with error message "something went wrong"' do
+        let!(:test_interactor_1) do
+          build_interactor('TestInteractor1') do
+            def perform
+              context.fail!('something went wrong')
+            end
+          end
+        end
+
+        it { expect { subject }.not_to raise_error }
+        it { is_expected.to be_a interactor_class.context_class }
+        it { is_expected.to be_failure }
+        it 'is expected to have errors "something went wrong" on :context' do
+          expect(subject.errors[:context]).not_to be_empty
+          expect(subject.errors[:context]).to include 'something went wrong'
+        end
+      end
     end
   end
 
@@ -92,6 +111,25 @@ RSpec.describe 'A basic organizer', type: :integration do
         expect_any_instance_of(test_interactor_1).to receive(:rollback)
         subject
       end
+
+      # https://github.com/aaronmallen/activeinteractor/issues/169
+      context 'with error message "something went wrong"' do
+        let!(:test_interactor_2) do
+          build_interactor('TestInteractor2') do
+            def perform
+              context.fail!('something went wrong')
+            end
+          end
+        end
+
+        it { expect { subject }.not_to raise_error }
+        it { is_expected.to be_a interactor_class.context_class }
+        it { is_expected.to be_failure }
+        it 'is expected to have errors "something went wrong" on :context' do
+          expect(subject.errors[:context]).not_to be_empty
+          expect(subject.errors[:context]).to include 'something went wrong'
+        end
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,21 +1,19 @@
 # frozen_string_literal: true
 
 begin
-  require 'codacy-coverage'
-  require 'simplecov'
-
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
-    [
-      SimpleCov::Formatter::HTMLFormatter,
-      Codacy::Formatter
-    ]
-  )
-
-  SimpleCov.start do
-    enable_coverage :branch
-    add_filter '/spec/'
-    add_filter '/lib/rails/**/*.rb'
-    track_files '/lib/**/*.rb'
+  if ENV['CODACY_PROJECT_TOKEN']
+    require 'codacy-coverage'
+
+    Codacy::Reporter.start
+  else
+    require 'simplecov'
+
+    SimpleCov.start do
+      enable_coverage :branch
+      add_filter '/spec/'
+      add_filter '/lib/rails/**/*.rb'
+      track_files '/lib/**/*.rb'
+    end
   end
 rescue LoadError
   puts 'Skipping coverage...'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Aaron Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -111,6 +111,7 @@ files:
 - lib/active_interactor/configurable.rb
 - lib/active_interactor/context/attributes.rb
 - lib/active_interactor/context/base.rb
+- lib/active_interactor/context/errors.rb
 - lib/active_interactor/context/loader.rb
 - lib/active_interactor/context/status.rb
 - lib/active_interactor/error.rb
@@ -200,10 +201,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/aaronmallen/activeinteractor/issues
-  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v1.0.2/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/1.0.2
+  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v1.0.3/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/1.0.3
   hompage_uri: https://github.com/aaronmallen/activeinteractor
-  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v1.0.2
+  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v1.0.3
   wiki_uri: https://github.com/aaronmallen/activeinteractor/wiki
 post_install_message: 
 rdoc_options: []