effective_resources 1.8.23 → 1.8.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125098fcfbdac7c18b9a7df8a451d3f4f7d0ac1b7d8120658b07e6c33d5b0f2b
-  data.tar.gz: 67f2018e9ed650ac1dfcc4f3143005367259a135964ce7e0bfe99c1b4b04d78f
+  metadata.gz: 9ef5eba619e3764fdc204b3e1b72ec0063b16c2319866688f4c8e7ff3808354d
+  data.tar.gz: '09e02f90c4db8a1f0f416ec6ece7471db4e9ab865a4bac701a4977c9c6f4e18a'
 SHA512:
-  metadata.gz: 6bc4633cb2e6c6c85f99d09f1c0a559547e74ebcfe7e9da21383d9b663325374efa467e2809041edc1f24ff4c37cea660a9416e3586a9c128df9b6a5a2375231
-  data.tar.gz: b3e4cc3b69b53eb69affbe7ab0eda2f7741746eb9ab43ac84fd7d907b1a365d74511bbe446037d22bee8ee6ea143b529f3889f3c3c87a6c7f9d125bfe9109d9e
+  metadata.gz: 65b2ec2e37dd19c24375b02533b86519733d83652b24fc131f267d625de17bdd0210efea61ca84e7186e2b3b0d5821a94e7faf1805665bf752c0b2636456eb8f
+  data.tar.gz: 8bf7c81fd895011224ffa0ed49942bf3c8517ca7e7a2c8141820247c859014de9fa1eed17517b25ed5951bff7d904c091b165d4ab1f2710ad8e674c34d9a8d06

data/app/models/concerns/effective_after_commit.rb

@@ -0,0 +1,29 @@
+# EffectiveAfterCommit
+#
+# Inspired by https://github.com/Envek/after_commit_everywhere
+#
+# This is automatically included into ActiveRecord::Base
+#
+# after_commit { MyMailer.welcome.deliver_later }
+
+module EffectiveAfterCommit
+  extend ActiveSupport::Concern
+
+  module Base
+    def after_commit(connection: self.class.connection, &callback)
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback, no_tx_action: :execute)
+    end
+
+    def before_commit(connection: self.class.connection, &callback)
+      raise(NotImplementedError, "#{__method__} works only with Rails 5.0+") if ActiveRecord::VERSION::MAJOR < 5
+
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback, no_tx_action: :warn_and_execute)
+    end
+
+    def after_rollback(connection: self.class.connection, &callback)
+      raise('expected a block') unless block_given?
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback, no_tx_action: :exception)
+    end
+  end
+
+end

data/app/models/effective/after_commit.rb

@@ -0,0 +1,53 @@
+module Effective
+  class AfterCommit
+
+    def initialize(connection:, **handlers)
+      @connection = connection
+      @handlers = handlers
+    end
+
+    def has_transactional_callbacks?
+      true
+    end
+
+    def trigger_transactional_callbacks?
+      true
+    end
+
+    def before_committed!(*)
+      @handlers[:before_commit]&.call
+    end
+
+    def committed!(args)
+      @handlers[:after_commit]&.call
+    end
+
+    def rolledback!(*)
+      @handlers[:after_rollback]&.call
+    end
+
+    def add_to_transaction(*)
+      @connection.add_transaction_record(self)
+    end
+
+    def self.register_callback(connection:, name:, no_tx_action:, callback:)
+      raise ArgumentError, "#{name} expected a block" unless callback
+
+      unless (connection.transaction_open? && connection.current_transaction.joinable?)
+        case no_tx_action
+        when :warn_and_execute
+          warn "#{name}: No transaction open. Executing callback immediately."
+          return callback.call
+        when :execute
+          return callback.call
+        when :exception
+          raise("#{name} is useless outside transaction")
+        end
+      end
+
+      after_commit = Effective::AfterCommit.new(connection: connection, "#{name}": callback)
+      connection.add_transaction_record(after_commit)
+    end
+
+  end
+end

data/app/models/effective/resources/attributes.rb

@@ -105,8 +105,10 @@ module Effective
         attributes = (klass.new().attributes rescue nil)
         return [] unless attributes
 
-        names = attributes.keys - belong_tos.map { |reference| reference.foreign_key }
-        names = names - [klass.primary_key, 'created_at', 'updated_at'] unless all
+        names = attributes.keys
+        names -= belong_tos.map { |reference| reference.foreign_key }
+        names -= belong_tos.map { |reference| reference.foreign_type if reference.options[:polymorphic] }
+        names -= [klass.primary_key, 'created_at', 'updated_at'] unless all
 
         attributes = names.inject({}) do |h, name|
           if klass.respond_to?(:column_for_attribute) # Rails 4+

data/lib/effective_resources/engine.rb

@@ -32,6 +32,7 @@ module EffectiveResources
 
         ActiveRecord::Base.extend(EffectiveDeviseUser::Base)
         ActiveRecord::Base.extend(EffectiveResource::Base)
+        ActiveRecord::Base.include(EffectiveAfterCommit::Base)
       end
     end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.23'.freeze
+  VERSION = '1.8.24'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.23
+  version: 1.8.24
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -157,11 +157,13 @@ files:
 - app/models/concerns/acts_as_statused.rb
 - app/models/concerns/acts_as_tokened.rb
 - app/models/concerns/acts_as_wizard.rb
+- app/models/concerns/effective_after_commit.rb
 - app/models/concerns/effective_devise_user.rb
 - app/models/concerns/effective_resource.rb
 - app/models/concerns/has_many_rich_texts.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/action_failed.rb
+- app/models/effective/after_commit.rb
 - app/models/effective/attribute.rb
 - app/models/effective/code_reader.rb
 - app/models/effective/http.rb