effective_resources 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91015a3de5ffe3fd8727b1076558a95eedd3601ce768cf7c24befa42635c6a1b
-  data.tar.gz: 655794c38fa9b32c7fd40692469fe255152820e497d727a69336429d8f7e3acc
+  metadata.gz: 5c6a9d06e7d62a4fa96c365b8e6386d4229585ed5c0963b3f55b435ed4b7cbf4
+  data.tar.gz: 84459f1187673d432756a4e3fccf6b163f3b5f55af26a7c1c485938e892d9e95
 SHA512:
-  metadata.gz: 427908e33318358ca2a00ea9d578585cd18ae62dd952016e129878ebc778303084c8af06ba5dbb2d919440f9d5a0733788895cd8d77a38224915e84381d6755b
-  data.tar.gz: 53fa67e820609b4349e1623975aee917954d865cf85dba56e27b70000a953b1394d17ab098f684a900cf60274ea25ec71e56c952f5f146822fe04c9bc39299ad
+  metadata.gz: f76ef089d1b702f51948cf5ec7b03fc8fe9529428190225b9e27bddbc91c83c3e8d9b01911a2ae5d97efcae22cd8e2f77dd0d642b32b5184b459a6ccb4e3bbfa
+  data.tar.gz: 6e13de73624c865c3312d2af94816890769599ed2aa1d89e4cde5251d545d25583a14293b04d2a152cc493c2c6c222015cba326e09dec19310771668bda2b8ab

data/app/models/concerns/acts_as_slugged.rb

@@ -40,7 +40,13 @@ module ActsAsSlugged
       return super unless args.length == 1
       return super if block_given?
 
-      where(slug: args.first).first || raise(::ActiveRecord::RecordNotFound.new("Couldn't find #{name} with 'slug'=#{args.first}"))
+      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_slug(args.first) || raise(::ActiveRecord::RecordNotFound.new("Couldn't find #{name} with 'slug'=#{args.first}"))
     end
 
     def find_by_slug_or_id(*args)
@@ -68,4 +74,16 @@ module ActsAsSlugged
     slug_was || slug
   end
 
+  def to_global_id(**params)
+    params[:tenant] = Tenant.current if defined?(Tenant)
+    GlobalID.new(URI::GID.build(app: Rails.application.config.global_id.app, model_name: model_name, model_id: to_param, params: params))
+  end
+
+  def reload(options = nil)
+    self.class.instance_variable_set(:@_effective_reloading, true)
+    retval = super
+    self.class.instance_variable_set(:@_effective_reloading, nil)
+    retval
+  end
+
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.4'.freeze
 end

metadata

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