jekyll-uj-powertools 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bb2525b4822d44d79b90f95dd50e2f4231fc1696825edeaafd13273e42834c4
-  data.tar.gz: eb8b0c45df97fd704a7cda6d2d532606ebf260b10d32edc14588728b3de23684
+  metadata.gz: e74f6d968d196904d9306b2b3c15479dafb8adbec2ce42dd1b9e4d2b42660646
+  data.tar.gz: ac464d3b6a8df83604094e1c5b817af659c32bc58ce76adc3e9b315aa85c85e8
 SHA512:
-  metadata.gz: e08a2ff66c6ba2f03ff2b4e694401c65b09b07a57015b2852e55cae268ab50dd68b2714d7cb5c5b29f755d3a8ab2bca089c63d938587dbdeb94904a3abe2421a
-  data.tar.gz: c2248351129af1c9494262f9ec1d99746f495cc3f124d6b875ab0c1bb765b845d38bf3e16ac35e9e9db119f1f7bc5b22ff407f08b2b8c52ce79103274d49fcfa
+  metadata.gz: 0dd1feb9617342c7a21f15c7f313f11be4d2c2956a592b5ea20289687267514390c0141133eeaaaa4c42b8f959c405ae31d2819613beecd7d6d1eeefc30337cd
+  data.tar.gz: 81a12879162cc3616076ab55ddf642fef351098986967e1ae55f0efaf79da1aaa7878243fdf263ddff13acb85e41205459d2b2b574c42e8cb82880fac039d06b

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.3"
+  spec.version = "1.6.4"
 
   # Author info
   spec.authors = ["ITW Creative Works"]

data/lib/helpers/variable_resolver.rb

@@ -0,0 +1,115 @@
+# Helper module for resolving variables in Jekyll tags
+module Jekyll
+  module UJPowertools
+    module VariableResolver
+      # Resolve a variable or string literal from context
+      # If prefer_literal is true, unquoted strings are treated as literals unless they're clearly variables
+      def resolve_input(context, input, prefer_literal = false)
+        return nil if input.nil? || input.empty?
+        
+        # Check if the input is a quoted string literal
+        if input.match(/^["'](.*)["']$/)
+          # It's a string literal - extract the value between quotes
+          $1
+        elsif prefer_literal
+          # In prefer_literal mode, only treat as variable if it has dots or exists in context
+          if input.include?('.') || context[input]
+            resolve_variable(context, input)
+          else
+            # Treat as literal string
+            input
+          end
+        else
+          # Default behavior - try to resolve as variable, return nil if not found
+          resolve_variable(context, input)
+        end
+      end
+
+      # Resolve a variable path through Jekyll's context
+      def resolve_variable(context, variable_name)
+        return nil if variable_name.nil? || variable_name.empty?
+        
+        # Handle nested variable access like page.resolved.post.id
+        parts = variable_name.split('.')
+        
+        # Start with the first part
+        current = context[parts.first]
+        
+        # Navigate through nested properties
+        parts[1..-1].each do |part|
+          break if current.nil?
+          
+          # Handle different types of objects
+          if current.respond_to?(:[])
+            current = current[part]
+          elsif current.respond_to?(:data) && current.data.respond_to?(:[])
+            # Handle Jekyll Drop objects
+            current = current.data[part]
+          else
+            current = nil
+          end
+        end
+        
+        current
+      end
+
+      # Parse comma-separated arguments (preserving quotes)
+      def parse_arguments(markup)
+        args = []
+        current_arg = ''
+        in_quotes = false
+        quote_char = nil
+
+        markup.each_char do |char|
+          if !in_quotes && (char == '"' || char == "'")
+            in_quotes = true
+            quote_char = char
+            current_arg += char
+          elsif in_quotes && char == quote_char
+            in_quotes = false
+            quote_char = nil
+            current_arg += char
+          elsif !in_quotes && char == ','
+            args << current_arg.strip
+            current_arg = ''
+          else
+            current_arg += char
+          end
+        end
+
+        args << current_arg.strip if current_arg.strip.length > 0
+        args
+      end
+
+      # Parse key=value options from arguments
+      def parse_options(args, context = nil)
+        options = {}
+        
+        args.each do |arg|
+          if arg.include?('=')
+            key, value = arg.split('=', 2)
+            key = key.strip
+            value = value.strip
+            
+            # If context provided, resolve variables in values
+            if context
+              value = resolve_input(context, value)
+            else
+              # Just strip quotes if no context
+              value = value.gsub(/^['"]|['"]$/, '')
+            end
+            
+            options[key] = value
+          end
+        end
+        
+        options
+      end
+
+      # Check if input was originally quoted
+      def is_quoted?(input)
+        !!(input && input.match(/^["']/))
+      end
+    end
+  end
+end

data/lib/jekyll-uj-powertools.rb

@@ -13,6 +13,7 @@ module Jekyll
   require_relative "hooks/markdown-images"
 
   # Load Tags
+  require_relative "tags/external"
   require_relative "tags/fake_comments"
   require_relative "tags/icon"
   require_relative "tags/iffalsy"

data/lib/tags/external.rb

@@ -0,0 +1,46 @@
+# Libraries
+require "jekyll"
+require_relative '../helpers/variable_resolver'
+
+module Jekyll
+  module UJPowertools
+    class ExternalTag < Liquid::Tag
+      include VariableResolver
+      
+      def initialize(tag_name, markup, tokens)
+        super
+        @markup = markup.strip
+      end
+
+      def render(context)
+        # Resolve input path (handles both literals and variables)
+        path = resolve_input(context, @markup)
+        return '' if path.nil? || path.empty?
+        
+        # Check if path already has a protocol (http:// or https://)
+        if path =~ /^https?:\/\//
+          # Already has protocol, return as-is
+          path
+        elsif path =~ /^\/\//
+          # Protocol-relative URL, return as-is
+          path
+        else
+          # Get site URL from context
+          site = context.registers[:site]
+          site_url = site.config['url'] || ''
+          
+          # Remove trailing slash from site_url if present
+          site_url = site_url.chomp('/')
+          
+          # Ensure path starts with /
+          path = "/#{path}" unless path.start_with?('/')
+          
+          # Combine site URL with path
+          "#{site_url}#{path}"
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('uj_external', Jekyll::UJPowertools::ExternalTag)

data/lib/tags/fake_comments.rb

@@ -1,8 +1,10 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJCommentsTag < Liquid::Tag
+    include UJPowertools::VariableResolver
     def initialize(tag_name, markup, tokens)
       super
       @markup = markup.strip
@@ -34,24 +36,12 @@ module Jekyll
         return nil unless page
         page['content']
       else
-        # Resolve the variable name
-        resolve_variable(context, @markup)
+        # Use the helper to resolve input (handles both literals and variables)
+        resolve_input(context, @markup)
       end
     end
     
-    def resolve_variable(context, variable_name)
-      # Handle nested variable access like page.content or include.content
-      parts = variable_name.split('.')
-      current = context
-      
-      parts.each do |part|
-        return nil unless current.respond_to?(:[]) || current.is_a?(Hash)
-        current = current[part]
-        return nil if current.nil?
-      end
-      
-      current
-    end
+    # resolve_variable method is now provided by VariableResolver module
     
     def strip_html(content)
       # Remove HTML tags

data/lib/tags/icon.rb

@@ -1,8 +1,10 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJIconTag < Liquid::Tag
+    include UJPowertools::VariableResolver
     # Default icon to show when requested icon is not found
     DEFAULT_ICON = '<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>'
 
@@ -69,28 +71,25 @@ module Jekyll
     end
 
     def render(context)
-      # Parse arguments that can be quoted or unquoted
+      # Parse arguments using helper
       parts = parse_arguments(@markup)
-      icon_name_input = parts[0]
-      css_classes = parts[1]
-
-      # Check if the input was originally quoted (literal string)
-      is_quoted = @markup.strip.match(/^['"]/)
-
-      # If quoted, use as literal. Otherwise, try to resolve as variable
-      if is_quoted
-        icon_name = icon_name_input
-      else
-        # Try to resolve as a variable
-        icon_name = resolve_variable(context, icon_name_input)
-        # If it didn't resolve to a string, use the input as literal
-        icon_name = icon_name_input if icon_name.nil? || !icon_name.is_a?(String)
-      end
-
-      # Strip quotes from resolved icon name if present
-      if icon_name.is_a?(String) && icon_name.match(/^['"].*['"]$/)
-        icon_name = icon_name[1..-2]
+      
+      # Resolve icon name - if it resolves to non-string, use the literal
+      icon_name = parts[0]
+      if icon_name
+        resolved = resolve_input(context, icon_name, true)
+        # If resolved value is not a string, treat the input as literal
+        if resolved.is_a?(String)
+          # Strip any quotes from the resolved string value
+          icon_name = resolved.gsub(/^['"]|['"]$/, '')
+        else
+          # Strip quotes if present and use as literal
+          icon_name = icon_name.gsub(/^['"]|['"]$/, '')
+        end
       end
+      
+      # Resolve CSS classes (treat unquoted strings as literals)
+      css_classes = resolve_input(context, parts[1], true) if parts[1]
 
       # Get site from context
       site = context.registers[:site]
@@ -205,57 +204,7 @@ module Jekyll
       nil
     end
 
-    def parse_arguments(markup)
-      # Parse arguments that can be quoted or unquoted
-      # Examples: award, fa-md  OR  'award', 'fa-md'  OR  myVar, "2em"
-      args = []
-      current_arg = ''
-      in_quotes = false
-      quote_char = nil
-
-      markup.each_char.with_index do |char, i|
-        if !in_quotes && (char == '"' || char == "'")
-          # Start of quoted string
-          in_quotes = true
-          quote_char = char
-        elsif in_quotes && char == quote_char
-          # End of quoted string
-          in_quotes = false
-          quote_char = nil
-        elsif !in_quotes && char == ','
-          # Argument separator
-          args << current_arg.strip
-          current_arg = ''
-        else
-          # Regular character
-          current_arg += char
-        end
-      end
-
-      # Add the last argument
-      args << current_arg.strip if current_arg.strip.length > 0
-
-      args
-    end
-
-    def resolve_variable(context, variable_name)
-      # Handle nested variable access like page.icon
-      parts = variable_name.split('.')
-      current = context
-
-      parts.each do |part|
-        if current.respond_to?(:[])
-          current = current[part]
-        elsif current.respond_to?(:key?) && current.key?(part)
-          current = current[part]
-        else
-          return nil
-        end
-        return nil if current.nil?
-      end
-
-      current
-    end
+    # parse_arguments and resolve_variable methods are now provided by VariableResolver module
   end
 end
 

data/lib/tags/iffalsy.rb

@@ -1,28 +1,20 @@
 # Libraries
-# ...
+require_relative '../helpers/variable_resolver'
 
 # Tag
 module Jekyll
   module UJPowertools
     class IfFalsyTag < Liquid::Block
+      include VariableResolver
+      
       def initialize(tag_name, markup, tokens)
         super
         @variable = markup.strip
       end
 
       def render(context)
-        # Use Liquid's variable lookup to handle nested properties
-        value = context.scopes.last[@variable] || context[@variable]
-
-        # For nested properties like page.my.variable
-        if @variable.include?('.')
-          parts = @variable.split('.')
-          value = context[parts.first]
-          parts[1..-1].each do |part|
-            value = value.is_a?(Hash) ? value[part] : nil
-            break if value.nil?
-          end
-        end
+        # Use the helper to resolve input (handles both literals and variables)
+        value = resolve_input(context, @variable)
 
         # Check if the value is falsy (nil, false, empty string, or 0)
         if value.nil? || value == false || value == "" || value == 0

data/lib/tags/iffile.rb

@@ -1,10 +1,12 @@
 # Libraries
-# ...
+require_relative '../helpers/variable_resolver'
 
 # Tag
 module Jekyll
   module UJPowertools
     class IfFileTag < Liquid::Block
+      include VariableResolver
+      
       def initialize(tag_name, markup, tokens)
         super
         @path = markup.strip
@@ -14,18 +16,11 @@ module Jekyll
         # Get the site object
         site = context.registers[:site]
 
-        # Resolve the path variable if it's a variable name
-        path = context[@path] || @path
-
-        # Handle nested variables like page.css_path
-        if @path.include?('.')
-          parts = @path.split('.')
-          path = context[parts.first]
-          parts[1..-1].each do |part|
-            path = path.is_a?(Hash) ? path[part] : nil
-            break if path.nil?
-          end
-        end
+        # Use the helper to resolve input (handles both literals and variables)
+        path = resolve_input(context, @path)
+        
+        # Return empty if path couldn't be resolved
+        return "" unless path
 
         # Ensure path starts with /
         path = "/#{path}" unless path.to_s.start_with?('/')

data/lib/tags/iftruthy.rb

@@ -1,28 +1,20 @@
 # Libraries
-# ...
+require_relative '../helpers/variable_resolver'
 
 # Tag
 module Jekyll
   module UJPowertools
     class IfTruthyTag < Liquid::Block
+      include VariableResolver
       def initialize(tag_name, markup, tokens)
         super
         @variable = markup.strip
       end
 
       def render(context)
-        # Use Liquid's variable lookup to handle nested properties
-        value = context.scopes.last[@variable] || context[@variable]
-
-        # For nested properties like page.my.variable
-        if @variable.include?('.')
-          parts = @variable.split('.')
-          value = context[parts.first]
-          parts[1..-1].each do |part|
-            value = value.is_a?(Hash) ? value[part] : nil
-            break if value.nil?
-          end
-        end
+        # Use the helper to resolve input (handles both literals and variables)
+        # Don't use prefer_literal for iftruthy - we want to check variables
+        value = resolve_input(context, @variable, false)
 
         # Check if the value is truthy (not nil, not false, not empty string, not 0)
         if value && value != false && value != "" && value != 0

data/lib/tags/image.rb

@@ -1,8 +1,10 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJImageTag < Liquid::Tag
+    include UJPowertools::VariableResolver
     def initialize(tag_name, markup, tokens)
       super
       @markup = markup.strip
@@ -12,10 +14,12 @@ module Jekyll
       # Parse arguments
       args = parse_arguments(@markup)
       src_input = args[0]
-      options = parse_options(args[1..-1])
 
-      # Resolve source path
-      src = resolve_variable(context, src_input)
+      # Parse options and resolve their values
+      options = parse_options(args[1..-1], context)
+
+      # Resolve source path (treat unquoted strings as literals)
+      src = resolve_input(context, src_input, true)
       return '' unless src
 
       # Check if this is an external URL
@@ -40,66 +44,7 @@ module Jekyll
 
     private
 
-    def parse_arguments(markup)
-      args = []
-      current_arg = ''
-      in_quotes = false
-      quote_char = nil
-
-      markup.each_char do |char|
-        if !in_quotes && (char == '"' || char == "'")
-          in_quotes = true
-          quote_char = char
-          current_arg += char
-        elsif in_quotes && char == quote_char
-          in_quotes = false
-          quote_char = nil
-          current_arg += char
-        elsif !in_quotes && char == ','
-          args << current_arg.strip
-          current_arg = ''
-        else
-          current_arg += char
-        end
-      end
-
-      args << current_arg.strip if current_arg.strip.length > 0
-      args
-    end
-
-    def parse_options(option_args)
-      options = {}
-
-      option_args.each do |arg|
-        if arg.include?('=')
-          key, value = arg.split('=', 2)
-          key = key.strip.gsub(/^['"]|['"]$/, '')
-          value = value.strip.gsub(/^['"]|['"]$/, '')
-          options[key] = value
-        end
-      end
-
-      options
-    end
-
-    def resolve_variable(context, variable_input)
-      # Strip quotes if present
-      if variable_input.match(/^['"]/)
-        variable_input.gsub(/^['"]|['"]$/, '')
-      else
-        # Resolve as variable
-        parts = variable_input.split('.')
-        current = context
-
-        parts.each do |part|
-          return nil unless current.respond_to?(:[]) || current.is_a?(Hash)
-          current = current[part]
-          return nil if current.nil?
-        end
-
-        current
-      end
-    end
+    # parse_arguments and parse_options methods are now provided by VariableResolver module
 
     def build_picture_element(src, src_path, extension, max_width, options)
       html = "<picture>\n"
@@ -194,10 +139,10 @@ module Jekyll
       html += " data-lazy=\"@src #{src}\""
       html += " class=\"#{css_class}\"" unless css_class.empty?
       html += " alt=\"#{alt}\""
+      html += " loading=\"#{loading}\""
       html += " style=\"#{style}\"" unless style.empty?
       html += " width=\"#{width}\"" unless width.empty?
       html += " height=\"#{height}\"" unless height.empty?
-      html += " loading=\"#{loading}\""
       html += ">"
 
       html

data/lib/tags/language.rb

@@ -1,8 +1,10 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJLanguageTag < Liquid::Tag
+    include UJPowertools::VariableResolver
     # Language mappings: ISO code => [English name, Native name]
     LANGUAGE_MAPPINGS = {
       'aa' => ['Afar', 'Afaraf'],
@@ -197,34 +199,25 @@ module Jekyll
     end
 
     def render(context)
-      # Parse arguments that can be quoted or unquoted
+      # Parse arguments using helper
       parts = parse_arguments(@markup)
-      iso_code_input = parts[0]
-      output_type = parts[1] || 'english' # default to english
-
-      # Check if the input was originally quoted (literal string)
-      is_quoted = @markup.strip.match(/^['"]/)
-
-      # If quoted, use as literal. Otherwise, try to resolve as variable
-      if is_quoted
-        iso_code = iso_code_input
-      else
-        # Try to resolve as a variable
-        iso_code = resolve_variable(context, iso_code_input)
-        # If it didn't resolve to a string, use the input as literal
-        iso_code = iso_code_input if iso_code.nil? || !iso_code.is_a?(String)
-      end
-
-      # Strip quotes from resolved iso code if present
-      if iso_code.is_a?(String) && iso_code.match(/^['"].*['"]$/)
-        iso_code = iso_code[1..-2]
-      end
-
-      # Strip quotes from output type if present
-      if output_type.is_a?(String) && output_type.match(/^['"].*['"]$/)
-        output_type = output_type[1..-2]
+      
+      # Resolve first argument - if it resolves to non-string, use the literal
+      iso_code = parts[0]
+      if iso_code
+        resolved = resolve_input(context, iso_code, true)
+        # If resolved value is not a string, treat the input as literal
+        if resolved.is_a?(String)
+          # Strip any quotes from the resolved string value
+          iso_code = resolved.gsub(/^['"]|['"]$/, '')
+        else
+          # Strip quotes if present and use as literal
+          iso_code = iso_code.gsub(/^['"]|['"]$/, '')
+        end
       end
-
+      
+      output_type = resolve_input(context, parts[1], true) || 'english' # default to english
+      
       # Convert to lowercase for lookup
       iso_code = iso_code.to_s.downcase
       output_type = output_type.to_s.downcase
@@ -241,60 +234,6 @@ module Jekyll
         language_data[0] # English name (default)
       end
     end
-
-    private
-
-    def parse_arguments(markup)
-      # Parse arguments that can be quoted or unquoted
-      # Examples: de, english  OR  'de', 'english'  OR  myVar, "native"
-      args = []
-      current_arg = ''
-      in_quotes = false
-      quote_char = nil
-
-      markup.each_char.with_index do |char, i|
-        if !in_quotes && (char == '"' || char == "'")
-          # Start of quoted string
-          in_quotes = true
-          quote_char = char
-        elsif in_quotes && char == quote_char
-          # End of quoted string
-          in_quotes = false
-          quote_char = nil
-        elsif !in_quotes && char == ','
-          # Argument separator
-          args << current_arg.strip
-          current_arg = ''
-        else
-          # Regular character
-          current_arg += char
-        end
-      end
-
-      # Add the last argument
-      args << current_arg.strip if current_arg.strip.length > 0
-
-      args
-    end
-
-    def resolve_variable(context, variable_name)
-      # Handle nested variable access like page.language
-      parts = variable_name.split('.')
-      current = context
-
-      parts.each do |part|
-        if current.respond_to?(:[])
-          current = current[part]
-        elsif current.respond_to?(:key?) && current.key?(part)
-          current = current[part]
-        else
-          return nil
-        end
-        return nil if current.nil?
-      end
-
-      current
-    end
   end
 end
 

data/lib/tags/member.rb

@@ -1,8 +1,10 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJMemberTag < Liquid::Tag
+    include UJPowertools::VariableResolver
     def initialize(tag_name, markup, tokens)
       super
       @markup = markup.strip
@@ -17,17 +19,10 @@ module Jekyll
       # Strip quotes from property if present
       property = property_input.gsub(/^['"]|['"]$/, '')
 
-      # Check if the member input was originally quoted
-      is_quoted = member_input && member_input.match(/^['"]/)
-
       # Resolve member ID
-      if is_quoted
-        # If quoted, strip quotes and use as literal
-        member_id = member_input.gsub(/^['"]|['"]$/, '')
-      else
-        # Otherwise resolve as variable
-        member_id = resolve_member_id(context, member_input)
-      end
+      member_id = is_quoted?(member_input) ?
+                  member_input.gsub(/^['"]|['"]$/, '') :
+                  resolve_member_id(context, member_input)
       return '' unless member_id
 
       # Find member in site.team collection

data/lib/tags/post.rb

@@ -1,8 +1,10 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJPostTag < Liquid::Tag
+    include UJPowertools::VariableResolver
     def initialize(tag_name, markup, tokens)
       super
       @markup = markup.strip
@@ -17,17 +19,10 @@ module Jekyll
       # Strip quotes from property if present
       property = property_input.gsub(/^['"]|['"]$/, '')
 
-      # Check if the post input was originally quoted
-      is_quoted = post_input && post_input.match(/^['"]/)
-
       # Resolve post ID
-      if is_quoted
-        # If quoted, strip quotes and use as literal
-        post_id = post_input.gsub(/^['"]|['"]$/, '')
-      else
-        # Otherwise resolve as variable
-        post_id = resolve_post_id(context, post_input)
-      end
+      post_id = is_quoted?(post_input) ?
+                post_input.gsub(/^['"]|['"]$/, '') :
+                resolve_post_id(context, post_input)
       return '' unless post_id
 
       # Find post in site collections
@@ -46,13 +41,6 @@ module Jekyll
         site_url + post.url
       when 'path'
         post.url
-      when 'image'
-        # Use the custom post.post.id if available, otherwise fall back to extracting from post.id
-        custom_id = (post.data['post'] && post.data['post']['id']) || post.id.gsub(/^\/(\w+)\//, '')
-        # Extract the slug from the Jekyll post ID
-        post_id_clean = post.id.gsub(/^\/(\w+)\//, '')
-        slug = post_id_clean.gsub(/^\d{4}-\d{2}-\d{2}-/, '')
-        "/assets/images/blog/post-#{custom_id}/#{slug}.jpg"
       when 'date'
         post.data['date'] ? post.data['date'].strftime('%Y-%m-%d') : ''
       when 'author'
@@ -65,6 +53,13 @@ module Jekyll
         Array(post.data['tags']).join(', ')
       when 'id'
         post.id
+      when 'image'
+        # Use the custom post.post.id if available, otherwise fall back to extracting from post.id
+        custom_id = (post.data['post'] && post.data['post']['id']) || post.id.gsub(/^\/(\w+)\//, '')
+        # Extract the slug from the Jekyll post ID
+        post_id_clean = post.id.gsub(/^\/(\w+)\//, '')
+        slug = post_id_clean.gsub(/^\d{4}-\d{2}-\d{2}-/, '')
+        "/assets/images/blog/post-#{custom_id}/#{slug}.jpg"
       when 'image-tag'
         # Generate image path
         # Use the custom post.post.id if available, otherwise fall back to extracting from post.id
@@ -73,20 +68,20 @@ module Jekyll
         post_id_clean = post.id.gsub(/^\/(\w+)\//, '')
         slug = post_id_clean.gsub(/^\d{4}-\d{2}-\d{2}-/, '')
         image_path = "/assets/images/blog/post-#{custom_id}/#{slug}.jpg"
-        
+
         # Parse additional options for the image tag
         image_options = parse_image_options(args[2..-1], context)
-        
+
         # Set default alt text if not provided
         if !image_options['alt']
           # Try to get the title from post.post.title first, then fall back to post.title
           default_alt = (post.data['post'] && post.data['post']['title']) || post.data['title']
           image_options['alt'] = default_alt if default_alt
         end
-        
+
         # Build the markup string for uj_image tag
         image_markup = build_image_markup(image_path, image_options)
-        
+
         # Parse and render the uj_image tag using Liquid template
         template_content = "{% uj_image #{image_markup} %}"
         template = Liquid::Template.parse(template_content)
@@ -105,7 +100,7 @@ module Jekyll
       current_arg = ''
       in_quotes = false
       quote_char = nil
-      
+
       markup.each_char.with_index do |char, i|
         if !in_quotes && (char == '"' || char == "'")
           in_quotes = true
@@ -122,11 +117,11 @@ module Jekyll
           current_arg += char
         end
       end
-      
+
       args << current_arg.strip if current_arg.strip.length > 0
       args
     end
-    
+
     def parse_arguments(markup)
       # Parse arguments that can be quoted or unquoted
       args = []
@@ -171,28 +166,16 @@ module Jekyll
       end
     end
 
-    def resolve_variable(context, variable_name)
-      # Handle nested variable access
-      parts = variable_name.split('.')
-      current = context
-
-      parts.each do |part|
-        return nil unless current.respond_to?(:[]) || current.is_a?(Hash)
-        current = current[part]
-        return nil if current.nil?
-      end
-
-      current
-    end
+    # resolve_variable method is now provided by VariableResolver module
 
     def find_post(site, post_id)
       post_id_clean = post_id.to_s.strip
-      
+
       # Search in posts collection first
       if site.collections['posts']
         post = site.collections['posts'].docs.find do |doc|
           # Check standard ID match
-          doc.id == post_id_clean || 
+          doc.id == post_id_clean ||
           doc.id.include?(post_id_clean) ||
           # Also check if the post has a custom post.id field that matches
           (doc.data['post'] && doc.data['post']['id'] == post_id_clean)
@@ -200,15 +183,15 @@ module Jekyll
         return post if post
       end
 
-      # Search in other collections that might contain posts  
+      # Search in other collections that might contain posts
       site.collections.each do |name, collection|
         next if name == 'posts'  # Already checked
 
         post = collection.docs.find do |doc|
-          (doc.id == post_id_clean || 
+          (doc.id == post_id_clean ||
            doc.id.include?(post_id_clean) ||
            # Check custom post.id field
-           (doc.data['post'] && doc.data['post']['id'] == post_id_clean)) && 
+           (doc.data['post'] && doc.data['post']['id'] == post_id_clean)) &&
           doc.data['post']
         end
         return post if post
@@ -216,15 +199,15 @@ module Jekyll
 
       nil
     end
-    
+
     def parse_image_options(option_args, context)
       options = {}
-      
+
       option_args.each do |arg|
         if arg.include?('=')
           key, value = arg.split('=', 2)
           key = key.strip
-          
+
           # Check if the value is quoted (literal) or unquoted (variable)
           if value.strip.match(/^['"].*['"]$/)
             # It's a literal string, strip quotes
@@ -234,22 +217,22 @@ module Jekyll
             resolved_value = resolve_variable(context, value.strip)
             value = resolved_value || value.strip
           end
-          
+
           options[key] = value
         end
       end
-      
+
       options
     end
-    
+
     def build_image_markup(image_path, options)
       # Build markup string in the format expected by uj_image tag
       markup_parts = ["\"#{image_path}\""]
-      
+
       options.each do |key, value|
         markup_parts << "#{key}=\"#{value}\""
       end
-      
+
       markup_parts.join(', ')
     end
   end

data/lib/tags/readtime.rb

@@ -1,8 +1,11 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJReadtimeTag < Liquid::Tag
+    include UJPowertools::VariableResolver
+    
     def initialize(tag_name, markup, tokens)
       super
       @markup = markup.strip
@@ -35,23 +38,9 @@ module Jekyll
         return nil unless page
         page['content']
       else
-        # Resolve the variable name
-        resolve_variable(context, @markup)
-      end
-    end
-    
-    def resolve_variable(context, variable_name)
-      # Handle nested variable access like page.content or include.content
-      parts = variable_name.split('.')
-      current = context
-      
-      parts.each do |part|
-        return nil unless current.respond_to?(:[]) || current.is_a?(Hash)
-        current = current[part]
-        return nil if current.nil?
+        # Use the helper to resolve input (handles both literals and variables)
+        resolve_input(context, @markup)
       end
-      
-      current
     end
     
     def strip_html(content)

data/lib/tags/social.rb

@@ -1,8 +1,10 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJSocialTag < Liquid::Tag
+    include UJPowertools::VariableResolver
     # Social platform URL patterns
     SOCIAL_URLS = {
       'facebook' => 'https://facebook.com/%s',
@@ -28,14 +30,8 @@ module Jekyll
     end
 
     def render(context)
-      # Parse the platform name (can be quoted or unquoted)
-      platform_input = parse_argument(@markup)
-      
-      # Resolve the platform name (could be a variable or literal string)
-      platform = resolve_variable(context, platform_input)
-      
-      # If it didn't resolve to anything, use the input as a literal string
-      platform = platform_input if platform.nil? || platform.empty?
+      # Resolve the platform name (handles both literals and variables)
+      platform = resolve_input(context, @markup) || @markup
       
       # Get the social handle from page.resolved.socials.{platform}
       page = context['page']
@@ -54,30 +50,7 @@ module Jekyll
     
     private
     
-    def parse_argument(markup)
-      # Remove quotes if present
-      cleaned = markup.strip
-      if (cleaned.start_with?('"') && cleaned.end_with?('"')) ||
-         (cleaned.start_with?("'") && cleaned.end_with?("'"))
-        cleaned[1..-2]
-      else
-        cleaned
-      end
-    end
-    
-    def resolve_variable(context, variable_name)
-      # Handle nested variable access like page.social
-      parts = variable_name.split('.')
-      current = context
-      
-      parts.each do |part|
-        return nil unless current.respond_to?(:[]) || current.is_a?(Hash)
-        current = current[part]
-        return nil if current.nil?
-      end
-      
-      current
-    end
+    # parse_argument and resolve_variable methods are now provided by VariableResolver module
   end
 end
 

data/lib/tags/translation_url.rb

@@ -1,27 +1,25 @@
 # Libraries
 require "jekyll"
+require_relative '../helpers/variable_resolver'
 
 module Jekyll
   class UJTranslationUrlTag < Liquid::Tag
+    include UJPowertools::VariableResolver
     def initialize(tag_name, markup, tokens)
       super
       @markup = markup.strip
     end
 
     def render(context)
-      # Parse arguments that can be quoted or unquoted
+      # Parse arguments using helper
       parts = parse_arguments(@markup)
       
       # Return root if no arguments
       return '/' if parts.empty? || parts[0].nil?
       
-      language_code_input = parts[0]
-      url_path_input = parts[1] || '/'
-
-      # Resolve language code (literal or variable)
-      language_code = resolve_argument_value(context, language_code_input)
-      # Resolve URL path (literal or variable)  
-      url_path = resolve_argument_value(context, url_path_input)
+      # Resolve both arguments using helper (handles literals and variables)
+      language_code = resolve_input(context, parts[0])
+      url_path = resolve_input(context, parts[1]) || '/'
 
       # Get site and translation config from context
       site = context.registers[:site]
@@ -46,80 +44,7 @@ module Jekyll
 
     private
 
-    def parse_arguments(markup)
-      # Parse arguments that can be quoted or unquoted
-      # Examples: 'es', '/pricing'  OR  language, page.canonical.path  OR  'es', page.url
-      args = []
-      current_arg = ''
-      in_quotes = false
-      quote_char = nil
-
-      markup.each_char.with_index do |char, i|
-        if !in_quotes && (char == '"' || char == "'")
-          # Start of quoted string - include the quote in the arg
-          in_quotes = true
-          quote_char = char
-          current_arg += char
-        elsif in_quotes && char == quote_char
-          # End of quoted string - include the quote in the arg
-          current_arg += char
-          in_quotes = false
-          quote_char = nil
-        elsif !in_quotes && char == ','
-          # Argument separator
-          args << current_arg.strip
-          current_arg = ''
-        else
-          # Regular character
-          current_arg += char
-        end
-      end
-
-      # Add the last argument
-      args << current_arg.strip if current_arg.strip.length > 0
-
-      args
-    end
-
-    def resolve_argument_value(context, argument_input)
-      return '' if argument_input.nil? || argument_input.empty?
-
-      # Check if the argument was originally quoted (literal string)
-      is_quoted = argument_input.match(/^['"].*['"]$/)
-
-      # If quoted, remove quotes and use as literal. Otherwise, try to resolve as variable
-      if is_quoted
-        # Remove quotes from literal string
-        resolved_value = argument_input[1..-2]
-      else
-        # Try to resolve as a variable
-        resolved_value = resolve_variable(context, argument_input)
-        # If variable resolved to nil, return empty string
-        return '' if resolved_value.nil?
-        # If it didn't resolve to a string, use the resolved value
-        resolved_value = resolved_value.to_s if resolved_value
-      end
-
-      resolved_value.to_s
-    end
-
-    def resolve_variable(context, variable_name)
-      parts = variable_name.split('.')
-      current = context
-
-      parts.each do |part|
-        if current.respond_to?(:[])
-          current = current[part]
-        elsif current.respond_to?(:key?) && current.key?(part)
-          current = current[part]
-        else
-          return nil
-        end
-        return nil if current.nil?
-      end
-
-      current
-    end
+    # parse_arguments and resolve_variable methods are now provided by VariableResolver module
 
     def normalize_path(path)
       return '' if path.nil? || path.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-uj-powertools
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - ITW Creative Works
@@ -115,9 +115,11 @@ files:
 - jekyll-uj-powertools.gemspec
 - lib/filters/main.rb
 - lib/generators/inject-properties.rb
+- lib/helpers/variable_resolver.rb
 - lib/hooks/inject-properties.rb
 - lib/hooks/markdown-images.rb
 - lib/jekyll-uj-powertools.rb
+- lib/tags/external.rb
 - lib/tags/fake_comments.rb
 - lib/tags/icon.rb
 - lib/tags/iffalsy.rb