effective_resources 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bbe9d2d397b7aa15ce5eac7e06195ea31bed308e6f11e1f3a5b0842228c4a3e
-  data.tar.gz: 347ae76d73478afb5130a71a030f293830a2450b567a4ce2cbbd03dd94c90e2a
+  metadata.gz: 5c6a9d06e7d62a4fa96c365b8e6386d4229585ed5c0963b3f55b435ed4b7cbf4
+  data.tar.gz: 84459f1187673d432756a4e3fccf6b163f3b5f55af26a7c1c485938e892d9e95
 SHA512:
-  metadata.gz: 71e9a722f002120691c88aa70ffba6b7892f29c6fc6d3d9f78e894c2ae8a421543a26fa2d77001a95fea0161f7de64cd755d9ea3c78fc78976e48ba1ad36e1d3
-  data.tar.gz: 6ec2a9c001636a0274c02d48baf192a0640b1cace67b07a71f7cd6bba7ea1c96ae65d28f62fc8f9bfcfaedc51ad78c5cc3f9815e9bea15fffd9ea8a5c7a2c8c2
+  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).or(where(id: 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.2'.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.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails