effective_resources 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e99f559d60204f03679abaeacb94f0406596ca751221002c69adcb2cea52ee
-  data.tar.gz: 7ff7732c4b04ffeff143812216af2e03a81008830fba3681614c44d59552959b
+  metadata.gz: 0e5b54802ada357459497c873ed7958745da7a62def14f6e0cea1b8b09b1ad3a
+  data.tar.gz: 391b11cbab23ea721aa01bb1ada824ab064b1182f16bc88083591746205424f2
 SHA512:
-  metadata.gz: 1884f93d5785dde2523add135e534d86a18880fe9cc1ded09d73a915ed1ce8c842907e63a0a9e1ac7aa829489b55d3f1eaf0de2be4add65cfaa806e0701fd422
-  data.tar.gz: 7f88e77db260d68330f44868d79f8aebfd7458e19a3b4a4a205811071d2e3abc32f69777dd2ac2c6b964c0df4e1efde54e7b0233705ee7fd6d906e95facf9d1f
+  metadata.gz: e33a16caedeaf449a75457ff5ee8ed7af961b3092e871ea3a404739054cb8fbf7fe0b9f388312e100ec6896c5f597591402a2efd0845a79bd4e44c1aa99fb16c
+  data.tar.gz: eb12d90c64e6e8467fd3dbc6733f7e7da0ee02a94231f33f464dc1896056e01f4b1a3e8998aa949815d741bb760fd732697c63682fe303cef2a132833ff801ee

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -228,7 +228,7 @@ module Effective
 
         # No attributes are assigned or saved. We purely call action! on the resource
 
-        ActiveRecord::Base.transaction do
+        EffectiveResources.transaction do
           successes = resources.select do |resource|
             begin
               resource.public_send("#{action}!") if EffectiveResources.authorized?(self, action, resource)

data/app/controllers/concerns/effective/crud_controller/save.rb

@@ -30,7 +30,7 @@ module Effective
 
         success = false
 
-        ActiveRecord::Base.transaction do
+        EffectiveResources.transaction(resource) do
           begin
             run_callbacks(:resource_before_save)
 

data/app/models/concerns/effective_after_commit.rb

@@ -12,17 +12,17 @@ module EffectiveAfterCommit
 
   module Base
     def after_commit(connection: self.class.connection, &callback)
-      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback, no_tx_action: :execute)
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback)
     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)
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback)
     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)
+      Effective::AfterCommit.register_callback(connection: connection, name: __method__, callback: callback)
     end
   end
 

data/app/models/effective/after_commit.rb

@@ -25,20 +25,11 @@ module Effective
       @handlers[:after_rollback]&.call
     end
 
-    def self.register_callback(connection:, name:, no_tx_action:, callback:)
+    def self.register_callback(connection:, name:, 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
+      raise("#{name} is useless outside transaction") unless connection.transaction_open?
+      raise("#{name} is useless outside transaction") unless connection.current_transaction.joinable?
 
       after_commit = Effective::AfterCommit.new("#{name}": callback)
       connection.add_transaction_record(after_commit)

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

@@ -12,10 +12,17 @@ module Effective
         @controller_path ||= route_name #[namespace, plural_name].compact * '/')
       end
 
+      def engines
+        return ([Rails.application] + Rails::Engine.subclasses.reverse) unless tenant?
+
+        [Rails.application, Tenant.Engine] + Rails::Engine.subclasses.reverse.reject do |klass|
+          tenant_engines_blacklist.any? { |name| klass.name.start_with?(name) }
+        end
+      end
+
       def routes
         @routes ||= begin
           routes = nil
-          engines = [Rails.application] + Rails::Engine.subclasses.reverse
 
           # Check from controller_path. This is generally correct.
           engines.each do |engine|

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

@@ -150,7 +150,7 @@ module Effective
 
         is_scope = false
 
-        ActiveRecord::Base.transaction do
+        EffectiveResources.transaction(klass) do
           begin
             relation = klass.public_send(name).kind_of?(ActiveRecord::Relation)
           rescue => e

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

@@ -32,11 +32,14 @@ module Effective
 
       def route_name_fallbacks
         mod = class_name.split('::').first.to_s.downcase
+        admin = ('admin' if namespace.present? && namespace.include?('/admin'))
 
         matches = [
           route_name.singularize,
           [*namespace, plural_name].join('/'),
+          [*admin, plural_name].join('/'),
           [*namespace, name].join('/'),
+          [*admin, name].join('/'),
           [*mod, *namespace, plural_name].join('/'),
           [*mod, *namespace, name].join('/')
         ]

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

@@ -15,6 +15,10 @@ module Effective
         name if Rails.application.config.tenants[name].present?
       end
 
+      def tenant_engines_blacklist
+        return [] unless tenant?
+        Rails.application.config.tenants.map { |name, _| name.to_s.classify }
+      end
     end
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.5'.freeze
+  VERSION = '1.9.6'.freeze
 end

data/lib/effective_resources.rb

@@ -51,6 +51,17 @@ module EffectiveResources
     klass
   end
 
+  def self.transaction(resource = nil, &block)
+    connection = (resource if resource.respond_to?(:transaction))
+    connection ||= (resource.class if resource.class.respond_to?(:transaction))
+    connection ||= '::ApplicationRecord'.safe_constantize
+    connection ||= 'ActiveRecord::Base'.safe_constantize
+
+    raise('unable to determine transaction class') unless connection.present?
+
+    connection.transaction { yield }
+  end
+
   def self.truthy?(value)
     if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails <5
       ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails