jekyll_picture_tag 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53c3ec9a79c58aae1d5dbead4e7d3071a4a28c69589f98ff93e87d0fc6aa64f3
-  data.tar.gz: 8ebe081b0754f009df43de9beb4917dd911ef223393bcea29d029f8a1b546e09
+  metadata.gz: 112ac65fbe4fb0b25934864d20de4e840259aa7bac0b43c8d6724d3d0c1ded7d
+  data.tar.gz: 8d6d101b1849762e3e955c80b301049a3cab5d7bea6f9ad8469521fb8e7fe60c
 SHA512:
-  metadata.gz: 3ad2303c3383cbb9e63bcf4e07560a717f4bbf317f714e005a7feabe72eb53a17981f6e1874c974686d1dd0a83ca90ad851b62890b33f8748051dbb8412dd267
-  data.tar.gz: b2beab9bd484db516d7d70bf4a2aec8bdf7b0192acfa92dd6c98afe283988831a2064ecb5c85462d0f54104b8ca9fd914a66ab5ff94067c9ba98ab385fd869a3
+  metadata.gz: 86c1e2e9f9e8f62fbbc1ae69975ac490f40358649725b6308c9b964ce29571bbdaef22c6f3a0036e8c3d6352bd799d3b05db080914b143283ba97d61282632d6
+  data.tar.gz: 17cf9d9e1d397651148191fd2c3d9cde68f2af59c17edabb18b9fb27ebba9ea534a42936f601bb999944d2ff884e09788e6301494896a2ceeae0c2d1b9c23aae

data/.rubocop.yml

@@ -24,7 +24,7 @@ AllCops:
     - '**/vendor/**/*'
 
 Layout/LineLength:
-  Max: 80
+  Max: 120
 
 # Disabled Cops
 Style/FrozenStringLiteralComment:
@@ -32,3 +32,6 @@ Style/FrozenStringLiteralComment:
 
 Style/StringConcatenation:
   Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false

data/docs/devs/releases.md

@@ -2,6 +2,12 @@
 ---
 # Release History
 
+* 2.1.0 29 January, 2024
+  * 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
+  * Fix backend format support detection for new versions of libvips & imagemagick
 * 2.0.3 April 1, 2021
   * Improve backend format support detection
 * 2.0.2 March 31, 2021

data/docs/users/notes/html_attributes.md

@@ -1,5 +1,5 @@
 # HTML attributes
 
   Jekyll Picture Tag has comprehensive attribute support for all generated HTML. You can add
-  attributes both through the [liquid tag]({{ site.baseurl }}/usage), and the [preset]({{
-  site.baseurl }}/presets) (scroll down a bit).
+  attributes both through the [liquid tag]({{ site.baseurl }}{% link /users/liquid_tag/index.md %}),
+  and the [preset]({{ site.baseurl }}{% link /usage/users/presets/html_attributes.md %}) (scroll down a bit).

data/docs/users/presets/markup_formats/fragments.md

@@ -13,7 +13,7 @@ to make things outside the scope of JPT.
   ```yml
   # _data/picture.yml
 
-  markup_presets:
+  presets:
     direct:
       markup: direct_url
       fallback_width: 800
@@ -31,7 +31,7 @@ to make things outside the scope of JPT.
   ```yml
   # _data/picture.yml
 
-  markup_presets:
+  presets:
     only_srcset:
       markup: naked_srcset
       widths: [800, 1200, 1600]

data/docs/users/presets/markup_formats/readme.md

@@ -17,7 +17,7 @@ Example:
 ```yml
 # /_data/picture.yml
 
-markup_presets:
+presets:
   my_preset:
     markup: data_auto
 ```

data/jekyll_picture_tag.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.14'
   spec.add_development_dependency 'minitest-rg'
-  spec.add_development_dependency 'mocha', '~> 1.9'
+  spec.add_development_dependency 'mocha', '~> 2.1'
   spec.add_development_dependency 'nokogiri', '~> 1.1'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 12.3'

data/lib/jekyll_picture_tag/parsers/image_backend.rb

@@ -14,21 +14,29 @@ module PictureTag
 
       # Returns array of formats that vips can save to
       def vips_formats
-        @vips_formats ||= `vips -l`
-                          .split('/n')
-                          .select { |line| line.include? 'ForeignSave' }
-                          .flat_map { |line| line.scan(/\.[a-z]{1,5}/) }
-                          .map { |format| format.strip.delete_prefix('.') }
-                          .uniq
+        if command?('vips')
+          @vips_formats ||= `vips -l`
+                            .split('/n')
+                            .select { |line| line.include? 'ForeignSave' }
+                            .flat_map { |line| line.scan(/\.[a-z]{1,5}/) }
+                            .map { |format| format.strip.delete_prefix('.') }
+                            .uniq
+        else
+          @vips_formats = []
+        end
       end
 
       # Returns an array of formats that imagemagick can handle.
       def magick_formats
-        @magick_formats ||= `convert -version`
-                            .scan(/Delegates.*/)
-                            .first
-                            .delete_prefix('Delegates (built-in):')
-                            .split
+        if command?('convert')
+          @magick_formats ||= `convert -version`
+                              .scan(/Delegates.*/)
+                              .first
+                              .delete_prefix('Delegates (built-in):')
+                              .split
+        else
+          @magick_formats = []
+        end
       end
 
       # Returns an array of all known names of a format, for the purposes of
@@ -41,16 +49,28 @@ module PictureTag
       private
 
       def error_string(format)
-        <<~HEREDOC
-          No support for generating #{format} files in this environment!
-          Libvips known savers: #{vips_formats.join(', ')}
-          Imagemagick known savers:  #{magick_formats.join(', ')}
-        HEREDOC
+        str = []
+        str << "No support for generating \"#{format}\" files in this environment!"
+        str << if command?('vips')
+                 "Libvips (installed) supports: \"#{vips_formats.join(', ')}\"."
+               else
+                 'Libvips is not installed.'
+               end
+        str << if command?('convert')
+                 "Imagemagick (installed) supports: \"#{magick_formats.join(', ')}\"."
+               else
+                 'Imagemagick is not installed.'
+               end
+        str.join(' ')
       end
 
       def alternates
         [%w[jpg jpeg], %w[avif heic heif]]
       end
+
+      def command?(command)
+        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.0.4'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/readme.md

@@ -18,10 +18,9 @@ If you're interested, contact me: robert@buchberger.cc
 **Responsive Images done correctly.**
 
 It's simple to throw a photo on a page and call it a day, but doing justice to users on all
-different browsers and devices is tedious and tricky. Tedious, tricky things should be automated. 
+different browsers and devices is tedious and tricky. Tedious, tricky things should be automated.
 [This blog post further elaborates on that theme.](https://robert-buchberger.com/blog/2021/responsive_images.html)
 
-
 Jekyll Picture Tag automatically builds cropped, resized, and reformatted images, builds several
 kinds of markup, offers extensive configuration while requiring none, and solves both the art
 direction and resolution switching problems with a little YAML configuration and a simple template
@@ -50,16 +49,22 @@ Tag is your responsive images minion - give it simple instructions and it'll han
 * Configure it easily, or not at all.
 * Make Lighthouse happy.
 
-## Documentation:
+## Documentation
 
-https://rbuchberger.github.io/jekyll_picture_tag/
+<https://rbuchberger.github.io/jekyll_picture_tag/>
 
-## Changelog:
+## Changelog
 
-https://rbuchberger.github.io/jekyll_picture_tag/devs/releases
+<https://rbuchberger.github.io/jekyll_picture_tag/devs/releases>
 
 Recent releases:
 
+* 2.1.0 29 January, 2024
+  * 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
+  * Fix backend format support detection for new versions of libvips & imagemagick
 * 2.0.3 April 1, 2021
   * Improve backend format support detection
 * 2.0.2 March 31, 2021
@@ -80,11 +85,11 @@ Recent releases:
   * 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.
@@ -96,14 +101,6 @@ Recent releases:
     officially and only `presets` and `media_queries`.
   * Improve docs with an introductory tutorial and 'how-to' flow.
 
-* 1.14.0 January 10, 2021
-  * Gracefully handle empty tag arguments.
-  * Re-add metadata stripping. I removed it inadvertently when refactoring; now
-    there's a test and a setting to turn it off.
-  * Respect Jekyll's `--disable-disk-cache` argument.
-  * Add baseurl configuration, allowing increased plugin support (such as I18n via `jekyll-multiple-languages-plugin`)
-  * Tooling & test suite maintenance and improvements.
-
 ## Help Wanted
 
 Writing code is only part of the job; often the harder part is knowing what needs to be changed. Any

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_picture_tag
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Robert Wierzbowski
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -144,14 +144,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement