dynamic_image 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1d723cd97a91199630354e541d2a740aa41bae8ccb07554c1e723096a1b6dc
-  data.tar.gz: b4f5a8bf26b69da95543cb8885f5add2b72504ea88f83c4097bc1c25a13c622f
+  metadata.gz: 814628e7438a06292a2a283be0c88b724a1449327276c2f7ca89656947c690d7
+  data.tar.gz: 8ff9d551e13362514d102cae1c04e61d3374689282715911448019c425c12487
 SHA512:
-  metadata.gz: e2ba7e0be3c929f9da2b1c7311ae7a246341f081cc8057e8293417a8a73634ec5844d0ce7a691c3d5c771d99924b311c59a2a9b9bf2e2baae84675a3967a8614
-  data.tar.gz: '08cfc8124f2d6e2bd9d505315b1af7ed87e42ae4ff497a88fafd240e9594943721a6f72e7f196d5dffb1a43a1c8489e9b1b427e4042e149aedcf21a22f0506ba'
+  metadata.gz: c52354d7f7100b367b402ea9be16a522872d423e8f1a21f49482bc86eb6223ac9d0c1194979e1d6b49fcfac2352922460aa44395e37adef1ca8cac0c6009e2b6
+  data.tar.gz: 94c370ea4a7ab9fe575ae324f8d50844c6600c5a677efcfe03471703130b4eea7613c5e3ac48d894481a1520484efdae2843ef90e36486f114009aa168681d1e

data/lib/dynamic_image/controller.rb

@@ -51,6 +51,24 @@ module DynamicImage
       @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
 
@@ -68,7 +86,7 @@ module DynamicImage
                  layout: false, locals: { options: options })
         end
         format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
-          send_image(@record, options)
+          process_and_send(@record, options)
         end
       end
     end
@@ -90,17 +108,10 @@ module DynamicImage
       params[:format]
     end
 
-    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
+    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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing