kamifusen 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e4345e5d359096961d48f2c5477fbcdf6fafec4b84f2ca32dc6e410a2502fa
-  data.tar.gz: d2b920f457438f5652c14cffd7d14032637549e10a753f1244cb95da3706e475
+  metadata.gz: cc7dc54c21db20fd2cfd6a7aec2c5b50aa7ee13f725648293246a5972f973240
+  data.tar.gz: 0f6d32fbe3006abc1d018916b66a71dbd20bd9e9edacf11ea5c4e841e446e5ca
 SHA512:
-  metadata.gz: e3c68441c27a9e4533d74975f2a57ebb0bffa59bfe66cc32f9ce2846c897d090b24d3ebf338fbc5de180d2368f4b56a84e81258b9866552f691e5f8740b934d2
-  data.tar.gz: 3334ffd8b926960203b4586f779130d00ad6d2c0010d02e7f2b419bfd2d2389d11be128f8901970fbff5f8f2705e9dbbb5ace3dda2bd7ec01f4f5dfc1719d20c
+  metadata.gz: ae20b1464beb842cc4a17275b2d154a3bf572405b8c7a97be7acd57e91245571460fbac7fdefff62e380cd0a6a21e6fb863df950d6f4d2552cde7a3faa80acd8
+  data.tar.gz: d120ad3e78b7094c352874b7fbafd611a6017eeef5cb2e621879e0863f310ef5a512b7ac58126c51d344647d40cc069837f7aa94a34c05af8733a1c40c5e1fac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kamifusen (1.6)
+    kamifusen (1.7)
       image_processing
       rails
 

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

@@ -4,6 +4,8 @@ options ||= {}
 alt = options[:alt]
 async = options.has_key?(:async)  ? options[:async]
                                   : true
+active_storage_direct_url = options.has_key?(:active_storage_direct_url)  ? options[:active_storage_direct_url]
+                                                                          : false
 klass = options[:class]
 picture_class = options[:picture_class]
 width = options[:width]
@@ -41,12 +43,27 @@ parameters += " alt=\"#{ alt }\"" if alt
 parameters += " width=\"#{ width }\"" if width
 parameters += " height=\"#{ height }\"" if height
 parameters += " class=\"#{ klass }\"" if klass
+
+def kamifusen_process(variant, active_storage_direct_url)
+  if active_storage_direct_url
+    begin
+      # Pour générer la processed url, il faut savoir où sont stockées les images
+      # https://discuss.rubyonrails.org/t/define-host-so-absolute-urls-work-in-development-and-test/75085
+      # https://stackoverflow.com/questions/60425407/uriinvalidurierror-bad-uriis-not-uri-nil-active-storage-service-url
+      # Not compatible with Disk storage, will return nil
+      url = variant.processed.url
+    rescue
+    end
+  end
+  url = url_for(variant) if url.nil?
+  url
+end
 %>
 <% if source.variable? %>
   <%#= "#{image_width} x #{image_height}, #{image_ratio} ratio => #{width} x #{height}<br>".html_safe %>
   <%
   # kamifusen settings
-  sizes = [320, 576, 640, 768, 992, 1152, 1200, 1400, 1536, 1984, 2400]
+  sizes = [360, 375, 414, 576, 640, 750, 768, 828, 992, 1152, 1200, 1366, 1400, 1536, 1920, 1984, 2400]
   quality = 80
   # Computing
   if width
@@ -59,13 +76,16 @@ parameters += " class=\"#{ klass }\"" if klass
   default_width = width_retina if width_retina && width_retina > default_width
   if Kamifusen.with_webp
     srcset_webp = sizes.map { |size|
-      "#{ url_for source.variant(resize: "#{size}>", format: :webp, quality: quality) } #{ size }w"
+      variant = source.variant(resize: "#{size}>", format: :webp, quality: quality)
+      "#{ kamifusen_process(variant, active_storage_direct_url) } #{ size }w"
     }.join(', ')
   end
   srcset_default = sizes.map { |size|
-    "#{ url_for source.variant(resize: "#{size}>", quality: quality) } #{ size }w"
+    variant = source.variant(resize: "#{size}>", quality: quality)
+    "#{ kamifusen_process(variant, active_storage_direct_url) } #{ size }w"
   }.join(', ')
-  default = url_for source.variant(resize: "#{default_width}>", quality: quality)
+  variant = source.variant(resize: "#{default_width}>", quality: quality)
+  default = kamifusen_process(variant, active_storage_direct_url)
   %>
   <picture<%= " class=\"#{picture_class}\"".html_safe unless picture_class.blank? %>>
     <% if Kamifusen.with_webp %>

data/lib/kamifusen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamifusen
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - Sébastien Moulène
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails