jekyll-uj-powertools 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2bbc8c153db266e8ef63d1eb3a5223c4c84fe099623eb2ed8c525965a4583fc
-  data.tar.gz: 404d483a3d63551ecf9cbb272b0c63afc6535050ec0b1688c4d2e176b2c8805d
+  metadata.gz: 6487d4258e4c8f8afe9d43a78898cdf73339924756f0d69f7ac19edb0f42a943
+  data.tar.gz: b0d0635fcd32cb3b9b78ffa4f0f1df976e573046d1b4fb19491d53d80ad83f1e
 SHA512:
-  metadata.gz: 6caa4c4a8e3e30d8cb8f3c92d12e1b0480a4acd724c96f8e7ee833bd58e87057612f3f00525fbd2de40b9d26343c1d4117c80cbfd69a709a3e3fa5f7287d533e
-  data.tar.gz: ed168cb35dad450d2adcad236f1810d2ffe76f0bc17d8589219758b13661b278199417cd8d3e6f1e0e18b1171664764eb4360741ffd1677f9855c8f60182910d
+  metadata.gz: 1030ea52ac7c9e11241602dc4b80a0c71e266ee1596735cf895e317e8566fc56adc29eeb6c94a28d398ca1fb372259aef8b81789442765079a50f09e7e5b9ff3
+  data.tar.gz: 186250ac81fdcc8756dc4b2ed6c9d7c62832ed384b70471efbacaab505c2905ec094b47bdb15b43cc1eadac503fb9d7a46fc0d318295ae1d772d7d3289f781a6

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

data/lib/hooks/markdown-images.rb

@@ -18,11 +18,8 @@ module Jekyll
       # Get post ID for @post/ prefix resolution
       post_id = doc.data['post'] && doc.data['post']['id'] ? doc.data['post']['id'] : nil
 
-      # Transform markdown images by parsing and rendering Liquid template
-      doc.content = doc.content.gsub(/!\[([^\]]*)\]\(([^)]+)\)/) do
-        alt_text = $1
-        image_path = $2
-
+      # Shared transformer: convert ![alt](src) → rendered <img> HTML
+      render_image = lambda do |alt_text, image_path|
         # Resolve @post/ prefix to full blog image path
         if image_path.start_with?('@post/')
           if post_id
@@ -33,19 +30,33 @@ module Jekyll
           end
         end
 
-        # Build the Liquid tag string
         if image_class
           liquid_tag = "{% uj_image \"#{image_path}\", alt=\"#{alt_text}\", class=\"#{image_class}\" %}"
         else
           liquid_tag = "{% uj_image \"#{image_path}\", alt=\"#{alt_text}\" %}"
         end
 
-        # Parse and render the Liquid template immediately
         template = Liquid::Template.parse(liquid_tag)
         context = doc.site.site_payload.merge({'page' => doc.to_liquid})
-        result = template.render(Liquid::Context.new(context))
+        template.render(Liquid::Context.new(context))
+      end
 
-        # Return the HTML with blank lines to ensure markdown treats it as raw HTML
+      # First pass: linked images [![alt](src)](href) → <a href><img></a>
+      # Must run BEFORE the bare-image pass so the outer [](href) wrapper is preserved.
+      # Kramdown otherwise promotes the inner ![](src) to a block and discards the wrapping link.
+      # display:block on the anchor — otherwise an inline <a> has a 20px-tall hit
+      # box, and clicks on the (taller) image overflow miss the link entirely.
+      doc.content = doc.content.gsub(/\[!\[([^\]]*)\]\(([^)]+)\)\]\(([^)]+)\)/) do
+        alt_text = $1
+        image_path = $2
+        href = $3
+        img_html = render_image.call(alt_text, image_path)
+        "\n\n<a href=\"#{href}\" style=\"display:block\">#{img_html}</a>\n\n"
+      end
+
+      # Second pass: bare markdown images ![alt](src)
+      doc.content = doc.content.gsub(/!\[([^\]]*)\]\(([^)]+)\)/) do
+        result = render_image.call($1, $2)
         "\n\n#{result}\n\n"
       end
     end

data/lib/tags/iffile.rb

@@ -16,11 +16,10 @@ module Jekyll
         # Get the site object
         site = context.registers[:site]
 
-        # Use the helper to resolve input (handles both literals and variables)
-        path = resolve_input(context, @path)
-        
+        path = resolve_path(context)
+
         # Return empty if path couldn't be resolved
-        return "" unless path
+        return "" if path.nil? || path.to_s.empty?
 
         # Ensure path starts with /
         path = "/#{path}" unless path.to_s.start_with?('/')
@@ -39,6 +38,27 @@ module Jekyll
           ""
         end
       end
+
+      private
+
+      # Resolve the path argument from context.
+      # Quoted strings are literals. Bare tokens are looked up as variables;
+      # if the root segment isn't defined in context, fall back to the literal markup.
+      def resolve_path(context)
+        return nil if @path.nil? || @path.empty?
+
+        # Quoted string literal
+        if @path.match(/^["'](.*)["']$/)
+          return $1
+        end
+
+        root = @path.split('.').first
+        resolved = resolve_variable(context, @path)
+        return resolved unless resolved.nil?
+
+        # Variable resolved to nil — fall back to literal only if root is also nil/undefined
+        context[root].nil? ? @path : nil
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-uj-powertools
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - ITW Creative Works