effective_resources 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085758676d246a9dd5d66beaafb5cdaf9590e25d
-  data.tar.gz: d9e777683dbe93f7e8aa8729f88f9731ad5b09ae
+  metadata.gz: 6d9f3c476a1b25d899e3ef80460fd11bf5738949
+  data.tar.gz: bff4db8bfebd28a8b194e390837a2509aff6f9fd
 SHA512:
-  metadata.gz: 730e4cecbdbfd7ee0fac449657e90d37bf40417c45ec4ab24519f50fb48588b2bf8c3e73eea0a355a70d0d793c3e301ee28e2b7ca53a2a6ff15d2438a809e7a5
-  data.tar.gz: b95e549ee16faaceb680920bd3261109ac2a9cbf2b80c1b3eeda41e069657e6056aa2efd1150b7a0471dba359ebbb748126cfcb1bce5fa6a92325aba2190d9cd
+  metadata.gz: 036821b4210acece00173e2c1afd0aa406a11359b50b91f1d6eae3b1be4da035cdfacd104b5e8a8a2608a6aed8df1a3257b0991a16f01fd086fcf6df3f6921a6
+  data.tar.gz: 5b208d0903fc51e37e3236c40a22a06d4938e4679d3131dede7b7df358754072e54fc3b9abb429677ee2ff56c8de36688b94e99477dd8d23167310414cbca8b1

data/app/models/concerns/acts_as_tokened.rb

@@ -30,6 +30,7 @@ module ActsAsTokened
     def find(*args)
       return super unless args.length == 1
       return super if block_given?
+      return find_by_id(args.first) if @_effective_reloading
 
       find_by_token(args.first) || raise(::ActiveRecord::RecordNotFound.new("Couldn't find #{name} with 'token'=#{args.first}"))
     end
@@ -40,5 +41,16 @@ module ActsAsTokened
     token
   end
 
+  def to_global_id(**params)
+    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/app/models/effective/resources/actions.rb

@@ -49,7 +49,10 @@ module Effective
           end
         end
 
-        path = routes[action].format(resource || instance).presence
+        # This generates the correct route when an object is overriding to_param
+        formattable = (resource || instance).attributes.symbolize_keys.merge(id: (resource || instance).to_param)
+
+        path = routes[action].format(formattable).presence
 
         if path.present? && opts.present?
           uri = URI.parse(path)
@@ -118,7 +121,6 @@ module Effective
       def is_post_route?(route)
         ['POST', 'PUT', 'PATCH'].any? { |verb| route.verb == verb }
       end
-
     end
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.8.11'.freeze
+  VERSION = '0.8.12'.freeze
 end

metadata

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