granite 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eee58f357db73ca54fa35ec5a68a13081bd450a8
-  data.tar.gz: 1042435a47b006d54caafc174552863a2024a52d
+  metadata.gz: f9bc00868502247ad725644cccc110d93845426e
+  data.tar.gz: '09710e9fbf2c004ef8d369869e3479f92377b51f'
 SHA512:
-  metadata.gz: 59143c029f08dae76509be73e06b653eedbfb29b98cf8b79ffebcd0eb0183fd63fe9312a0fa51c8d7806097e5a70d7168e87e116c45ce7e16af3211886b03ed4
-  data.tar.gz: f3d6579fbd80170a55a3fef47e90db59236087a0ecd4b14c1f54f145553b38bc118efd7f24a535b5d6225143511db18b26f82187bcebb3f384063c03bdc997f2
+  metadata.gz: 29d0c0a27c84fb772a96af9b1fd110d0ea1453b0d47252c803ba29f32201c6cd50a9665da4137ba8349ec7c0cd01c9dddca7e408d8054daec694adfe8442d931
+  data.tar.gz: 6c7d51a1f438c7d1958d261f5f7e51be1aa38adf161877ef96500b3a5d19069907f7d615f0335ca63f898a5b06268afeb40f72f3bf040b610e41abebb683f6ef

data/lib/granite/action/exceptions_handling.rb

@@ -0,0 +1,39 @@
+module Granite
+  class Action
+    module ExceptionsHandling
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :_exception_handlers, instance_writer: false
+        self._exception_handlers = {}
+
+        protected :_exception_handlers
+      end
+
+      module ClassMethods
+        # Register default handler for exceptions thrown inside execute_perform! and after_commit methods.
+        # @param klass Exception class, could be parent class too [Class]
+        # @param block [Block<Exception>] with default behavior for handling specified
+        #   type exceptions. First block argument is raised exception instance.
+        #
+        # @return [Hash<Class, Proc>] Registered handlers
+        def handle_exception(klass, &block)
+          self._exception_handlers = _exception_handlers.merge(klass => block)
+        end
+      end
+
+      private
+
+      def handled_exceptions
+        _exception_handlers.keys
+      end
+
+      def handle_exception(e)
+        klass = e.class.ancestors.detect do |ancestor|
+          ancestor <= Exception && _exception_handlers[ancestor]
+        end
+        instance_exec(e, &_exception_handlers[klass]) if klass
+      end
+    end
+  end
+end

data/lib/granite/action/performing.rb

@@ -1,3 +1,4 @@
+require 'granite/action/exceptions_handling'
 require 'granite/action/transaction'
 require 'granite/action/error'
 
@@ -17,28 +18,14 @@ module Granite
     module Performing
       extend ActiveSupport::Concern
 
+      include ExceptionsHandling
       include Transaction
 
       included do
-        class_attribute :_exception_handlers, instance_writer: false
-        self._exception_handlers = {}
-
-        protected :_exception_handlers
-
         define_callbacks :execute_perform
       end
 
       module ClassMethods
-        # Register default handler for exceptions thrown inside execute_perform! method.
-        # @param klass Exception class, could be parent class too [Class]
-        # @param block [Block<Exception>] with default behavior for handling specified
-        #   type exceptions. First block argument is raised exception instance.
-        #
-        # @return [Hash<Class, Proc>] Registered handlers
-        def handle_exception(klass, &block)
-          self._exception_handlers = _exception_handlers.merge(klass => block)
-        end
-
         def perform(*)
           fail 'Perform block declaration was removed! Please declare `private def execute_perform!(*)` method'
         end
@@ -54,7 +41,7 @@ module Granite
       #   using `:on`)
       # @return [Object] result of execute_perform! method execution or false in case of errors
       def perform(context: nil, **options)
-        transactional do
+        transaction do
           valid?(context) && perform_action(options)
         end
       end
@@ -72,7 +59,7 @@ module Granite
       # @raise [Granite::Action::ValidationError] Action or associated objects are invalid
       # @raise [NotImplementedError] execute_perform! method was not defined yet
       def perform!(context: nil, **options)
-        transactional do
+        transaction do
           validate!(context)
           perform_action!(**options)
         end
@@ -88,7 +75,7 @@ module Granite
       # @raise [NotImplementedError] execute_perform! method was not defined yet
       def try_perform!(context: nil, **options)
         return unless satisfy_preconditions?
-        transactional do
+        transaction do
           validate!(context)
           perform_action!(**options)
         end
@@ -108,7 +95,7 @@ module Granite
         result = run_callbacks(:execute_perform) { execute_perform!(options) }
         @_action_performed = true
         result || true
-      rescue *_exception_handlers.keys => e
+      rescue *handled_exceptions => e
         handle_exception(e)
         raise_validation_error(e) if raise_errors
         raise Rollback
@@ -121,13 +108,6 @@ module Granite
       def execute_perform!(**_options)
         fail NotImplementedError, "BA perform body MUST be defined for #{self}"
       end
-
-      def handle_exception(e)
-        klass = e.class.ancestors.detect do |ancestor|
-          ancestor <= Exception && _exception_handlers[ancestor]
-        end
-        instance_exec(e, &_exception_handlers[klass]) if klass
-      end
     end
   end
 end

data/lib/granite/action/transaction.rb

@@ -1,40 +1,44 @@
+require 'granite/action/transaction_manager'
+
 module Granite
   class Action
-    class Rollback < defined?(ActiveRecord) ? ActiveRecord::Rollback : StandardError
-    end
-
     module Transaction
       extend ActiveSupport::Concern
 
-      private
-
-      def transactional(&block)
-        if transactional?
-          yield
-        else
-          @_transactional = true
-          result = transaction(&block) || false
-          @_transactional = nil
-          result
-        end
+      included do
+        define_callbacks :commit
       end
 
-      def transactional?
-        # Fuck the police!
-        !(!@_transactional)
+      module ClassMethods
+        delegate :transaction, to: :'Granite::Action::TransactionManager'
+
+        private
+
+        # Defines a callback which will be triggered right after transaction committed
+        # Uses the same arguments as `ActiveSupport::Callbacks.set_callback` except for the first two
+        #
+        def after_commit(*args, &block)
+          set_callback :commit, :after, *args, &block
+        end
       end
 
-      def transaction(&block)
-        if defined?(ActiveRecord::Base)
-          ActiveRecord::Base.transaction(&block)
-        else
+      def run_callbacks(event)
+        if event.to_s == 'commit'
           begin
-            yield
-          rescue Granite::Action::Rollback
-            false
+            super event
+          rescue *handled_exceptions => e
+            handle_exception(e)
           end
+        else
+          super event
         end
       end
+
+      private
+
+      def transaction(&block)
+        self.class.transaction(trigger_callbacks_for: self, &block)
+      end
     end
   end
 end

data/lib/granite/action/transaction_manager.rb

@@ -0,0 +1,86 @@
+module Granite
+  class Action
+    class Rollback < defined?(ActiveRecord) ? ActiveRecord::Rollback : StandardError
+    end
+
+    module TransactionManager
+      class << self
+        # Runs a block in a transaction
+        # It will open a new transaction or append a block to the current one if it exists
+        #
+        # @param [Object] trigger_callbacks_for - object which will receive `run_callbacks(:commit)` after transaction commited
+        # @return [Object] result of a block
+        def transaction(trigger_callbacks_for: nil, &block)
+          (callback_listeners << trigger_callbacks_for) if trigger_callbacks_for
+
+          if in_a_transaction?
+            yield
+          else
+            wrap_in_transaction_with_callbacks(&block)
+          end
+        end
+
+        private
+
+        IN_A_TRANSACTION_KEY = :granite_transaction_manager_in_a_transaction
+        CALLBACK_LISTENERS_KEY = :granite_transaction_manager_callback_listeners
+
+        def callback_listeners
+          Thread.current[CALLBACK_LISTENERS_KEY] ||= []
+        end
+
+        def in_a_transaction?
+          !!(Thread.current[IN_A_TRANSACTION_KEY])
+        end
+
+        def in_a_transaction=(value)
+          Thread.current[IN_A_TRANSACTION_KEY] = value
+        end
+
+        def wrap_in_transaction_with_callbacks(&block)
+          self.in_a_transaction = true
+
+          result = wrap_in_transaction(&block) || false
+
+          trigger_callbacks if result
+
+          result
+        ensure
+          callback_listeners.clear
+          self.in_a_transaction = nil
+        end
+
+        def wrap_in_transaction(&block)
+          if defined?(ActiveRecord::Base)
+            ActiveRecord::Base.transaction(&block)
+          else
+            begin
+              yield
+            rescue Granite::Action::Rollback
+              false
+            end
+          end
+        end
+
+        def trigger_callbacks
+          collected_errors = []
+
+          callback_listeners.reverse.each do |listener|
+            begin
+              listener.run_callbacks :commit
+            rescue StandardError => e
+              collected_errors << e
+            end
+          end
+
+          if collected_errors.any?
+            collected_errors[1..-1].each do |error|
+              ActiveData.config.logger.error "Unhandled error in callback: #{error.inspect}\n#{error.backtrace.join("\n")}"
+            end
+            fail collected_errors.first
+          end
+        end
+      end
+    end
+  end
+end

data/lib/granite/version.rb

@@ -1,3 +1,3 @@
 module Granite
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Arkadiy Zabazhanov & friends
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -280,6 +280,7 @@ files:
 - lib/granite.rb
 - lib/granite/action.rb
 - lib/granite/action/error.rb
+- lib/granite/action/exceptions_handling.rb
 - lib/granite/action/performer.rb
 - lib/granite/action/performing.rb
 - lib/granite/action/policies.rb
@@ -292,6 +293,7 @@ files:
 - lib/granite/action/projectors.rb
 - lib/granite/action/subject.rb
 - lib/granite/action/transaction.rb
+- lib/granite/action/transaction_manager.rb
 - lib/granite/action/types.rb
 - lib/granite/action/types/collection.rb
 - lib/granite/base.rb