jekyll_picture_tag 1.14.0 → 2.0.0pre1

data/lib/jekyll_picture_tag/srcsets/basic.rb

@@ -53,11 +53,11 @@ module PictureTag
       end
 
       def width_attribute
-        files.first.source_width.to_s
+        source_image.width.to_s
       end
 
       def height_attribute
-        files.first.source_height.to_s
+        source_image.height.to_s
       end
 
       private
@@ -86,11 +86,7 @@ module PictureTag
       end
 
       def source_width
-        @source_width ||= if PictureTag.crop(@media)
-                            target_files.first.source_width
-                          else
-                            @source_image.width
-                          end
+        source_image.width
       end
 
       def target_files
@@ -112,9 +108,7 @@ module PictureTag
         GeneratedImage.new(
           source_file: @source_image,
           width: width,
-          format: @input_format,
-          crop: PictureTag.crop(@media),
-          gravity: PictureTag.gravity(@media)
+          format: @input_format
         )
       end
     end

data/lib/jekyll_picture_tag/utils.rb

@@ -2,28 +2,10 @@ module PictureTag
   # This is a little module to hold logic that doesn't fit other places. If it
   # starts getting big, refactor.
   module Utils
-    # These are valid ImageMagick gravity arguments (relevant to our use
-    # case):
-    GRAVITIES =
-      %w[center
-         north
-         northeast
-         east
-         southeast
-         south
-         southwest
-         west
-         northwest].freeze
-
-    # This is an attempt to recognize valid imagemagick geometry arguments
-    # with regex. It only tries to match values which don't preserve aspect
-    # ratio, as they're the ones people might actually need here.
-    GEOMETRY_REGEX = /\A\d*%?[x:]?\d*[%!]?([+-]\d+){,2}\Z/i.freeze
-
     class << self
       # Configure Jekyll to keep our generated files
       def keep_files
-        dest_dir = PictureTag.config['picture']['output']
+        dest_dir = PictureTag.pconfig['output']
 
         # Chop a slash off the end, if it's there. Doesn't work otherwise.
         dest_dir = dest_dir[0..-2] if dest_dir =~ %r{/\z}
@@ -35,7 +17,7 @@ module PictureTag
 
       # Print a warning to the console
       def warning(message)
-        return if PictureTag.config['picture']['suppress_warnings']
+        return if PictureTag.pconfig['suppress_warnings']
 
         warn 'Jekyll Picture Tag Warning: '.yellow + message
       end
@@ -64,6 +46,10 @@ module PictureTag
         input.split('_').map(&:capitalize).join
       end
 
+      def snakeize(input)
+        input.scan(/[A-Z][a-z]+/).map(&:downcase).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)
@@ -77,6 +63,10 @@ module PictureTag
         # y = mx + b
         (m * xval) + b
       end
+
+      def aspect_float(width, height)
+        width.to_f / height
+      end
     end
   end
 end

data/lib/jekyll_picture_tag/version.rb

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

data/readme.md

@@ -1,3 +1,5 @@
+![Logo](docs/logo.svg)
+
 # Jekyll Picture Tag
 
 ![Tests & Formatting](https://github.com/rbuchberger/jekyll_picture_tag/workflows/Tests%20&%20Formatting/badge.svg)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_picture_tag
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 2.0.0pre1
 platform: ruby
 authors:
 - Robert Wierzbowski
@@ -10,8 +10,92 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
+- !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: '2.6'
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: objective_elements
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-vips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.17
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -32,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +158,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -194,82 +278,11 @@ dependencies:
     - - ">="
       - !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: '2.6'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: objective_elements
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: jekyll
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 description: |2
-      Jekyll Picture Tag is a liquid tag that adds responsive images to your
-      Jekyll static site.Jekyll Picture Tag automatically creates resized source
-      images, is fully configurable, and covers all use cases — including art
-      direction and resolution switching — with a little YAML configuration and a
-      simple template tag.
+      Jekyll Picture Tag adds responsive images to your Jekyll static site. It
+      automatically creates resized source images, is fully configurable, and
+      covers all use cases, including art direction and resolution switching, with
+      a little YAML configuration and a simple template tag.
 email:
 - robert@buchberger.cc
 executables: []
@@ -282,7 +295,6 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".solargraph.yml"
-- Dockerfile
 - Gemfile
 - LICENSE.txt
 - Rakefile
@@ -298,6 +310,8 @@ files:
 - docs/devs/index.md
 - docs/devs/releases.md
 - docs/index.md
+- docs/logo.png
+- docs/logo.svg
 - docs/users/configuration/directories.md
 - docs/users/configuration/disable.md
 - docs/users/configuration/fast_build.md
@@ -306,6 +320,7 @@ files:
 - docs/users/configuration/kramdown_fix.md
 - docs/users/configuration/suppress_warnings.md
 - docs/users/configuration/urls.md
+- docs/users/getting_started.md
 - docs/users/index.md
 - docs/users/installation.md
 - docs/users/liquid_tag/argument_reference/alternate_images.md
@@ -321,10 +336,10 @@ files:
 - 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/notes/migration_1.md
+- docs/users/notes/migration_2.md
 - docs/users/presets/cropping.md
 - docs/users/presets/default.md
 - docs/users/presets/examples.md
@@ -342,31 +357,27 @@ files:
 - 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
+- docs/users/tutorial.md
 - 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/defaults/global.rb
+- lib/jekyll_picture_tag/defaults/presets.rb
 - lib/jekyll_picture_tag/images.rb
 - lib/jekyll_picture_tag/images/generated_image.rb
+- lib/jekyll_picture_tag/images/image_file.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
-- lib/jekyll_picture_tag/instructions/html_attributes.rb
-- lib/jekyll_picture_tag/instructions/preset.rb
-- lib/jekyll_picture_tag/instructions/set.rb
-- lib/jekyll_picture_tag/instructions/tag_parser.rb
+- lib/jekyll_picture_tag/instructions/children/config.rb
+- lib/jekyll_picture_tag/instructions/children/context.rb
+- lib/jekyll_picture_tag/instructions/children/params.rb
+- lib/jekyll_picture_tag/instructions/children/parsers.rb
+- lib/jekyll_picture_tag/instructions/children/preset.rb
+- lib/jekyll_picture_tag/instructions/parents/conditional_instruction.rb
+- lib/jekyll_picture_tag/instructions/parents/env_instruction.rb
 - lib/jekyll_picture_tag/output_formats.rb
 - lib/jekyll_picture_tag/output_formats/auto.rb
 - lib/jekyll_picture_tag/output_formats/basic.rb
@@ -379,6 +390,12 @@ files:
 - lib/jekyll_picture_tag/output_formats/naked_srcset.rb
 - lib/jekyll_picture_tag/output_formats/picture.rb
 - lib/jekyll_picture_tag/output_formats/readme.md
+- lib/jekyll_picture_tag/parsers.rb
+- lib/jekyll_picture_tag/parsers/arg_splitter.rb
+- lib/jekyll_picture_tag/parsers/configuration.rb
+- lib/jekyll_picture_tag/parsers/html_attributes.rb
+- lib/jekyll_picture_tag/parsers/preset.rb
+- lib/jekyll_picture_tag/parsers/tag_parser.rb
 - lib/jekyll_picture_tag/router.rb
 - lib/jekyll_picture_tag/srcsets.rb
 - lib/jekyll_picture_tag/srcsets/basic.rb
@@ -390,7 +407,8 @@ files:
 homepage: https://github.com/rbuchberger/jekyll_picture_tag
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  documentation_uri: https://rbuchberger.github.io/jekyll_picture_tag/
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -399,18 +417,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
       version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
-requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+      version: 1.3.1
+requirements:
+- libvips
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Easy responsive images for Jekyll.