dynamic_image 3.0.7 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63df20c9bb3d9e6ec0c62667a3d885086f2f17e2e5d3cf7181dcdef9d6c52057
-  data.tar.gz: f94ae92030634af73011e745b96f445091c5140824b309a23ff653bc75f2d831
+  metadata.gz: 33ad9b707b455fded33a4b6860ce21d85e53ee88041ccb5f078beba0c850148b
+  data.tar.gz: 79d19fbda9f9a90fa26dc421cf13fab00cb7d90251076bb27e6b316fddc4529a
 SHA512:
-  metadata.gz: 10cda7189c6319e1e6e73c07856cf5d302d870485f5139e7389efa2c9f12fb2302e242f3fa7924d7ba4732c6525ad55e5b4e54d8e6430d88211dcb1dc0f1ce14
-  data.tar.gz: 8077111478b4900b85086bd85849c94eb6fd372533ea3529a89c035d267e4c1b97e302f9a87b6621d40f6db9d9cc17bdf9e4f39696034f7ec7e9c111c885ab94
+  metadata.gz: 9eacc78569bb34efb9ae84381b1c96966e834cd9a9ff82968dcdf9aa690286a1192e3f13db1c899f4e31f93c15f293d673d9bf1fdf13e48a828e8ad0c8a27acf
+  data.tar.gz: 1d47d899162e89321605adb632193c0a0cdace30b48b3feae2c61967e68b2fee92a66a009b7baf7c1e078b3a9ab09afc8529fc58f16105510cce80cdddf657cf

data/Rakefile

@@ -6,6 +6,9 @@ require "rspec/core/rake_task"
 APP_RAKEFILE = "spec/internal/Rakefile"
 load "rails/tasks/engine.rake"
 
+# release-please creates the tag and the release commit.
+Rake::Task["release:source_control_push"].clear
+
 RSpec::Core::RakeTask.new
 
 task default: :spec

data/lib/dynamic_image/controller.rb

@@ -9,6 +9,7 @@ module DynamicImage
   # As a bonus, this also prevents unauthorized URL enumeration.
   module Controller
     extend ActiveSupport::Concern
+    include Dis::Controller
 
     included do
       before_action :verify_signed_params
@@ -70,7 +71,7 @@ module DynamicImage
                     content_type: processed.format.content_type,
                     disposition: "inline" }
       if variant
-        send_file(variant.data_file_path, **send_opts)
+        send_dis_data(variant, **send_opts)
       else
         send_data(processed.cropped_and_resized(requested_size), **send_opts)
       end
@@ -95,10 +96,10 @@ module DynamicImage
 
       respond_to do |format|
         format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
-          send_file(@record.data_file_path,
-                    filename:,
-                    content_type: @record.content_type,
-                    disposition:)
+          send_dis_data(@record,
+                        filename:,
+                        content_type: @record.content_type,
+                        disposition:)
         end
       end
     end

data/lib/dynamic_image/engine.rb

@@ -29,7 +29,7 @@ module DynamicImage
 
     initializer "dynamic_image.extensions", before: :load_active_support do
       ActiveSupport.on_load(:active_record) do
-        send :include, DynamicImage::BelongsTo
+        include DynamicImage::BelongsTo
       end
       ActionDispatch::Routing::Mapper.include DynamicImage::Routing
 

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/model/transformations.rb

@@ -76,7 +76,9 @@ module DynamicImage
 
       def transform_image(&block)
         read_image_metadata if data_changed?
-        self.data = block.call(DynamicImage::ImageProcessor.new(Pathname(data_file_path))).read
+        self.data = with_data_file do |path|
+          block.call(DynamicImage::ImageProcessor.new(path)).read
+        end
         read_image_metadata
         self
       end

data/lib/dynamic_image/model.rb

@@ -106,8 +106,13 @@ module DynamicImage
     private
 
     def read_image_metadata
-      metadata = DynamicImage::Metadata.new(Pathname(data_file_path))
       @valid_image = false
+      with_data_file do |path|
+        apply_image_metadata(DynamicImage::Metadata.new(path))
+      end
+    end
+
+    def apply_image_metadata(metadata)
       return unless metadata.valid?
 
       self.colorspace = metadata.colorspace

data/lib/dynamic_image/processed_image.rb

@@ -82,9 +82,11 @@ module DynamicImage
     def normalized
       require_valid_image!
 
-      image = DynamicImage::ImageProcessor.new(Pathname(record.data_file_path))
-      image = yield(image) if block_given?
-      image.convert(format).read
+      record.with_data_file do |path|
+        image = DynamicImage::ImageProcessor.new(path)
+        image = yield(image) if block_given?
+        image.convert(format).read
+      end
     end
 
     private

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamicImage
-  VERSION = "3.0.7"
+  VERSION = "3.0.9"
 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.9
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -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.16
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing
 test_files: []