jekyll-images 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515ee9d8da3516558a79b0081bbc3c59a20d1e864078ba028799d79c2a99e98f
-  data.tar.gz: 99060950bcaaf59a9ee9eb7e10179568306d8551114d28f13542c70c972f9dc4
+  metadata.gz: ade8806597db4aad25430a39bb1c7a8db08e4e474015344e7afe2e8bbd717038
+  data.tar.gz: c97d3622656034a395f745aaeafe47fc994cb1c1a18ba9853251ef77f924ebcc
 SHA512:
-  metadata.gz: 0bd8090750b793a5feb1fda57d17855584d1e1ff3f09f5cefa40e49a76dca8e17f6fc1a5fc1a0f4bb827d5c895f3eaf871951b4b4ddcce9a22274ff84f3dded9
-  data.tar.gz: 784c8c1ec1bb4045abf3f40726730cf23b154e8454ddfdc3f97d91bfd69bd3ee606cc4f5ffb5b2efffb6fc4d07bf0e7df430fed40c05048c8688897cee90b332
+  metadata.gz: 3398cc500da4c3ee7ea3be463247422636e37d9a363ab5b2aa94a42acd755f90341995c35b51055fe6bb446b90526a383d3bffbb507cbde64750b98cb85ac94c
+  data.tar.gz: b76bdd36d899533d031990eb152bb93032e609877b32806b9a629c6c4590ddef5baae6e63e8f98a236574d3a21d0fb10538c64ac8d7fee7b64e92af55418c1a6

data/lib/jekyll/filters/thumbnail.rb

@@ -1,29 +1,41 @@
 # frozen_string_literal: true
 
+require 'pry'
 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, height = nil, crop = :attention, auto_rotate = true)
         return unless input
+        return cached_image(input).dest if cached_image? input
 
         height = height if height.to_i > 1
-        image = Jekyll::Images::Thumbnail.new(@context.registers[:site],
-                                              input,
-                                              width: width,
-                                              height: height,
-                                              crop: crop,
-                                              auto_rotate: auto_rotate)
-
-        # XXX: This won't run optimizations more than once but it won't
-        # also optimize source images.
+        image = cached_image input, width, height, crop, auto_rotate
+
         image.write && image.optimize
         image.dest
       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, width = nil, height = nil, crop = nil, auto_rotate = nil)
+        @@cached_images[input] ||= Jekyll::Images::Thumbnail.new(@context.registers[:site],
+                                                          input,
+                                                          width: width,
+                                                          height: height,
+                                                          crop: crop,
+                                                          auto_rotate: auto_rotate)
+      end
     end
   end
 end

data/lib/jekyll/images/thumbnail.rb

@@ -47,14 +47,17 @@ module Jekyll
 
       # Generates a destination from filename only if we're downsizing
       def dest
-        @dest ||= if image.width > width
+        @dest ||= if thumbnail?
                     filename.gsub(/#{extname}\z/, "_#{width}x#{height}#{extname}")
                   else
-                    Jekyll.logger.info "Not thumbnailing #{filename}"
-                    filename
+                    filename.gsub(/#{extname}\z/, "_optimized#{extname}")
                   end
       end
 
+      def thumbnail?
+        image.width > width
+      end
+
       def extname
         @extname ||= File.extname filename
       end
@@ -69,8 +72,12 @@ module Jekyll
       def write
         return unless write?
 
-        Jekyll.logger.info "Thumbnailing #{filename} => #{dest}"
-        thumbnail.write_to_file(dest)
+        if thumbnail?
+          Jekyll.logger.info "Thumbnailing #{filename} => #{dest}"
+          thumbnail.write_to_file(dest)
+        else
+          FileUtils.cp(filename, dest)
+        end
 
         # Add it to the static files so Jekyll copies them.  Once they
         # are written they're copied when the site is loaded.
@@ -90,7 +97,7 @@ module Jekyll
 
         pct = ((after.to_f / before) * -100 + 100).round(2)
 
-        Jekyll.logger.info "Reduced #{filename} from #{before} to #{after} bytes (%#{pct})"
+        Jekyll.logger.info "Reduced #{dest} from #{before} to #{after} bytes (%#{pct})"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-images
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - f
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -65,7 +65,6 @@ files:
 - README.md
 - lib/jekyll-images.rb
 - lib/jekyll/filters/thumbnail.rb
-- lib/jekyll/hooks/thumbnail.rb
 - lib/jekyll/images/jpeg_optim.rb
 - lib/jekyll/images/oxipng.rb
 - lib/jekyll/images/runner.rb
@@ -78,7 +77,7 @@ metadata:
   homepage_uri: https://0xacab.org/sutty/jekyll/jekyll-images
   source_code_uri: https://0xacab.org/sutty/jekyll/jekyll-images
   documentation_uri: https://rubydoc.info/gems/jekyll-images
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - jekyll-images - Optimizes images for Jekyll
@@ -101,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Optimizes images for Jekyll
 test_files: []

data/lib/jekyll/hooks/thumbnail.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-Jekyll::Hooks.register :documents, :post_render do |doc|
-#  binding.pry
-end