effective_resources 1.19.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fa9ad10485d34b037ef8158f511515c9a061b4ac524126b84c6e5817bd884a8
-  data.tar.gz: 46b857a3f1882bc6b1a0d64ee6d5ee235604c54c5fef4ec02497c9481c9adefd
+  metadata.gz: 92cb8d28e2d00e637797983e7a92538e36b3096f417610f99b03675e418c495f
+  data.tar.gz: 8c3ad5a41b9f79ecbbf88577f93fd937454f6c472d68d8f05ecadd264fc4bece
 SHA512:
-  metadata.gz: 9626397d8cdf8cfb2ecf1b04d0ca3d21d8279ebb53e603db92efc7de5a7d47d9f73d4f20da1299c1a1c9ac8b89733ea144a6a11605698562877a831d28ab9d08
-  data.tar.gz: c5410dc75eb3e2aa126b15e2476f2824bc68ecb7ddd4c1811041601929524956ba616037b1e2680c8860b7d257a0df84efc9a2c92353c97a77f282e1014ae428
+  metadata.gz: a69b8c4224eeac5e5ef2c6e9bf537b562e02dc3c194cb82f0c4a001ff3485a2895111433fbf8058a1e7b92fd3eead3d19c0cf9bbee98b79b86570607db704727
+  data.tar.gz: ac9e60af57f79f860cadeb4263d1f898b3814188f07c7625fe070f25689cbbe93357a07a93e3c679e4d281c145e7f810e693dee5bfc5640e439e36e92955c475

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
 
-        EffectiveResources.transaction do
+        ActiveRecord::Base.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

@@ -55,14 +55,14 @@ module Effective
 
         if exception.present?
           Rails.logger.info "  \e[31m\e[1mFAILED\e[0m\e[22m" # bold red
-          Rails.logger.info "  Unable to #{action} #{resource} - #{e.class} #{e}"
+          Rails.logger.info "  Unable to #{action} #{resource} - #{exception.class} #{exception}"
           exception.backtrace.first(5).each { |line| Rails.logger.info('  ' + line) }
 
           if resource.respond_to?(:restore_attributes) && resource.persisted?
             resource.restore_attributes(['status', 'state'])
           end
 
-          flash.now[:danger] = resource_flash(:danger, resource, action, e: e)
+          flash.now[:danger] = resource_flash(:danger, resource, action, e: exception)
 
           if exception.kind_of?(ActiveRecord::StaleObjectError)
             flash.now[:danger] = "#{flash.now[:danger]} <a href='#', class='alert-link' onclick='window.location.reload(true); return false;'>reload page and try again</a>"

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.19.1'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/lib/effective_resources.rb

@@ -86,10 +86,6 @@ module EffectiveResources
     klass
   end
 
-  def self.transaction(resource = nil, &block)
-    resource.class.transaction { yield }
-  end
-
   # Used by streaming CSV export in datatables
   def self.with_resource_enumerator(&block)
     raise('expected a block') unless block_given?
@@ -163,4 +159,17 @@ module EffectiveResources
     duplicate
   end
 
+  def self.transaction(resource = nil, &block)
+    raise('expected a block') unless block_given?
+
+    if resource.respond_to?(:transaction)
+      resource.transaction { yield }
+    elsif resource.class.respond_to?(:transaction)
+      resource.class.transaction { yield }
+    else
+      ActiveRecord::Base.transaction { yield }
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails