dynamic_image 2.0.18 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9620717b51e3fcc35f2f90957062663615f646a9a74af97dcb5c3608bc3b6dbf
-  data.tar.gz: dfcff9e322e4e6cfabba94d37f7fac37020c12c6e5683d98b0fcbdd9a7108df9
+  metadata.gz: 2a9eeb1b5378e17d2dcf9d6c0245df5386a1253dfdbefd0fff61fd5faeb2a1ee
+  data.tar.gz: 3156acfe1931d9530dc5c23d51716904feb2f1f16f00657cd9aa52c61d97cf94
 SHA512:
-  metadata.gz: 2acfe22422a4a319e43979a219027051df1d4680bd313d7ae3ff5739f436e71cb933913cb9e1108ba34bb33d2184ec5b4b423c1ca9867e455b037cd4dc2b1e98
-  data.tar.gz: 792b3807154854335a0bea0bcd0ad619ddd6d8ff7be2ebc3ee06c446b6b36ace01848c87a20fb6e5d1f225f8072e76eeb0e39fa40cdfa6aec46de683023354e0
+  metadata.gz: d3c0d2fd1e238b181b8d7cd86ebb12c65ebbe37e606bf434c969584def13b968e0bbd66b845b553d65c7d8e9245f20a066b88ee66f523de87391adf285aa194a
+  data.tar.gz: 51eda1715d2eb18931256018f95dfe9f714817bda16601d5c1ded50778cc4a0a31d27ec00ffe3287a88205e1c49cea09c0d159594c8552a2a94084821ff403c1

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/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

@@ -59,7 +59,7 @@ module DynamicImage
           render(file: File.join(File.dirname(__FILE__), "templates/show"),
                  layout: false, locals: { options: options })
         end
-        format.any(:gif, :jpeg, :png, :tiff) do
+        format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
           send_image(DynamicImage::ProcessedImage.new(@record, options))
         end
       end
@@ -69,7 +69,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,

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/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

@@ -43,7 +43,7 @@ module DynamicImage
     # 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 +59,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 +70,35 @@ 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
+        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))
-        )
+      record.variants.find_by(variant_params(size)) || create_variant(size)
+    rescue ActiveRecord::RecordNotUnique
+      record.variants.find_by(variant_params(size))
     end
 
     def format
@@ -110,10 +118,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
@@ -136,27 +140,25 @@ module DynamicImage
     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,
-        height: size.y,
-        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/version.rb

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

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.23
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2020-06-23 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
@@ -134,6 +162,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
@@ -157,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing