granite 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9bc00868502247ad725644cccc110d93845426e
-  data.tar.gz: '09710e9fbf2c004ef8d369869e3479f92377b51f'
+  metadata.gz: 3792e5a0bab26cb24becc52bb82e89198a74e84f
+  data.tar.gz: 1c085cd86ae0ca9379cfd8d6708a24dea36a6454
 SHA512:
-  metadata.gz: 29d0c0a27c84fb772a96af9b1fd110d0ea1453b0d47252c803ba29f32201c6cd50a9665da4137ba8349ec7c0cd01c9dddca7e408d8054daec694adfe8442d931
-  data.tar.gz: 6c7d51a1f438c7d1958d261f5f7e51be1aa38adf161877ef96500b3a5d19069907f7d615f0335ca63f898a5b06268afeb40f72f3bf040b610e41abebb683f6ef
+  metadata.gz: b1afd8ebb16b30ac0a5142369cb7bcb5ac62ab9c1d11a2c5ec84b0a525a70b43b0181e51aed50003384baa4303c0eb466440216acf345d66a7cde594e594e6de
+  data.tar.gz: 8bd7ef7aff11fa0f9aaa444993c637cffe2ff7f2c8dfc1b39ec1680d5766a32f5d0bd40a3bfc6fe17f9020a08df40d1777ffff942ea6507e3ed68d40e6edbb26

data/lib/granite.rb

@@ -23,6 +23,7 @@ require 'granite/dispatcher'
 require 'granite/action'
 require 'granite/projector'
 require 'granite/routing'
+require 'granite/typecasters'
 require 'granite/rails' if defined?(::Rails)
 
 ActiveData.base_concern = Granite::Base

data/lib/granite/action/performing.rb

@@ -1,4 +1,3 @@
-require 'granite/action/exceptions_handling'
 require 'granite/action/transaction'
 require 'granite/action/error'
 
@@ -18,14 +17,28 @@ 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
@@ -41,7 +54,7 @@ module Granite
       #   using `:on`)
       # @return [Object] result of execute_perform! method execution or false in case of errors
       def perform(context: nil, **options)
-        transaction do
+        transactional do
           valid?(context) && perform_action(options)
         end
       end
@@ -59,7 +72,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)
-        transaction do
+        transactional do
           validate!(context)
           perform_action!(**options)
         end
@@ -75,7 +88,7 @@ module Granite
       # @raise [NotImplementedError] execute_perform! method was not defined yet
       def try_perform!(context: nil, **options)
         return unless satisfy_preconditions?
-        transaction do
+        transactional do
           validate!(context)
           perform_action!(**options)
         end
@@ -95,7 +108,7 @@ module Granite
         result = run_callbacks(:execute_perform) { execute_perform!(options) }
         @_action_performed = true
         result || true
-      rescue *handled_exceptions => e
+      rescue *_exception_handlers.keys => e
         handle_exception(e)
         raise_validation_error(e) if raise_errors
         raise Rollback
@@ -108,6 +121,13 @@ 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,43 +1,39 @@
-require 'granite/action/transaction_manager'
-
 module Granite
   class Action
+    class Rollback < defined?(ActiveRecord) ? ActiveRecord::Rollback : StandardError
+    end
+
     module Transaction
       extend ActiveSupport::Concern
 
-      included do
-        define_callbacks :commit
-      end
-
-      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
+      private
 
-      def run_callbacks(event)
-        if event.to_s == 'commit'
-          begin
-            super event
-          rescue *handled_exceptions => e
-            handle_exception(e)
-          end
+      def transactional(&block)
+        if transactional?
+          yield
         else
-          super event
+          @_transactional = true
+          result = transaction(&block) || false
+          @_transactional = nil
+          result
         end
       end
 
-      private
+      def transactional?
+        # Fuck the police!
+        !(!@_transactional)
+      end
 
       def transaction(&block)
-        self.class.transaction(trigger_callbacks_for: self, &block)
+        if defined?(ActiveRecord::Base)
+          ActiveRecord::Base.transaction(&block)
+        else
+          begin
+            yield
+          rescue Granite::Action::Rollback
+            false
+          end
+        end
       end
     end
   end

data/lib/granite/represents/attribute.rb

@@ -43,7 +43,7 @@ module Granite
         return unless reference.respond_to?(reader)
 
         variable_cache(:value) do
-          normalize(enumerize(reference.public_send(reader)))
+          normalize(enumerize(typecast(defaultize(reference.public_send(reader)))))
         end
       end
 
@@ -60,6 +60,8 @@ module Granite
 
         reference_attribute = reference.attribute(name)
 
+        return nil if reference_attribute.nil?
+
         return Granite::Action::Types::Collection.new(reference_attribute.type) if [
           ActiveData::Model::Attributes::ReferenceMany,
           ActiveData::Model::Attributes::Collection,

data/lib/granite/typecasters.rb

@@ -0,0 +1,10 @@
+require 'active_data'
+
+ActiveData.typecaster('Granite::Action::Types::Collection') do |value, attribute|
+  typecaster = ActiveData.typecaster(attribute.type.subtype)
+  if value.respond_to? :transform_values
+    value.transform_values { |v| typecaster.call(v, attribute) }
+  elsif value.respond_to?(:map)
+    value.map { |v| typecaster.call(v, attribute) }
+  end
+end

data/lib/granite/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Arkadiy Zabazhanov & friends
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -28,16 +28,16 @@ dependencies:
   name: active_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +280,6 @@ 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
@@ -293,7 +292,6 @@ 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
@@ -328,6 +326,7 @@ files:
 - lib/granite/rspec/raise_validation_error.rb
 - lib/granite/rspec/satisfy_preconditions.rb
 - lib/granite/translations.rb
+- lib/granite/typecasters.rb
 - lib/granite/version.rb
 homepage: https://github.com/toptal/granite
 licenses:

data/lib/granite/action/exceptions_handling.rb

@@ -1,39 +0,0 @@
-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/transaction_manager.rb

@@ -1,86 +0,0 @@
-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