jekyll_picture_tag 1.10.0 → 1.13.0

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.0'.freeze
+  VERSION = '1.13.0'.freeze
 end

data/readme.md

@@ -39,19 +39,21 @@ 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 version: 
+Latest versions: 
 
-* 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.13.0 November 23, 2020
+  * Add image quality interpolation; allows for variable image quality based on image size.
+  * Bugfix: Perform format, resize, and quality changes simultaneously rather than individually.
+    * Allows for actual lossless webp: simply set quality to 100.
+    * Improves fresh (no cached images) build times by ~15%
+    * Fix problems with poor image quality.
 
 ## 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,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_picture_tag
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Robert Wierzbowski
 - Brendan Tobolaski
 - Robert Buchberger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,16 +100,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -152,62 +152,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: base32
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !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
@@ -246,27 +232,75 @@ files:
 - 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/cdn.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/relative_urls.md
+- docs/users/configuration/suppress_warnings.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/width_height_attributes.md
+- docs/users/presets/width_srcsets.md
 - 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 +321,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
@@ -299,7 +332,7 @@ homepage: https://github.com/rbuchberger/jekyll_picture_tag
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -317,8 +350,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Easy responsive images for Jekyll.
 test_files: []

data/docs/_layouts/directory.html

@@ -1,32 +0,0 @@
----
-layout: default
----
-
-<link href="{{ site.baseurl }}/assets/style.css" rel="stylesheet" type="text/css">
-
-<ul class="directory">
-  <li><a href="{{ site.baseurl }}/">Quick Start</a></li>
-  <li><a href="{{ site.baseurl }}/installation">Installation</a></li>
-  <li><a href="{{ site.baseurl }}/usage">Usage</a></li>
-  <li><a href="{{ site.baseurl }}/global_configuration">Global Settings</a></li>
-  <li><a href="{{ site.baseurl }}/presets">Writing Presets</a></li>
-  <li><a href="{{ site.baseurl }}/example_presets">Example Presets</a></li>
-  <li><a href="{{ site.baseurl }}/output">Output Formats</a></li>
-  <li><a href="{{ site.baseurl }}/notes">Notes and FAQ</a></li>
-  <li><a href="{{ site.baseurl }}/contributing">Contributing</a></li>
-  <li><a href="{{ site.baseurl }}/releases">Release History</a></li>
-</ul>
-
-<hr />
-
-{{ content }}
-
-<script>
-  const navItems = Array.from(document.querySelectorAll('ul.directory li'))
-  const currentPath = window.location.toString()
-  const activeItem = navItems.find(function(item) {
-    return item.firstChild.href == currentPath
-  })
-
-  activeItem.classList.add('active')
-</script>

data/docs/assets/style.css

@@ -1,31 +0,0 @@
-  @media (max-width: 600px) {
-    ul.directory {
-      flex-direction: column;
-      align-items: center;
-    }
-  }
-
-  ul.directory {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    list-style: none;
-    padding-left: 0;
-    flex-grow: 0;
-  }  
-
-  ul.directory li {
-    margin: .3em;
-  }
-
-  ul.directory a {
-    line-height: 2;
-    padding: 8px 20px;
-  }
-
-  li.active a {
-    border-radius: 3px;
-    background-color: #007edf;
-    color: #fff;
-    box-shadow: 2px 2px 3px #999;
-  }

data/docs/contributing.md

@@ -1,109 +0,0 @@
----
----
-# Contributing
-
-Bug reports, feature requests, and feedback are very welcome, either through github issues or via
-email: robert@buchberger.cc 
-
-Pull requests are encouraged! I'm happy to answer questions and provide assistance along the way.
-Don't let any of the recommendations/requests in this guide stop you from submitting one.
-
-## Setup
-
-It's pretty standard:
-
-```
-$ git clone git@github.com:rbuchberger/jekyll_picture_tag.git
-$ cd jekyll_picture_tag
-$ bundle install
-```
-
-## Testing
-
-You probably only need to use docker if it's inconvenient to install ImageMagick 7.
-
-### Bare Metal
-
-`rake test` runs the test suite (both unit tests and integration tests). Ignore the mini_magick
-`method redefined` warnings (unless you know how to fix them?) 
-
-`rake unit` runs just the unit tests, while `rake integration` runs the integration tests. The unit
-test coverage isn't stellar, but both unit and integration tests together hit 100%.
-
-Speaking of coverage, simplecov is set up -- you'll get a measurement of coverage in the test output
-and a nice report in the `coverage` directory. I'd like to move to mutation based coverage testing,
-but that's a project for another day.
-
-The tests do output a few images to the `/tmp/` directory, which I'm pretty sure means it won't work
-on Windows. This is fixable if there is a need, so if that gets in your way just ask.
-
-`rake rubocop` checks code formatting, `rake rubocop:auto_correct` will try to fix any rubocop
-issues, if possible.
-
-`rake` will run all tests and rubocop.
-
-### Docker
-
-The following commands will build and run the tests inside a docker image. This is useful if it's
-inconvenient to install ImageMagick 7, or to ensure the Travis CI build will succeed:
-
-```
-$ docker build . -t jpt
-$ docker run -t jpt
-```
-
-## Docs
-
-I think one of the biggest opportunities for improvement in this plugin is its documentation. I'd
- really love help here, and all you need to know is markdown.
-
-It runs on github pages, which is based on jekyll. You can preview as you edit:
-
-0. Follow setup instructions above
-1. `$ cd docs`
-2. `$ bundle install`
-3. `$ bundle exec jekyll serve`
-4. In a web browser, navigate to `localhost:4000/jekyll_picture_tag/`
-
-## Code Guidelines
-
-* Generally, go for straightforward and readable rather than terse and clever. I'm not actually a
-  very good programmer; I need simple code that's easy to understand.
-
-* Refactoring is welcome, especially in the name of the previous point.
-
-* I'm very reluctant to introduce breaking changes to configuration settings. This rule isn't
-  absolute, but I'm not going to do it without a good reason.
-
-* I've been using 80 characters for code and 100 characters for documentation.
-
-* Don't disable cops without strong justification.
-
-* I generally try to write tests before writing code, especially when fixing bugs. This
-  gives us some confidence that what we think we're testing and what we're actually testing aren't
-  too different.
-
-## Hard rules
-
-These aren't the rules for submitting a pull request, these are the rules for merging into master.
-I'm thrilled to receive any help at all, and I'm more than happy to help with meeting these
-criteria:
-
-* Liquid tag syntax can only be extended; no breaking changes. I'm not willing to force
-  users to dig through their entire site and change every picture tag in order to update to the
-  latest version.
-
-* Maintain "no configuration required" - a new user must be able to add JPT to their gemfile, bundle
-  install, and start writing picture tags in their site without touching a yml file.
-
-* 100% test coverage (Meaning that when running the unit and integration tests together, every line
-  of code in the `lib` folder must run at least once.)
-
-* No failing tests
-
-* No rubocop warnings
-
-### Thanks!
-
-As I said, don't let any of the rules & guidelines scare you away. They're the rules for merging
-into master, not submitting a pull request. I'm thrilled to receive any help at all.