kamifusen 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267a1dc5741237d4a1255563dcb2f7fccb7717233ae02ad17b32d8829e9dd8d8
-  data.tar.gz: 24662f9214bbbc62cfb9268ff88a071d4d0bb5cf85e82902b0b1cf20f7cf409b
+  metadata.gz: d6b3840b515b44e7d6ed8aa12a5356ebba29978d01129ce320c76f3d22a307eb
+  data.tar.gz: 64095c851bda7934311a8a3e02d296c4cc777d030bc3e7d418543d5b1c36ac07
 SHA512:
-  metadata.gz: bbe200dc7c4335380d89fd878fbc3bee55deadddd5cc30a3ca920c0df0c9f86c4ab6199486d67f8959bb2e14154492587cc8898b2f4e97dcdb191a447a4df62a
-  data.tar.gz: cb0a63d0b2ae76002bb2455aae1e7ed2c706a6580518b5ac06cb4189b2b760f05a184711558ed2e9ee4c4cae4bc110ac1eb5b575cb3b17b95447c3a85d6456e7
+  metadata.gz: 3dcaaa6832c838370e8912a53a024df972450fa51d95661334815e3d74779f4d756718823df8fe435f5f0cb692386c5d999a738c5ee44f0ac418ce54ddbd97ea
+  data.tar.gz: 3163c01dbd79f9bbcc1e13ac3b19f11b5b5bab40f681c63f23d0e419721ca7a11cac36581778bc928a5a064ebea201fbb594d9df26b16dc8864bd2712f6c8d23

data/.gitignore

@@ -1,9 +1,4 @@
 /.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/spec/reports/
-/.bundle/
 /doc/
 /log/*.log
 /pkg/
@@ -13,5 +8,3 @@
 /test/dummy/log/*.log
 /test/dummy/storage/
 /test/dummy/tmp/
-.byebug_history
-.DS_Store

data/Rakefile

@@ -1,8 +1,3 @@
 # frozen_string_literal: true
-
+require "bundler/setup"
 require "bundler/gem_tasks"
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-task default: :rubocop

data/app/views/kamifusen/_view.html.erb

@@ -6,8 +6,8 @@ elsif source.respond_to?(:attached?)
   source_is_set = source.attached?
 end
 %>
-<% 
-if source_is_set 
+<%
+if source_is_set
   options ||= {}
   cached = options.dig(:cached)
   cache_if(cached, [source, options]) do
@@ -20,8 +20,19 @@ if source_is_set
     picture_class = options[:picture_class]
     width = options[:width]
     height = options[:height]
+    crop = options[:crop]
+    if crop && (width.nil? || height.nil?)
+      raise ArgumentError, "Cropping needs a width and a height."
+    end
     variant_sizes = Kamifusen.sizes.dup
     quality = Kamifusen.quality.dup
+    default_variant_options = {}
+    case ActiveStorage.variant_processor
+    when :vips
+      default_variant_options = { saver: { quality: quality } }
+    when :mini_magick
+      default_variant_options = { quality: quality }
+    end
 
     sizes = options[:sizes] || {}
     sizes_value = sizes.map { |key, value| [key, value].join(' ').strip }.join(', ')
@@ -40,8 +51,8 @@ if source_is_set
       elsif height.nil?
         # Calculated height, preserving the aspect ratio
         height = width / image_ratio
-      else
-        # Explicit dimensions. We redefine the height if aspect ratio is not preserved.
+      elsif !crop
+        # Explicit dimensions, no crop. We redefine the height if aspect ratio is not preserved.
         width = [image_width, width].min
         height = width / image_ratio
       end
@@ -73,15 +84,36 @@ if source_is_set
       default_width = width_retina if width_retina && width_retina > default_width
       if Kamifusen.with_webp
         srcset_webp = variant_sizes.map { |size|
-          variant = source.variant(resize: "#{size}>", format: :webp, quality: quality)
+          if crop
+            # Width: 400, height: 600 ; if width: 200, height: 300
+            variant_height = (height * size / width).round
+            variant_options = default_variant_options.merge({ resize_to_fill: [size, variant_height], format: :webp })
+          else
+            variant_options = default_variant_options.merge({ resize_to_limit: [size, nil], format: :webp })
+          end
+          variant = source.variant(variant_options)
           "#{ Kamifusen.process(variant, active_storage_direct_url) } #{size}w"
         }.join(', ')
       end
       srcset_default = variant_sizes.map { |size|
-        variant = source.variant(resize: "#{size}>", quality: quality)
+        if crop
+          # Width: 400, height: 600 ; if width: 200, height: 300
+          variant_height = (height * size / width).round
+          variant_options = default_variant_options.merge({ resize_to_fill: [size, variant_height] })
+        else
+          variant_options = default_variant_options.merge({ resize_to_limit: [size, nil] })
+        end
+        variant = source.variant(variant_options)
         "#{ Kamifusen.process(variant, active_storage_direct_url) } #{size}w"
       }.join(', ')
-      variant = source.variant(resize: "#{default_width}>", quality: quality)
+      if crop
+        # Width: 400, height: 600 ; if width: 200, height: 300
+        variant_height = (height * default_width / width).round
+        variant_options = default_variant_options.merge({ resize_to_fill: [default_width, variant_height] })
+      else
+        variant_options = default_variant_options.merge({ resize_to_limit: [default_width, nil] })
+      end
+      variant = source.variant(variant_options)
       default = Kamifusen.process(variant, active_storage_direct_url)
       %>
       <picture<%= " class=\"#{picture_class}\"".html_safe unless picture_class.blank? %>>

data/kamifusen.gemspec

@@ -29,6 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails"
   spec.add_dependency "image_processing"
 
-  spec.add_development_dependency "listen"
   spec.add_development_dependency "sqlite3"
 end

data/lib/kamifusen/processor.rb

@@ -14,28 +14,73 @@ module Kamifusen
 
     protected
 
-    def keycdn_url
-      url = "#{Kamifusen.keycdn}/#{variant.blob.key}?"
-      transformations = variant.variation.transformations
-      url += "format=#{transformations[:format]}&" if transformations.has_key? :format
-      url += "quality=#{transformations[:quality]}&" if transformations.has_key? :quality
-      if transformations.has_key? :resize
+    def transformations
+      @transformations ||= variant.variation.transformations
+    end
+
+    def format
+      return @format if defined?(@format)
+      @format = transformations.fetch(:format)
+    end
+
+    def quality
+      return @quality if defined?(@quality)
+      @quality =  case ActiveStorage.variant_processor
+                  when :vips
+                    transformations.dig(:saver, :quality)
+                  when :mini_magick
+                    transformations.fetch(:quality)
+                  end
+    end
+
+    def width
+      return @width if defined?(@width)
+      if transformations.has_key?(:resize)
+        Kamifusen.deprecator.warn("The `resize` transformation is deprecated. Please use `resize_to_limit` instead.")
+        # resize: "100>"
         resize = transformations[:resize]
-        # 100>
-        if '>'.in? resize
-          width = resize.split('>').first.to_i
-          url += "width=#{width}&"
-        end
+        @width = resize.split('>').first.to_i if '>'.in?(resize)
+      elsif transformations.has_key?(:resize_to_limit)
+        # resize_to_limit: [100, nil]
+        @width = transformations[:resize_to_limit].first.to_i
+      elsif transformations.has_key?(:resize_to_fill)
+        # resize_to_fill: [400, 600]
+        @width = transformations[:resize_to_fill].first.to_i
       end
-      url
+      @width
+    end
+
+    def height
+      return @height if defined?(@height)
+      if transformations.has_key?(:resize_to_fill)
+        # resize_to_fill: [400, 600]
+        @height = transformations[:resize_to_fill].second.to_i
+      end
+      @height
+    end
+
+    def crop
+      return @crop if defined?(@crop)
+      @crop = transformations.has_key?(:resize_to_fill)
+    end
+
+    def keycdn_url
+      return @keycdn_url if defined?(@keycdn_url)
+      @keycdn_url = "#{Kamifusen.keycdn}/#{variant.blob.key}?"
+      @keycdn_url += "format=#{format}&" if format.present?
+      @keycdn_url += "width=#{width}&" if width.present?
+      @keycdn_url += "height=#{height}&" if crop && height.present?
+      @keycdn_url += "quality=#{quality}&" if quality.present?
+      @keycdn_url
     end
 
     def active_storage_url
-      url = nil
-      url = processed_url if active_storage_direct_url
-      url ||= smart_url
-      url ||= explicit_url
-      url
+      return @active_storage_url if defined?(@active_storage_url)
+      @active_storage_url = nil
+      @active_storage_url = processed_url if active_storage_direct_url
+      @active_storage_url ||= smart_url
+      @active_storage_url ||= explicit_url
+      @active_storage_url
     end
 
     def processed_url

data/lib/kamifusen/railtie.rb

@@ -1,6 +1,10 @@
 module Kamifusen
   class Railtie < ::Rails::Railtie
-    initializer "my_gem.view_helpers" do
+    initializer "kamifusen.deprecator", before: :load_environment_config do |app|
+      app.deprecators[:kamifusen] = ActionMailbox.deprecator
+    end
+
+    initializer "kamifusen.view_helpers" do
       ActiveSupport.on_load(:action_view) { include Kamifusen::ViewHelper }
     end
   end

data/lib/kamifusen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kamifusen
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/lib/kamifusen.rb

@@ -11,6 +11,10 @@ module Kamifusen
     yield self
   end
 
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new("2.0", "Kamifūsen")
+  end
+
   def self.process(variant, active_storage_direct_url = false)
     Processor.new(variant, active_storage_direct_url).url
   end
@@ -55,6 +59,9 @@ module Kamifusen
   @@quality = 70
 
   class Engine < ::Rails::Engine
+    initializer "kamifusen.deprecator", before: :load_environment_config do |app|
+      app.deprecators[:kamifusen] = Kamifusen.deprecator
+    end
   end
 
   class Error < StandardError

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamifusen
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Sébastien Moulène
 - Arnaud Levy
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: listen
-  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -79,8 +64,6 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -102,7 +85,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sebousan/kamifusen
   source_code_uri: https://github.com/sebousan/kamifusen
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Images, light as balloons
 test_files: []

data/Gemfile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in kamifusen.gemspec
-gemspec
-
-gem "rake", "~> 13.0"
-
-gem "rubocop", "~> 1.7"
-
-gem "byebug"

data/Gemfile.lock

@@ -1,244 +0,0 @@
-PATH
-  remote: .
-  specs:
-    kamifusen (1.12.0)
-      image_processing
-      rails
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.4)
-      activesupport (= 7.1.3.4)
-      globalid (>= 0.3.6)
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activerecord (7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      timeout (>= 0.4.0)
-    activestorage (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      marcel (~> 1.0)
-    activesupport (7.1.3.4)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
-    builder (3.3.0)
-    byebug (11.1.3)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.4.1)
-    crass (1.0.6)
-    date (3.3.4)
-    drb (2.2.1)
-    erubi (1.13.0)
-    ffi (1.17.0)
-    ffi (1.17.0-x86_64-darwin)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    i18n (1.14.5)
-      concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
-      mini_magick (>= 4.9.5, < 5)
-      ruby-vips (>= 2.0.17, < 3)
-    io-console (0.7.2)
-    irb (1.14.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.22.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    mini_magick (4.13.2)
-    mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.24.1)
-    mutex_m (0.2.0)
-    net-imap (0.4.14)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.0)
-      net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.16.6)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-darwin)
-      racc (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
-      ast (~> 2.4.1)
-      racc
-    psych (5.1.2)
-      stringio
-    racc (1.8.0)
-    rack (3.1.6)
-    rack-session (2.0.0)
-      rack (>= 3.0.0)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rackup (2.1.0)
-      rack (>= 3)
-      webrick (~> 1.8)
-    rails (7.1.3.4)
-      actioncable (= 7.1.3.4)
-      actionmailbox (= 7.1.3.4)
-      actionmailer (= 7.1.3.4)
-      actionpack (= 7.1.3.4)
-      actiontext (= 7.1.3.4)
-      actionview (= 7.1.3.4)
-      activejob (= 7.1.3.4)
-      activemodel (= 7.1.3.4)
-      activerecord (= 7.1.3.4)
-      activestorage (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      bundler (>= 1.15.0)
-      railties (= 7.1.3.4)
-    rails-dom-testing (2.2.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
-      loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rainbow (3.1.1)
-    rake (13.2.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
-    rdoc (6.7.0)
-      psych (>= 4.0.0)
-    regexp_parser (2.9.2)
-    reline (0.5.9)
-      io-console (~> 0.5)
-    rexml (3.3.1)
-      strscan
-    rubocop (1.65.0)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
-    ruby-progressbar (1.13.0)
-    ruby-vips (2.2.1)
-      ffi (~> 1.12)
-    sqlite3 (2.0.2)
-      mini_portile2 (~> 2.8.0)
-    sqlite3 (2.0.2-x86_64-darwin)
-    stringio (3.1.1)
-    strscan (3.1.0)
-    thor (1.3.1)
-    timeout (0.4.1)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
-    websocket-driver (0.7.6)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.16)
-
-PLATFORMS
-  ruby
-  x86_64-darwin-20
-
-DEPENDENCIES
-  byebug
-  kamifusen!
-  listen
-  rake (~> 13.0)
-  rubocop (~> 1.7)
-  sqlite3
-
-BUNDLED WITH
-   2.4.22