dynamic_image 2.0.25 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20b1cfa9c326762d6b3d1bca63b4d8d65516cc266abd03f55328b4cca8086dc3
-  data.tar.gz: 4a0496d6507534664dc8e39bc59358a2607df6aaaa966ee0eda3990f72cae8bf
+  metadata.gz: eca1d50c2a8a433acc951254bd40d1717de820d564656584611dbc28fc7b5c01
+  data.tar.gz: c76ed29bd97f9c4cfc0a7e393b8ac675fd938129dea98cf5307885d7dbca18d5
 SHA512:
-  metadata.gz: c04933c776c41870142473869f983fd0d8d1a0b98602abf41b3fb5392f6d6ef8c4cb2f77c875044f32cbc7903d1dd9de06c644fcfc73c913bd414583ee27dfae
-  data.tar.gz: 79ad9d9b59398d56765878253170eae968d2d8320c31b992fd9758ff2dd00b8131db1fae2746f6af359eeb8b9934dfe4020b30cd91602f1b6872302c95b2d1d6
+  metadata.gz: 060a0bae2ea57be5954f290b1a5503299aa59b4a54db20f727ef9286afa704cbcaefe11a7e700dda58f9e829313a547af53cfa31a3d46b4a3cbb45e18cfb316c
+  data.tar.gz: 11f78861bfd9c41c3fe49bb2f6d50c94f464eadaeeb225191d4512070b6cdbd9cdcaebe1e714c9f7903512287ae3e68e743fa9dd4be42c9f4af6600865c31b6f

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"

data/lib/dynamic_image/controller.rb

@@ -44,13 +44,28 @@ module DynamicImage
     private
 
     def cache_expiration_header
-      expires_in 30.days, public: true if response.status == 200
+      expires_in 1.year, 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
+    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
 
@@ -64,11 +79,11 @@ module DynamicImage
 
       respond_to do |format|
         format.html do
-          render(file: File.join(File.dirname(__FILE__), "templates/show"),
+          render(template: "dynamic_image/images/show",
                  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 +105,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/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/processed_image.rb

@@ -90,7 +90,10 @@ module DynamicImage
     end
 
     def convert_to_srgb(image, combined)
-      combined.profile(srgb_profile) if image.data["profiles"].present?
+      if image.data["profiles"].present? &&
+         exif.colorspacedata&.strip&.downcase == record.colorspace
+        combined.profile(srgb_profile)
+      end
       combined.colorspace("sRGB") if record.cmyk?
     end
 
@@ -111,6 +114,10 @@ module DynamicImage
       end
     end
 
+    def exif
+      @exif ||= DynamicImage::ImageReader.new(record.data).exif
+    end
+
     def format
       @format ||= record_format
     end

data/lib/dynamic_image/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.1.4
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-02-06 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
@@ -96,16 +110,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,7 @@ files:
 - README.md
 - Rakefile
 - app/models/dynamic_image/variant.rb
+- app/views/dynamic_image/images/show.html.erb
 - db/migrate/20190620160500_create_dynamic_image_variants.rb
 - lib/dynamic_image.rb
 - lib/dynamic_image/belongs_to.rb
@@ -166,7 +181,6 @@ files:
 - 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
 - lib/rails/generators/dynamic_image/resource/resource_generator.rb
 homepage: https://github.com/elektronaut/dynamic_image
@@ -188,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