dynamic_image 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a9eeb1b5378e17d2dcf9d6c0245df5386a1253dfdbefd0fff61fd5faeb2a1ee
-  data.tar.gz: 3156acfe1931d9530dc5c23d51716904feb2f1f16f00657cd9aa52c61d97cf94
+  metadata.gz: 6828f7825142e16348273c97f77cda19d191849ff09e545174c8bb445372257e
+  data.tar.gz: 480ebd62de3ddf2a780971b1b63c1ef545dff59f7f54ee1f7ede5ebef33a485b
 SHA512:
-  metadata.gz: d3c0d2fd1e238b181b8d7cd86ebb12c65ebbe37e606bf434c969584def13b968e0bbd66b845b553d65c7d8e9245f20a066b88ee66f523de87391adf285aa194a
-  data.tar.gz: 51eda1715d2eb18931256018f95dfe9f714817bda16601d5c1ded50778cc4a0a31d27ec00ffe3287a88205e1c49cea09c0d159594c8552a2a94084821ff403c1
+  metadata.gz: 95279e2367c7f8639be599e3717fd815bcf4f482a59ab3bcafd1e51aac3ce7c86621a1f694a2dfced38473de1b73fde9e7396a085d7e0cc6a335270267ddccfb
+  data.tar.gz: 62e6c9b6b440a51855ae1d5a89bb2b85fab6c126603aa5e0b08f58b372bf7007ddb3e5eb7c9d910a2bb0ee59a0fb217711e706e5adbdb19008f0e97d9ec67087

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/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)
 
@@ -60,7 +66,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))
+          send_image(@record, options)
         end
       end
     end
@@ -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/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,6 +42,20 @@ 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
@@ -95,12 +111,6 @@ 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))
-    end
-
     def format
       @format ||= record_format
     end
@@ -110,7 +120,7 @@ module DynamicImage
     end
 
     def jpeg?
-      content_type == "image/jpeg" || content_type == "image/jpeg"
+      content_type == "image/jpeg"
     end
 
     def image_sizing
@@ -137,8 +147,6 @@ 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",

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.23"
+  VERSION = "2.0.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Inge Jørgensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
@@ -155,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
@@ -171,7 +173,7 @@ homepage: https://github.com/elektronaut/dynamic_image
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,7 +189,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: []