kamifusen 1.3 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac96058e579f9ae629576bd126de9042b25ab3faffc7b99dfa875944d576239
-  data.tar.gz: e8480cdec01a138f28b8a725492b99a50d41c1ae107e59c4e41544bf61b4b1d5
+  metadata.gz: cc7dc54c21db20fd2cfd6a7aec2c5b50aa7ee13f725648293246a5972f973240
+  data.tar.gz: 0f6d32fbe3006abc1d018916b66a71dbd20bd9e9edacf11ea5c4e841e446e5ca
 SHA512:
-  metadata.gz: 2d3d568386dfb35f13a820c8b6d4ec7a0381958dc1cc387932f844c50deeb40f6afd3c9041edfb4222d5506ef358dc837f3709a22fac6ba28d5169b51efe1be9
-  data.tar.gz: 43ec54add0ff08ec20ba708db5c3de12555c2d260e17314696ee6ac2c7bc3957912e800fdfbea66412883375dbcc9d1ea8f932c4b36dff34ddd59c22081938a5
+  metadata.gz: ae20b1464beb842cc4a17275b2d154a3bf572405b8c7a97be7acd57e91245571460fbac7fdefff62e380cd0a6a21e6fb863df950d6f4d2552cde7a3faa80acd8
+  data.tar.gz: d120ad3e78b7094c352874b7fbafd611a6017eeef5cb2e621879e0863f310ef5a512b7ac58126c51d344647d40cc069837f7aa94a34c05af8733a1c40c5e1fac

data/Gemfile.lock

@@ -1,67 +1,67 @@
 PATH
   remote: .
   specs:
-    kamifusen (1.3)
+    kamifusen (1.7)
       image_processing
       rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    actioncable (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4)
-      actionpack (= 6.1.4)
-      activejob (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionmailbox (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.4)
-      actionpack (= 6.1.4)
-      actionview (= 6.1.4)
-      activejob (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionmailer (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4)
-      actionview (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4)
-      actionpack (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    actiontext (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4)
-      activesupport (= 6.1.4)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4)
-      activesupport (= 6.1.4)
+    activejob (6.1.4.1)
+      activesupport (= 6.1.4.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activerecord (6.1.4)
-      activemodel (= 6.1.4)
-      activesupport (= 6.1.4)
-    activestorage (6.1.4)
-      actionpack (= 6.1.4)
-      activejob (= 6.1.4)
-      activerecord (= 6.1.4)
-      activesupport (= 6.1.4)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activestorage (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -74,8 +74,8 @@ GEM
     crass (1.0.6)
     erubi (1.10.0)
     ffi (1.15.3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.1)
@@ -84,7 +84,7 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.10.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -92,12 +92,12 @@ GEM
     marcel (1.0.1)
     method_source (1.0.0)
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
+    mini_mime (1.1.1)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.4)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.1.1)
@@ -106,29 +106,29 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4)
-      actioncable (= 6.1.4)
-      actionmailbox (= 6.1.4)
-      actionmailer (= 6.1.4)
-      actionpack (= 6.1.4)
-      actiontext (= 6.1.4)
-      actionview (= 6.1.4)
-      activejob (= 6.1.4)
-      activemodel (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
+    rails (6.1.4.1)
+      actioncable (= 6.1.4.1)
+      actionmailbox (= 6.1.4.1)
+      actionmailer (= 6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actiontext (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.4)
+      railties (= 6.1.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -151,7 +151,7 @@ GEM
     rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    ruby-vips (2.1.2)
+    ruby-vips (2.1.3)
       ffi (~> 1.12)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)

data/README.md

@@ -1,5 +1,7 @@
 # Kamifūsen
 
+Images in Ruby on Rails, as lightweight as possible!
+
 ![Kamifūsen in Yamagata](https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/%E4%B8%AD%E6%B4%A5%E5%B7%9D%E9%9B%AA%E3%81%BE%E3%81%A4%E3%82%8A.jpg/1024px-%E4%B8%AD%E6%B4%A5%E5%B7%9D%E9%9B%AA%E3%81%BE%E3%81%A4%E3%82%8A.jpg)
 
 ## Installation

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

@@ -2,20 +2,68 @@
 # image_tag options
 options ||= {}
 alt = options[:alt]
-width = options[:width]
-height = options[:height]
+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]
-parameters = " loading=\"lazy\" decoding=\"async\""
-parameters += " alt=\"#{ options[:alt] }\"" if alt
-parameters += " width=\"#{ options[:width] }\"" if width
-parameters += " height=\"#{ options[:height]}\"" if height
-parameters += " class=\"#{ options[:class] }\"" if klass
+width = options[:width]
+height = options[:height]
+if  source&.metadata &&
+    source.metadata['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
+  elsif width.nil?
+    # Calculer la height sur ratio
+    width = height * image_ratio
+  elsif height.nil?
+    # Calcule la width sur 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
+    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
+
+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
@@ -28,13 +76,16 @@ parameters += " class=\"#{ options[:class] }\"" 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.3"
+  VERSION = "1.7"
 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

metadata

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