jekyll_picture_tag 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c2eba1d97111de1ef819824525ee40dadc297235b0d9a723e50292aca614277
-  data.tar.gz: 2b50ae28f44441be8b41329cc488d99afb68954f13b3292af1bac90e1cbc9fad
+  metadata.gz: 9ccbffcf313082eec49e27ba5e80d9b6f5d6727dda3125562c5822209eea8cec
+  data.tar.gz: b1c68f683fd243b960a9d15a7556927175fcdd9a94f2e3438b32d543beb56ebf
 SHA512:
-  metadata.gz: 8b9be36209c87b8475377e7f76117f1d0ac042d885f10e46f49a757d18af751a5df4953b2bd85ebbe94af77fd878e8a425394e713c181573e71d2c00c53be8f0
-  data.tar.gz: 1c7a556b2f1bc1b0a29010e9c7a8c484df86b049ac0247d831b23b7c58478f3b0a54a07df014b126af727d4f110677f0c366a83712b9f10b8229b3b9dbb7f8eb
+  metadata.gz: d821c75305bb4d3022fab0f5bbba9503f05280d01c16414c91eb00d78746367612236c11d09eb7b34b2a10ec2d16349d91676756e313c85c60e7602c26b69078
+  data.tar.gz: cdd31c120638ebeaed12cb9d37bf7196997d8f6b05f33c2eaba3940e01915921e3d665d2f5cc041f5ed80b0ecdcae1d65bc99140887e7832a43d66b1a748c935

data/.github/workflows/code-checks.yml

@@ -8,15 +8,15 @@ on:
 
 jobs:
   checks:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
 
       - name: Install system dependencies
-        run: sudo apt install libjpeg-dev webp libpng-dev libavifile-0.7c2 libopenjpip7 imagemagick libvips-tools
+        run: sudo apt-get update && sudo apt-get install --yes libjpeg-dev webp libpng-dev libavif-dev libheif-dev libopenjpip7 imagemagick libvips-tools build-essential
 
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # Version taken from .ruby-version file.
       # Also runs bundle install.

data/docs/Gemfile

@@ -2,5 +2,4 @@ source 'https://rubygems.org'
 
 group :jekyll_plugins do
   gem 'github-pages'
-  gem 'jekyll-rtd-theme'
 end

data/docs/Gemfile.lock

@@ -136,8 +136,6 @@ GEM
       addressable (~> 2.0)
       jekyll (>= 3.5, < 5.0)
       rubyzip (>= 1.3.0)
-    jekyll-rtd-theme (0.1.6)
-      github-pages (~> 206)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.6.1)
@@ -245,7 +243,6 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  jekyll-rtd-theme
 
 BUNDLED WITH
    2.1.4

data/docs/_config.yml

@@ -1,9 +1,9 @@
-remote_theme: rundocs/jekyll-rtd-theme
+remote_theme: rbuchberger/jekyll-rtd-theme@main
 
 title: Jekyll Picture Tag
 description: Images for Jekyll, done correctly.
 lang: en-US
 
 baseurl: '/jekyll_picture_tag'
-readme_index: 
+readme_index:
   with_frontmatter: true

data/docs/devs/contributing/testing.md

@@ -19,5 +19,3 @@ The primary way to run these checks is `rake`:
 * Depending on your environment, you may need to prefix all rake commands with `bundle exec`
 * Simplecov is set up -- you'll get a measurement of coverage in the test output and a nice report
   in the `coverage` directory.
-* The tests use the `/tmp/` directory directly, which I'm pretty sure means it won't work on
-  Windows. This is fixable, so if that gets in your way just ask.

data/docs/devs/releases.md

@@ -2,13 +2,15 @@
 ---
 # Release History
 
+* 2.1.3 10 June, 2025
+  * Decide whether to call `magick` or `convert` more intelligently. This adds Windows support, without breaking JPT on Ubuntu or other distros that only ship an ancient version of ImageMagick. Thanks to [@MUmarShahbaz](https://github.com/MUmarShahbaz) for [#324](https://github.com/rbuchberger/jekyll_picture_tag/pull/324)
 * 2.1.2 13 September, 2024
   * Remove overly specific version spec for ruby-vips - thanks to [@hschne](https://github.com/hschne) for [#313](https://github.com/rbuchberger/jekyll_picture_tag/pull/313)
 * 2.1.1 20 July, 2024
   * Don't provide Q setting for PPM images - thanks to @dichiban for [#309](https://github.com/rbuchberger/jekyll_picture_tag/pull/309)
   * Fix alpha premultiplication - thanks to @KaarlisCaune for [#302](https://github.com/rbuchberger/jekyll_picture_tag/pull/302)
 * 2.1.0 29 January, 2024
-  * Check whether the vips CLI is installed before trying to use it. Thanks to @philrb for 
+  * Check whether the vips CLI is installed before trying to use it. Thanks to @philrb for
     [#299](https://github.com/rbuchberger/jekyll_picture_tag/pull/299)
   * Update minimum required mocha version to maintain compatibility with minitest
 * 2.0.4 August 16, 2022
@@ -33,11 +35,11 @@
   * Require Ruby >= 2.6, support Ruby 3.0
   * Require Jekyll >= 4.0
   * Cropping is changing.
-      * We now use the libvips
+    * We now use the libvips
         [smartcrop function](https://www.rubydoc.info/gems/ruby-vips/Vips/Image#smartcrop-instance_method),
         which does some magic to keep the most useful part of the image.
-      * Geometry is renamed to 'crop', and reduced to simple aspect ratios only. (`width:height`)
-      * Gravity is gone, replaced by 'keep' which is translated to a libvips
+    * Geometry is renamed to 'crop', and reduced to simple aspect ratios only. (`width:height`)
+    * Gravity is gone, replaced by 'keep' which is translated to a libvips
         [interestingness](https://www.rubydoc.info/gems/ruby-vips/Vips/Interesting) setting.
   * Add stock presets and media queries, under the `jpt-` prefix.
   * Add `format_quality` default settings for webp, avif, and jp2.

data/docs/users/presets/image_formats.md

@@ -17,5 +17,5 @@ used**. `original` does what you'd expect. To supply webp, you must have an
 imagemagick webp delegate installed. (Most package managers just name it 'webp')
 
 _Supported formats are anything which imagemagick supports, and has an installed
-delegate. See a list by running `$ convert --version`_.
+delegate. See a list by running `$ magick --version`_.
 

data/docs/users/presets/subpresets.md

@@ -0,0 +1,97 @@
+---
+sort: 15
+---
+
+# Aliases & Subpresets
+
+If you're making more than one preset, you probably have things you'd prefer to not copy to every preset. Maybe some finely tuned quality settings, or different variations and crops. Thankfully, YAML has an anchor & alias feature to help with this.
+
+Anchors are defined with a `&` and a name, placed after a key, but before the value. For the sake of example, we've defined a quality for JPEG, and given it the anchor "high_quality".
+
+```yml
+  default: 
+    format_quality:
+      jpg: &high_quality 90
+```
+
+With our anchor added, we can refer back to it with an alias. These are in the same format, but we use a `*` instead. (and we don't place a value, since we're making the alias our value!)
+
+```yml
+  logo: 
+    format_quality:
+      jpg: *high_quality
+```
+
+Now any time we change our default quality, the quality in the logo preset will be updated too!
+
+
+## Subpresets
+
+Where this feature really gets powerful, is the ability to base a preset entirely off another.
+
+In the block below, we've created a base preset, which we'll build every other one upon. We can override any of the values later on, if we want to.
+
+```yml
+  base: &base
+    formats: [webp, original]
+    format_quality:
+      webp: 90
+    attributes:
+      img: 'loading="lazy"'
+```
+
+Now we can use the special merge key, `<<`, which will copy all values from an aliased map into the new one.
+
+```yml
+  default:
+    <<: *base
+    widths: [500, 600, 700, 800, 900, 1000, 1200, 1600]
+    link_source: true
+
+  project_showcase:
+    <<: *base
+    widths: [700, 864, 900, 1296, 1600, 1728]
+```
+
+Since both of these new presets merge our base preset, the final result will be parsed like this:
+
+```yml
+  default:
+    formats: [webp, original]
+    format_quality:
+      webp: 90
+    attributes:
+      img: 'loading="lazy"'
+    widths: [500, 600, 700, 800, 900, 1000, 1200, 1600]
+    link_source: true
+
+  project_showcase:
+    formats: [webp, original]
+    format_quality:
+      webp: 90
+    attributes:
+      img: 'loading="lazy"'
+    widths: [700, 864, 900, 1296, 1600, 1728]
+```
+
+Note however, this is **not a deep merge**, only a shallow merge. What that means is, any values nested in the preset will be overwritten by the presence of a key. If we bring back our previous example, but add an attribute to it:
+
+```yml
+  project_showcase:
+    <<: *base
+    widths: [700, 864, 900, 1296, 1600, 1728]
+    attributes:
+      picture: 'class="showcase"'
+```
+
+You'll notice that, although we didn't change the `img` attributes, the parsed result will be **missing the attributes from the parent preset**, like this:
+
+```yml
+  project_showcase:
+    formats: [webp, original]
+    format_quality:
+      webp: 90
+    attributes:
+      picture: 'class="showcase"'
+    widths: [700, 864, 900, 1296, 1600, 1728]
+```

data/jekyll_picture_tag.gemspec

@@ -57,5 +57,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-performance', '~> 1.9.0'
   spec.add_development_dependency 'rubocop-rake', '~> 0.5.0'
   spec.add_development_dependency 'simplecov', '~> 0.20.0'
-  spec.add_development_dependency 'solargraph'
 end

data/lib/jekyll_picture_tag/parsers/image_backend.rb

@@ -28,7 +28,13 @@ module PictureTag
 
       # Returns an array of formats that imagemagick can handle.
       def magick_formats
-        if command?('convert')
+        if command?('magick')
+          @magick_formats ||= `magick -version`
+                              .scan(/Delegates.*/)
+                              .first
+                              .delete_prefix('Delegates (built-in):')
+                              .split
+        elsif command?('convert')
           @magick_formats ||= `convert -version`
                               .scan(/Delegates.*/)
                               .first
@@ -56,7 +62,7 @@ module PictureTag
                else
                  'Libvips is not installed.'
                end
-        str << if command?('convert')
+        str << if command?('magick') || command?('convert')
                  "Imagemagick (installed) supports: \"#{magick_formats.join(', ')}\"."
                else
                  'Imagemagick is not installed.'
@@ -69,7 +75,12 @@ module PictureTag
       end
 
       def command?(command)
-        system("which #{command} > /dev/null 2>&1")
+        is_windows = RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+        if is_windows
+          system("where #{command} > NUL 2>&1")
+        else
+          system("which #{command} > /dev/null 2>&1")
+        end
       end
     end
   end

data/lib/jekyll_picture_tag/version.rb

@@ -1,3 +1,3 @@
 module PictureTag
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.1.3'.freeze
 end

data/package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "jekyll_picture_tag",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

data/readme.md

@@ -44,8 +44,10 @@ Tag is your responsive images minion - give it simple instructions and it'll han
 
 <https://rbuchberger.github.io/jekyll_picture_tag/devs/releases>
 
-Recent releases:
+2.0 and later releases:
 
+* 2.1.3 10 June, 2025
+  * Decide whether to call `magick` or `convert` more intelligently. This adds Windows support, without breaking JPT on Ubuntu or other distros that only ship an ancient version of ImageMagick. Thanks to [@MUmarShahbaz](https://github.com/MUmarShahbaz) for [#324](https://github.com/rbuchberger/jekyll_picture_tag/pull/324)
 * 2.1.2 13 September, 2024
   * Remove overly specific version spec for ruby-vips - thanks to [@hschne](https://github.com/hschne) for [#313](https://github.com/rbuchberger/jekyll_picture_tag/pull/313)
 * 2.1.1 20 July, 2024

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_picture_tag
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Robert Wierzbowski
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -264,20 +264,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.20.0
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |2
       Jekyll Picture Tag adds responsive images to your Jekyll static site. It
       automatically creates resized source images, is fully configurable, and
@@ -356,6 +342,7 @@ files:
 - docs/users/presets/nomarkdown_override.md
 - docs/users/presets/pixel_ratio_srcsets.md
 - docs/users/presets/quality_width_graph.png
+- docs/users/presets/subpresets.md
 - docs/users/presets/width_height_attributes.md
 - docs/users/presets/width_srcsets.md
 - docs/users/presets/writing_presets.md
@@ -404,6 +391,7 @@ files:
 - lib/jekyll_picture_tag/srcsets/width.rb
 - lib/jekyll_picture_tag/utils.rb
 - lib/jekyll_picture_tag/version.rb
+- package-lock.json
 - readme.md
 homepage: https://github.com/rbuchberger/jekyll_picture_tag
 licenses:
@@ -429,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - libvips
-rubygems_version: 3.3.20
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Easy responsive images for Jekyll.