jekyll-picture-tag-ng 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c023d8fa0eeb80434e5a7b0765ef2f5ae23d4b9cb042dfd11fc378113bb4796
-  data.tar.gz: d533e604e583d1003db2f5a6837d5fe5dc0906812e426221239332577b141b13
+  metadata.gz: 8e259d3e6bc42b9cf71ed0cf2a19671e70630dc5179bf638f0d12e65198f5453
+  data.tar.gz: 3eec5ed3f61f0ef11ddfb0fad57a74263cb580a9d0b8d7347242da8f59cec906
 SHA512:
-  metadata.gz: 794f56c96b166b376951c77b27a22dd9d285f03626dbcd3127a58f60b601a316c48d60f42bba1e6733e4517f82c1826fc40e611d467ccdbfd3261b35ec0571b2
-  data.tar.gz: 6b854e35c9ca6d7acba69b938f3c14d7622e7c3b39b1743541031a641f2b3ba9aaab7f52752d93f1bf86fc85d1ef47b6d85badeb9e72d1eb1bed9ae3ac3ce4ac
+  metadata.gz: e21c2a050577813b90f09ebdd3dd03c6300c8e84f0538feeb29921616584c049e6d2d1338cb6b9a19944f7f06535927150398c56a2426cc21fc490c1cc7b280e
+  data.tar.gz: b16a120225b1772e33f3d722aa461c3670b25b9d01f0c4c230611e3f145cb54a8c517324777cc6e2a555e2bed1ba9e05ce4a688f4a4cf28f920c48b908c637b6

data/README.md

@@ -32,7 +32,7 @@ plugins:
 
 ### Using with GitHub Pages
 
-If you're using GitHub Pages to deploy your site, you'll need to use a custom action to be able to use this plugin and install ImageMagick. You can create such GitHub action by browsing to
+If you're using GitHub Pages to deploy your site, you'll need to use a custom action to be able to use this plugin and install ImageMagick/libvips. You can create such GitHub action by browsing to
 
 ```
 https://github.com/{YOUR/REPO}/new/main?filename=.github%2Fworkflows%2Fjekyll.yml&workflow_template=pages%2Fjekyll
@@ -41,10 +41,12 @@ https://github.com/{YOUR/REPO}/new/main?filename=.github%2Fworkflows%2Fjekyll.ym
 You will need to add the following lines as a step for the build job of your GitHub action (before the `jekyll build` command) :
 
 ```yaml
-- name: Install imagemagick
-  run: sudo apt-get update && sudo apt-get install imagemagick
+- name: Install imagemagick and libvips
+  run: sudo apt-get update && sudo apt-get install imagemagick libvips-tools
 ```
 
+If you do not intend to use the `libvips` backend (see Configuration), you should remove `libvips-tools` from the `apt-get install` command above, as installing it takes some time (still a lot less than generating all versions with Image Magick)
+
 After adding the custom action to your repository, you'll need to update the repository settings on GitHub : go to the "Pages" section and change the "Source" setting from "Deploy from a branch" to "GitHub Actions".
 
 ## Usage
@@ -61,6 +63,7 @@ Configuration is done in the `_config.yml` of your website, under the `picture_t
 
 ```yaml
 picture_tag_ng:
+  backend: imagemagick
   parallel: false
   threads: 16
   background_color: FFFFFF
@@ -71,6 +74,7 @@ picture_tag_ng:
 
 The example above is equivalent to the defaults.
 
+- `backend` can be either `imagemagick` (more well-tested) or `libvips` (a lot faster but less tested)
 - `background_color` is the color used to replace transparency when converting from `webp` to `jpeg`
 - `picture_versions` in the simplest form, maps version names to target widths in pixels. The default configuration above produces output files 700px wide in `img/m/` and 400px wide in `img/s/`. See below for more complex forms.
 - `parallel` is a boolean indicating if you want to generate the output files in parallel threads. With a website that has a lot of large pictures, I get ~30% speed improvements when generating the site locally.
@@ -161,6 +165,8 @@ to the following HTML :
 
 #### Extra `convert` arguments
 
+:warning: The options in this section will do nothing when used with the `libvips` backend :warning:
+
 The `extra_convert_args` and `pre_extra_convert_args` options allow you to add any [`convert` argument](https://imagemagick.org/script/convert.php) to the image conversion processes. The `pre_extra_convert_args` will be added before the resize operation, and the `extra_convert_args` after the resize operation. These options must be either arrays of strings or a string that will be split on spaces. This can be used to add a watermark to all your pictures (see example below).
 
 Additionally, you can set different values based on the version for both these options. In the example below, the `m` version of output pictures will be blurred :

data/lib/jekyll-picture-tag-ng/jekyll/picture_tag/out_image_file.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module PictureTag
+    # Class that holds generated variants of pictures.
+    # Handles the call to the external program for image resizing (`convert`)
+    class OutImageFile < StaticFile
+      def initialize(site, orig_static_file, version, pictype)
+        super(site, site.source, orig_static_file.dir, orig_static_file.name)
+        @version = version
+        @picture_dim = if picture_versions[@version].is_a?(Hash)
+                         picture_versions[@version]["out_size"]
+                       else
+                         picture_versions[@version]
+                       end
+        @pictype = pictype
+        @collection = nil
+      end
+
+      def copy_file(dest_path)
+        cmd = if config["backend"] == "libvips"
+                vips_popen_args dest_path
+              else
+                imagemagick_popen_args dest_path
+              end
+        Jekyll.logger.debug "copy_file : #{path} -> #{dest_path} (#{cmd})"
+        p = IO.popen(cmd, err: %i[child out])
+        Jekyll.logger.debug "command_output :\n    #{p.readlines.join("    ")}"
+        p.close
+        File.utime(self.class.mtimes[path], self.class.mtimes[path], dest_path)
+      end
+
+      def imagemagick_popen_args(dest_path)
+        args = ["convert", @path]
+        args.concat pre_convert_args
+        args.concat ["-resize", "#{@picture_dim}x>"] unless replace_args
+        if @pictype == "jpg"
+          args.concat ["-background", "##{@config["background_color"]}",
+                       "-flatten", "-alpha", "off"]
+        end
+        args.concat convert_args
+        args.push dest_path
+      end
+
+      def vips_popen_args(dest_path)
+        args = ["vips", "thumbnail", @path]
+        dest_path = dest_path.clone.concat "[background=#{rgb_bg_color}]" if @pictype == "jpg"
+        args.push dest_path
+        args.push @picture_dim.to_s
+        args.concat ["--size", "down", "--height", "999999"]
+      end
+
+      def destination(dest)
+        output_dir = File.join("img", @version, @dir)
+        output_basename = @site.in_dest_dir(
+          @site.dest,
+          File.join(output_dir, "#{basename}.#{@pictype}")
+        )
+        FileUtils.mkdir_p(File.dirname(output_dir))
+        @destination ||= {}
+        @destination[dest] ||= output_basename
+      end
+
+      def as_args(input)
+        if input.nil?
+          []
+        elsif input.is_a?(Array)
+          input.clone
+        elsif input.is_a?(String)
+          input.split(" ")
+        else
+          raise(
+            TypeError,
+            "[jekyll-picture-tag-ng] `extra_convert_args` must be an array or a string (#{input})"
+          )
+        end
+      end
+
+      def rgb_bg_color
+        hex = config["background_color"]
+        @rgb_bg_color ||= "#{hex.slice(0, 2).to_i(16)} #{hex.slice(2, 2).to_i(16)} #{hex.slice(4, 2).to_i(16)}"
+      end
+
+      def picture?
+        extname =~ /(\.jpg|\.jpeg|\.webp)$/i
+      end
+
+      def config
+        @config ||= CONFIG.merge(@site.config["picture_tag_ng"] || {})
+      end
+
+      def picture_versions
+        config["picture_versions"]
+      end
+
+      def replace_args
+        if picture_versions[@version].is_a?(Hash) &&
+           !picture_versions[@version]["replace_convert_args"].nil?
+          picture_versions[@version]["replace_convert_args"]
+        else
+          config["replace_convert_args"]
+        end
+      end
+
+      def convert_args
+        @convert_args ||= as_args(config["extra_convert_args"]).concat(
+          picture_versions[@version].is_a?(Hash) &&
+          picture_versions[@version]["extra_convert_args"] || []
+        )
+      end
+
+      def pre_convert_args
+        @pre_convert_args ||= as_args(config["pre_extra_convert_args"]).concat(
+          picture_versions[@version].is_a?(Hash) &&
+          picture_versions[@version]["pre_extra_convert_args"] || []
+        )
+      end
+    end
+  end
+end

data/lib/jekyll-picture-tag-ng/jekyll/picture_tag/pics_generator.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative "out_image_file"
+
+module Jekyll
+  module PictureTag
+    # Adds `OutImageFile` instances to the site's static files
+    class PicsGenerator < Generator
+      safe true
+      priority :lowest
+
+      def generate(site)
+        @config ||= CONFIG.merge(site.config["picture_tag_ng"] || {})
+        @picture_versions = @config["picture_versions"]
+        new_statics = []
+        site.static_files.filter { |f| f.extname =~ /(\.jpg|\.jpeg|\.webp)$/i }.each do |f|
+          @config["picture_versions"].each do |v, _s|
+            img_f = OutImageFile.new(site, f, v, "jpg")
+            new_statics << img_f
+            img_f = OutImageFile.new(site, f, v, "webp")
+            new_statics << img_f
+          end
+        end
+
+        new_statics.each { |f| site.static_files << f }
+      end
+    end
+  end
+end

data/lib/jekyll-picture-tag-ng/jekyll/picture_tag.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative "static_file"
+require_relative "picture_tag/pics_generator"
+
+module Jekyll
+  class Error < StandardError; end
+
+  module PictureTag
+    # Module's default config
+    CONFIG = {
+      "backend" => "imagemagick",
+      "picture_versions" => {
+        "s" => "400",
+        "m" => "700"
+      },
+      "background_color" => "FFFFFF",
+      "extra_convert_args" => [],
+      "replace_convert_args" => false
+    }.freeze
+  end
+end

data/lib/jekyll-picture-tag-ng/jekyll/site.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require "jekyll"
+
+module Jekyll
+  # Override the write methid to paralellize it
+  class Site
+    alias_method "old_write", "write"
+
+    def write
+      if conf_parallel
+        Jekyll.logger.info "Writing files in parallel"
+        Jekyll::Commands::Doctor.conflicting_urls(self)
+        each_site_file do |item|
+          regenerator.regenerate?(item) && add_task { item.write(dest) }
+        end
+        thread_pool.each do
+          add_task { -1 } # Each thread will terminate when a task returns `-1`
+        end
+        thread_pool.each(&:join)
+        reset_thread_pool # Cleanup to be ready for next generation (`jekyll serve`)
+        regenerator.write_metadata
+        Jekyll::Hooks.trigger :site, :post_write, self
+        nil
+      else
+        old_write
+      end
+    end
+
+    def thread_pool
+      @thread_pool ||= (0..n_threads).map do |i|
+        Jekyll.logger.debug "Creating thread num #{i}"
+        Thread.new do
+          j = 0
+          Kernel.loop do
+            Jekyll.logger.debug "Doing task num. #{j}"
+            j += 1
+            task = next_task
+            if task.nil?
+              sleep 0.1
+            elsif task.instance_of?(Proc)
+              res = task.call
+            end
+
+            break if res == -1
+          end
+          Jekyll.logger.debug "Finishing thread num #{i}"
+        end
+      end
+    end
+
+    def n_threads
+      config.dig "picture_tag_ng", "threads" || 8
+    end
+
+    def conf_parallel
+      config.dig "picture_tag_ng", "parallel" || false
+    end
+
+    def reset_thread_pool
+      @thread_pool = nil
+    end
+
+    def next_task
+      @task_queue ||= []
+      @task_queue.shift
+    end
+
+    def add_task(&task)
+      @task_queue ||= []
+      @task_queue.push(task)
+    end
+  end
+end

data/lib/jekyll-picture-tag-ng/jekyll/static_file.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "jekyll"
+
+module Jekyll
+  # Override default static file to make some instance variables readable
+  class StaticFile
+    attr_reader :site, :dest, :dir, :name
+  end
+end

data/lib/jekyll-picture-tag-ng/jekyll.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative "jekyll/picture_tag"
+require_relative "jekyll/site"

data/lib/jekyll-picture-tag-ng/kramdown/converter.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require "kramdown"
+require_relative "../jekyll/picture_tag"
+
+module Kramdown
+  module Converter
+    # Override Kramdown HTML converter to output picture tags
+    class Html
+      def convert_img(el, _indent)
+        require "cgi"
+        res = "<picture>"
+        new_src = el.attr["src"]
+        if File.extname(el.attr["src"]) =~ /(\.jpg|\.jpeg|\.webp)$/i &&
+           el.attr["src"] !~ %r{^https?://}
+          picture_versions.each do |version, _geometry|
+            src_base = File.join(
+              "/img",
+              version,
+              File.dirname(el.attr["src"]).split("/").map do |x|
+                x.gsub(" ", "%20")
+              end.join("/"),
+              File.basename(el.attr["src"], File.extname(el.attr["src"])).gsub(" ", "%20")
+            )
+            media = media_attribute(version)
+            new_src = "#{src_base}.jpg" if version == default_pic_version
+            res += "<source #{media} srcset=\"#{src_base}.webp\" type=\"image/webp\">"
+            res += "<source #{media} srcset=\"#{src_base}.jpg\" type=\"image/jpeg\">"
+          end
+        end
+        el.attr["src"] = new_src
+        res += "<img#{html_attributes(el.attr)}>"
+        res += "</picture>"
+      end
+
+      def media_attribute(version)
+        geometry = picture_versions[version]
+        if geometry.is_a?(Hash)
+          if geometry["media"].is_a?(String)
+            "media=\"#{geometry["media"]}\""
+          elsif geometry["media"].is_a?(Integer)
+            "media=\"(max-width: #{geometry["media"]}px)\""
+          else
+            "media=\"(max-width: #{geometry["out_size"]}px)\""
+          end
+        else
+          "media=\"(max-width: #{geometry}px)\""
+        end
+      end
+
+      def site_config
+        @site_config ||= Jekyll::PictureTag::CONFIG.merge(JEKYLL_SITE.config["picture_tag_ng"] || {})
+      end
+
+      def default_pic_version
+        @default_pic_version ||= _get_default_pic_version
+      end
+
+      def _get_default_pic_version
+        largest_version = ""
+        largest_size = 0
+        picture_versions.each do |version, geometry|
+          size = if geometry.is_a?(Integer)
+                   geometry
+                 elsif geometry["default"]
+                   999_999_999
+                 else
+                   geometry["out_size"]
+                 end
+          if size > largest_size
+            largest_version = version
+            largest_size = size
+          end
+        end
+        largest_version
+      end
+
+      def picture_versions
+        site_config["picture_versions"]
+      end
+    end
+  end
+end

data/lib/jekyll-picture-tag-ng/kramdown/parser.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "kramdown"
+
+module Kramdown
+  module Parser
+    # Override Kramdown parser to add `loading="lazy"` to images
+    class Kramdown
+      def add_link(el, href, title, alt_text = nil, ial = nil)
+        el.options[:ial] = ial
+        update_attr_with_ial(el.attr, ial) if ial
+        if el.type == :a
+          el.attr["href"] = href
+        else
+          el.attr["src"] = href
+          el.attr["alt"] = alt_text
+          el.attr["loading"] = el.attr["loading"] || "lazy"
+          el.children.clear
+        end
+        el.attr["title"] = title if title
+        @tree.children << el
+      end
+
+      require "kramdown/parser/kramdown"
+    end
+  end
+end

data/lib/jekyll-picture-tag-ng/kramdown.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative "kramdown/parser"
+require_relative "kramdown/converter"

data/lib/jekyll-picture-tag-ng/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module PictureTag
-    VERSION = "0.5.1"
+    VERSION = "0.6.1"
   end
 end

data/lib/jekyll-picture-tag-ng.rb

@@ -1,315 +1,9 @@
 # frozen_string_literal: true
 
-require "jekyll"
-require "kramdown"
 require_relative "jekyll-picture-tag-ng/version"
-
-module Jekyll
-  # Override default static file to make some instance variables readable
-  class StaticFile
-    attr_reader :site, :dest, :dir, :name
-  end
-
-  module PictureTag
-    CONFIG = {
-      "picture_versions" => {
-        "s" => "400",
-        "m" => "700"
-      },
-      "background_color" => "FFFFFF",
-      "extra_convert_args" => [],
-      "replace_convert_args" => false
-    }.freeze
-
-    class Error < StandardError; end
-
-    # Class that holds generated variants of pictures
-    class OutImageFile < StaticFile
-      def initialize(site, orig_static_file, version, pictype)
-        super(site, site.source, orig_static_file.dir, orig_static_file.name)
-        @version = version
-        @picture_dim = if picture_versions[@version].is_a?(Hash)
-                         picture_versions[@version]["out_size"]
-                       else
-                         picture_versions[@version]
-                       end
-        @pictype = pictype
-        @collection = nil
-      end
-
-      def config
-        @config ||= CONFIG.merge(@site.config["picture_tag_ng"] || {})
-      end
-
-      def replace_args
-        result = config["replace_convert_args"]
-        if picture_versions[@version].is_a?(Hash) &&
-           !picture_versions[@version]["replace_convert_args"].nil?
-          result = picture_versions[@version]["replace_convert_args"]
-        end
-        result
-      end
-
-      def picture_versions
-        config["picture_versions"]
-      end
-
-      def as_args(input)
-        if input.nil?
-          []
-        elsif input.is_a?(Array)
-          input.clone
-        elsif input.is_a?(String)
-          input.split(" ")
-        else
-          raise(
-            TypeError,
-            "[jekyll-picture-tag-ng] `extra_convert_args` must be an array or a string (#{input})"
-          )
-        end
-      end
-
-      def convert_args
-        @convert_args ||= as_args(config["extra_convert_args"]).concat(
-          picture_versions[@version].is_a?(Hash) &&
-          picture_versions[@version]["extra_convert_args"] || []
-        )
-      end
-
-      def pre_convert_args
-        @pre_convert_args ||= as_args(config["pre_extra_convert_args"]).concat(
-          picture_versions[@version].is_a?(Hash) &&
-          picture_versions[@version]["pre_extra_convert_args"] || []
-        )
-      end
-
-      def picture?
-        extname =~ /(\.jpg|\.jpeg|\.webp)$/i
-      end
-
-      def destination(dest)
-        output_dir = File.join("img", @version, @dir)
-        output_basename = @site.in_dest_dir(
-          @site.dest,
-          File.join(output_dir, "#{basename}.#{@pictype}")
-        )
-        FileUtils.mkdir_p(File.dirname(output_dir))
-        @destination ||= {}
-        @destination[dest] ||= output_basename
-      end
-
-      def popen_args(dest_path)
-        args = ["convert", @path]
-        args.concat pre_convert_args
-        args.concat ["-resize", "#{@picture_dim}x>"] unless replace_args
-        if @pictype == "jpg"
-          args.concat ["-background", "##{@config["background_color"]}",
-                       "-flatten", "-alpha", "off"]
-        end
-        args.concat convert_args
-        args.push dest_path
-      end
-
-      def copy_file(dest_path)
-        Jekyll.logger.debug "copy_file : #{path} -> #{dest_path} (#{popen_args(dest_path)})"
-        p = IO.popen(popen_args(dest_path))
-        p.close
-        File.utime(self.class.mtimes[path], self.class.mtimes[path], dest_path)
-      end
-    end
-
-    # Will generate the picture variants
-    class PicsGenerator < Generator
-      safe true
-      priority :lowest
-
-      def generate(site)
-        @config ||= CONFIG.merge(site.config["picture_tag_ng"] || {})
-        @picture_versions = @config["picture_versions"]
-        new_statics = []
-        site.static_files.filter { |f| f.extname =~ /(\.jpg|\.jpeg|\.webp)$/i }.each do |f|
-          @config["picture_versions"].each do |v, _s|
-            img_f = OutImageFile.new(site, f, v, "jpg")
-            new_statics << img_f
-            img_f = OutImageFile.new(site, f, v, "webp")
-            new_statics << img_f
-          end
-        end
-
-        new_statics.each { |f| site.static_files << f }
-      end
-    end
-  end
-end
+require_relative "jekyll-picture-tag-ng/jekyll"
+require_relative "jekyll-picture-tag-ng/kramdown"
 
 Jekyll::Hooks.register :site, :after_init do |site|
   Kramdown::Converter::JEKYLL_SITE = site
 end
-
-module Jekyll
-  # Override the write methid to paralellize it
-  class Site
-    alias_method "old_write", "write"
-
-    def n_threads
-      config["picture_tag_ng"]["threads"] || 8
-    end
-
-    def thread_pool
-      @thread_pool ||= (0..n_threads).map do |i|
-        Jekyll.logger.debug "Creating thread num #{i}"
-        Thread.new do
-          j = 0
-          Kernel.loop do
-            Jekyll.logger.debug "Doing task num. #{j}"
-            j += 1
-            task = next_task
-            if task.nil?
-              sleep 0.1
-            elsif task.instance_of?(Proc)
-              res = task.call
-            end
-
-            break if res == -1
-          end
-          Jekyll.logger.debug "Finishing thread num #{i}"
-        end
-      end
-    end
-
-    def reset_thread_pool
-      @thread_pool = nil
-    end
-
-    def next_task
-      @task_queue ||= []
-      @task_queue.shift
-    end
-
-    def add_task(&task)
-      @task_queue ||= []
-      @task_queue.push(task)
-    end
-
-    def write
-      if config["picture_tag_ng"]["parallel"]
-        Jekyll.logger.info "Writing files in parallel"
-        Jekyll::Commands::Doctor.conflicting_urls(self)
-        each_site_file do |item|
-          regenerator.regenerate?(item) && add_task { item.write(dest) }
-        end
-        thread_pool.each do
-          add_task { -1 }
-        end
-        thread_pool.each(&:join)
-        reset_thread_pool
-        regenerator.write_metadata
-        Jekyll::Hooks.trigger :site, :post_write, self
-        nil
-      else
-        old_write
-      end
-    end
-  end
-end
-
-module Kramdown
-  module Parser
-    # Override Kramdown parser
-    class Kramdown
-      def add_link(el, href, title, alt_text = nil, ial = nil)
-        el.options[:ial] = ial
-        update_attr_with_ial(el.attr, ial) if ial
-        if el.type == :a
-          el.attr["href"] = href
-        else
-          el.attr["src"] = href
-          el.attr["alt"] = alt_text
-          el.attr["loading"] = el.attr["loading"] || "lazy"
-          el.children.clear
-        end
-        el.attr["title"] = title if title
-        @tree.children << el
-      end
-
-      require "kramdown/parser/kramdown"
-    end
-  end
-
-  module Converter
-    # Override Kramdown HTML converter
-    class Html
-      def site_config
-        @site_config ||= Jekyll::PictureTag::CONFIG.merge(JEKYLL_SITE.config["picture_tag_ng"] || {})
-      end
-
-      def picture_versions
-        site_config["picture_versions"]
-      end
-
-      def _get_default_pic_version
-        largest_version = ""
-        largest_size = 0
-        picture_versions.each do |version, geometry|
-          size = if geometry.is_a?(Integer)
-                   geometry
-                 elsif geometry["default"]
-                   999_999_999
-                 else
-                   geometry["out_size"]
-                 end
-          if size > largest_size
-            largest_version = version
-            largest_size = size
-          end
-        end
-        largest_version
-      end
-
-      def default_pic_version
-        @default_pic_version ||= _get_default_pic_version
-      end
-
-      def media_attribute(version)
-        geometry = picture_versions[version]
-        if geometry.is_a?(Hash)
-          if geometry["media"].is_a?(String)
-            "media=\"#{geometry["media"]}\""
-          elsif geometry["media"].is_a?(Integer)
-            "media=\"(max-width: #{geometry["media"]}px)\""
-          else
-            "media=\"(max-width: #{geometry["out_size"]}px)\""
-          end
-        else
-          "media=\"(max-width: #{geometry}px)\""
-        end
-      end
-
-      def convert_img(el, _indent)
-        require "cgi"
-        res = "<picture>"
-        new_src = el.attr["src"]
-        if File.extname(el.attr["src"]) =~ /(\.jpg|\.jpeg|\.webp)$/i &&
-           el.attr["src"] !~ %r{^https?://}
-          picture_versions.each do |version, _geometry|
-            src_base = File.join(
-              "/img",
-              version,
-              File.dirname(el.attr["src"]).split("/").map do |x|
-                x.gsub(" ", "%20")
-              end.join("/"),
-              File.basename(el.attr["src"], File.extname(el.attr["src"])).gsub(" ", "%20")
-            )
-            media = media_attribute(version)
-            new_src = "#{src_base}.jpg" if version == default_pic_version
-            res += "<source #{media} srcset=\"#{src_base}.webp\" type=\"image/webp\">"
-            res += "<source #{media} srcset=\"#{src_base}.jpg\" type=\"image/jpeg\">"
-          end
-        end
-        el.attr["src"] = new_src
-        res += "<img#{html_attributes(el.attr)}>"
-        res += "</picture>"
-      end
-    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-picture-tag-ng
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - pcouy
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-29 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -68,6 +68,15 @@ files:
 - README.md
 - Rakefile
 - lib/jekyll-picture-tag-ng.rb
+- lib/jekyll-picture-tag-ng/jekyll.rb
+- lib/jekyll-picture-tag-ng/jekyll/picture_tag.rb
+- lib/jekyll-picture-tag-ng/jekyll/picture_tag/out_image_file.rb
+- lib/jekyll-picture-tag-ng/jekyll/picture_tag/pics_generator.rb
+- lib/jekyll-picture-tag-ng/jekyll/site.rb
+- lib/jekyll-picture-tag-ng/jekyll/static_file.rb
+- lib/jekyll-picture-tag-ng/kramdown.rb
+- lib/jekyll-picture-tag-ng/kramdown/converter.rb
+- lib/jekyll-picture-tag-ng/kramdown/parser.rb
 - lib/jekyll-picture-tag-ng/version.rb
 - sig/jekyll/picture_tag.rbs
 homepage: https://pierre-couy.dev/projects/jekyll-picture-tag-ng.html
@@ -78,7 +87,7 @@ metadata:
   homepage_uri: https://pierre-couy.dev/projects/jekyll-picture-tag-ng.html
   documentation_uri: https://pierre-couy.dev/projects/jekyll-picture-tag-ng.html
   source_code_uri: https://github.com/pcouy/jekyll-picture-tag-ng
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Replace the default Kramdown rendering of pictures to use auto-generated
   alternatives