derived_images 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d5a7a0212b48a6d0f1abddb10b928a72d447485a6199ed37785fd4983ebf2f5
-  data.tar.gz: 7027ba8cee4dd84145de31557763138c209ccdf6fe446a32e041fffb1aa4c6c0
+  metadata.gz: baf29fb4eb242552ac2986bdc0edafcbcea4e002d392c9c496d3de8722cbf31b
+  data.tar.gz: 2bc1784b75cad336ef7e878b2ab885f5f0df3edb278296757d644cf6d80ffa8a
 SHA512:
-  metadata.gz: bebf02ecc4da6e61535f6e0b2fb07ea0549cd1e510973c57d0c2e6df72739cd759620c31a2f5be2a10fe941f51db384db0a7fb054f41d0a989621e2495a1ab72
-  data.tar.gz: 5643b01fe003a19e2e3963d93d85b125aa22fcb5740c70676b55f58f253600104c10797adf3b8657f26146fe56778addd209242693c118016a90958df3bbeda8
+  metadata.gz: a876902f03b4331d000aab0bb8e3d608e57b17edc40f68a920ec88aa452aa7dbce5e221496e03bc4e5723e6e57cdffa465adf457c832a5287c2b7d4dccfc8075
+  data.tar.gz: 9a24bb5f27aac0519af396408b3d6256e1c66afa708a125881cad8018b3f86f034b1974eb24c0ed132c617c66b0d09b11f3901b620341ace4be44aa8404f0359

data/lib/derived_images/cache.rb

@@ -73,7 +73,7 @@ module DerivedImages
     def each
       return enum_for(:each) unless block_given?
 
-      path.glob('*/*') { |path| yield path.to_s.last(65).delete('/') }
+      path.glob('*/*') { |path| yield path.to_s.last(65).delete('/') } if enabled?
       self
     end
 

data/lib/derived_images/manifest_entry.rb

@@ -8,10 +8,7 @@ module DerivedImages
     def initialize(source, target)
       @source = source
       @target = target
-      target_ext = File.extname(target)
-      pipeline = PROCESSORS.fetch(DerivedImages.config.processor).dup
-      pipeline = pipeline.convert(target_ext) if target_ext.present?
-      @pipeline = pipeline
+      @pipeline = default_pipeline(File.extname(target).delete_prefix('.'))
     end
 
     def ==(other)
@@ -37,7 +34,9 @@ module DerivedImages
     def cache_key
       return nil unless source_present?
 
-      Digest::SHA256.hexdigest({ source: source_digest, pipeline: options_hash }.to_json)
+      Digest::SHA256.hexdigest({ version: DerivedImages::VERSION,
+                                 source: source_digest,
+                                 pipeline: options_hash }.to_json)
     end
 
     def self.empty_pipeline
@@ -45,6 +44,7 @@ module DerivedImages
     end
 
     PROCESSORS = { mini_magick: ImageProcessing::MiniMagick, vips: ImageProcessing::Vips }.freeze
+    COMPRESSION_OVERRIDES = { 'avif' => 'av1', 'heic' => 'hevc' }.freeze
 
     def target_digest
       Digest::SHA256.file(target_path).hexdigest
@@ -60,6 +60,17 @@ module DerivedImages
       Digest::SHA256.file(source_path).hexdigest
     end
 
+    def default_pipeline(target_ext)
+      pipeline = PROCESSORS.fetch(DerivedImages.config.processor).dup
+      pipeline = pipeline.convert(target_ext) if target_ext.present?
+      vips = pipeline.options[:processor] == ImageProcessing::Vips::Processor
+      if vips && !Vips.at_least_libvips?(8, 12) && COMPRESSION_OVERRIDES.key?(target_ext)
+        # https://github.com/libvips/libvips/commit/47383b5bfc136f7870c319a1edce4848e177425b
+        pipeline = pipeline.saver(compression: COMPRESSION_OVERRIDES.fetch(target_ext))
+      end
+      pipeline
+    end
+
     protected
 
     def options_hash

data/lib/derived_images/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DerivedImages
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/derived_images/worker.rb

@@ -45,11 +45,13 @@ module DerivedImages
     end
 
     def generate(entry, cache_key)
+      target_path = entry.target_path
       time = Benchmark.realtime do
         tempfile = entry.pipeline.loader(fail: true).call(entry.source_path.to_s)
-        FileUtils.mv(tempfile.path, entry.target_path)
+        File.chmod(0o644, tempfile.path)
+        FileUtils.mv(tempfile.path, target_path)
       end
-      cache.store(cache_key, entry.target_path)
+      cache.store(cache_key, target_path)
       DerivedImages.config.logger.info("Created #{entry.target} from #{entry.source} in #{time.round(3)}s")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: derived_images
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Kitson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_processing