dynamic_image 2.0.21 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7183bc59ab57bc659f3d38e0c2bd1fa250689d1e4647dfcc68e0eddceb4c2260
-  data.tar.gz: 882038f115a0e2d78684f02a19672138d8a68a3e36af0ac74d736a7d4056083a
+  metadata.gz: fd1d723cd97a91199630354e541d2a740aa41bae8ccb07554c1e723096a1b6dc
+  data.tar.gz: b4f5a8bf26b69da95543cb8885f5add2b72504ea88f83c4097bc1c25a13c622f
 SHA512:
-  metadata.gz: c2a6a1f35e3458693ae0d0c5b9eaca4fd5ddcd70164e070f67f80236723befc57d677d0de673bf94afb0416458cde7bc04648f7bd512d5682984af6ccb4adeae
-  data.tar.gz: b6ca975270f79fb9100aaeb1d2083f30adf7196c77783f663b741f84144c49bc6b42338ba220b050fca4637746f57328adff2d88f9fc9b48c829ff08d9157e72
+  metadata.gz: e2ba7e0be3c929f9da2b1c7311ae7a246341f081cc8057e8293417a8a73634ec5844d0ce7a691c3d5c771d99924b311c59a2a9b9bf2e2baae84675a3967a8614
+  data.tar.gz: '08cfc8124f2d6e2bd9d505315b1af7ed87e42ae4ff497a88fafd240e9594943721a6f72e7f196d5dffb1a43a1c8489e9b1b427e4042e149aedcf21a22f0506ba'

data/README.md

@@ -1,5 +1,5 @@
 [![Version](https://img.shields.io/gem/v/dynamic_image.svg?style=flat)](https://rubygems.org/gems/dynamic_image)
-[![Build Status](https://travis-ci.org/elektronaut/dynamic_image.svg?branch=master)](https://travis-ci.org/elektronaut/dynamic_image)
+![Build](https://github.com/elektronaut/dynamic_image/workflows/Build/badge.svg)
 [![Code Climate](https://codeclimate.com/github/elektronaut/dynamic_image/badges/gpa.svg)](https://codeclimate.com/github/elektronaut/dynamic_image)
 [![Code Climate](https://codeclimate.com/github/elektronaut/dynamic_image/badges/coverage.svg)](https://codeclimate.com/github/elektronaut/dynamic_image)
 [![Inline docs](http://inch-ci.org/github/elektronaut/dynamic_image.svg)](http://inch-ci.org/github/elektronaut/dynamic_image)
@@ -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/belongs_to.rb

@@ -8,7 +8,7 @@ module DynamicImage
 
     module ClassMethods
       def belongs_to_image(name, scope = nil, **options)
-        belongs_to(name, scope, options)
+        belongs_to(name, scope, **options)
 
         define_method "#{name}=" do |new_image|
           if new_image.present? && !new_image.is_a?(DynamicImage::Model)

data/lib/dynamic_image/controller.rb

@@ -44,13 +44,21 @@ 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_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)
 
@@ -59,8 +67,8 @@ module DynamicImage
           render(file: File.join(File.dirname(__FILE__), "templates/show"),
                  layout: false, locals: { options: options })
         end
-        format.any(:gif, :jpeg, :png, :tiff, :webp) do
-          send_image(DynamicImage::ProcessedImage.new(@record, options))
+        format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
+          send_image(@record, options)
         end
       end
     end
@@ -69,7 +77,7 @@ module DynamicImage
       return unless stale?(@record)
 
       respond_to do |format|
-        format.any(:gif, :jpeg, :png, :tiff, :webp) do
+        format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
           send_data(@record.data,
                     filename: filename,
                     content_type: @record.content_type,
@@ -82,12 +90,17 @@ 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(image, options)
+      processed_image = DynamicImage::ProcessedImage.new(image, options)
+      if process_later?(processed_image, requested_size)
+        DynamicImage::Jobs::CreateVariant
+          .perform_later(image, options, requested_size.to_s)
+        head 503, retry_after: 10
+      else
+        send_data(processed_image.cropped_and_resized(requested_size),
+                  content_type: processed_image.content_type,
+                  disposition: "inline")
+      end
     end
 
     def verify_signed_params

data/lib/dynamic_image/engine.rb

@@ -31,7 +31,7 @@ module DynamicImage
       ActiveSupport.on_load(:active_record) do
         send :include, DynamicImage::BelongsTo
       end
-      ActionDispatch::Routing::Mapper.send :include, DynamicImage::Routing
+      ActionDispatch::Routing::Mapper.include DynamicImage::Routing
 
       ActionDispatch::ExceptionWrapper.rescue_responses.merge!(
         "DynamicImage::Errors::InvalidSignature" => :unauthorized

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/image_sizing.rb

@@ -149,8 +149,8 @@ module DynamicImage
       @uncropped
     end
 
-    def vector(x, y)
-      Vector2d.new(x, y)
+    def vector(width, height)
+      Vector2d.new(width, height)
     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/model/dimensions.rb

@@ -82,8 +82,8 @@ module DynamicImage
 
       private
 
-      def vector(x, y)
-        Vector2d.new(x, y)
+      def vector(width, height)
+        Vector2d.new(width, height)
       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
@@ -70,27 +86,36 @@ module DynamicImage
     private
 
     def coalesced(image)
-      return image unless gif?
+      gif? ? DynamicImage::ImageReader.new(image.coalesce.to_blob).read : image
+    end
 
-      DynamicImage::ImageReader.new(image.coalesce.to_blob).read
+    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,
+                                   content_type: content_type,
+                                   data: crop_and_resize(size))
+      )
     end
 
     def crop_and_resize(size)
       normalized do |image|
-        if record.cropped? || size != record.size
-          image.crop(image_sizing.crop_geometry_string(size))
-          image.resize(size)
-        end
+        next unless record.cropped? || size != record.size
+
+        image.crop(image_sizing.crop_geometry_string(size))
+        image.resize(size)
       end
     end
 
-    def find_or_create_variant(size)
-      record.variants.find_by(variant_params(size)) ||
-        record.variants.create(
-          variant_params(size).merge(filename: record.filename,
-                                     content_type: content_type,
-                                     data: crop_and_resize(size))
-        )
+    def exif
+      @exif ||= DynamicImage::ImageReader.new(record.data).exif
     end
 
     def format
@@ -102,7 +127,7 @@ module DynamicImage
     end
 
     def jpeg?
-      content_type == "image/jpeg" || content_type == "image/jpeg"
+      content_type == "image/jpeg"
     end
 
     def image_sizing
@@ -110,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
@@ -133,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
 
@@ -149,15 +164,16 @@ 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)
 
-      { width: size.x.round,
-        height: size.y.round,
-        crop_width: crop_size.x,
-        crop_height: crop_size.y,
-        crop_start_x: crop_start.x,
-        crop_start_y: crop_start.y,
+      { width: size.x.round, height: size.y.round,
+        crop_width: crop_size.x, crop_height: crop_size.y,
+        crop_start_x: crop_start.x, crop_start_y: crop_start.y,
         format: format }
     end
   end

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.21"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.1.0
 platform: ruby
 authors:
 - Inge Jørgensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-11-13 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
@@ -78,6 +92,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -127,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
@@ -134,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
@@ -142,7 +187,7 @@ homepage: https://github.com/elektronaut/dynamic_image
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing
 test_files: []