kamifusen 1.6 → 1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e4345e5d359096961d48f2c5477fbcdf6fafec4b84f2ca32dc6e410a2502fa
-  data.tar.gz: d2b920f457438f5652c14cffd7d14032637549e10a753f1244cb95da3706e475
+  metadata.gz: fc161cf43bce3f420864d28ab413979ed4c224c163ca872e78453bbd0d950c7f
+  data.tar.gz: 30796fb41b0280a5be83a29016cda1651514e80386014b402a0c6da627174b6d
 SHA512:
-  metadata.gz: e3c68441c27a9e4533d74975f2a57ebb0bffa59bfe66cc32f9ce2846c897d090b24d3ebf338fbc5de180d2368f4b56a84e81258b9866552f691e5f8740b934d2
-  data.tar.gz: 3334ffd8b926960203b4586f779130d00ad6d2c0010d02e7f2b419bfd2d2389d11be128f8901970fbff5f8f2705e9dbbb5ace3dda2bd7ec01f4f5dfc1719d20c
+  metadata.gz: 6f72675f224e8e87f64f4ada42f9c0cb4e86ed7c7002ad5316b2831048d52e8b1b9691ed8381a6484d12b9717f99cf49b36d05b1313198b2356e0cf307d6960d
+  data.tar.gz: 0fb2c26afde61d40cbb96f84c26416d0809cccec2a0fe37188925727a011f965fdcdfc045808293c7209198a597dc2a4641ec142d1bd19cc308db10c20404f7a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kamifusen (1.6)
+    kamifusen (1.10)
       image_processing
       rails
 
@@ -76,7 +76,7 @@ GEM
     ffi (1.15.3)
     globalid (0.5.2)
       activesupport (>= 5.0)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -89,20 +89,22 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
     mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     nio4r (2.5.8)
-    nokogiri (1.12.4)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -168,7 +170,7 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -183,4 +185,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.7
+   2.2.30

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Sébastien Moulène
+Copyright (c) 2021 noesya
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,77 +1,98 @@
 <%
-# image_tag options
 options ||= {}
 alt = options[:alt]
-async = options.has_key?(:async)  ? options[:async]
-                                  : 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]
-if  source&.metadata &&
-    source.metadata['analyzed'] &&
-    source.metadata.has_key?('width') &&
-    source.metadata.has_key?('height')
+
+variant_sizes = Kamifusen.sizes.dup
+quality = Kamifusen.quality.dup
+
+sizes = options[:sizes] || {}
+
+if source&.analyzed? && source.metadata.has_key?('width') && source.metadata.has_key?('height')
   image_width = source.metadata['width']
   image_height = source.metadata['height']
   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
+    # Image real dimensions
+    width = [image_width, variant_sizes.last].min
+    height = width * image_ratio
   elsif width.nil?
-    # Calculer la height sur ratio
+    # Calculated width, preserving the aspect ratio
     width = height * image_ratio
   elsif height.nil?
-    # Calcule la width sur ratio
+    # Calculated height, preserving the aspect ratio
     height = width / image_ratio
   else
-    # Width et height sont explicites,
-    # si le ratio demandé n'est pas celui de l'image,
-    # Redéfinir la height
+    # Explicit dimensions. We redefine the height if aspect ratio is not preserved.
     width = [image_width, width].min
     height = width / image_ratio
   end
   width = width.round
   height = height.round
 end
+
 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
+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
+      url = variant.processed.url
+    rescue
+      # Not compatible with DiskService, which returns a URI::InvalidURIError
+    end
+  end
+  url ||= url_for(variant)
+  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
-    sizes.reject! { |size| size > width_retina }
-    sizes << width_retina
-    sizes.uniq!
+    variant_sizes.reject! { |size| size > width_retina }
+    variant_sizes << width_retina
+    variant_sizes.uniq!
   end
-  default_width = sizes.max
+  default_width = variant_sizes.max
   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"
+    srcset_webp = variant_sizes.map { |size|
+      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"
+  srcset_default = variant_sizes.map { |size|
+    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 %>
-      <source srcset="<%= srcset_webp %>" type="image/webp">
+      <source srcset="<%= srcset_webp %>"
+              type="image/webp"
+              <%= " sizes=\"#{sizes.map { |key, value| [key, value].join(' ') }.join(', ')}\"".html_safe unless sizes.empty? %>>
     <% end %>
-    <img src="<%= default %>" srcset="<%= srcset_default %>" type="<%= source.content_type %>"<%= raw parameters %>>
+    <img  src="<%= default %>"
+          srcset="<%= srcset_default %>"
+          type="<%= source.content_type %>"
+          <%= " sizes=\"#{sizes.map { |key, value| [key, value].join(' ') }.join(', ')}\"".html_safe unless sizes.empty? %>
+          <%= raw parameters %>>
   </picture>
 <% else %>
   <picture>

data/lib/kamifusen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kamifusen
-  VERSION = "1.6"
+  VERSION = "1.10"
 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.6'
+  version: '1.10'
 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-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,7 +82,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - app/views/kamifusen/_view.html.erb

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Arnaud Levy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.