active_scaffold 3.6.11.1 → 3.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10795ad02dbbf1ea2033af6b1b36857f0105acf45daa21f44bf576737b838331
-  data.tar.gz: e5fb0e9f651127a06d8057a5eeab6934ba62211c9bb9d3f0b8ac6df5e7e5bb58
+  metadata.gz: c15e01c11227052618d2b92ad709cfa1197de5ce2d088fb1f5d808f831714ae3
+  data.tar.gz: 64dcb127193bf37114da0d406d514f3091cca7b6295841134a0d9d939c5344f9
 SHA512:
-  metadata.gz: e738f18a2fe367d7796057fe2f098c6bc5f7291615e4315a78a33f0283df30b7c6c12b26af51b03489112ecd2c2310ac30a5bfac7d29e1c6be26a9700982dc41
-  data.tar.gz: 4ccb202176df05c3f9d4882ccd4abf6f025204ffa993b9daa6c3b3b4bcabc06eb22e4f98630253a85c1ef9ce68160b11d6beeb6c6a64ae8f7a885b26e12278ed
+  metadata.gz: 86fc673e0a500a8b7734ddb8cde6ebf309f22f6781f60df385e1a715d2218fb120bc2e54ce0fd4befd0ee94093d5e0c6ada201258240f98212eb7f492e68342d
+  data.tar.gz: 9be0d09ab6ad138c3e27ba3d2dba898ad7d72e53005cc1dbab56c4655ce9499dd2aea6afb9450493248ab450be7209fd1d8d9e5bda67f529a70ec42989c90cef

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 3.6.13
+- Fix link caching on action when threadsafe is enabled
+
+= 3.6.12
+- Fix getting proxy for action link when iterating over action links and threadsafe is enabled, so link can be changed
+
 = 3.6.11.1
 - Fix required attribute broken on previous version when no validation was found
 

data/lib/active_scaffold/extensions/cow_proxy.rb

@@ -71,6 +71,17 @@ module CowProxy
           name !~ /[!?]$/
         end
 
+        def each(options = {}, &block)
+          super(options) do |item|
+            item = __wrap__(item) || item unless item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+            if options[:include_set]
+              yield item, __getobj__.instance_variable_get(:@set)
+            else
+              yield item
+            end
+          end
+        end
+
         protected
 
         # Copy wrapped values to duplicated wrapped object

data/lib/active_scaffold/helpers/action_link_helpers.rb

@@ -167,10 +167,10 @@ module ActiveScaffold
 
       def cached_action_link_url(link, record)
         @action_links_urls ||= {}
-        @action_links_urls[link.name_to_cache] || begin
+        @action_links_urls[link.name_to_cache.to_s] || begin
           url_options = cached_action_link_url_options(link, record)
           if cache_action_link_url?(link, record)
-            @action_links_urls[link.name_to_cache] = url_for(url_options)
+            @action_links_urls[link.name_to_cache.to_s] = url_for(url_options)
           else
             url_options.merge! eid: nil, embedded: nil if link.nested_link?
             url_for(params_for(url_options))
@@ -207,7 +207,7 @@ module ActiveScaffold
 
       def action_link_url(link, record)
         url = replace_id_params_in_action_link_url(link, record, cached_action_link_url(link, record))
-        url = add_query_string_to_cached_url(link, url) if @action_links_urls[link.name_to_cache]
+        url = add_query_string_to_cached_url(link, url) if @action_links_urls[link.name_to_cache.to_s]
         url
       end
 
@@ -267,10 +267,10 @@ module ActiveScaffold
 
       def cached_action_link_url_options(link, record)
         @action_links_url_options ||= {}
-        @action_links_url_options[link.name_to_cache] || begin
+        @action_links_url_options[link.name_to_cache.to_s] || begin
           options = action_link_url_options(link, record)
           if cache_action_link_url_options?(link, record)
-            @action_links_url_options[link.name_to_cache] = options
+            @action_links_url_options[link.name_to_cache.to_s] = options
           end
           options
         end
@@ -378,7 +378,7 @@ module ActiveScaffold
             end
         end
         id ||= record&.id&.to_s || (nested? ? nested_parent_id.to_s : '')
-        action_link_id = ActiveScaffold::Registry.cache :action_link_id, link.name_to_cache do
+        action_link_id = ActiveScaffold::Registry.cache :action_link_id, link.name_to_cache.to_s do
           action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)}#{link.action}"
           action_link_id(action_id, '--ID--')
         end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = '11.1'.freeze
+    PATCH = 13
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.11.1
+  version: 3.6.13
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails