dynamic_image 2.0.21 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7183bc59ab57bc659f3d38e0c2bd1fa250689d1e4647dfcc68e0eddceb4c2260
-  data.tar.gz: 882038f115a0e2d78684f02a19672138d8a68a3e36af0ac74d736a7d4056083a
+  metadata.gz: bfb9c218b8902487079281c04685088ba37cee03ba5944425c8e391869ed1f54
+  data.tar.gz: 6be8904c347f0721fe0d52f4693c65c7a7c96d77d81b169c00b83859df46c741
 SHA512:
-  metadata.gz: c2a6a1f35e3458693ae0d0c5b9eaca4fd5ddcd70164e070f67f80236723befc57d677d0de673bf94afb0416458cde7bc04648f7bd512d5682984af6ccb4adeae
-  data.tar.gz: b6ca975270f79fb9100aaeb1d2083f30adf7196c77783f663b741f84144c49bc6b42338ba220b050fca4637746f57328adff2d88f9fc9b48c829ff08d9157e72
+  metadata.gz: 712f4d5d9077baec9e3f67d01ae686a38ef380686a37a5c6c91b2e0d27db50e2623cd30c3b25e107a3b03fc6e0712fe20bc0643fc47ae73473ee735e94d031b5
+  data.tar.gz: 8ef5cd0021f2d32bc0876923c19f9e059edd5fdb52e06893cbab4dc4d739f72551f5bf53da8ee0007854f78d2cb5cc1de157542e40be9d27b17c6eeee735ccdb

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)

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, :webp) 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, :webp) 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

@@ -31,7 +31,7 @@ module DynamicImage
       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_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/processed_image.rb

@@ -70,27 +70,30 @@ module DynamicImage
     private
 
     def coalesced(image)
-      return image unless gif?
+      gif? ? DynamicImage::ImageReader.new(image.coalesce.to_blob).read : image
+    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
@@ -152,12 +155,9 @@ module DynamicImage
     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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.22
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
@@ -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