glib-web 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e50fd58d6fa3b0ee4d505c72f4bc49adf0809e208486eeb5c0aaeada10d39dfa
-  data.tar.gz: f32fb5c6985560a68a6240586e2a6411ffaec55dab2a30c12eecc177a002efaa
+  metadata.gz: 4f8b29b4f537ee6bf84d38fb8e0e9731b66a6f7dd39cc7498d2dc38680b47832
+  data.tar.gz: e6b063e4098ef285461c961c166ce3bb18f54749b20e83a27ccea15480f37c43
 SHA512:
-  metadata.gz: 0ddfb285130294449bbb45b56458dedfaa5cdc7ad791877b8e7e722e4da26bf0cfa2c11b5b24a56031d2da80bcdac40a6065bee6c453add16891f91956f81cca
-  data.tar.gz: 3f5ed1fc1745800c005db0356d123b6e334d6333262e99943933ee528861227cb31174618bd9d400c73eb8b849906a534bc47018bbe0eeb5472cc5efc323325f
+  metadata.gz: 68b869bf225f42361ee6e2aa10004101469ed51298961dd5acd86a33305c6a475a864788071e44d2d1fc6fa6253a0d198279936052ccb127a4d74b4bbf6cf164
+  data.tar.gz: c7204c91732b75735519b7242ee04d481ef11a938f0194963f3eaeb21b2c8e3d65c45e29c1b7a45398440eb4475126dfcf51397ff09e5a725d12b7714c28ea4f

data/app/helpers/glib/json_ui/abstract_builder.rb

@@ -286,15 +286,12 @@ module Glib
         def self.action(propName)
           define_method(propName) do |value|
             if value # Allow nil value
+              # Isolate nested action callbacks (e.g. onClick) from the outer context's
+              # singleton-tracking state, and ensure the outer state is restored even if
+              # the callback raises.
               json.set!(propName) do
-                # Save/restore singleton tracking around nested action callbacks (e.g. onClick)
-                # to prevent the inner callback from polluting the outer context's state.
-                builder = page.action_builder
-                saved_singleton_set = builder.singleton_action_set
-                saved_singleton_name = builder.singleton_action_name
-                builder.reset_singleton_tracking!
-                value.call(builder)
-                builder.restore_singleton_tracking!(saved_singleton_set, saved_singleton_name)
+                action_builder = page.action_builder
+                action_builder.with_isolated_singleton_tracking { value.call(action_builder) }
               end
             end
           end

data/app/helpers/glib/json_ui/action_builder.rb

@@ -19,6 +19,21 @@ module Glib
         @singleton_action_name = action_name
       end
 
+      # Runs block with fresh singleton-tracking state, then restores whatever
+      # was there before — even if the block raises. Used around user-provided
+      # callbacks (onLoad, onUnload, etc.) so that their action state doesn't
+      # leak out and trip the singleton guard on later actions.
+      def with_isolated_singleton_tracking
+        saved_set = @singleton_action_set
+        saved_name = @singleton_action_name
+        reset_singleton_tracking!
+        begin
+          yield
+        ensure
+          restore_singleton_tracking!(saved_set, saved_name)
+        end
+      end
+
       def method_missing(m, *args)
         if @multiple
           add_element_to_array_v1 'action', m, *args

data/app/helpers/glib/json_ui/page_helper.rb

@@ -76,6 +76,11 @@ module Glib
 
       def json_ui_action(json)
         @__json_ui_action ||= Page.new(json, self)
+        # The Page is memoized across calls within the same view context (e.g. sequential
+        # injection templates sharing one render). Reset the builder's singleton-tracking
+        # state so each caller gets a fresh state, otherwise a prior caller's action
+        # would trip the singleton guard.
+        @__json_ui_action.action_builder.reset_singleton_tracking!
         @__json_ui_action.action_builder
       end
 
@@ -135,19 +140,19 @@ module Glib
           json.actionCable do
             if (on_error = options[:onError])
               json.onError do
-                on_error.call(@action_builder)
+                @action_builder.with_isolated_singleton_tracking { on_error.call(@action_builder) }
               end
             end
 
             if (on_open = options[:onOpen])
               json.onOpen do
-                on_open.call(@action_builder)
+                @action_builder.with_isolated_singleton_tracking { on_open.call(@action_builder) }
               end
             end
 
             if (on_close = options[:onClose])
               json.onClose do
-                on_close.call(@action_builder)
+                @action_builder.with_isolated_singleton_tracking { on_close.call(@action_builder) }
               end
             end
 
@@ -298,31 +303,31 @@ module Glib
         def on(options = {})
           if (on_load = options[:load])
             json.onLoad do
-              on_load.call @action_builder
+              @action_builder.with_isolated_singleton_tracking { on_load.call @action_builder }
             end
           end
 
           if (on_rerender = options[:reRender])
             json.onRerender do
-              on_rerender.call @action_builder
+              @action_builder.with_isolated_singleton_tracking { on_rerender.call @action_builder }
             end
           end
 
           if (on_unload = options[:unload])
             json.onUnload do
-              on_unload.call @action_builder
+              @action_builder.with_isolated_singleton_tracking { on_unload.call @action_builder }
             end
           end
 
           if (on_refocus = options[:refocus])
             json.onRefocus do
-              on_refocus.call @action_builder
+              @action_builder.with_isolated_singleton_tracking { on_refocus.call @action_builder }
             end
           end
 
           if (on_foreground = options[:foreground])
             json.onForeground do
-              on_foreground.call @action_builder
+              @action_builder.with_isolated_singleton_tracking { on_foreground.call @action_builder }
             end
           end
         end

data/lib/tasks/db.rake

@@ -64,7 +64,6 @@ namespace :db do
           entries.each do |a|
             attrs = Hash[a.attributes.sort]
             attrs.delete_if { |k, v| v.nil? }
-            # attrs.delete_if { |k, v| v.nil? }
 
             id = if attrs.include?('id')
               [a.id]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - ''