jekyll-images 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9343975c53eefd5a9e88ed8ef249455a5fc82ca6ae5ba5b36ce46f369ee0d24b
-  data.tar.gz: 2ab5924b0216ff9354bb404316f43b09448431d04fcfe9ae5233ca4da347f8a8
+  metadata.gz: 940d7564e5f46ba24c22eec51f474252fc5f23445f37f2589a05788c2b107e55
+  data.tar.gz: 3fdb9012e009324edac12a65d2550dedb93cb4bf899d50ce011a0849c23fc44a
 SHA512:
-  metadata.gz: 52d5e60cc1edfb8e5a72dcbdbfaf062d51846fe0a281103ece714fc5251ee75d9c3f9c19ee3ac7e137c147f8a9a56b3c79fde6df28488f353923cc0b623f96a1
-  data.tar.gz: fccc5454c030535ace052d299c4f34b419d6d698aa3ff24fd3447adc52414118bb144204bdccf7ce04dd89f00b13be1200f8d3e823e20b9579ac9b1cef8d93ef
+  metadata.gz: f1b872ea8903b49b10efe560c0d568debcdfb937a8efbdb6059f238251ab71279d78056479d756cbc7c6bef34577e23c09e22c0ce97ff73d1e2ec0e853b31a49
+  data.tar.gz: 59136867e0841097770b5ae7f3a774f8a4d6934445dcc0bf8e47ab6df4104bd70d34061eb88ac0bcf0c7ef6c53a4b30c970f959164700a41cb4a501008593772

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
+        input = @context.registers[:site].in_source_dir input
+
+        unless ::File.exist? input
+          Jekyll.logger.warn "File doesn't exist #{input}"
+          return input
+        end
+
+        Jekyll::Images::Cache.cached_image(input).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
+        input = @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 input
         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
+        input = @context.registers[:site].in_source_dir input
+
+        unless ::File.exist? input
+          Jekyll.logger.warn "File doesn't exist #{input}"
+          return input
+        end
+
+        Jekyll::Images::Cache.cached_image(input).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/thumbnail.rb

@@ -50,6 +50,10 @@ module Jekyll
                   end
       end
 
+      def url
+        static_file.url
+      end
+
       def thumbnail?
         image.width > width
       end
@@ -78,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?
@@ -96,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,13 @@
 # frozen_string_literal: true
 
+require_relative 'jekyll/images/cache'
+
+Jekyll::Images::Cache.site = Jekyll.sites.first
+
 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.7
+  version: 0.3.0
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-11-16 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.2
 signing_key:
 specification_version: 4
 summary: Optimizes images for Jekyll