kamifusen 1.5 → 1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b297bc21e758df40da735dee289c75adf846daf1fc4d11c88aa041b9985cf4e
-  data.tar.gz: 62322fa18a71d6297fff797b91fcbc3ce06103bd20327b262b08be8d6d6f11a5
+  metadata.gz: a82b418d1a07d8b33f845d6ded2bdf3d1309943e41350f8e003bbdcbfe867f08
+  data.tar.gz: 0d20f1c01167036520f1451f1d295d8c7a32d40e315b8ac6fdee707fb3236c43
 SHA512:
-  metadata.gz: 48dd1181ec937589ded1d25f5897f99e9ce2a52714f7239c6f8dca14db443cc9fa22ca11f8301a1de66d624e974a9e1d182aafe0b1b307757ecbe256c592c8fd
-  data.tar.gz: 817ec1062b6b0b44f264182b2ba3af016f43fe77c7ac87dd640210d81798ee901c4e2895ef4d841b229ef8e2a78629fb58d0f6f2f1b1527251974790065fabdd
+  metadata.gz: 999758e2fece72df932546f261091b4ffc1584b85668fc9102852d703d4c45526a66ae980ae918f64a6884b99267d2c8c2d3c4646b78a7475ccfd5c01ccf64e0
+  data.tar.gz: be8d74901d1bb3f1859e01e6940c00aa2c9ee67aa086c34fb241de5e5adb510e14a93f39c040ba8dfa8708b1134d7637783775b3a7225cb400575d57643c316c

data/Gemfile.lock

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

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

@@ -2,11 +2,18 @@
 # image_tag options
 options ||= {}
 alt = options[:alt]
-async = options[:sync] || true
+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]
 height = options[:height]
+
+sizes = Kamifusen.sizes
+quality = Kamifusen.quality
+
 if  source&.metadata &&
     source.metadata['analyzed'] &&
     source.metadata.has_key?('width') &&
@@ -16,8 +23,8 @@ if  source&.metadata &&
   image_ratio = 1.0 * image_width / image_height
   if width.nil? && height.nil?
     # Prendre width et height réelles de l'image
-    width = image_width
-    height = image_height
+    width = [image_width, sizes.last].min
+    height = width * image_ratio
   elsif width.nil?
     # Calculer la height sur ratio
     width = height * image_ratio
@@ -34,19 +41,31 @@ if  source&.metadata &&
   width = width.round
   height = height.round
 end
-parameters = " "
-parameters = " loading=\"lazy\" decoding=\"async\"" if async
+parameters = ""
+parameters += " loading=\"lazy\" decoding=\"async\"" if async
 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]
-  quality = 80
   # Computing
   if width
     width_retina = width * 2
@@ -58,13 +77,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.5"
+  VERSION = "1.9"
 end

data/lib/kamifusen/view_helper.rb

@@ -2,7 +2,6 @@
 module Kamifusen
   module ViewHelper
     def kamifusen_tag(source, options = {})
-      image_tag(source, options)
       render "kamifusen/view", source: source, options: options
     end
   end

data/lib/kamifusen.rb

@@ -9,6 +9,36 @@ module Kamifusen
   mattr_accessor :with_webp
   @@with_webp = true
 
+  mattr_accessor :sizes
+  @@sizes = [
+    # 360, # Old android
+    375, # Old iPhone
+    # 414, # ?
+    576, # Tablets desktop
+    640, # iPhone SE, some tablets
+    750, # iPhone 6/7/8, 375@2x
+    768, # Old iPads, Old desktops
+    # 828, # ?
+    # 992, # Breakpoint bootstrap
+    1080, # iPhone 6/7/8 plus, 414@2.608 (sorry)
+    # 1125, # iPhone 10, 375@3x
+    1152,
+    # 1172, # iPhone 12, 390@3x
+    1200, # Desktop
+    1366, # Desktop
+    # 1400, # Breakpoint boostrap
+    1440, # Samsung Galaxy S20, 360@4x
+    1536, # Desktop, some iPads
+    1920, # Desktop 2k
+    2048, # Some iPad
+    2240, # Desktop iMac M1 chipset
+    2880, # Desktop MacBook Pro/Air 13" @2x
+    3072  # Desktop MacBook Pro 16" @2x
+  ]
+
+  mattr_accessor :quality
+  @@quality = 80
+
   class Engine < ::Rails::Engine
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamifusen
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.9'
 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