jekyll-images 0.2.6.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aaeed177d571388aaee458474e013b9c99f0965bc48bd1a22d4041a1dcef38d
-  data.tar.gz: 475e6843df583c9dc11c5742fa5cf9afc12ca22f171ba99fc2b7d04d069a7847
+  metadata.gz: 2b9b71c35193e6576d44fe7acab6166e90c5e9a55c6b884d3fd63d1bbd9af5e2
+  data.tar.gz: ad1a2f6f0913b44b5e7e0f824ea547fcdb37a940c7b4b5aeb7582407b4638c82
 SHA512:
-  metadata.gz: 8ce335efa57aa6d2f82f0fef851ae192a748c9e2245d87187da6f598ec0add082be44a9fb5594d5f8f4675b3505f9f562aa606d52ea1cb397e3af8fd85e6953c
-  data.tar.gz: 717f5b7681bafb34f86bff82845b776281640d6c79b12d83c1d43f9b85ff5fbdeaf5c80f182c6c7221afa8f3154775d105fef21b34c2eb766c80710c200ccc39
+  metadata.gz: 5be91d54ad4e4c410581044f6446040098e8999a845ed5545a68f9c3dfb19a9a9a0bf81de3f9ae84195e9876d4b862a70613ef0b370f2641152bab63211be3c4
+  data.tar.gz: 93dc21ef593b4c334f8288ff93b4a957397ff435003b1621fb1145235c50096ccb0676e8530c66ecdc406f5fa8337d8bf88bf175d753a68dbd8c7d94561c29bb

data/lib/jekyll/filters/height.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Filters
+    # Obtain image height
+    module Height
+      def height(input)
+        return unless input
+        path = @context.registers[:site].in_source_dir input
+
+        unless ::File.exist? path
+          Jekyll.logger.warn "File doesn't exist #{input}"
+          return input
+        end
+
+        Jekyll::Images::Cache.cached_image(path).height
+      rescue Vips::Error => e
+        Jekyll.logger.warn "Failed to process #{input}: #{e.message}"
+        nil
+      end
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::Filters::Height)

data/lib/jekyll/filters/thumbnail.rb

@@ -4,13 +4,17 @@ module Jekyll
   module Filters
     # Liquid filter for use in templates
     module Thumbnail
-      @@cached_images = {}
-
       # Generates a thumbnail and returns its alternate destination
       def thumbnail(input, width = nil, height = nil, crop = nil, auto_rotate = nil)
         return unless input
+        path = @context.registers[:site].in_source_dir input
+
+        unless ::File.exist? input
+          Jekyll.logger.warn "File doesn't exist #{input}"
+          return input
+        end
 
-        image = cached_image input
+        image = Jekyll::Images::Cache.cached_image path
         thumb = image.thumbnail(width: width,
                                 height: height,
                                 crop: crop,
@@ -18,21 +22,11 @@ module Jekyll
 
         thumb.write && thumb.optimize
 
-        thumb.dest
+        thumb.url
       rescue Vips::Error => e
         Jekyll.logger.warn "Failed to process #{input}: #{e.message}"
         input
       end
-
-      private
-
-      def cached_image?(input)
-        @@cached_images.key? input
-      end
-
-      def cached_image(input)
-        @@cached_images[input] ||= Jekyll::Images::Image.new(@context.registers[:site], input)
-      end
     end
   end
 end

data/lib/jekyll/filters/width.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Filters
+    # Obtain image width
+    module Width
+      def width(input)
+        return unless input
+        path = @context.registers[:site].in_source_dir input
+
+        unless ::File.exist? path
+          Jekyll.logger.warn "File doesn't exist #{input}"
+          return input
+        end
+
+        Jekyll::Images::Cache.cached_image(path).width
+      rescue Vips::Error => e
+        Jekyll.logger.warn "Failed to process #{input}: #{e.message}"
+        nil
+      end
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::Filters::Width)

data/lib/jekyll/images/cache.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Images
+    # Cache
+    class Cache
+      class << self
+        attr_accessor :site
+
+        def cached_images
+          @cached_images ||= {}
+        end
+
+        def cached_image?(input)
+          cached_images.key? input
+        end
+
+        def cached_image(input)
+          cached_images[input] ||= Jekyll::Images::Image.new(site, input)
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/images/image.rb

@@ -5,7 +5,7 @@ require 'vips'
 module Jekyll
   module Images
     class Image
-      attr_reader :site, :filename
+      attr_reader :site, :filename, :height, :width
 
       def initialize(site, filename)
         unless File.exist? filename
@@ -15,14 +15,16 @@ module Jekyll
         @cached_thumbnails = {}
         @site = site
         @filename = filename
-      end
 
-      def image
-        @image ||= Vips::Image.new_from_file filename, access: :sequential
+        # We only need the image to get height and width
+        image = Vips::Image.new_from_file filename, access: :sequential
+
+        @height = image.height
+        @width = image.width
       end
 
       def thumbnail(**args)
-        @cached_thumbnails[args.hash.to_s] ||= Thumbnail.new site: site, filename: filename, image: image, **args
+        @cached_thumbnails[args.hash.to_s] ||= Thumbnail.new site: site, filename: filename, image: self, **args
       end
     end
   end

data/lib/jekyll/images/thumbnail.rb

@@ -21,12 +21,14 @@ module Jekyll
         @auto_rotate = args[:auto_rotate].nil? ? true : args[:auto_rotate]
       end
 
+      # XXX: We don't memoize because we don't need the thumbnail in
+      # memory after it has been written.
       def thumbnail
-        @thumbnail ||= Vips::Image.thumbnail filename,
-                                             width,
-                                             height: height,
-                                             auto_rotate: auto_rotate,
-                                             crop: crop
+        Vips::Image.thumbnail filename,
+                              width,
+                              height: height,
+                              auto_rotate: auto_rotate,
+                              crop: crop
       end
 
       # Finds a height that's proportional to the width
@@ -48,6 +50,10 @@ module Jekyll
                   end
       end
 
+      def url
+        static_file.url
+      end
+
       def thumbnail?
         image.width > width
       end
@@ -76,9 +82,7 @@ module Jekyll
 
         # Add it to the static files so Jekyll copies them.  Once they
         # are written they're copied when the site is loaded.
-        site.static_files << Jekyll::StaticFile.new(site, site.source,
-                                                    File.dirname(dest),
-                                                    File.basename(dest))
+        site.static_files << static_file
 
         # The file was updated, so it exists and is newer than source
         !write?
@@ -94,6 +98,14 @@ module Jekyll
 
         Jekyll.logger.info "Reduced #{dest} from #{before} to #{after} bytes (%#{pct})"
       end
+
+      def relative_path
+        @relative_path ||= dest.sub(site.source, '').sub(%r{\A/}, '')
+      end
+
+      def static_file
+        @static_file ||= Jekyll::StaticFile.new(site, site.source, File.dirname(relative_path), File.basename(relative_path))
+      end
     end
   end
 end

data/lib/jekyll-images.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
+require_relative 'jekyll/images/cache'
+
+Jekyll::Hooks.register :site, :after_reset do |site|
+  Jekyll::Images::Cache.site = site
+end
+
 require_relative 'jekyll/images/image'
 require_relative 'jekyll/images/thumbnail'
 require_relative 'jekyll/filters/thumbnail'
+require_relative 'jekyll/filters/width'
+require_relative 'jekyll/filters/height'
 require_relative 'jekyll/images/oxipng'
 require_relative 'jekyll/images/jpeg_optim'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-images
 version: !ruby/object:Gem::Version
-  version: 0.2.6.1
+  version: 0.3.1
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -64,7 +64,10 @@ files:
 - LICENSE
 - README.md
 - lib/jekyll-images.rb
+- lib/jekyll/filters/height.rb
 - lib/jekyll/filters/thumbnail.rb
+- lib/jekyll/filters/width.rb
+- lib/jekyll/images/cache.rb
 - lib/jekyll/images/image.rb
 - lib/jekyll/images/jpeg_optim.rb
 - lib/jekyll/images/oxipng.rb
@@ -100,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Optimizes images for Jekyll