activeinteractor 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8990e7455e8d135a08b562e71a81bc6ca0e14b4b98f25505d73c6b02e2638466
-  data.tar.gz: cf16acdae03eb8a3d15808fd4a01a112143878e502c20dd3a9d4dfc6396ebc09
+  metadata.gz: eb4ea1ab1b182695f3eb1123b9a2d24dc417a7b9c677cd4cfcd09e5c382c2353
+  data.tar.gz: 7cccf0b3d2d91598546c9683a10f7610b3c01941ea4c4aa9a6fe283dec673203
 SHA512:
-  metadata.gz: ed677499ed9140e3dffedcee26f77f3b2967b51d24b7eabf594cacbfb1bf0f3a1bb9bd76f6a94a1a5d0ac61dd190380871391b76fc1afa29f65ae44fa57c1a75
-  data.tar.gz: 874df56e5d15a5bcdda48c4297c5b5b64feed016d9c0ea84ac450b907569d49f8298e1b1d49929cac7e949522c31f94ef7a5f64426b5ad4ffbc70e1a2ccddb14
+  metadata.gz: 10f396ce895b5217010e39cd45354dba784b7216fd20aba7bb80acac9293e22711dfada8c6a573dbb8676ca961146b18bf1c215c73efdd3c351abc749c44b39a
+  data.tar.gz: fa3b9aa5f0d3b1629300003711264fd2fd61368268e579d57087592c87ed024eb46396fc316f2e5e1edf3e4043abb1c51a84334f0c645c450c80f9fda057be92

data/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [v0.1.6] - 2019-07-24
+
+### Changed
+
+- [#45] Lowered method complexity and enforced single responsibility
+
+### Security
+
+- [#48] Update simplecov: 0.16.1 → 0.17.0 (major)
+- [#51] Update rake: 12.3.2 → 12.3.3 (patch)
+
 ## [v0.1.5] - 2019-06-30
 
 ### Added
@@ -57,7 +68,8 @@ and this project adheres to [Semantic Versioning].
 
 <!-- versions -->
 
-[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.5..HEAD
+[Unreleased]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.6..HEAD
+[v0.1.6]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.5...v0.1.6
 [v0.1.5]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.4...v0.1.5
 [v0.1.4]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.3...v0.1.4
 [v0.1.3]: https://github.com/aaronmallen/activeinteractor/compare/v0.1.2...v0.1.3
@@ -76,3 +88,6 @@ and this project adheres to [Semantic Versioning].
 [#37]: https://github.com/aaronmallen/activeinteractor/pull/37
 [#38]: https://github.com/aaronmallen/activeinteractor/pull/38
 [#39]: https://github.com/aaronmallen/activeinteractor/pull/39
+[#45]: https://github.com/aaronmallen/activeinteractor/pull/45
+[#48]: https://github.com/aaronmallen/activeinteractor/pull/48
+[#51]: https://github.com/aaronmallen/activeinteractor/pull/51

data/lib/active_interactor/context.rb

@@ -55,9 +55,9 @@ module ActiveInteractor
       # @see https://api.rubyonrails.org/classes/ActiveModel/Errors.html ActiveModel::Errors
       # @raise [Error::ContextFailure]
       def fail!(errors = {})
-        self.errors.merge!(errors) unless errors.empty?
-        @_failed = true
-        raise Error::ContextFailure, self
+        merge_errors(errors)
+        mark_failed!
+        raise_context_failure!
       end
 
       # Whether the context instance has failed. By default, a new
@@ -121,8 +121,8 @@ module ActiveInteractor
       def rollback!
         return false if @_rolled_back
 
-        _called.reverse_each(&:execute_rollback)
-        @_rolled_back = true
+        rollback_called
+        mark_rolledback!
       end
 
       # Whether the context instance is successful. By default, a new
@@ -162,6 +162,26 @@ module ActiveInteractor
         @_called ||= []
       end
 
+      def mark_failed!
+        @_failed = true
+      end
+
+      def mark_rolledback!
+        @_rolled_back = true
+      end
+
+      def merge_errors(errors)
+        self.errors.merge!(errors) unless errors.empty?
+      end
+
+      def raise_context_failure!
+        raise Error::ContextFailure, self
+      end
+
+      def rollback_called
+        _called.reverse_each(&:execute_rollback)
+      end
+
       def validation_callback?(method_name)
         _validate_callbacks.map(&:filter).include?(method_name)
       end

data/lib/active_interactor/context/attributes.rb

@@ -136,14 +136,9 @@ module ActiveInteractor
       #
       # @return [Hash{Symbol => *}] the deleted attributes
       def clean!
-        deleted = {}
-        return deleted if keys.empty?
+        return {} if keys.empty?
 
-        keys.reject { |key| self.class.attributes.include?(key) }.each do |attribute|
-          deleted[attribute] = self[attribute] if self[attribute]
-          delete_field(key.to_s)
-        end
-        deleted
+        clean_keys!
       end
 
       # All keys of properties currently defined on the instance
@@ -172,6 +167,13 @@ module ActiveInteractor
         key
       end
 
+      def clean_keys!
+        keys.reject { |key| self.class.attributes.include?(key) }.each_with_object({}) do |attribute, deleted|
+          deleted[attribute] = self[attribute] if self[attribute]
+          delete_field(key.to_s)
+        end
+      end
+
       def map_attributes(attributes)
         return {} unless attributes
 

data/lib/active_interactor/interactor/worker.rb

@@ -23,7 +23,7 @@ module ActiveInteractor
       def execute_perform
         execute_perform!
       rescue ActiveInteractor::Error::ContextFailure => e
-        ActiveInteractor.logger.error("ActiveInteractor: #{e}")
+        log_context_failure(e)
         context
       end
 
@@ -32,12 +32,9 @@ module ActiveInteractor
       # @return [ActiveInteractor::Context::Base] an instance of {ActiveInteractor::Context::Base}
       def execute_perform!
         run_callbacks :perform do
-          perform!
-          finalize_context!
-          context
-        rescue # rubocop:disable Style/RescueStandardError
-          context.rollback!
-          raise
+          execute_context!
+        rescue => e # rubocop:disable Style/RescueStandardError
+          rollback_context_and_raise!(e)
         end
       end
 
@@ -64,6 +61,12 @@ module ActiveInteractor
         interactor.send(:context)
       end
 
+      def execute_context!
+        perform!
+        finalize_context!
+        context
+      end
+
       def fail_on_invalid_context!(validation_context = nil)
         context.fail! if should_fail_on_invalid_context?(validation_context)
       end
@@ -73,12 +76,21 @@ module ActiveInteractor
         context.called!
       end
 
+      def log_context_failure(exception)
+        ActiveInteractor.logger.error("ActiveInteractor: #{exception}")
+      end
+
       def perform!
         fail_on_invalid_context!(:calling)
         interactor.perform
         fail_on_invalid_context!(:called)
       end
 
+      def rollback_context_and_raise!(exception)
+        context.rollback!
+        raise exception
+      end
+
       def should_fail_on_invalid_context?(validation_context)
         !validate_context(validation_context) && interactor.fail_on_invalid_context?
       end

data/lib/active_interactor/organizer.rb

@@ -170,11 +170,21 @@ module ActiveInteractor
     #  in favor of this default implementation.
     def perform
       self.class.organized.each do |interactor|
-        run_callbacks :each_perform do
-          self.context = interactor.new(context)
-                                   .tap(&:skip_clean_context!)
-                                   .execute_perform!
-        end
+        execute_interactor_perform_with_callbacks!(interactor)
+      end
+    end
+
+    private
+
+    def execute_interactor_perform!(interactor)
+      self.context = interactor.new(context)
+                               .tap(&:skip_clean_context!)
+                               .execute_perform!
+    end
+
+    def execute_interactor_perform_with_callbacks!(interactor)
+      run_callbacks :each_perform do
+        execute_interactor_perform!(interactor)
       end
     end
   end

data/lib/active_interactor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Aaron Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -247,10 +247,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/aaronmallen/activeinteractor/issues
-  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v0.1.5/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/0.1.5
+  changelog_uri: https://github.com/aaronmallen/activeinteractor/blob/v0.1.6/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/activeinteractor/0.1.6
   hompage_uri: https://github.com/aaronmallen/activeinteractor
-  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v0.1.5
+  source_code_uri: https://github.com/aaronmallen/activeinteractor/tree/v0.1.6
   wiki_uri: https://github.com/aaronmallen/activeinteractor/wiki
 post_install_message: 
 rdoc_options: []
@@ -267,7 +267,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby interactors with ActiveModel::Validations