dynamic_image 2.0.19 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8a443b4bff71c2168b0564f451cbe768ab6c5543e4527e80514e2abc95ec608
-  data.tar.gz: c30e81b7cb0a61e53de91a6abfbdbddaf9dd9cbc71275377b174f7b4ac225c33
+  metadata.gz: 6828f7825142e16348273c97f77cda19d191849ff09e545174c8bb445372257e
+  data.tar.gz: 480ebd62de3ddf2a780971b1b63c1ef545dff59f7f54ee1f7ede5ebef33a485b
 SHA512:
-  metadata.gz: 1fac29b093705e10f1183269128d4db4874d3a500b2bbc25ae67b03993e0e05228148e548d7f1183766c204ecbb9711857b26dea513653628be7692df85e6aa2
-  data.tar.gz: 40bf839a47d7ae69b55455b919d16973117b7e7877980802f9c5d3a8b761f7c8460893705b4fa60b08a8e9ea1988265855d6dfdd25a934c89ac3aa1f9a9969dc
+  metadata.gz: 95279e2367c7f8639be599e3717fd815bcf4f482a59ab3bcafd1e51aac3ce7c86621a1f694a2dfced38473de1b73fde9e7396a085d7e0cc6a335270267ddccfb
+  data.tar.gz: 62e6c9b6b440a51855ae1d5a89bb2b85fab6c126603aa5e0b08f58b372bf7007ddb3e5eb7c9d910a2bb0ee59a0fb217711e706e5adbdb19008f0e97d9ec67087

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)
@@ -15,9 +15,9 @@ uploaded, DynamicImage stores the original file and generates images
 on demand. It handles cropping, resizing, format and colorspace
 conversion.
 
-Supported formats at the moment are JPEG, PNG, GIF, BMP and TIFF. The
-latter will automatically be converted to JPG. CMYK images will be
-converted to RGB, and RGB images will be converted to the sRGB
+Supported formats at the moment are JPEG, PNG, GIF, BMP, WebP and TIFF.
+BMP, WebP and TIFF images will automatically be converted to JPG. CMYK
+images will be converted to RGB, and RGB images will be converted to the sRGB
 colorspace for consistent appearance in all browsers.
 
 DynamicImage is built on [Dis](https://github.com/elektronaut/dis)

data/lib/dynamic_image.rb

@@ -12,6 +12,7 @@ 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"

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,19 @@ 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)
+      image_size = processed_image.record.size.x * processed_image.record.size.y
+      image_size > 12_500_000 &&
+        !processed_image.find_variant(size)
+    end
+
     def render_image(options)
       return unless stale?(@record)
 
@@ -59,8 +65,8 @@ module DynamicImage
           render(file: File.join(File.dirname(__FILE__), "templates/show"),
                  layout: false, locals: { options: options })
         end
-        format.any(:gif, :jpeg, :png, :tiff) 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 +75,7 @@ module DynamicImage
       return unless stale?(@record)
 
       respond_to do |format|
-        format.any(:gif, :jpeg, :png, :tiff) do
+        format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
           send_data(@record.data,
                     filename: filename,
                     content_type: @record.content_type,
@@ -82,12 +88,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

@@ -17,11 +17,21 @@ module DynamicImage
       end
     end
 
+    initializer "dynamic_image.mime_types" do
+      Mime::Type.register "image/bmp", :bmp
+      Mime::Type.register "image/gif", :gif
+      Mime::Type.register "image/jpeg", :jpg
+      Mime::Type.register "image/jpeg", :jpeg
+      Mime::Type.register "image/png", :png
+      Mime::Type.register "image/tiff", :tiff
+      Mime::Type.register "image/webp", :webp
+    end
+
     initializer "dynamic_image.extensions", before: :load_active_support do
       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

@@ -11,7 +11,8 @@ module DynamicImage
           "\xff\xd8",                         # JPEG
           "\x49\x49\x2a\x00",                 # TIFF
           "\x4d\x4d\x00\x2a",
-          "\x42\x4d"                          # BMP
+          "\x42\x4d",                         # BMP
+          "\x52\x49\x46\x46"                  # WEBP
         ].map { |s| s.dup.force_encoding("binary") }
       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/model/validations.rb

@@ -69,7 +69,8 @@ module DynamicImage
              image/jpeg
              image/pjpeg
              image/png
-             image/tiff]
+             image/tiff
+             image/webp]
         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,29 @@ module DynamicImage
     private
 
     def coalesced(image)
-      return image unless gif?
+      gif? ? DynamicImage::ImageReader.new(image.coalesce.to_blob).read : image
+    end
+
+    def convert_to_srgb(image, combined)
+      combined.profile(srgb_profile) if image.data["profiles"].present?
+      combined.colorspace("sRGB") if record.cmyk?
+    end
 
-      DynamicImage::ImageReader.new(image.coalesce.to_blob).read
+    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
-      end
-    end
+        next unless record.cropped? || size != record.size
 
-    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))
-        )
+        image.crop(image_sizing.crop_geometry_string(size))
+        image.resize(size)
+      end
     end
 
     def format
@@ -102,7 +120,7 @@ module DynamicImage
     end
 
     def jpeg?
-      content_type == "image/jpeg" || content_type == "image/jpeg"
+      content_type == "image/jpeg"
     end
 
     def image_sizing
@@ -110,10 +128,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,30 +147,26 @@ 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" }[record.content_type]
+      { "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
 
     def require_valid_image!
       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.19"
+  VERSION = "2.0.24"
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.19
+  version: 2.0.24
 platform: ruby
 authors:
 - Inge Jørgensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,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 +106,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 +155,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 +164,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 +173,7 @@ homepage: https://github.com/elektronaut/dynamic_image
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing
 test_files: []