effective_resources 1.19.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee4ff2d3193e327ddaa6fd457d83df4342e1ccfd1a5a0d2d06525ee5e8b5ce3
-  data.tar.gz: 63c5eebe27c1f4a49fba71dd2e1b69a92ce73faa35c915f53f77b4fca8dc8beb
+  metadata.gz: f9da0a46c6938d58b83a1da33cf0a198c8f4f53f7c3bb4b96ee5467160c06370
+  data.tar.gz: 6435ce69271ba313f1d02642d16ad24791cd4c2ea99e14be06782ceb4cc409e2
 SHA512:
-  metadata.gz: d6f2209d606a8e800f9d9b715b06dfbe1d230f73dd429728257d2f7b2876211bba08a5111cf992a9ed20c92f8d320bf62a2cae994c550d8e27b354e4ea602c3d
-  data.tar.gz: 7d78f999628f819a663debe59ffd1799c1b8caeaafb264e4fe986b90f23a573d63d019612e83b455c75fb2741510367f706015b9c5587b0b24b731e3b398286a
+  metadata.gz: b35a6f53cd730eec70f2010332cbfd44c7e311b4341cf033b2b490069341b0e9fdad5bd607209b6ef63e1e9695dfcd5490b72d14a293aceed31159cacd2a30c9
+  data.tar.gz: bea48fa8d635bbed0d2786b52c70b09a7e35629177bcda6f5218f1d7c83db5c1fe964f88243468d22b2753ee0a74223b6d3e91d47e67e8f5320a202bdb8942f5

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

@@ -33,7 +33,7 @@ module Effective
 
         begin
           ActiveRecord::Base.transaction do
-            EffectiveResources.transaction(resource) do
+            resource.transaction do
               run_callbacks(:resource_before_save)
 
               if resource.public_send("#{save_action}!") == false
@@ -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/app/models/concerns/acts_as_tokened.rb

@@ -29,9 +29,11 @@ module ActsAsTokened
       return super unless args.length == 1
       return super if block_given?
 
-      if self.class.instance_variable_get(:@_effective_reloading) || (respond_to?(:klass) && klass.instance_variable_get(:@_effective_reloading))
-        return find_by_id(args.first)
-      end
+      reloading = instance_variable_get(:@_effective_reloading)
+      reloading ||= self.class.instance_variable_get(:@_effective_reloading)
+      reloading ||= klass.instance_variable_get(:@_effective_reloading) if respond_to?(:klass)
+
+      return find_by_id(args.first) if reloading
 
       find_by_token(args.first) || raise(::ActiveRecord::RecordNotFound.new("Couldn't find #{name} with 'token'=#{args.first}"))
     end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.19.0'.freeze
+  VERSION = '2.0.0'.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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Code and Effect