jekyll-responsive-image 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf6dd65d141c5c460607846dbab0ff66c14872e8e812f389c77988450ab0b50
-  data.tar.gz: 2f7206e95230b9c73bb2328cabd9a7787a66d6a142efb2803d12e6edeb9e8db9
+  metadata.gz: 6997784f689936e81a50d386893ff4bab36054dcaa2811b3be30aecf5d02c6c8
+  data.tar.gz: 0133f99007cd590aed90e238feecdc822e94003168455285c1e4ea65340833c0
 SHA512:
-  metadata.gz: 1eec62dcb1ffe3ed76a64b7f9ff71019f9917b0f7f209f060eea56d769634d2b61d5792ef8963c4e8844b0c02ddb76b07982d86c66785b17c11914f888d2f163
-  data.tar.gz: f47845d9f3c59eac66f1af384afb56a8aa67a7d2b60110d50fe61e64a9acfd89441b3330773e57b7696d7a345125e1b14dbb4b4e8bf09154a21c6ffa48b71774
+  metadata.gz: dab196e76bf72c37681e5ba3d0e87fb732c90fae7f58dc1e4db03a2bac0644345797412da9f854929a2d53b8881759e0b5cf8520a9d1c57bcaa34a2c2c6db4fe
+  data.tar.gz: f45b4fd482e8c75a728a3112ee4b0bbf3dc78f45c23f57bf9caeba2e830ae6d7ecba32a8634a3755545e6087a98555d01415c0b80f6f319473e2d9dc29a21a20

data/lib/jekyll-responsive-image/block.rb

@@ -4,7 +4,13 @@ module Jekyll
       include Jekyll::ResponsiveImage::Utils
 
       def render(context)
-        attributes = YAML.load(super)
+        content = super
+
+        if content.include?("\t")
+          content = content.lines.map {|line| line.gsub(/\G[\t ]/, "  ")}.join("\n")
+        end
+
+        attributes = YAML.load(content)
         Renderer.new(context.registers[:site], attributes).render_responsive_image
       end
     end

data/lib/jekyll-responsive-image/config.rb

@@ -17,8 +17,19 @@ module Jekyll
         @site = site
       end
 
+      def valid_config(config)
+        config.has_key?('responsive_image') && config['responsive_image'].is_a?(Hash)
+      end
+
       def to_h
-        DEFAULTS.merge(@site.config['responsive_image'])
+        config = {}
+
+        if valid_config(@site.config)
+          config = @site.config['responsive_image']
+        end
+
+
+        DEFAULTS.merge(config)
                 .merge(site_source: @site.source, site_dest: @site.dest)
       end
     end

data/lib/jekyll-responsive-image/image_processor.rb

@@ -6,14 +6,13 @@ module Jekyll
       def process(image_path, config)
         absolute_image_path = File.expand_path(image_path.to_s, config[:site_source])
 
-        raise SyntaxError.new("Invalid image path specified: #{image_path}") unless File.file?(absolute_image_path)
+        Jekyll.logger.warn "Invalid image path specified: #{image_path.inspect}" unless File.file?(absolute_image_path)
 
-        resize_handler = ResizeHandler.new
-        img = Magick::Image::read(absolute_image_path).first
+        resize_handler = ResizeHandler.new(absolute_image_path, config)
 
         {
-          original: image_hash(config, image_path, img.columns, img.rows),
-          resized: resize_handler.resize_image(img, config),
+          original: image_hash(config, image_path, resize_handler.original_image.columns, resize_handler.original_image.rows),
+          resized: resize_handler.resize_image,
         }
       end
 

data/lib/jekyll-responsive-image/renderer.rb

@@ -25,7 +25,11 @@ module Jekyll
           partial = File.read(image_template)
           template = Liquid::Template.parse(partial)
 
-          result = template.render!(@attributes.merge(@site.site_payload))
+          info = {
+            registers: { site: @site }
+          }
+
+          result = template.render!(@attributes.merge(@site.site_payload), info)
 
           RenderCache.set(cache_key, result)
         end

data/lib/jekyll-responsive-image/resize_handler.rb

@@ -3,26 +3,39 @@ module Jekyll
     class ResizeHandler
       include ResponsiveImage::Utils
 
-      def resize_image(img, config)
-        img.auto_orient! if config['auto_rotate']
+      attr_reader :original_image
 
+      def initialize(original_image_absolute_path, config)
+        @config = config
+
+        @original_image_absolute_path = original_image_absolute_path
+
+        if @config['auto_rotate']
+          load_full_image
+          @original_image.auto_orient!
+        else
+          load_image_properties_only
+        end
+      end
+
+      def resize_image
         resized = []
 
-        config['sizes'].each do |size|
+        @config['sizes'].each do |size|
           width = size['width']
-          ratio = width.to_f / img.columns.to_f
-          height = (img.rows.to_f * ratio).round
+          ratio = width.to_f / @original_image.columns.to_f
+          height = (@original_image.rows.to_f * ratio).round
 
-          next unless needs_resizing?(img, width)
+          next unless needs_resizing?(width)
 
-          image_path = img.filename.force_encoding(Encoding::UTF_8)
-          filepath = format_output_path(config['output_path_format'], config, image_path, width, height)
-          resized.push(image_hash(config, filepath, width, height))
+          image_path = @original_image.filename.force_encoding(Encoding::UTF_8)
+          filepath = format_output_path(@config['output_path_format'], @config, image_path, width, height)
+          resized.push(image_hash(@config, filepath, width, height))
 
-          site_source_filepath = File.expand_path(filepath, config[:site_source])
-          site_dest_filepath = File.expand_path(filepath, config[:site_dest])
+          site_source_filepath = File.expand_path(filepath, @config[:site_source])
+          site_dest_filepath = File.expand_path(filepath, @config[:site_dest])
 
-          if config['save_to_source']
+          if @config['save_to_source']
             target_filepath = site_source_filepath
           else
             target_filepath = site_dest_filepath
@@ -36,16 +49,22 @@ module Jekyll
 
           Jekyll.logger.info "Generating #{target_filepath}"
 
-          if config['strip']
-            img.strip!
+          load_full_image unless @original_image_pixels_loaded
+
+          if @config['strip']
+            @original_image.strip!
           end
-          i = img.scale(ratio)
+
+          i = @original_image.scale(ratio)
+
+          quality = size['quality'] || @config['default_quality']
+
           i.write(target_filepath) do |f|
             f.interlace = i.interlace
-            f.quality = size['quality'] || config['default_quality']
+            f.quality = quality
           end
 
-          if config['save_to_source']
+          if @config['save_to_source']
             # Ensure the generated file is copied to the _site directory
             Jekyll.logger.info "Copying resized image to #{site_dest_filepath}"
             FileUtils.copy_file(site_source_filepath, site_dest_filepath)
@@ -54,7 +73,7 @@ module Jekyll
           i.destroy!
         end
 
-        img.destroy!
+        @original_image.destroy!
 
         resized
       end
@@ -65,8 +84,18 @@ module Jekyll
         Pathname.new(format % params).cleanpath.to_s
       end
 
-      def needs_resizing?(img, width)
-        img.columns > width
+      def needs_resizing?(width)
+        @original_image.columns > width
+      end
+
+      def load_full_image
+        @original_image = Magick::Image::read(@original_image_absolute_path).first
+        @original_image_pixels_loaded = true
+      end
+
+      def load_image_properties_only
+        @original_image = Magick::Image::ping(@original_image_absolute_path).first
+        @original_image_pixels_loaded = false
       end
 
       def ensure_output_dir_exists!(path)

data/lib/jekyll-responsive-image/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module ResponsiveImage
-    VERSION = '1.5.1'.freeze
+    VERSION = '1.6.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-responsive-image
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Joseph Wynn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -19,7 +19,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 description: "\n    Highly configurable Jekyll plugin for managing responsive images.
   Automatically\n    resizes images and provides a Liquid template tag for loading
   the images with\n    picture, img srcset, Imager.js, etc.\n  "
@@ -89,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Responsive image management for Jekyll