effective_resources 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9da0a46c6938d58b83a1da33cf0a198c8f4f53f7c3bb4b96ee5467160c06370
-  data.tar.gz: 6435ce69271ba313f1d02642d16ad24791cd4c2ea99e14be06782ceb4cc409e2
+  metadata.gz: aad99f05ab646eaf5777374411ea3cee95a7d6809a4dd1c9110ddd78b248e0a9
+  data.tar.gz: 79a500fabc0110e16298f4031004655ba2d317413a1df90eb31390add344745f
 SHA512:
-  metadata.gz: b35a6f53cd730eec70f2010332cbfd44c7e311b4341cf033b2b490069341b0e9fdad5bd607209b6ef63e1e9695dfcd5490b72d14a293aceed31159cacd2a30c9
-  data.tar.gz: bea48fa8d635bbed0d2786b52c70b09a7e35629177bcda6f5218f1d7c83db5c1fe964f88243468d22b2753ee0a74223b6d3e91d47e67e8f5320a202bdb8942f5
+  metadata.gz: 211a18be0391a97797bab8d502ca0295c70cbe1d4a11da84e06fcf6f4187b1da9f027f85bda0cb513b6a4089d566f3698676ef973f4458ab7218bb2aebcb57ee
+  data.tar.gz: 87612647fbde94ec96a736c2c462b22021c644ef7496aa3feb7b1da63f15baf83337ca002ebf9c920112e7c43caaf9b9351ff5b73712fefc8b62a61e723eba49

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

@@ -33,7 +33,7 @@ module Effective
 
         begin
           ActiveRecord::Base.transaction do
-            resource.transaction do
+            EffectiveResources.transaction(resource) do
               run_callbacks(:resource_before_save)
 
               if resource.public_send("#{save_action}!") == false
@@ -49,8 +49,11 @@ module Effective
               exception = e   # Dont rollback
             end
           end
+        rescue ActiveRecord::RecordInvalid => e
+          exception = e
         rescue => e
           exception = e
+          notify_exception(e, resource, action) unless e.class.name == 'RuntimeError'
         end
 
         if exception.present?
@@ -74,6 +77,14 @@ module Effective
         success
       end
 
+      def notify_exception(exception, resource, action)
+        if defined?(ExceptionNotifier)
+          ExceptionNotifier.notify_exception(exception, env: request.env, data: { resource: resource, action: action })
+        else
+          raise(exception)
+        end
+      end
+
       def resource_flash(status, resource, action, e: nil)
         submit = commit_action(action)
         message = submit[status].respond_to?(:call) ? instance_exec(&submit[status]) : submit[status]

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/lib/effective_resources.rb

@@ -159,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: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails