effective_resources 1.9.4 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72da4b1b0ca72429a3a32b29cfb4f6fa3e8861b0c5ca4e5243b5f9b6405c55fd
-  data.tar.gz: a145acc8a26f9e13aa237bce6519f0d5f6e9964d6c3db556324876dca5fdf2e7
+  metadata.gz: bc155a948b5a244e8a5c7beaa9d634eb1aab656cde915aecaeba3a3e69fa8d69
+  data.tar.gz: 947a11397a9b568cbd29c586fd79e310c4f512bfcf4aed7a8048be567afbadae
 SHA512:
-  metadata.gz: 6bb00698226acb546365464870767a22e235310a9128d2fa7a80df17dca9697d9f58bfb2810744657591d0c80605a836d507cfe9f9d79abd5cffb6a712ddc4d1
-  data.tar.gz: 329869f907f76bd54bd506e41433a40e1fd95837b81219cf80c2f349fc448d081080e4e73558c42207c90b576f0c0a1a1f31698a7e05378674a048f13486cc17
+  metadata.gz: dbf358c58522cb4153495a960f5f3b46da781d0489149b87cdf4498441582b990c0399982ae3d897277d97433c03d9b1de490c3e4607af1c8ee1f935ca2efdf9
+  data.tar.gz: 4ab89fad47f59f7e18ad2ef674589e41a8fb47c4fc6f21133ce0aeccf3b892bb6c5b5832e93c1019ca8682c329b61396f5e69be8e991a6ff31fad69d53dad192

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/acts_as_statused.rb

@@ -125,16 +125,16 @@ module ActsAsStatused
       define_method("#{sym}?") { status == sym.to_s }
       define_method("was_#{sym}?") { send("#{sym}_at").present? }
 
-      unless has_attribute?("#{sym}_at")
+      #unless has_attribute?("#{sym}_at")
         define_method("#{sym}_at") { status_steps["#{sym}_at".to_sym] }
         define_method("#{sym}_at=") { |value| status_steps["#{sym}_at".to_sym] = value }
-      end
+      #end
 
-      unless has_attribute?("#{sym}_by_id")
+      #unless has_attribute?("#{sym}_by_id")
         define_method("#{sym}_by") { acts_as_statused_by_user(sym) }
         define_method("#{sym}_by_id") { status_steps["#{sym}_by".to_sym] }
         define_method("#{sym}_by_id=") { |value| status_steps["#{sym}_by".to_sym] = value }
-      end
+      #end
 
       # approved!
       define_method("#{sym}!") do |atts = {}|
@@ -180,4 +180,3 @@ module ActsAsStatused
   end
 
 end
-

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,21 @@ module Effective
         @controller_path ||= route_name #[namespace, plural_name].compact * '/')
       end
 
+      def route_engines
+        if tenant? && Tenant.current.present?
+          [Rails.application, Tenant.Engine] + Rails::Engine.subclasses.reverse.reject do |klass|
+            tenant_engines_blacklist.any? { |name| klass.name.start_with?(name) }
+          end
+        else
+          [Rails.application] + Rails::Engine.subclasses.reverse
+        end
+      end
+
       def routes
         @routes ||= begin
           routes = nil
-          engines = [Rails.application] + Rails::Engine.subclasses.reverse
+
+          engines = route_engines()
 
           # 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/init.rb

@@ -11,7 +11,7 @@ module Effective
 
         # Sets the class but also namespaces
         @model_klass = _klass_by_input(input)
-        @model_klass = _klass_by_input(relation) if relation.present?
+        @model_klass = _klass_by_input(relation) unless relation.nil?
 
         # Consider controller_name
         if @model_klass && input.kind_of?(String) && namespace.blank?

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.4'.freeze
+  VERSION = '1.9.8'.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.4
+  version: 1.9.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails