jekyll-picture-tag-ng 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2819edd23c6ea86844dc240bd5e7919d2feb274973fa0dd3f6a2f8309bfc32
-  data.tar.gz: 4cac1933e03ad045a4e2d362b8d41af0142bf93896658503965df3bcdda11b2d
+  metadata.gz: 16f42bd13a6802cd5f6ed65bbeaf0bce3dace3f9ccf7c0139786545c8bc3935c
+  data.tar.gz: c098473b51d98a4a79ad16baf584d79c643ff17ffbac15d3f909d29f2a9e420d
 SHA512:
-  metadata.gz: 5542a64a8d14317ad90380d0faeea45327b99590af770f0c059bfb7f378148336b8848d130e46f04fef2ef13fdc1026f91bd671115558ec5ee4a71762df918c6
-  data.tar.gz: 6c3aff4446150db753872190fe6d6c7c48d85f229ca456b9ae0ff9be703cb3ce44a18e3e4cb7b15fc86e72bccf0940bc754f73722be1aadc4a023cdd88284b0d
+  metadata.gz: 40db0e283c5bcba0ae73096bc95bcb294853f115e7f86c05a616ad1c86501660c8460b453484c7990ddaa839caba8277a5fc309ab6306c03979c6e987e7d892c
+  data.tar.gz: f57d381abdb4acca624ced2cfab14112991d4fa94b8e7854ef654173eef16da6f96f73807f1c09819949f373b1f1d5b850b634e7c784b169c2b9f49598fa1a87

data/README.md

@@ -1,6 +1,6 @@
 # Jekyll Picture Tag NG
 
-This plugin will automatically generate variants of your pictures on build, and change the Kramdown rendering to use the variants with HTML picture tags when including pictures from markdown. Developped for and used on [Crocodile Couture](https://crocodile-couture.fr)
+This plugin will automatically generate variants of your pictures on build, and change the Kramdown rendering to use the variants with HTML picture tags when including pictures from markdown. Developed for and used on [Crocodile Couture](https://crocodile-couture.fr)
 
 ## Installation
 
@@ -51,9 +51,9 @@ After adding the custom action to your repository, you'll need to update the rep
 
 By installing the plugin and activating it, `jekyll build` and `jekyll serve` commands will perform an additional step to generate several versions of your `jpeg` and `webp` files : for each of these files in the source directory, and each version defined, a file will be output in the `img/{version}` directory of the rendered website.
 
-When using the default markdown syntax for including pictures (`![Alt text](PICTURE_URL)`) with the Kramdown renderer, `<picture>` tags with appropriate `<source>` children tags will be output.
+When using the default markdown syntax for including pictures (`![Alt text](PICTURE_URL)`) with the Kramdown renderer, `<picture>` tags with appropriate `<source>` children tags will be output. This will automatically exclude any picture element with the `src` attribute starting with "`http://`" or "`https://`".
 
-When working locally, it is recommended to use the `--incremental` option which will prevent Jekyll from re-generating all the picture versions (can take quite some time) every time you save a file. However, there is a catch : when using `--incremental`, if you edit your configuration file to change the output formats and build again, your pages will not be updated with the appropriate `<source>` tags for the new versions.
+When working locally, you can use the `--incremental` option to prevent Jekyll from re-generating all the pictures (which can take a long time) when re-launching the `jekyll serve` command. This is useful when developing a plugin or tweaking the `_config.yml` file (which both require you to frequently re-launch the `jekyll serve` command). However, be careful about using this option when changing the plugin's output image formats : the plugin will skip generating the new output formats in `--incremental` mode for pictures that were previously generated for the old output formats.
 
 ### Configuration
 
@@ -73,18 +73,18 @@ The example above is equivalent to the defaults.
 
 - `background_color` is the color used to replace transparency when converting from `webp` to `jpeg`
 - `picture_versions` 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/`.
-- `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. However, this seems to make building the site with the recommended Github workflow fail.
-- `threads` is the number of concurrent threads for generating the website (only used if `parallel` is `true`
+- `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.
+- `threads` is the number of concurrent threads for generating the website (only used if `parallel` is `true`)
 
 ## Development
 
-After cloning the repo, you can run the following commands in a local jekyll website's folder to start hacking on the code of `jekyll-picture-tag-ng` (you'll need to replace the path in the second command :
+After cloning the repo, you can run the following commands in a local Jekyll website's folder to start hacking on the code of `jekyll-picture-tag-ng` (you'll need to replace the path in the second command) :
 
     $ bundle remove jekyll-picture-tag-ng # if you previously used jekyll-picture-tag-ng from rubygems
     $ bundle add --path /absolute/or/relative/path/to/your/local/jekyll-picture-tag-ng/repo jekyll-picture-tag-ng
     $ bundle exec jekyll serve # Re-run this when you want to test changes to your local jekyll-picture-tag-ng
 
-To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [the Rubygems repository](https://rubygems.org).
 
 ## Contributing
 

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

@@ -2,6 +2,6 @@
 
 module Jekyll
   module PictureTag
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

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

@@ -127,6 +127,10 @@ module Jekyll
       end
     end
 
+    def reset_thread_pool
+      @thread_pool = nil
+    end
+
     def next_task
       @task_queue ||= []
       @task_queue.shift
@@ -139,7 +143,7 @@ module Jekyll
 
     def write
       if config["picture_tag_ng"]["parallel"]
-        Jekyll.logger.info "Writing files in parallel (should not work on GH Pages)"
+        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) }
@@ -148,6 +152,7 @@ module Jekyll
           add_task { -1 }
         end
         thread_pool.each(&:join)
+        reset_thread_pool
         regenerator.write_metadata
         Jekyll::Hooks.trigger :site, :post_write, self
         nil
@@ -196,7 +201,9 @@ module Kramdown
         require "cgi"
         res = "<picture>"
         new_src = el.attr["src"]
-        if File.extname(el.attr["src"]) =~ /(\.jpg|\.jpeg|\.webp)$/i
+        puts el.attr["src"]
+        if File.extname(el.attr["src"]) =~ /(\.jpg|\.jpeg|\.webp)$/i &&
+           el.attr["src"] !~ %r{^https?://}
           picture_versions.each_with_index do |(version, geometry), index|
             src_base = File.join(
               "/img",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-picture-tag-ng
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - pcouy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll