effective_resources 1.18.9 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cee67d7d1f8986997b77f0a8d4d2f50cd7b0344ec84522dea0980df07662098
-  data.tar.gz: 07bd05a2149368657239d5ed7abd4cce69a3d84b761f81f2653353c3cb4441d3
+  metadata.gz: 2ee4ff2d3193e327ddaa6fd457d83df4342e1ccfd1a5a0d2d06525ee5e8b5ce3
+  data.tar.gz: 63c5eebe27c1f4a49fba71dd2e1b69a92ce73faa35c915f53f77b4fca8dc8beb
 SHA512:
-  metadata.gz: 395ca8155e668c86d1060901f9106f155d8202d0f235aac7ec8ef9e497b45b6b02386ec6e6e127615a3291640514508f2ccdbbc3696a1ff41c050ad83289b10e
-  data.tar.gz: 4d264db3c46fb74607fc31094a435e3b7c6db1895639f7a425ae65b971a0a051e0f09e1ad5ff059c38d3f5f36e243734302205a29fb6a703ac274847578da9e5
+  metadata.gz: d6f2209d606a8e800f9d9b715b06dfbe1d230f73dd429728257d2f7b2876211bba08a5111cf992a9ed20c92f8d320bf62a2cae994c550d8e27b354e4ea602c3d
+  data.tar.gz: 7d78f999628f819a663debe59ffd1799c1b8caeaafb264e4fe986b90f23a573d63d019612e83b455c75fb2741510367f706015b9c5587b0b24b731e3b398286a

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

@@ -29,44 +29,43 @@ module Effective
         end
 
         success = false
+        exception = nil
 
-        EffectiveResources.transaction(resource) do
-          begin
-            run_callbacks(:resource_before_save)
+        begin
+          ActiveRecord::Base.transaction do
+            EffectiveResources.transaction(resource) do
+              run_callbacks(:resource_before_save)
 
-            if resource.public_send("#{save_action}!") == false
-              raise Effective::ActionFailed.new("failed to #{action}")
-            end
+              if resource.public_send("#{save_action}!") == false
+                raise Effective::ActionFailed.new("failed to #{action}")
+              end
 
-            yield if block_given?
+              yield if block_given?
 
-            run_callbacks(:resource_after_save)
+              run_callbacks(:resource_after_save)
 
-            success = true
-          rescue => e
-            if Rails.env.development?
-              Rails.logger.info "  \e[31m\e[1mFAILED\e[0m\e[22m" # bold red
-              Rails.logger.info "  Unable to #{action} #{resource} - #{e.class} #{e}"
-              e.backtrace.first(5).each { |line| Rails.logger.info('  ' + line) }
+              success = true
+            rescue Effective::ActionFailed => e
+              exception = e   # Dont rollback
             end
+          end
+        rescue => e
+          exception = e
+        end
 
-            if resource.respond_to?(:restore_attributes) && resource.persisted?
-              resource.restore_attributes(['status', 'state'])
-            end
+        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}"
+          exception.backtrace.first(5).each { |line| Rails.logger.info('  ' + line) }
 
-            flash.now[:danger] = resource_flash(:danger, resource, action, e: e)
-
-            case e
-            when 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>"
-              raise(ActiveRecord::Rollback) # This is a soft error, we want to display the flash message to user
-            when Effective::ActionFailed
-              # Nothing to do
-            when ActiveRecord::RecordInvalid, RuntimeError
-              raise(ActiveRecord::Rollback) # This is a soft error, we want to display the flash message to user
-            else
-              raise(e) # This is a real error that should be sent to 500. Client should not see the message.
-            end
+          if resource.respond_to?(:restore_attributes) && resource.persisted?
+            resource.restore_attributes(['status', 'state'])
+          end
+
+          flash.now[:danger] = resource_flash(:danger, resource, action, e: e)
+
+          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>"
           end
         end
 

data/app/helpers/effective_acts_as_email_form_helper.rb

@@ -9,8 +9,8 @@ module EffectiveActsAsEmailFormHelper
     raise('expected an acts_as_email_form resource') unless resource.class.respond_to?(:acts_as_email_form?)
 
     # Load the template.
-    email_template = if action.present? && resource.email_form_effective_email_templates?
-      Effective::EmailTemplate.where(template_name: action).first!
+    email_template = if action.present? && defined?(EffectiveEmailTemplates)
+      action.kind_of?(Effective::EmailTemplate) ? action : Effective::EmailTemplate.where(template_name: action).first!
     end
 
     # These defaults are only used when there is no email_template

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.18.9'.freeze
+  VERSION = '1.19.0'.freeze
 end

data/lib/effective_resources.rb

@@ -87,10 +87,7 @@ module EffectiveResources
   end
 
   def self.transaction(resource = nil, &block)
-    connection = 'ActiveRecord::Base'.safe_constantize
-    raise('unable to determine transaction class') unless connection.present?
-
-    connection.transaction { yield }
+    resource.class.transaction { yield }
   end
 
   # Used by streaming CSV export in datatables

metadata

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