dynamic_image 2.0.22 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb9c218b8902487079281c04685088ba37cee03ba5944425c8e391869ed1f54
-  data.tar.gz: 6be8904c347f0721fe0d52f4693c65c7a7c96d77d81b169c00b83859df46c741
+  metadata.gz: 814628e7438a06292a2a283be0c88b724a1449327276c2f7ca89656947c690d7
+  data.tar.gz: 8ff9d551e13362514d102cae1c04e61d3374689282715911448019c425c12487
 SHA512:
-  metadata.gz: 712f4d5d9077baec9e3f67d01ae686a38ef380686a37a5c6c91b2e0d27db50e2623cd30c3b25e107a3b03fc6e0712fe20bc0643fc47ae73473ee735e94d031b5
-  data.tar.gz: 8ef5cd0021f2d32bc0876923c19f9e059edd5fdb52e06893cbab4dc4d739f72551f5bf53da8ee0007854f78d2cb5cc1de157542e40be9d27b17c6eeee735ccdb
+  metadata.gz: c52354d7f7100b367b402ea9be16a522872d423e8f1a21f49482bc86eb6223ac9d0c1194979e1d6b49fcfac2352922460aa44395e37adef1ca8cac0c6009e2b6
+  data.tar.gz: 94c370ea4a7ab9fe575ae324f8d50844c6600c5a677efcfe03471703130b4eea7613c5e3ac48d894481a1520484efdae2843ef90e36486f114009aa168681d1e

data/README.md

@@ -31,6 +31,7 @@ and enumeration attacks.
 * Rails 5
 * Ruby 2.4+
 * ImageMagick command line tools
+* ExifTool
 
 ## Documentation
 

data/lib/dynamic_image.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "mini_exiftool"
 require "mini_magick"
 require "dis"
 require "vector2d"
@@ -12,11 +13,12 @@ require "dynamic_image/errors"
 require "dynamic_image/helper"
 require "dynamic_image/image_reader"
 require "dynamic_image/image_sizing"
+require "dynamic_image/jobs"
 require "dynamic_image/metadata"
 require "dynamic_image/model"
 require "dynamic_image/processed_image"
 require "dynamic_image/routing"
 
 module DynamicImage
-  cattr_accessor :digest_verifier
+  cattr_accessor :digest_verifier, :process_later_limit
 end

data/lib/dynamic_image/controller.rb

@@ -44,13 +44,39 @@ module DynamicImage
     private
 
     def cache_expiration_header
-      expires_in 30.days, public: true
+      expires_in 30.days, public: true if response.status == 200
     end
 
     def find_record
       @record = model.find(params[:id])
     end
 
+    def process_and_send(image, options)
+      processed_image = DynamicImage::ProcessedImage.new(image, options)
+      if process_later?(processed_image, requested_size)
+        process_later(image, options, requested_size)
+        head 503, retry_after: 10
+      else
+        send_image(processed_image, requested_size)
+      end
+    rescue MiniMagick::Error
+      process_later(image, options, requested_size)
+      raise
+    end
+
+    def process_later(image, options, requested_size)
+      DynamicImage::Jobs::CreateVariant
+        .perform_later(image, options, requested_size.to_s)
+    end
+
+    def process_later?(processed_image, size)
+      return false unless DynamicImage.process_later_limit
+
+      image_size = processed_image.record.size.x * processed_image.record.size.y
+      image_size > DynamicImage.process_later_limit &&
+        !processed_image.find_variant(size)
+    end
+
     def render_image(options)
       return unless stale?(@record)
 
@@ -60,7 +86,7 @@ module DynamicImage
                  layout: false, locals: { options: options })
         end
         format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
-          send_image(DynamicImage::ProcessedImage.new(@record, options))
+          process_and_send(@record, options)
         end
       end
     end
@@ -82,12 +108,10 @@ module DynamicImage
       params[:format]
     end
 
-    def send_image(processed_image)
-      send_data(
-        processed_image.cropped_and_resized(requested_size),
-        content_type: processed_image.content_type,
-        disposition: "inline"
-      )
+    def send_image(processed_image, requested_size)
+      send_data(processed_image.cropped_and_resized(requested_size),
+                content_type: processed_image.content_type,
+                disposition: "inline")
     end
 
     def verify_signed_params

data/lib/dynamic_image/errors.rb

@@ -3,11 +3,17 @@
 module DynamicImage
   module Errors
     class Error < StandardError; end
+
     class InvalidImage < DynamicImage::Errors::Error; end
+
     class InvalidHeader < DynamicImage::Errors::Error; end
+
     class InvalidSignature < DynamicImage::Errors::Error; end
+
     class InvalidSizeOptions < DynamicImage::Errors::Error; end
+
     class InvalidTransformation < DynamicImage::Errors::Error; end
+
     class ParameterMissing < DynamicImage::Errors::Error; end
   end
 end

data/lib/dynamic_image/image_reader.rb

@@ -21,6 +21,12 @@ module DynamicImage
       @data = data
     end
 
+    def exif
+      raise DynamicImage::Errors::InvalidHeader unless valid_header?
+
+      MiniExiftool.new(string_io)
+    end
+
     def read
       raise DynamicImage::Errors::InvalidHeader unless valid_header?
 
@@ -39,7 +45,11 @@ module DynamicImage
     private
 
     def file_header
-      @file_header ||= StringIO.new(@data, "rb").read(8)
+      @file_header ||= string_io.read(8)
+    end
+
+    def string_io
+      StringIO.new(@data, "rb")
     end
   end
 end

data/lib/dynamic_image/jobs.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "dynamic_image/jobs/create_variant"

data/lib/dynamic_image/jobs/create_variant.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module DynamicImage
+  module Jobs
+    # = Create variant
+    #
+    # Creates an image variant.
+    class CreateVariant < ActiveJob::Base
+      queue_as :dis
+
+      def perform(record, options, size)
+        size_v = Vector2d.parse(size)
+        DynamicImage::ProcessedImage.new(record, options)
+                                    .find_or_create_variant(size_v)
+      end
+    end
+  end
+end

data/lib/dynamic_image/processed_image.rb

@@ -6,6 +6,8 @@ module DynamicImage
   # Handles all processing of images. Takes an instance of
   # +DynamicImage::Model+ as argument.
   class ProcessedImage
+    attr_reader :record
+
     def initialize(record, options = {})
       @record    = record
       @uncropped = options[:uncropped] ? true : false
@@ -40,10 +42,24 @@ module DynamicImage
       find_or_create_variant(size).data
     end
 
+    # Find or create a variant with the given size.
+    def find_or_create_variant(size)
+      find_variant(size) || create_variant(size)
+    rescue ActiveRecord::RecordNotUnique
+      find_variant(size)
+    end
+
+    # Find a variant with the given size.
+    def find_variant(size)
+      return nil unless record.persisted?
+
+      record.variants.find_by(variant_params(size))
+    end
+
     # Normalizes the image.
     #
     # * Applies EXIF rotation
-    # * CMYK images are converted to sRGB
+    # * Converts to sRGB
     # * Strips metadata
     # * Optimizes GIFs
     # * Performs format conversion if the requested format is different
@@ -59,7 +75,7 @@ module DynamicImage
       process_data do |image|
         image.combine_options do |combined|
           combined.auto_orient
-          combined.colorspace("sRGB") if needs_colorspace_conversion?
+          convert_to_srgb(image, combined)
           yield(combined) if block_given?
           optimize(combined)
         end
@@ -73,6 +89,14 @@ module DynamicImage
       gif? ? DynamicImage::ImageReader.new(image.coalesce.to_blob).read : image
     end
 
+    def convert_to_srgb(image, combined)
+      if image.data["profiles"].present? &&
+         exif.colorspacedata&.strip&.downcase == record.colorspace
+        combined.profile(srgb_profile)
+      end
+      combined.colorspace("sRGB") if record.cmyk?
+    end
+
     def create_variant(size)
       record.variants.create(
         variant_params(size).merge(filename: record.filename,
@@ -90,10 +114,8 @@ module DynamicImage
       end
     end
 
-    def find_or_create_variant(size)
-      record.variants.find_by(variant_params(size)) || create_variant(size)
-    rescue ActiveRecord::RecordNotUnique
-      record.variants.find_by(variant_params(size))
+    def exif
+      @exif ||= DynamicImage::ImageReader.new(record.data).exif
     end
 
     def format
@@ -105,7 +127,7 @@ module DynamicImage
     end
 
     def jpeg?
-      content_type == "image/jpeg" || content_type == "image/jpeg"
+      content_type == "image/jpeg"
     end
 
     def image_sizing
@@ -113,10 +135,6 @@ module DynamicImage
         DynamicImage::ImageSizing.new(record, uncropped: @uncropped)
     end
 
-    def needs_colorspace_conversion?
-      record.cmyk?
-    end
-
     def needs_format_conversion?
       format != record_format
     end
@@ -136,15 +154,9 @@ module DynamicImage
       result
     end
 
-    attr_reader :record
-
     def record_format
-      { "image/bmp" => "BMP",
-        "image/png" => "PNG",
-        "image/gif" => "GIF",
-        "image/jpeg" => "JPEG",
-        "image/pjpeg" => "JPEG",
-        "image/tiff" => "TIFF",
+      { "image/bmp" => "BMP", "image/png" => "PNG", "image/gif" => "GIF",
+        "image/jpeg" => "JPEG", "image/pjpeg" => "JPEG", "image/tiff" => "TIFF",
         "image/webp" => "WEBP" }[record.content_type]
     end
 
@@ -152,6 +164,10 @@ module DynamicImage
       raise DynamicImage::Errors::InvalidImage unless record.valid?
     end
 
+    def srgb_profile
+      File.join(File.dirname(__FILE__), "profiles/sRGB_ICC_v4_Appearance.icc")
+    end
+
     def variant_params(size)
       crop_size, crop_start = image_sizing.crop_geometry(size)
 

data/lib/dynamic_image/routing.rb

@@ -13,8 +13,9 @@ module DynamicImage
       options = {
         path: "#{resource_name}/:digest(/:size)",
         constraints: { size: /\d+x\d+/ },
-        only: [:show]
+        only: %i[show]
       }.merge(options)
+
       resources resource_name, options do
         get :uncropped, on: :member
         get :original, on: :member

data/lib/dynamic_image/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.1.1
 platform: ruby
 authors:
 - Inge Jørgensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.6
+- !ruby/object:Gem::Dependency
+  name: mini_exiftool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,8 @@ files:
 - lib/dynamic_image/helper.rb
 - lib/dynamic_image/image_reader.rb
 - lib/dynamic_image/image_sizing.rb
+- lib/dynamic_image/jobs.rb
+- lib/dynamic_image/jobs/create_variant.rb
 - lib/dynamic_image/metadata.rb
 - lib/dynamic_image/model.rb
 - lib/dynamic_image/model/dimensions.rb
@@ -162,6 +178,7 @@ files:
 - lib/dynamic_image/model/validations.rb
 - lib/dynamic_image/model/variants.rb
 - lib/dynamic_image/processed_image.rb
+- lib/dynamic_image/profiles/sRGB_ICC_v4_Appearance.icc
 - lib/dynamic_image/routing.rb
 - lib/dynamic_image/templates/show.html.erb
 - lib/dynamic_image/version.rb
@@ -170,7 +187,7 @@ homepage: https://github.com/elektronaut/dynamic_image
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing
 test_files: []