dynamic_image 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63df20c9bb3d9e6ec0c62667a3d885086f2f17e2e5d3cf7181dcdef9d6c52057
-  data.tar.gz: f94ae92030634af73011e745b96f445091c5140824b309a23ff653bc75f2d831
+  metadata.gz: f8c80c235c367dfba5f1f1dd4090306163154f3405137e1a4c75686b8320f678
+  data.tar.gz: ec04c685222c9653f058da65e72d07bfaaabba61015427c7f694868e85dc7ffb
 SHA512:
-  metadata.gz: 10cda7189c6319e1e6e73c07856cf5d302d870485f5139e7389efa2c9f12fb2302e242f3fa7924d7ba4732c6525ad55e5b4e54d8e6430d88211dcb1dc0f1ce14
-  data.tar.gz: 8077111478b4900b85086bd85849c94eb6fd372533ea3529a89c035d267e4c1b97e302f9a87b6621d40f6db9d9cc17bdf9e4f39696034f7ec7e9c111c885ab94
+  metadata.gz: c41a23304affdb4b95892ca12ba3039d2b205d7f4bb6f77f7a2ff72c38dbacd10b90bb9982ff4365608ce946a3204b7af8706f8b05143b85e35457a5710722bb
+  data.tar.gz: 75657ccd66682799dc73545bc48ddd35b1ebd703e82979404f4161b7e83a5c4d7bc487d97e791a7858ee648e0cd29f66c392a43d24115882500b810fa7bcfc23

data/lib/dynamic_image/format.rb

@@ -3,7 +3,7 @@
 module DynamicImage
   class Format
     attr_reader :name, :animated, :content_types, :extensions, :magic_bytes,
-                :save_options
+                :save_options, :signature
 
     def initialize(name, options)
       options = default_options.merge(options)
@@ -15,6 +15,7 @@ module DynamicImage
       @magic_bytes = options[:magic_bytes].map do |s|
         s.dup.force_encoding("binary")
       end
+      @signature = options[:signature]
       @save_options = options[:save_options]
     end
 
@@ -22,6 +23,12 @@ module DynamicImage
       animated
     end
 
+    def matches?(bytes)
+      return false unless magic_bytes.any? { |b| bytes.start_with?(b) }
+
+      signature.nil? || signature.call(bytes)
+    end
+
     def content_type
       content_types.first
     end
@@ -56,12 +63,7 @@ module DynamicImage
       def sniff(bytes)
         return unless bytes
 
-        formats.each do |format|
-          format.magic_bytes.each do |b|
-            return format if bytes.start_with?(b)
-          end
-        end
-        nil
+        formats.find { |format| format.matches?(bytes) }
       end
 
       private
@@ -73,7 +75,7 @@ module DynamicImage
 
     def default_options
       { animated: false, content_type: [], extension: [], magic_bytes: [],
-        save_options: {} }
+        signature: nil, save_options: {} }
     end
 
     register(
@@ -119,6 +121,7 @@ module DynamicImage
       content_type: %w[image/webp],
       extension: %w[.webp],
       magic_bytes: ["\x52\x49\x46\x46"],
+      signature: ->(bytes) { bytes.bytesize >= 12 && bytes[8, 4] == "WEBP" },
       save_options: { Q: 90, strip: true }
     )
   end

data/lib/dynamic_image/image_reader.rb

@@ -2,6 +2,8 @@
 
 module DynamicImage
   class ImageReader
+    HEADER_BYTES = 12
+
     def initialize(data)
       @data = data
     end
@@ -37,10 +39,10 @@ module DynamicImage
 
     def read_file_header
       if @data.is_a?(Pathname)
-        File.binread(@data.to_s, 8)
+        File.binread(@data.to_s, HEADER_BYTES)
       else
         data_stream = stream
-        header = data_stream.read(8)
+        header = data_stream.read(HEADER_BYTES)
         data_stream.seek(0 - header.length, IO::SEEK_CUR) if header
         header
       end

data/lib/dynamic_image/metadata.rb

@@ -65,17 +65,21 @@ module DynamicImage
 
     def read_metadata
       image = reader.read
+      width, height = dimensions_from(image)
+      width, height = height, width if rotated?(image)
+      { width:, height:, colorspace: image.get("interpretation") }
+    rescue Vips::Error
+      :invalid
+    end
 
+    def dimensions_from(image)
       width = image.get("width")
       height = if image.get_fields.include?("page-height")
                  image.get("page-height")
                else
                  image.get("height")
                end
-
-      width, height = height, width if rotated?(image)
-
-      { width:, height:, colorspace: image.get("interpretation") }
+      [width, height]
     end
 
     def orientation(image)

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamicImage
-  VERSION = "3.0.7"
+  VERSION = "3.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing
 test_files: []