dynamic_image 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e9d1fe6e9eca656b2f800ff782b1e74e9f86dd0cf75da272470a2b92ee77c3
-  data.tar.gz: 66c3cc61cdb78a845b13fa43101ac0235b5b72df2d5397cdf6e29033632be4bd
+  metadata.gz: 29045ac647420e30871365d212f63966bf829dab26f4bc9bb97bf096fae7f154
+  data.tar.gz: 61953910945dd403634b106dee5335f780195a8ba00f894ce86cb5aea479960c
 SHA512:
-  metadata.gz: '04423593c2dcc2f6797e37cb4d8a732f189d617632099cd81c8a56f7b10d5fd3f6b2c110527cd7c44ec5f91208c2f73d1a865d89e779a839db1834f4f3f7340d'
-  data.tar.gz: 734fc7820ddd5b55c95cfe7311a1f449892dfb81eae9fc264393ec4d36e08982e11df89dfc56b2ff3c32a48dcc738623ff6062a173d0d931b6b24932951aaf93
+  metadata.gz: 6634f152e4b04da0dd65bd575d46dd862fdfe0f22c0fe0e05c8025fa4d90207db109ea262252ff01a6daa4db71a8a0a0993c6a413b5afd6a9ee691287ae09c65
+  data.tar.gz: 74db0d48ad670d7a2a566114e0bfd53c154e95e4c79a27388b04c7e10930bf409891cabf8cd8de67638e21f4b84f82b8d267ae36feb6d05823f308d157586512

data/lib/dynamic_image/belongs_to.rb

@@ -7,8 +7,8 @@ module DynamicImage
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def belongs_to_image(name, scope = nil, **options)
-        belongs_to(name, scope, **options)
+      def belongs_to_image(name, scope = nil, **)
+        belongs_to(name, scope, **)
 
         define_method "#{name}=" do |new_image|
           if new_image.present? && !new_image.is_a?(DynamicImage::Model)

data/lib/dynamic_image/controller.rb

@@ -77,7 +77,7 @@ module DynamicImage
       respond_to do |format|
         format.html do
           render(template: "dynamic_image/images/show",
-                 layout: false, locals: { options: options })
+                 layout: false, locals: { options: })
         end
         format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
           process_and_send(@record, options)
@@ -91,9 +91,9 @@ module DynamicImage
       respond_to do |format|
         format.any(:gif, :jpeg, :jpg, :png, :tiff, :webp) do
           send_data(@record.data,
-                    filename: filename,
+                    filename:,
                     content_type: @record.content_type,
-                    disposition: disposition)
+                    disposition:)
         end
       end
     end

data/lib/dynamic_image/helper.rb

@@ -26,16 +26,13 @@ module DynamicImage
     #
     #   image = Image.find(params[:id])
     #   dynamic_image_tag(image)
-    #   # => <img alt="My file" height="200" src="..." width="320" />
+    #   # => <img height="200" src="..." width="320" />
     #   dynamic_image_tag(image, size: "100x100", alt="Avatar")
     #   # => <img alt="Avatar" height="62" src="..." width="100" />
     def dynamic_image_tag(record_or_array, options = {})
-      record = extract_dynamic_image_record(record_or_array)
-      options = { alt: filename_to_alt(record.filename) }.merge(options)
-
       size = fit_size!(record_or_array, options)
       url_options = options.extract!(*allowed_dynamic_image_url_options)
-      html_options = { size: size }.merge(options)
+      html_options = { size: }.merge(options)
 
       image_tag(dynamic_image_path_with_size(record_or_array,
                                              size,
@@ -143,7 +140,7 @@ module DynamicImage
         routing_type: :url,
         action: nil,
         format: default_format_for_image(record),
-        size: size
+        size:
       }.merge(options)
       options[:digest] =
         dynamic_image_digest(record, options[:action], options[:size])
@@ -179,7 +176,7 @@ module DynamicImage
 
     def image_sizing(record, size_opts, uncropped)
       ImageSizing
-        .new(record, uncropped: uncropped)
+        .new(record, uncropped:)
         .fit(size_opts[:size], size_opts).floor.to_s
     end
   end

data/lib/dynamic_image/image_processor.rb

@@ -77,7 +77,7 @@ module DynamicImage
     private
 
     def apply(new_image)
-      self.class.new(new_image, target_format: target_format)
+      self.class.new(new_image, target_format:)
     end
 
     def blank_image

data/lib/dynamic_image/jobs/create_variant.rb

@@ -8,6 +8,10 @@ module DynamicImage
     class CreateVariant < ActiveJob::Base
       queue_as :dis
 
+      discard_on Dis::Errors::NotFoundError
+
+      retry_on StandardError, attempts: 10, wait: :polynomially_longer
+
       def perform(record, options, size)
         size_v = Vector2d.parse(size)
         DynamicImage::ProcessedImage.new(record, options)

data/lib/dynamic_image/metadata.rb

@@ -77,7 +77,7 @@ module DynamicImage
                  end
 
         { width: image.get("width"),
-          height: height,
+          height:,
           colorspace: image.get("interpretation") }
       end
     end

data/lib/dynamic_image/model.rb

@@ -100,7 +100,7 @@ module DynamicImage
     # Includes a timestamp fingerprint in the URL param, so
     # that rendered images can be cached indefinitely.
     def to_param
-      [id, updated_at.utc.to_formatted_s(cache_timestamp_format)].join("-")
+      [id, updated_at.utc.to_fs(cache_timestamp_format)].join("-")
     end
 
     private

data/lib/dynamic_image/processed_image.rb

@@ -40,7 +40,11 @@ module DynamicImage
     def find_variant(size)
       return nil unless record.persisted?
 
-      record.variants.find_by(variant_params(size))
+      variant = record.variants.find_by(variant_params(size))
+      variant&.tap(&:data)
+    rescue Dis::Errors::NotFoundError
+      variant.destroy
+      nil
     end
 
     def format

data/lib/dynamic_image/version.rb

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

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

@@ -19,8 +19,8 @@ module DynamicImage
                     "#{file_name.pluralize}_controller.rb"),
           after: "ApplicationController\n"
         ) do
-          "  include DynamicImage::Controller\n\n  private\n\n" \
-            "  def model\n    #{class_name}\n  end\n"
+          "  include DynamicImage::Controller\n\n  private\n\n  " \
+            "def model\n    #{class_name}\n  end\n"
         end
       end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_image
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Inge Jørgensen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dis
@@ -78,62 +77,6 @@ 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
-    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: 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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: DynamicImage is a Rails plugin that simplifies image uploading and processing
 email:
 - inge@elektronaut.no
@@ -178,7 +121,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,15 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rails plugin that simplifies image uploading and processing
 test_files: []