jekyll-highlight-cards 2.0.0 → 2.2.0

data/lib/jekyll-highlight-cards/polaroid_tag.rb

@@ -33,53 +33,40 @@ module JekyllHighlightCards
   #   {% polaroid /img.jpg link="https://example.com" image_link="https://other.com" %}
   class PolaroidTag < Liquid::Tag
     include ArchiveHelper
-    include DimensionParser
     include ExpressionEvaluator
     include TemplateRenderer
 
-    # Initialize the tag
-    #
-    # @param tag_name [String] the name of the tag
-    # @param markup [String] the tag markup containing parameters
-    # @param tokens [Array] parse tokens (unused)
-    def initialize(tag_name, markup, tokens)
-      super
-      @markup = markup.strip
-    end
-
     # Render the polaroid tag
     #
     # @param context [Liquid::Context] the Liquid rendering context
     # @return [String] rendered HTML
     def render(context)
-      # Parse markup
       params = parse_markup(@markup, context)
 
-      # Validate required image_url
-      raise ArgumentError, "polaroid tag requires an image URL" if params[:image_url].nil? || params[:image_url].empty?
-
-      # Parse size parameter if present
-      width, height = parse_dimensions(params[:size]) if params[:size]
+      raise ArgumentError, "polaroid tag requires an image URL" if params.fetch(:image_url).empty?
 
-      # Determine link URL (defaults to image URL)
-      # Track if link was explicitly provided
-      explicit_link = !params[:link].nil? && !params[:link].empty?
-      link_url = params[:link] || params[:image_url]
+      width, height = DimensionParser.parse_dimensions(params[:size])
 
-      # Determine image link URL (can be overridden by image_link parameter)
-      # If image_link is provided, use it; otherwise use the standard link_url
-      image_link_url = if params[:image_link] && !params[:image_link].empty?
-                         params[:image_link]
-                       else
+      explicit_link = !params[:link].to_s.empty?
+      link_url = if params[:link].to_s.empty?
+                   params.fetch(:image_url)
+                 else
+                   params.fetch(:link)
+                 end
+      image_link_url = if params[:image_link].to_s.empty?
                          link_url
+                       else
+                         params.fetch(:image_link)
                        end
+      archive_url = resolve_archive(
+        params[:archive],
+        link_url,
+        site: context.registers[:site],
+        explicit_link: explicit_link
+      )
 
-      # Resolve archive URL (archives the link URL, not the image)
-      archive_url = resolve_archive(params[:archive], context, link_url)
-
-      # Build template variables
       variables = build_template_variables(
-        params[:image_url],
+        params.fetch(:image_url),
         width,
         height,
         params[:title],
@@ -90,11 +77,7 @@ module JekyllHighlightCards
         archive_url
       )
 
-      # Get site from context
-      site = context.registers[:site]
-
-      # Render template
-      render_template(site, "polaroid", variables)
+      render_template(context.registers[:site], "polaroid", variables)
     end
 
     private
@@ -105,91 +88,32 @@ module JekyllHighlightCards
     # @param context [Liquid::Context] the Liquid context
     # @return [Hash] parsed parameters
     def parse_markup(markup, context)
-      # Split by whitespace, keeping quoted strings and Liquid expressions together
-      # Handles escaped quotes (\") and backslashes (\\) within quoted strings
-      tokens = []
-      current = ""
-      in_quotes = false
-      quote_char = nil
-      in_liquid = 0
-      escaped = false
-
-      markup.each_char do |char|
-        # Handle escape sequences when in quotes
-        if escaped
-          current += char # Add the escaped character directly
-          escaped = false
-          next
-        end
-
-        # Check for escape character when in quotes
-        if char == "\\" && in_quotes
-          escaped = true
-          next # Don't add backslash to output, it's just the escape marker
-        end
-
-        # Track Liquid expression boundaries
-        if char == "{" && !in_quotes
-          in_liquid += 1
-          current += char
-        elsif char == "}" && !in_quotes && in_liquid.positive?
-          in_liquid -= 1
-          current += char
-        # Track quote boundaries
-        elsif ['"', "'"].include?(char) && !in_quotes && in_liquid.zero?
-          in_quotes = true
-          quote_char = char
-          current += char
-        elsif char == quote_char && in_quotes
-          in_quotes = false
-          current += char
-          quote_char = nil
-        # Split on whitespace only if not in quotes or Liquid expression
-        elsif char.match?(/\s/) && !in_quotes && in_liquid.zero?
-          tokens << current unless current.empty?
-          current = ""
-        else
-          current += char
-        end
-      end
-      tokens << current unless current.empty?
-
-      # First token is image URL (required)
-      image_url_token = tokens.shift
-      image_url = evaluate_expression(image_url_token, context, allow_nil: false)
+      parsed = PolaroidMarkup.parse(markup)
 
-      # Parse remaining tokens as key=value pairs
-      result = { image_url: image_url }
-      tokens.each do |token|
-        next unless token =~ /^(\w+)=(.+)$/
+      result = { image_url: evaluate_expression(parsed[:image_url], context) }
+      parsed.each do |key, value|
+        next if key == :image_url
 
-        key = Regexp.last_match(1).to_sym
-        value_token = Regexp.last_match(2)
-
-        # Evaluate value as Liquid expression
-        result[key] = evaluate_expression(value_token, context, allow_nil: true)
+        result[key] = evaluate_expression(value, context)
       end
 
       result
     end
 
-    # Resolve archive URL (may be explicit, auto-lookup, or opt-out)
+    # Resolve archive URL (may be explicit, auto-lookup, or opt-out).
+    # Named archive params are already Liquid-evaluated in parse_markup.
     #
     # @param source [String, nil] the archive source
-    # @param context [Liquid::Context] the Liquid context (unused but kept for consistency)
     # @param url [String] the target URL to archive
+    # @param site [Jekyll::Site, nil] site for +highlight_cards.noarchive+
+    # @param explicit_link [Boolean] whether +link=+ was provided (self-link is not an archive target)
     # @return [String, nil] resolved archive URL
-    def resolve_archive(source, context, url)
-      # Check for explicit opt-out
-      return nil if source&.downcase == "none"
-
-      # Check for explicit archive URL
-      return evaluate_expression(source, context, allow_nil: true) if source && !source.empty?
-
-      # Auto-lookup if enabled (archives the link URL, not the image)
-      return archive_url_for(url) if archive_enabled?
+    def resolve_archive(source, url, site: nil, explicit_link: true)
+      return nil if source && source.downcase == "none"
+      return source unless source.to_s.empty?
+      return nil unless explicit_link
 
-      nil
+      archive_enabled? && archive_url_for(url, site: site)
     end
 
     # Build template variables hash for rendering
@@ -215,12 +139,12 @@ module JekyllHighlightCards
       explicit_link,
       archive_url
     )
-      # Only set link_display if link was explicitly provided (not defaulted to image)
-      link_display = explicit_link && link_url ? strip_protocol(link_url) : nil
+      link_display = strip_protocol(link_url) if explicit_link
+      escaped_title = CGI.escapeHTML(title.to_s)
+      escaped_title = "&nbsp;" if escaped_title.empty?
 
       {
         "image_url" => image_url,
-        "link_url" => link_url,
         "image_link_url" => image_link_url,
         "title" => title,
         "alt" => alt,
@@ -229,12 +153,12 @@ module JekyllHighlightCards
         "width" => width,
         "height" => height,
         "escaped_image_url" => CGI.escapeHTML(image_url),
-        "escaped_link_url" => link_url ? CGI.escapeHTML(link_url) : nil,
-        "escaped_image_link_url" => image_link_url ? CGI.escapeHTML(image_link_url) : nil,
-        "escaped_title" => title && !title.empty? ? CGI.escapeHTML(title) : "&nbsp;",
-        "escaped_alt" => alt && !alt.empty? ? CGI.escapeHTML(alt) : "",
-        "escaped_link_display" => link_display && !link_display.empty? ? CGI.escapeHTML(link_display) : "&nbsp;",
-        "escaped_archive_url" => archive_url ? CGI.escapeHTML(archive_url) : nil
+        "escaped_link_url" => CGI.escapeHTML(link_url),
+        "escaped_image_link_url" => CGI.escapeHTML(image_link_url),
+        "escaped_title" => escaped_title,
+        "escaped_alt" => CGI.escapeHTML(alt.to_s),
+        "escaped_link_display" => link_display && CGI.escapeHTML(link_display),
+        "escaped_archive_url" => archive_url && CGI.escapeHTML(archive_url)
       }
     end
 
@@ -243,7 +167,7 @@ module JekyllHighlightCards
     # @param url [String] the URL
     # @return [String] URL without protocol
     def strip_protocol(url)
-      url.sub(%r{^https?://}, "")
+      url.sub(%r{\Ahttps?://}, "")
     end
   end
 end

data/lib/jekyll-highlight-cards/template_renderer.rb

@@ -27,13 +27,14 @@ module JekyllHighlightCards
         template = Liquid::Template.parse(template_content)
         template.render(variables)
       rescue Errno::ENOENT, Errno::EACCES => e
-        raise TemplateRenderError, "Failed to read template '#{template_name}' at #{template_path}: #{e.message}"
+        raise TemplateRenderError, "Failed to read template '#{template_name}' at #{template_path}: #{e.class}: #{e}"
       rescue Encoding::InvalidByteSequenceError => e
-        raise TemplateRenderError, "Invalid encoding in template '#{template_name}' at #{template_path}: #{e.message}"
+        raise TemplateRenderError,
+              "Invalid encoding in template '#{template_name}' at #{template_path}: #{e.class}: #{e}"
       rescue Liquid::SyntaxError, Liquid::Error => e
-        raise TemplateRenderError, "Liquid error in template '#{template_name}': #{e.message}"
+        raise TemplateRenderError, "Liquid error in template '#{template_name}': #{e.class}: #{e}"
       rescue StandardError => e
-        raise TemplateRenderError, "Unexpected error rendering template '#{template_name}': #{e.message}"
+        raise TemplateRenderError, "Unexpected error rendering template '#{template_name}': #{e.class}: #{e}"
       end
     end
 
@@ -57,6 +58,19 @@ module JekyllHighlightCards
       find_gem_template(relative_path)
     end
 
+    # Verify template path is safe (within allowed directory)
+    #
+    # @param allowed_dir [String] the allowed base directory
+    # @param template_path [String] the template path to check
+    # @return [String, nil] template path if safe, nil otherwise
+    def safe_template_path(allowed_dir, template_path)
+      return nil unless File.exist?(template_path)
+
+      expanded_dir = File.expand_path(allowed_dir)
+      expanded_path = File.expand_path(template_path)
+      template_path if expanded_path.start_with?(expanded_dir)
+    end
+
     private
 
     # Validate template name to prevent path traversal attacks
@@ -76,9 +90,11 @@ module JekyllHighlightCards
     # @param relative_path [String] relative path to template
     # @return [String, nil] path to template or nil
     def find_user_template(site, relative_path)
-      return nil unless site&.source
+      source = site&.source
+      # Empty source would File.join to "/_includes/..." — skip it explicitly.
+      return nil unless source.is_a?(String) && !source.empty?
 
-      includes_dir = File.join(site.source, "_includes")
+      includes_dir = File.join(source, "_includes")
       template_path = File.join(includes_dir, relative_path)
 
       safe_template_path(includes_dir, template_path)
@@ -95,19 +111,5 @@ module JekyllHighlightCards
 
       safe_template_path(includes_dir, template_path)
     end
-
-    # Verify template path is safe (within allowed directory)
-    #
-    # @param allowed_dir [String] the allowed base directory
-    # @param template_path [String] the template path to check
-    # @return [String, nil] template path if safe, nil otherwise
-    def safe_template_path(allowed_dir, template_path)
-      return nil unless File.exist?(template_path)
-
-      expanded_dir = File.expand_path(allowed_dir)
-      expanded_path = File.expand_path(template_path)
-
-      expanded_path.start_with?(expanded_dir) ? template_path : nil
-    end
   end
 end

data/lib/jekyll-highlight-cards/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllHighlightCards
-  VERSION = "2.0.0"
+  VERSION = "2.2.0"
 end

data/lib/jekyll-highlight-cards.rb

@@ -12,11 +12,17 @@ require_relative "jekyll-highlight-cards/dimension_parser"
 require_relative "jekyll-highlight-cards/expression_evaluator"
 require_relative "jekyll-highlight-cards/archive_helper"
 require_relative "jekyll-highlight-cards/template_renderer"
+require_relative "jekyll-highlight-cards/linkcard_markup"
+require_relative "jekyll-highlight-cards/polaroid_markup"
 
 # Require tags and hooks
 require_relative "jekyll-highlight-cards/linkcard_tag"
 require_relative "jekyll-highlight-cards/polaroid_tag"
 require_relative "jekyll-highlight-cards/image_sizing_hooks"
+require_relative "jekyll-highlight-cards/freeze_archives/markup_analyzer"
+require_relative "jekyll-highlight-cards/freeze_archives/tag_locator"
+require_relative "jekyll-highlight-cards/freeze_archives/archive_inserter"
+require_relative "jekyll-highlight-cards/commands/freeze_archives"
 
 # jekyll-highlight-cards: Styled card components for Jekyll
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-highlight-cards
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Texarkanine
@@ -63,6 +63,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: mutant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: mutant-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,28 +167,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -195,10 +223,16 @@ files:
 - jekyll-highlight-cards.gemspec
 - lib/jekyll-highlight-cards.rb
 - lib/jekyll-highlight-cards/archive_helper.rb
+- lib/jekyll-highlight-cards/commands/freeze_archives.rb
 - lib/jekyll-highlight-cards/dimension_parser.rb
 - lib/jekyll-highlight-cards/expression_evaluator.rb
+- lib/jekyll-highlight-cards/freeze_archives/archive_inserter.rb
+- lib/jekyll-highlight-cards/freeze_archives/markup_analyzer.rb
+- lib/jekyll-highlight-cards/freeze_archives/tag_locator.rb
 - lib/jekyll-highlight-cards/image_sizing_hooks.rb
+- lib/jekyll-highlight-cards/linkcard_markup.rb
 - lib/jekyll-highlight-cards/linkcard_tag.rb
+- lib/jekyll-highlight-cards/polaroid_markup.rb
 - lib/jekyll-highlight-cards/polaroid_tag.rb
 - lib/jekyll-highlight-cards/template_renderer.rb
 - lib/jekyll-highlight-cards/version.rb