jekyll-uj-powertools 1.6.22 → 1.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e12576d7e500881fe56b9a6fdf6963b458635435ae7f27ef03df1562410c7a
-  data.tar.gz: 2418ef5a2771bb1383be22a27830beb6d9d513652f48eb2741204315eb2ec442
+  metadata.gz: 8e244425c0a57091b17d74eeb82b585314a5892bc4d2185e6dc50b5d66d7d16c
+  data.tar.gz: e999ee1ea01bee859c675e451c3d8323c984b225a7ae2438f3d06f1f43158848
 SHA512:
-  metadata.gz: bde8bed7311f9b164d05608c4eef60984cb995598367f44ec05d8e46f21a6569692066a615e7f239f0f48dcdd92c693f660e508ab6e4b6b7dfdca945ffe67f45
-  data.tar.gz: 6b4ac3a7cb149197bad09eabacd25a8c2d05c899fede95e564464d37aa6e97e37de880e419269030419b8b44a46085bc88cecd0add0186e3125c1bb0d0ecee55
+  metadata.gz: 4042544bbfb0c7e818b9d56ab22adb617c0e5ab74f5284e03eaab1c2a5fed114b77e3d7860759cdef9d0ba9d057b542e5e916f690bda237defbf7426056fcff7
+  data.tar.gz: cd588783c0bd5b02069eb47363352d6200d03de8b4208004a34a23db7372a123dffc47b2138174e7969f4380cf39f649ac977c06a41e6dfbedd7469592732a5f

data/jekyll-uj-powertools.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   # Gem info
   spec.name = "jekyll-uj-powertools"
-  spec.version = "1.6.22"
+  spec.version = "1.6.24"
 
   # Author info
   spec.authors = ["ITW Creative Works"]

data/lib/tags/logo.rb

@@ -5,12 +5,15 @@ require_relative '../helpers/variable_resolver'
 module Jekyll
   class UJLogoTag < Liquid::Tag
     include UJPowertools::VariableResolver
-    
+
     # Default logo to show when requested logo is not found
     DEFAULT_LOGO = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M320 64C334.7 64 348.2 72.1 355.2 85L571.2 485C577.9 497.4 577.6 512.4 570.4 524.5C563.2 536.6 550.1 544 536 544L104 544C89.9 544 76.9 536.6 69.6 524.5C62.3 512.4 62.1 497.4 68.8 485L284.8 85C291.8 72.1 305.3 64 320 64zM320 232C306.7 232 296 242.7 296 256L296 368C296 381.3 306.7 392 320 392C333.3 392 344 381.3 344 368L344 256C344 242.7 333.3 232 320 232zM346.7 448C347.3 438.1 342.4 428.7 333.9 423.5C325.4 418.4 314.7 418.4 306.2 423.5C297.7 428.7 292.8 438.1 293.4 448C292.8 457.9 297.7 467.3 306.2 472.5C314.7 477.6 325.4 477.6 333.9 472.5C342.4 467.3 347.3 457.9 346.7 448z"/></svg>'
-    
-    # Cache for loaded logos to improve performance
+
+    # Cache for loaded logos (raw SVG content) to improve performance
     @@logo_cache = {}
+
+    # Counter for generating unique prefixes per logo instance
+    @@instance_counter = 0
     
     def initialize(tag_name, markup, tokens)
       super
@@ -63,38 +66,76 @@ module Jekyll
       # Get site from context
       site = context.registers[:site]
       return '' unless site
-      
-      # Load the logo SVG from file
-      logo_svg = load_logo_from_file(logo_name.to_s, type, color)
-      return '' unless logo_svg
-      
-      # Return the SVG directly
-      logo_svg
+
+      # Load the raw logo SVG from file (cached)
+      raw_svg = load_logo_from_file(logo_name.to_s, type, color)
+      return '' unless raw_svg
+
+      # Generate unique prefix for this instance to prevent ID conflicts
+      # when the same logo is used multiple times on a page
+      @@instance_counter += 1
+      unique_prefix = "#{logo_name}-#{@@instance_counter}"
+
+      # Prefix all IDs with unique prefix
+      prefix_svg_ids(raw_svg, unique_prefix)
     end
-    
+
     private
-    
+
     def load_logo_from_file(logo_name, type, color)
       # Create cache key
       cache_key = "#{type}/#{color}/#{logo_name}"
-      
-      # Return cached version if available
+
+      # Return cached version if available (raw SVG without prefixing)
       return @@logo_cache[cache_key] if @@logo_cache.key?(cache_key)
-      
+
       # Build file path
       logo_path = File.join(Dir.pwd, 'node_modules', 'ultimate-jekyll-manager', 'assets', 'logos', type, color, "#{logo_name}.svg")
-      
+
       # Try to load the logo
       logo_svg = if File.exist?(logo_path)
                    File.read(logo_path)
                  else
                    DEFAULT_LOGO
                  end
-      
-      # Cache the result
+
+      # Cache the raw result (before prefixing)
       @@logo_cache[cache_key] = logo_svg
       return logo_svg
     end
+
+    # Prefix all IDs in an SVG with the logo name to prevent conflicts
+    # when multiple SVGs are inlined on the same page
+    def prefix_svg_ids(svg_content, prefix)
+      # Find all id attributes in the SVG
+      ids = svg_content.scan(/\bid=["']([^"']+)["']/).flatten.uniq
+
+      return svg_content if ids.empty?
+
+      result = svg_content.dup
+
+      ids.each do |id|
+        new_id = "#{prefix}-#{id}"
+
+        # Replace id definitions: id="X" and id='X'
+        result.gsub!(/\bid=(["'])#{Regexp.escape(id)}\1/, "id=\"#{new_id}\"")
+
+        # Replace url() references: url(#X) and url('#X') and url("#X")
+        result.gsub!(/url\(\s*##{Regexp.escape(id)}\s*\)/, "url(##{new_id})")
+        result.gsub!(/url\(\s*["']##{Regexp.escape(id)}["']\s*\)/, "url(##{new_id})")
+
+        # Replace xlink:href references: xlink:href="#X"
+        result.gsub!(/xlink:href=["']##{Regexp.escape(id)}["']/, "xlink:href=\"##{new_id}\"")
+
+        # Replace x:href references (custom namespace, convert to standard href): x:href="#X"
+        result.gsub!(/x:href=["']##{Regexp.escape(id)}["']/, "href=\"##{new_id}\"")
+
+        # Replace href references (modern SVG): href="#X"
+        result.gsub!(/\bhref=["']##{Regexp.escape(id)}["']/, "href=\"##{new_id}\"")
+      end
+
+      result
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-uj-powertools
 version: !ruby/object:Gem::Version
-  version: 1.6.22
+  version: 1.6.24
 platform: ruby
 authors:
 - ITW Creative Works
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-10 00:00:00.000000000 Z
+date: 2025-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll