jekyll_picture_tag 1.10.1 → 1.14.0

data/lib/jekyll_picture_tag/output_formats/basic.rb

@@ -6,6 +6,10 @@ module PictureTag
     class Basic
       include ObjectiveElements
 
+      def to_s
+        wrap(base_markup).to_s
+      end
+
       # Used for both the fallback image, and for the complete markup.
       def build_base_img
         img = SingleTag.new 'img'
@@ -23,10 +27,6 @@ module PictureTag
         img
       end
 
-      def to_s
-        wrap(base_markup).to_s
-      end
-
       private
 
       # Handles various wrappers around basic markup
@@ -73,24 +73,26 @@ module PictureTag
       def build_fallback_image
         return fallback_candidate if fallback_candidate.exists?
 
-        build_new_fallback_image
-      end
-
-      def fallback_candidate
-        @fallback_candidate ||= GeneratedImage.new(
+        image = GeneratedImage.new(
           source_file: PictureTag.source_images.first,
           format: PictureTag.fallback_format,
-          width: PictureTag.fallback_width,
+          width: checked_fallback_width,
           crop: PictureTag.crop,
           gravity: PictureTag.gravity
         )
+
+        image.generate
+
+        image
       end
 
-      def build_new_fallback_image
-        GeneratedImage.new(
+      # It's only a candidate, because we don't know if the fallback width
+      # setting is larger than the source file.
+      def fallback_candidate
+        @fallback_candidate ||= GeneratedImage.new(
           source_file: PictureTag.source_images.first,
           format: PictureTag.fallback_format,
-          width: checked_fallback_width,
+          width: PictureTag.fallback_width,
           crop: PictureTag.crop,
           gravity: PictureTag.gravity
         )
@@ -119,7 +121,7 @@ module PictureTag
 
       def source_width
         if PictureTag.crop
-          fallback_candidate.cropped_source_width
+          fallback_candidate.source_width
         else
           source.width
         end

data/lib/jekyll_picture_tag/output_formats/img.rb

@@ -3,6 +3,8 @@ module PictureTag
     # Represents a bare <img> tag with a srcset attribute.
     # Used when <picture> is unnecessary.
     class Img < Basic
+      private
+
       def srcset
         @srcset ||= build_srcset(
           PictureTag.source_images.first, PictureTag.formats.first
@@ -17,8 +19,17 @@ module PictureTag
 
         img.attributes << PictureTag.html_attributes['parent']
 
+        add_dimensions(img, srcset)
+
         img
       end
+
+      def add_dimensions(img, srcset)
+        return unless PictureTag.preset['dimension_attributes']
+
+        img.width = srcset.width_attribute
+        img.height = srcset.height_attribute
+      end
     end
   end
 end

data/lib/jekyll_picture_tag/output_formats/picture.rb

@@ -3,7 +3,13 @@ module PictureTag
     # Represents a <picture> tag, enclosing at least 2 <source> tags and an
     # <img> tag.
     class Picture < Basic
+      private
+
       def srcsets
+        @srcsets ||= build_srcsets
+      end
+
+      def build_srcsets
         formats = PictureTag.formats
         # Source images are provided in reverse order and must be flipped:
         images = PictureTag.source_images.reverse
@@ -37,6 +43,22 @@ module PictureTag
         source
       end
 
+      def build_base_img
+        img = super
+
+        # Only add source dimensions if there is a single source image.
+        # Currently you can't use both art direction and intrinsic image sizes.
+        if PictureTag.preset['dimension_attributes'] &&
+           PictureTag.source_images.length == 1
+          img.attributes << {
+            width: srcsets.first.width_attribute,
+            height: srcsets.first.height_attribute
+          }
+        end
+
+        img
+      end
+
       def base_markup
         picture = DoubleTag.new(
           'picture',

data/lib/jekyll_picture_tag/router.rb

@@ -9,6 +9,7 @@ module PictureTag
   # gets big, I'll refactor.
   module Router
     attr_accessor :instructions, :context
+
     # Context forwarding
 
     # Global site data
@@ -107,8 +108,8 @@ module PictureTag
       preset.nomarkdown?
     end
 
-    def quality(format)
-      preset.quality(format)
+    def quality(format, width)
+      preset.quality(format, width)
     end
   end
 end

data/lib/jekyll_picture_tag/srcsets/basic.rb

@@ -23,6 +23,7 @@ module PictureTag
         @format ||= files.first.format
       end
 
+      # GeneratedImage class
       def files
         @files ||= build_files
       end
@@ -51,6 +52,14 @@ module PictureTag
         "(#{PictureTag.media_presets[@media]})"
       end
 
+      def width_attribute
+        files.first.source_width.to_s
+      end
+
+      def height_attribute
+        files.first.source_height.to_s
+      end
+
       private
 
       def build_files
@@ -78,7 +87,7 @@ module PictureTag
 
       def source_width
         @source_width ||= if PictureTag.crop(@media)
-                            target_files.first.cropped_source_width
+                            target_files.first.source_width
                           else
                             @source_image.width
                           end

data/lib/jekyll_picture_tag/utils.rb

@@ -63,6 +63,20 @@ module PictureTag
       def titleize(input)
         input.split('_').map(&:capitalize).join
       end
+
+      # Linear interpolator. Pass it 2 values in the x array, 2 values
+      # in the y array, and an x value, returns a y value.
+      def interpolate(xvals, yvals, xval)
+        xvals.map!(&:to_f)
+        yvals.map!(&:to_f)
+
+        # Slope
+        m = (yvals.last - yvals.first) / (xvals.last - xvals.first)
+        # Value of y when x=0
+        b = yvals.first - (m * xvals.first)
+        # y = mx + b
+        (m * xval) + b
+      end
     end
   end
 end

data/lib/jekyll_picture_tag/version.rb

@@ -1,3 +1,3 @@
 module PictureTag
-  VERSION = '1.10.1'.freeze
+  VERSION = '1.14.0'.freeze
 end

data/readme.md

@@ -1,5 +1,7 @@
 # Jekyll Picture Tag
 
+![Tests & Formatting](https://github.com/rbuchberger/jekyll_picture_tag/workflows/Tests%20&%20Formatting/badge.svg)
+
 **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
@@ -24,7 +26,7 @@ different image entirely.
 
 **Developer Sanity:** If you want to serve multiple images in multiple formats and resolutions, you
 have a litany of markup to write and a big pile of images to generate and organize. Jekyll Picture
-Tag is your responsive images minion - give it simple instructions and it'll handle the rest. 
+Tag is your responsive images minion - give it simple instructions and it'll handle the rest.
 
 ## Features
 
@@ -39,21 +41,22 @@ https://rbuchberger.github.io/jekyll_picture_tag/
 
 ## Changelog:
 
-https://rbuchberger.github.io/jekyll_picture_tag/releases
+https://rbuchberger.github.io/jekyll_picture_tag/devs/releases
 
-Latest versions: 
+Recent releases:
 
-* 1.10.0 May 11, 2020
-  * **Image Cropping support!** access the power of ImageMagick's `crop` function.
-  * Don't issue a warning when `default` preset is not found.
-  * Documentation improvements
-* 1.10.1 July 2, 2020
-  * Bugfix for erroneously regenerated images
+* 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
 and all feedback is greatly appreciated, especially in regards to documentation. What are your pain
 points? See the [contributing
-guidelines](https://rbuchberger.github.io/jekyll_picture_tag/contributing), or the
+guidelines](https://rbuchberger.github.io/jekyll_picture_tag/devs/contributing), or the
 [issues](https://github.com/rbuchberger/jekyll_picture_tag/issues) page for more.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_picture_tag
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Robert Wierzbowski
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,6 +40,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.11'
+- !ruby/object:Gem::Dependency
+  name: minitest-rg
+  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'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -100,114 +114,142 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
+        version: 0.5.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: base32
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.20.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: objective_elements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -234,39 +276,90 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
+- ".github/workflows/code-checks.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".solargraph.yml"
-- ".travis.yml"
 - Dockerfile
 - Gemfile
 - LICENSE.txt
 - Rakefile
+- docs/.envrc
 - docs/Gemfile
 - docs/Gemfile.lock
 - docs/_config.yml
-- docs/_layouts/directory.html
-- docs/assets/style.css
-- docs/contributing.md
-- docs/example_presets.md
-- docs/global_configuration.md
+- docs/devs/contributing/code.md
+- docs/devs/contributing/docs.md
+- docs/devs/contributing/index.md
+- docs/devs/contributing/setup.md
+- docs/devs/contributing/testing.md
+- docs/devs/index.md
+- docs/devs/releases.md
 - docs/index.md
-- docs/installation.md
-- docs/migration.md
-- docs/notes.md
-- docs/output.md
-- docs/presets.md
-- docs/releases.md
-- docs/usage.md
+- docs/users/configuration/directories.md
+- docs/users/configuration/disable.md
+- docs/users/configuration/fast_build.md
+- docs/users/configuration/ignore_missing.md
+- docs/users/configuration/index.md
+- docs/users/configuration/kramdown_fix.md
+- docs/users/configuration/suppress_warnings.md
+- docs/users/configuration/urls.md
+- docs/users/index.md
+- docs/users/installation.md
+- docs/users/liquid_tag/argument_reference/alternate_images.md
+- docs/users/liquid_tag/argument_reference/attributes.md
+- docs/users/liquid_tag/argument_reference/base_image.md
+- docs/users/liquid_tag/argument_reference/crop.md
+- docs/users/liquid_tag/argument_reference/link.md
+- docs/users/liquid_tag/argument_reference/preset.md
+- docs/users/liquid_tag/argument_reference/readme.md
+- docs/users/liquid_tag/examples.md
+- docs/users/liquid_tag/index.md
+- docs/users/notes/git_lfs.md
+- docs/users/notes/github_pages.md
+- docs/users/notes/html_attributes.md
+- docs/users/notes/index.md
+- docs/users/notes/input_checking.md
+- docs/users/notes/kramdown_bug.md
+- docs/users/notes/managing_images.md
+- docs/users/notes/migration.md
+- docs/users/presets/cropping.md
+- docs/users/presets/default.md
+- docs/users/presets/examples.md
+- docs/users/presets/fallback_image.md
+- docs/users/presets/html_attributes.md
+- docs/users/presets/image_formats.md
+- docs/users/presets/image_quality.md
+- docs/users/presets/index.md
+- docs/users/presets/link_source.md
+- docs/users/presets/markup_formats/fragments.md
+- docs/users/presets/markup_formats/javascript_friendly.md
+- docs/users/presets/markup_formats/readme.md
+- docs/users/presets/markup_formats/standard_html.md
+- docs/users/presets/media_queries.md
+- docs/users/presets/nomarkdown_override.md
+- docs/users/presets/pixel_ratio_srcsets.md
+- docs/users/presets/quality_width_graph.png
+- docs/users/presets/strip_metadata.md
+- docs/users/presets/width_height_attributes.md
+- docs/users/presets/width_srcsets.md
+- install_imagemagick.sh
 - jekyll-picture-tag.gemspec
 - jekyll_picture_tag.gemspec
 - lib/jekyll-picture-tag.rb
 - lib/jekyll_picture_tag.rb
+- lib/jekyll_picture_tag/cache.rb
+- lib/jekyll_picture_tag/cache/base.rb
+- lib/jekyll_picture_tag/cache/generated.rb
+- lib/jekyll_picture_tag/cache/source.rb
 - lib/jekyll_picture_tag/defaults/global.yml
 - lib/jekyll_picture_tag/defaults/presets.yml
-- lib/jekyll_picture_tag/generated_image.rb
-- lib/jekyll_picture_tag/img_uri.rb
+- lib/jekyll_picture_tag/images.rb
+- lib/jekyll_picture_tag/images/generated_image.rb
+- lib/jekyll_picture_tag/images/img_uri.rb
+- lib/jekyll_picture_tag/images/source_image.rb
 - lib/jekyll_picture_tag/instructions.rb
 - lib/jekyll_picture_tag/instructions/arg_splitter.rb
 - lib/jekyll_picture_tag/instructions/configuration.rb
@@ -287,7 +380,6 @@ files:
 - lib/jekyll_picture_tag/output_formats/picture.rb
 - lib/jekyll_picture_tag/output_formats/readme.md
 - lib/jekyll_picture_tag/router.rb
-- lib/jekyll_picture_tag/source_image.rb
 - lib/jekyll_picture_tag/srcsets.rb
 - lib/jekyll_picture_tag/srcsets/basic.rb
 - lib/jekyll_picture_tag/srcsets/pixel_ratio.rb
@@ -317,7 +409,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project:
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: Easy responsive images for Jekyll.