dynamic_image 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3c91615696c4df8f094670ca324626be3a3d33f232b6dd483c22d36d547534
-  data.tar.gz: b781ca35542805f1fe34446d60fe23a12d07603c560a1aa9e95f8b519551ea8c
+  metadata.gz: a62dce84fcc98c58fd62f1a59ef08bb918cfe77c3441542959609b0eb8e6b5da
+  data.tar.gz: 8dc11abb55c9cf425fd651f9017cd9477235bd712b185c268c36f36191833422
 SHA512:
-  metadata.gz: ed8c8fdfe061bf189beb9946faa56c5bb631edd0f4fc1099a71c6fbd07aee2e815299d7acbf0385dfb001186122035d91d6a834bf002383a1d1fb3283ac3a5e7
-  data.tar.gz: f80069f885761140e96a98d2aa0c0dc0b47a2b668d9fae06d0afefc49b0ada0c59013c7fe97f8d6f6f7102ab83c747076c0ba2982d1112f58f81ea39b3c028dc
+  metadata.gz: da083259103d212b5bc8909659b5e3110a18ac8ca34cc232c2a1d120e6927d8165ae04f9367661e96687cf43f1be9079002b54cd3947d9c5aa61d15eea5c44f7
+  data.tar.gz: fe2692f3948999720c135ce33e94e979d945bf985617d852bb10bd972e917519ea03f3e3e321bce2677da9f88c7fd70aea4f86f4d4fda1373adf547658542fa0

data/README.md

@@ -28,8 +28,8 @@ and enumeration attacks.
 
 ## Requirements
 
-* Rails 4.2
-* Ruby 1.9.3+
+* Rails 5
+* Ruby 2.4+
 * ImageMagick command line tools
 
 ## Documentation

data/Rakefile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-APP_RAKEFILE = "spec/internal/Rakefile".freeze
+APP_RAKEFILE = "spec/internal/Rakefile"
 load "rails/tasks/engine.rake"
 
 RSpec::Core::RakeTask.new

data/app/models/dynamic_image/variant.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module DynamicImage
+  class Variant < ApplicationRecord
+    include Dis::Model
+
+    self.table_name = "dynamic_image_variants"
+    self.dis_type = "image-variants"
+
+    belongs_to :image, polymorphic: true, inverse_of: :variants
+
+    validates_data_presence
+
+    validates :format, presence: true
+
+    validates :width, :height, :crop_width, :crop_height,
+              numericality: { greater_than: 0, only_integer: true }
+
+    validates :crop_start_x, :crop_start_y,
+              numericality: { only_integer: true }
+  end
+end

data/db/migrate/20190620160500_create_dynamic_image_variants.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class CreateDynamicImageVariants < ActiveRecord::Migration[5.2]
+  def change
+    create_table :dynamic_image_variants do |t|
+      t.references :image, polymorphic: true, null: false
+
+      # Dis attributes
+      t.string  :content_hash, null: false
+      t.string  :content_type, null: false
+      t.integer :content_length, null: false
+      t.string  :filename, null: false
+
+      t.string :format, null: false
+      t.integer :width, :height, null: false
+      t.integer :crop_width, :crop_height, null: false
+      t.integer :crop_start_x, :crop_start_y, null: false
+
+      t.timestamps null: false
+    end
+
+    add_index(:dynamic_image_variants,
+              %i[image_id image_type],
+              name: "dynamic_image_variants_by_image")
+
+    add_index(:dynamic_image_variants,
+              %i[image_id image_type format width height crop_width
+                 crop_height crop_start_x crop_start_y],
+              name: "dynamic_image_variants_by_format_and_size",
+              unique: true)
+  end
+end

data/lib/dynamic_image.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require "mini_magick"
 require "dis"
@@ -7,6 +7,7 @@ require "vector2d"
 require "dynamic_image/belongs_to"
 require "dynamic_image/controller"
 require "dynamic_image/digest_verifier"
+require "dynamic_image/engine"
 require "dynamic_image/errors"
 require "dynamic_image/helper"
 require "dynamic_image/image_reader"
@@ -14,7 +15,6 @@ require "dynamic_image/image_sizing"
 require "dynamic_image/metadata"
 require "dynamic_image/model"
 require "dynamic_image/processed_image"
-require "dynamic_image/railtie"
 require "dynamic_image/routing"
 
 module DynamicImage

data/lib/dynamic_image/belongs_to.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   # = DynamicImage Belongs To

data/lib/dynamic_image/controller.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   # = DynamicImage Controller
@@ -53,6 +53,7 @@ module DynamicImage
 
     def render_image(options)
       return unless stale?(@record)
+
       respond_to do |format|
         format.html do
           render(file: File.join(File.dirname(__FILE__), "templates/show"),
@@ -66,14 +67,13 @@ module DynamicImage
 
     def render_raw_image(disposition: "inline", filename: nil)
       return unless stale?(@record)
+
       respond_to do |format|
         format.any(:gif, :jpeg, :png, :tiff) do
-          send_data(
-            @record.data,
-            filename: filename,
-            content_type: @record.content_type,
-            disposition: disposition
-          )
+          send_data(@record.data,
+                    filename: filename,
+                    content_type: @record.content_type,
+                    disposition: disposition)
         end
       end
     end
@@ -82,16 +82,16 @@ module DynamicImage
       params[:format]
     end
 
-    def send_image(image)
+    def send_image(processed_image)
       send_data(
-        image.cropped_and_resized(requested_size),
-        content_type: image.content_type,
-        disposition:  "inline"
+        processed_image.cropped_and_resized(requested_size),
+        content_type: processed_image.content_type,
+        disposition: "inline"
       )
     end
 
     def verify_signed_params
-      key = [:action, :id, :size].map do |k|
+      key = %i[action id size].map do |k|
         k == :id ? params.require(k).to_i : params.require(k)
       end.join("-")
       DynamicImage.digest_verifier.verify(key, params[:digest])

data/lib/dynamic_image/digest_verifier.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   # = DynamicImage Digest Verifier
@@ -31,22 +31,20 @@ module DynamicImage
     # Verifies that <tt>digest</tt> is valid for <tt>data</tt>.
     # Raises a +DynamicImage::Errors::InvalidSignature+ error if not.
     def verify(data, digest)
-      if valid_digest?(data, digest)
-        true
-      else
-        raise DynamicImage::Errors::InvalidSignature
-      end
+      return true if valid_digest?(data, digest)
+
+      raise DynamicImage::Errors::InvalidSignature
     end
 
     private
 
-    def secure_compare(a, b)
-      return false unless a.bytesize == b.bytesize
+    def secure_compare(str, other)
+      return false unless str.bytesize == other.bytesize
 
-      l = a.unpack "C#{a.bytesize}"
+      l = str.unpack "C#{str.bytesize}"
 
       res = 0
-      b.each_byte { |byte| res |= byte ^ l.shift }
+      other.each_byte { |byte| res |= byte ^ l.shift }
       res.zero?
     end
 

data/lib/dynamic_image/{railtie.rb → engine.rb}

@@ -1,29 +1,40 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
-  class Railtie < ::Rails::Railtie
-    initializer "dynamic_image" do
+  class Engine < ::Rails::Engine
+    initializer "dynamic_image.digest_verifier" do
+      config.after_initialize do |app|
+        secret = app.key_generator.generate_key("dynamic_image")
+        DynamicImage.digest_verifier = DynamicImage::DigestVerifier.new(secret)
+      end
+    end
+
+    initializer "dynamic_image.migrations" do |app|
+      unless app.root.to_s.match?(root.to_s)
+        config.paths["db/migrate"].expanded.each do |expanded_path|
+          app.config.paths["db/migrate"] << expanded_path
+        end
+      end
+    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::ExceptionWrapper.rescue_responses.merge!(
         "DynamicImage::Errors::InvalidSignature" => :unauthorized
       )
+    end
 
+    initializer "dynamic_image.sentry" do
       # If Sentry is configured, exclude reporting of tampered signatures
       if Object.const_defined?("Raven")
         Raven.configure do |c|
           c.excluded_exceptions += ["DynamicImage::Errors::InvalidSignature"]
         end
       end
-
-      config.after_initialize do |app|
-        secret = app.key_generator.generate_key("dynamic_image")
-        DynamicImage.digest_verifier = DynamicImage::DigestVerifier.new(secret)
-      end
-
-      ActiveSupport.on_load(:active_record) do
-        send :include, DynamicImage::BelongsTo
-      end
     end
   end
 end

data/lib/dynamic_image/errors.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   module Errors

data/lib/dynamic_image/helper.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   # = DynamicImage Helper
@@ -117,11 +117,9 @@ module DynamicImage
     private
 
     def allowed_dynamic_image_url_options
-      [
-        :format, :only_path, :protocol, :host, :subdomain, :domain,
-        :tld_length, :port, :anchor, :trailing_slash, :script_name,
-        :action, :routing_type
-      ]
+      %i[format only_path protocol host subdomain domain
+         tld_length port anchor trailing_slash script_name
+         action routing_type ]
     end
 
     def default_format_for_image(record)
@@ -162,9 +160,9 @@ module DynamicImage
     end
 
     def filename_to_alt(str)
-      File.basename(str, ".*".freeze)
-          .sub(/-[[:xdigit:]]{32,64}\z/, "".freeze)
-          .tr("-_".freeze, " ".freeze)
+      File.basename(str, ".*")
+          .sub(/-[[:xdigit:]]{32,64}\z/, "")
+          .tr("-_", " ")
           .capitalize
     end
 

data/lib/dynamic_image/image_reader.rb

@@ -1,19 +1,35 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   class ImageReader
+    class << self
+      def magic_bytes
+        @magic_bytes ||= [
+          "\x47\x49\x46\x38\x37\x61",         # GIF
+          "\x47\x49\x46\x38\x39\x61",
+          "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", # PNG
+          "\xff\xd8",                         # JPEG
+          "\x49\x49\x2a\x00",                 # TIFF
+          "\x4d\x4d\x00\x2a",
+          "\x42\x4d"                          # BMP
+        ].map { |s| s.dup.force_encoding("binary") }
+      end
+    end
+
     def initialize(data)
       @data = data
     end
 
     def read
       raise DynamicImage::Errors::InvalidHeader unless valid_header?
+
       MiniMagick::Image.read(@data)
     end
 
     def valid_header?
       return false if file_header.blank?
-      magic_bytes.each do |str|
+
+      self.class.magic_bytes.each do |str|
         return true if file_header.start_with?(str)
       end
       false
@@ -24,17 +40,5 @@ module DynamicImage
     def file_header
       @file_header ||= StringIO.new(@data, "rb").read(8)
     end
-
-    def magic_bytes
-      [
-        "\x47\x49\x46\x38\x37\x61".force_encoding("binary"),         # GIF
-        "\x47\x49\x46\x38\x39\x61".force_encoding("binary"),
-        "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a".force_encoding("binary"), # PNG
-        "\xff\xd8".force_encoding("binary"),                         # JPEG
-        "\x49\x49\x2a\x00".force_encoding("binary"),                 # TIFF
-        "\x4d\x4d\x00\x2a".force_encoding("binary"),
-        "\x42\x4d".force_encoding("binary")                          # BMP
-      ]
-    end
   end
 end

data/lib/dynamic_image/image_sizing.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   # = DynamicImage Image Sizing
@@ -121,20 +121,22 @@ module DynamicImage
       start
     end
 
-    def parse_vector(v)
-      v.is_a?(String) ? str_to_vector(v) : v
+    def parse_vector(vector)
+      vector.is_a?(String) ? str_to_vector(vector) : vector
     end
 
     attr_reader :record
 
-    def require_dimensions!(v)
-      raise DynamicImage::Errors::InvalidSizeOptions unless v.x > 0 && v.y > 0
+    def require_dimensions!(vector)
+      return if vector.x.positive? && vector.y.positive?
+
+      raise DynamicImage::Errors::InvalidSizeOptions
     end
 
     def shift_vector(vect)
       vector(
-        vect.x < 0 ? vect.x.abs : 0,
-        vect.y < 0 ? vect.y.abs : 0
+        vect.x.negative? ? vect.x.abs : 0,
+        vect.y.negative? ? vect.y.abs : 0
       )
     end
 

data/lib/dynamic_image/metadata.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   # = DynamicImage Metadata
@@ -13,15 +13,15 @@ module DynamicImage
     # Returns the color space of the image as a string. The result will be one
     # of the following: "rgb", "cmyk", "gray".
     def colorspace
-      if valid?
-        case metadata[:colorspace]
-        when /rgb/i
-          "rgb"
-        when /cmyk/i
-          "cmyk"
-        when /gray/i
-          "gray"
-        end
+      return unless valid?
+
+      case metadata[:colorspace]
+      when /rgb/i
+        "rgb"
+      when /cmyk/i
+        "cmyk"
+      when /gray/i
+        "gray"
       end
     end
 
@@ -80,7 +80,7 @@ module DynamicImage
         {
           colorspace: image[:colorspace],
           dimensions: image[:dimensions],
-          format:     image[:format]
+          format: image[:format]
         }
       end
     end

data/lib/dynamic_image/model.rb

@@ -1,8 +1,9 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require "dynamic_image/model/dimensions"
 require "dynamic_image/model/transformations"
 require "dynamic_image/model/validations"
+require "dynamic_image/model/variants"
 
 module DynamicImage
   # = DynamicImage Model
@@ -65,6 +66,7 @@ module DynamicImage
     include DynamicImage::Model::Dimensions
     include DynamicImage::Model::Transformations
     include DynamicImage::Model::Validations
+    include DynamicImage::Model::Variants
 
     included do
       before_validation :read_image_metadata, if: :data_changed?
@@ -121,11 +123,9 @@ module DynamicImage
     end
 
     def safe_content_types
-      %w(
-        image/png
-        image/gif
-        image/jpeg
-      )
+      %w[image/png
+         image/gif
+         image/jpeg]
     end
   end
 end

data/lib/dynamic_image/model/dimensions.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   module Model

data/lib/dynamic_image/model/transformations.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   module Model
@@ -59,6 +59,7 @@ module DynamicImage
 
       def rotated_crop(new_width)
         return nil unless cropped?
+
         [
           new_width - (crop_start_y + crop_height),
           crop_start_x,
@@ -69,6 +70,7 @@ module DynamicImage
 
       def rotated_crop_gravity(new_width)
         return nil unless crop_gravity?
+
         [new_width - crop_gravity_y, crop_gravity_x]
       end
 

data/lib/dynamic_image/model/validations.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   module Model
@@ -9,6 +9,7 @@ module DynamicImage
     # integrity.
     module Validations
       extend ActiveSupport::Concern
+
       included do
         validates_data_presence
 
@@ -57,22 +58,18 @@ module DynamicImage
 
       module ClassMethods
         def allowed_colorspaces
-          %w(
-            rgb
-            cmyk
-            gray
-          )
+          %w[rgb
+             cmyk
+             gray]
         end
 
         def allowed_content_types
-          %w(
-            image/bmp
-            image/gif
-            image/jpeg
-            image/pjpeg
-            image/png
-            image/tiff
-          )
+          %w[image/bmp
+             image/gif
+             image/jpeg
+             image/pjpeg
+             image/png
+             image/tiff]
         end
       end
 
@@ -80,9 +77,10 @@ module DynamicImage
 
       def validate_crop_bounds
         required_size = crop_start + crop_size
-        if required_size.x > real_size.x || required_size.y > real_size.y
-          errors.add(:crop_size, "is out of bounds")
-        end
+        return unless required_size.x > real_size.x ||
+                      required_size.y > real_size.y
+
+        errors.add(:crop_size, "is out of bounds")
       end
 
       def validate_image

data/lib/dynamic_image/model/variants.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module DynamicImage
+  module Model
+    # = DynamicImage Model Variants
+    #
+    # Validates that all necessary attributes are valid. All of these are
+    # managed by +DynamicImage::Model+, so this is mostly for enforcing
+    # integrity.
+    module Variants
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :variants,
+                 as: :image,
+                 class_name: "DynamicImage::Variant",
+                 dependent: :destroy
+
+        before_update :clear_variants, if: :data_changed?
+      end
+
+      private
+
+      def clear_variants
+        variants.destroy_all
+      end
+    end
+  end
+end

data/lib/dynamic_image/processed_image.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   # = DynamicImage Processed Image
@@ -35,12 +35,9 @@ module DynamicImage
     #
     # Returns a binary string.
     def cropped_and_resized(size)
-      normalized do |image|
-        if record.cropped? || size != record.size
-          image.crop(image_sizing.crop_geometry_string(size))
-          image.resize(size)
-        end
-      end
+      return crop_and_resize(size) unless record.persisted?
+
+      find_or_create_variant(size).data
     end
 
     # Normalizes the image.
@@ -73,11 +70,27 @@ module DynamicImage
     private
 
     def coalesced(image)
-      if gif?
-        image.coalesce
-        image = DynamicImage::ImageReader.new(image.to_blob).read
+      return image unless gif?
+
+      DynamicImage::ImageReader.new(image.coalesce.to_blob).read
+    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
       end
-      image
+    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))
+        )
     end
 
     def format
@@ -93,8 +106,8 @@ module DynamicImage
     end
 
     def image_sizing
-      @image_sizing ||= DynamicImage::ImageSizing.new(record,
-                                                      uncropped: @uncropped)
+      @image_sizing ||=
+        DynamicImage::ImageSizing.new(record, uncropped: @uncropped)
     end
 
     def needs_colorspace_conversion?
@@ -108,11 +121,8 @@ module DynamicImage
     def optimize(image)
       image.layers "optimize" if gif?
       image.strip
-      if jpeg?
-        image.quality(85)
-        image.sampling_factor "4:2:0"
-        image.interlace "JPEG"
-      end
+      image.quality(85).sampling_factor("4:2:0").interlace("JPEG") if jpeg?
+      image
     end
 
     def process_data
@@ -126,22 +136,28 @@ module DynamicImage
     attr_reader :record
 
     def record_format
-      case record.content_type
-      when "image/bmp"
-        "BMP"
-      when "image/png"
-        "PNG"
-      when "image/gif"
-        "GIF"
-      when "image/jpeg", "image/pjpeg"
-        "JPEG"
-      when "image/tiff"
-        "TIFF"
-      end
+      { "image/bmp" => "BMP",
+        "image/png" => "PNG",
+        "image/gif" => "GIF",
+        "image/jpeg" => "JPEG",
+        "image/pjpeg" => "JPEG",
+        "image/tiff" => "TIFF" }[record.content_type]
     end
 
     def require_valid_image!
       raise DynamicImage::Errors::InvalidImage unless record.valid?
     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,
+        format: format }
+    end
   end
 end

data/lib/dynamic_image/routing.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
   # = DynamicImage Routing
@@ -11,9 +11,9 @@ module DynamicImage
     #   image_resources :avatars
     def image_resources(resource_name, options = {})
       options = {
-        path:        "#{resource_name}/:digest(/:size)",
+        path: "#{resource_name}/:digest(/:size)",
         constraints: { size: /\d+x\d+/ },
-        only:        [:show]
+        only: [:show]
       }.merge(options)
       resources resource_name, options do
         get :uncropped, on: :member

data/lib/dynamic_image/version.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DynamicImage
-  VERSION = "2.0.16".freeze
+  VERSION = "2.0.17"
 end

data/lib/rails/generators/dynamic_image/resource/resource_generator.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require "rails/generators"
 require "rails/generators/rails/resource/resource_generator"
@@ -52,16 +52,14 @@ module DynamicImage
       end
 
       def dynamic_image_attributes
-        %w(
-          content_hash:string content_type:string
-          content_length:integer
-          filename:string
-          colorspace:string
-          real_width:integer real_height:integer
-          crop_width:integer crop_height:integer
-          crop_start_x:integer crop_start_y:integer
-          crop_gravity_x:integer crop_gravity_y:integer
-        )
+        %w[content_hash:string content_type:string
+           content_length:integer
+           filename:string
+           colorspace:string
+           real_width:integer real_height:integer
+           crop_width:integer crop_height:integer
+           crop_start_x:integer crop_start_y:integer
+           crop_gravity_x:integer crop_gravity_y:integer]
       end
     end
   end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.17
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: dis
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: vector2d
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '4.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '4.9'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: dis
+  name: vector2d
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: sqlite3
   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'
 description: DynamicImage is a Rails plugin that simplifies image uploading and processing
 email:
 - inge@elektronaut.no
@@ -116,10 +116,13 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/models/dynamic_image/variant.rb
+- db/migrate/20190620160500_create_dynamic_image_variants.rb
 - lib/dynamic_image.rb
 - lib/dynamic_image/belongs_to.rb
 - lib/dynamic_image/controller.rb
 - lib/dynamic_image/digest_verifier.rb
+- lib/dynamic_image/engine.rb
 - lib/dynamic_image/errors.rb
 - lib/dynamic_image/helper.rb
 - lib/dynamic_image/image_reader.rb
@@ -129,8 +132,8 @@ files:
 - lib/dynamic_image/model/dimensions.rb
 - lib/dynamic_image/model/transformations.rb
 - lib/dynamic_image/model/validations.rb
+- lib/dynamic_image/model/variants.rb
 - lib/dynamic_image/processed_image.rb
-- lib/dynamic_image/railtie.rb
 - lib/dynamic_image/routing.rb
 - lib/dynamic_image/templates/show.html.erb
 - lib/dynamic_image/version.rb
@@ -147,15 +150,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing