derived_images 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c8643b74c6c114c37979a7139f55eea2e6ee13925cf307fc0808784151e2b0c
-  data.tar.gz: 3b41b5bc4754ab82afd4970992a5656dfefca77dec526fe38bb4e3cc81de0611
+  metadata.gz: d7495dac1828694cef4a8efc10c27f79841caa93383b2fd87293920a0529b008
+  data.tar.gz: '05378013aa550c4007d4c749df0c6208292594dc5b48c86058f06de162b526dc'
 SHA512:
-  metadata.gz: 685da6a723ed7dabb55008423f8924c4484da7cdb5ab2499d0c13e5424353df9c6d41cd43c0f9332249e0d713199b2758fab6b12c0c34cca4b7dc4a1065581ac
-  data.tar.gz: e872970ac4a591925d026c1740e932cdfb912b816f5c3dd1110fd765d814a88bb2558622d06389d51aa89c8027515bf28cbf3bc172b69a9c1dee24781538ba42
+  metadata.gz: 41ba0a79e9c02d7961dded202fcb2063b415e4f99ffb1ba8cd7f999600b479d00deeb03b2c7c47b5a2fccf955daa4dc88f98c240d4cb8cff5f29019eab137507
+  data.tar.gz: f10af7e4af7e7ee9a912b6e766680ce0ba7414bc3619a0772e49cf8d7db4b6e425e2304f07df9c7c477789cfee89f8c707dd23ccc75742495054604b618ae37e

data/lib/derived_images/format_support.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module DerivedImages
+  # A helper class to test for library support for different image formats.
+  class FormatSupport
+    KNOWN_FORMATS = %w[bmp gif jpg png webp avif heic jp2 jxl].freeze
+
+    def initialize(processor = DerivedImages.config.processor)
+      @processor = processor
+    end
+
+    KNOWN_FORMATS.each do |format|
+      define_method("#{format}?") { supports?(format) }
+    end
+
+    alias jpeg_2000? jp2?
+    alias jpeg_xl? jxl?
+
+    def supports?(format)
+      if processor == :vips
+        vips.include?(format)
+      elsif processor == :mini_magick
+        magick.include?(format)
+      else
+        raise "Unknown processor #{processor}"
+      end
+    end
+
+    def self.table(processor)
+      instance = new(processor)
+      %w[BMP GIF JPEG PNG TIFF WebP].map { [_1, true] }.tap do |table|
+        table << ['AVIF', instance.avif?]
+        table << ['HEIC', instance.heic?]
+        table << ['JPEG 2000', instance.jpeg_2000?]
+        table << ['JPEG XL', instance.jpeg_xl?]
+      end
+    end
+
+    private
+
+    attr_reader :processor
+
+    def vips
+      @vips ||= Vips.get_suffixes.map { _1.delete('.') }
+    end
+
+    def magick
+      @magick ||= begin
+        output, = MiniMagick::Shell.new.execute(%w[identify -list format])
+        lines = output.partition("\n\n").first.lines[2..]
+        lines.reject { _1.start_with?(' ' * 10) } # Remove continuation lines
+             .map { _1.strip.split(/\s+/, 4) } # split out fields ("Format Module Mode Description")
+             .select { |_format, _, mode, _| mode.start_with?('rw') } # Read and write supported
+             .map { _1.first.delete('*').downcase }
+      end
+    end
+  end
+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.3'
+  VERSION = '0.4.1'
 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)
+        tempfile = entry.pipeline.call(entry.source_path.to_s)
+        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

data/lib/derived_images.rb

@@ -2,9 +2,11 @@
 
 require 'image_processing'
 require 'listen'
+require 'rails'
 
 require 'derived_images/cache'
 require 'derived_images/dsl'
+require 'derived_images/format_support'
 require 'derived_images/manifest'
 require 'derived_images/manifest_entry'
 require 'derived_images/processor'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: derived_images
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael Kitson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_processing
@@ -65,6 +65,7 @@ files:
 - lib/derived_images.rb
 - lib/derived_images/cache.rb
 - lib/derived_images/dsl.rb
+- lib/derived_images/format_support.rb
 - lib/derived_images/manifest.rb
 - lib/derived_images/manifest_entry.rb
 - lib/derived_images/processor.rb