jekyll-imgflow 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37c208e7250fe6da8291bfab933d5df7391347d0ce95492e32e1d94e54df7a8
-  data.tar.gz: cd222c0e6dbdcffe168ec0919a12d53c57324a277cb9efeecb5173a98c4c5b04
+  metadata.gz: 2f902d95441ebd7a1c3a98200b140c2bf109343a79cf43700221a6cfec2902df
+  data.tar.gz: c89e222e5f37bb795f44ec7b6e3ecc865ca3fb66fefac0481ea31211f8fa7dfb
 SHA512:
-  metadata.gz: 2f566b0e2d70993a209a5353cf1b91d54e3b3f3143397146f58bbbcf19428eab9797ed5def60efdd3d8f926f214fa2ec6670d47ccfd6c000fe2f9c35b2bac00c
-  data.tar.gz: 0b601aea8c16d71133816f034b4277e399e6108569af169c0984416ef6e5d90edc30490d17af254f736f2897eae5c6b55d515888a4b71af35dd8020b63f37a88
+  metadata.gz: cfc171eb11a3f533033671d2b8d8bfdc90bd3a9790bc9b764cf1ada4e58817179261419c80af2cd0eb2bc8c6bc1c130d754f31a0415664bd4262c43f0c3adb49
+  data.tar.gz: 1f92eb5e21c373a01e570bcaa843a51ccfd093655c46a64a4ae21248c9d4862d8cd6acac84830e2f1d023a8de4a8b8b2662bfbfe44e83c0a6a633c6eb23cc6d1

data/lib/jekyll-imgflow/imgflow_tag.rb

@@ -60,7 +60,8 @@ module Jekyll
       # Combine image path with preset markup. Keep the path quoted because
       # filenames may contain spaces.
       image_markup = if image_path.include?(" ")
-                       "\"#{image_path.gsub('"', '\\"')}\""
+                       escaped_path = image_path.gsub("\\") { "\\\\" }.gsub('"', '\\"')
+                       "\"#{escaped_path}\""
                      else
                        image_path
                      end

data/lib/jekyll-imgflow/picture_tag_adaptor.rb

@@ -42,11 +42,11 @@ module JekyllImgFlow
     # @param picture_markup [String] Picture Tag markup like "{% picture hero image.jpg 16:9 --alt Text %}"
     # @return [Hash] Translation result with markup and attributes
     def translate_to_imgflow(picture_markup)
-      # Extract content between {% picture ... %}
-      match = picture_markup.match(/\{%\s*picture\s+(.+?)%\}/)
-      return { markup: "", attributes: {} } unless match
+      # Extract content between {% picture ... %} without a backtracking regex
+      content = extract_picture_content(picture_markup)
+      return { markup: "", attributes: {} } unless content
 
-      content = match[1].strip
+      content = content.strip
       return { markup: "", attributes: {} } if content.empty?
 
       # Parse arguments
@@ -75,6 +75,32 @@ module JekyllImgFlow
 
     private
 
+    def extract_picture_content(markup)
+      offset = 0
+      while (opening = markup.index("{%", offset))
+        cursor = skip_whitespace(markup, opening + 2)
+        if markup[cursor, 7] == "picture"
+          cursor += 7
+          if cursor < markup.length && whitespace?(markup[cursor])
+            cursor = skip_whitespace(markup, cursor)
+            closing = markup.index("%}", cursor)
+            return markup[cursor...closing] if closing
+          end
+        end
+        offset = opening + 2
+      end
+      nil
+    end
+
+    def skip_whitespace(markup, cursor)
+      cursor += 1 while cursor < markup.length && whitespace?(markup[cursor])
+      cursor
+    end
+
+    def whitespace?(character)
+      [" ", "\t", "\r", "\n"].include?(character)
+    end
+
     # Parse arguments handling quoted paths and attributes
     # @param content [String] Raw content
     # @return [Array] Parsed arguments

data/lib/jekyll-imgflow/providers/sharp.rb

@@ -79,7 +79,7 @@ module JekyllImgFlow
 
         format_op = @operations.find { |op| op[:type] == :format }
         quality_op = @operations.find { |op| op[:type] == :quality }
-        command_parts += ["-f", format_op[:format]] if format_op
+        command_parts += ["-f", sharp_format(format_op[:format])] if format_op
         command_parts += ["-q#{quality_op[:quality]}"] if quality_op
 
         if opacity && opacity < 1.0
@@ -142,7 +142,7 @@ module JekyllImgFlow
         quality_op = @operations.find { |op| op[:type] == :quality }
         alpha_op = @operations.find { |op| op[:type] == :alpha_opacity }
 
-        command_parts += ["-f", format_op[:format]] if format_op
+        command_parts += ["-f", sharp_format(format_op[:format])] if format_op
         command_parts += ["-q#{quality_op[:quality]}"] if quality_op
         if alpha_op
           alpha_value = (alpha_op[:opacity] * 255).round
@@ -200,7 +200,7 @@ module JekyllImgFlow
         quality_op = @operations.find { |op| op[:type] == :quality }
         alpha_op = @operations.find { |op| op[:type] == :alpha_opacity }
 
-        command_parts += ["-f", format_op[:format]] if format_op
+        command_parts += ["-f", sharp_format(format_op[:format])] if format_op
         command_parts += ["-q#{quality_op[:quality]}"] if quality_op
         if alpha_op
           alpha_value = (alpha_op[:opacity] * 255).round
@@ -209,6 +209,12 @@ module JekyllImgFlow
 
         command_parts.join(" ")
       end
+
+      # Sharp CLI calls JPEG "jpeg", while ImgFlow uses the standard "jpg"
+      # extension in generated filenames and public configuration.
+      def sharp_format(format)
+        format.to_s == "jpg" ? "jpeg" : format
+      end
     end
   end
 end

data/lib/jekyll-imgflow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllImgFlow
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-imgflow
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Svend Gundestrup