kamifusen 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac96058e579f9ae629576bd126de9042b25ab3faffc7b99dfa875944d576239
-  data.tar.gz: e8480cdec01a138f28b8a725492b99a50d41c1ae107e59c4e41544bf61b4b1d5
+  metadata.gz: 21b6ef8996df081487d71d6a914c245ab3fedb803a775ed1b4c10384b3f5a1df
+  data.tar.gz: 9e481700b2654d2bafae6cf79f6f4b44b7d4445407075283b7a2bd9a01200aea
 SHA512:
-  metadata.gz: 2d3d568386dfb35f13a820c8b6d4ec7a0381958dc1cc387932f844c50deeb40f6afd3c9041edfb4222d5506ef358dc837f3709a22fac6ba28d5169b51efe1be9
-  data.tar.gz: 43ec54add0ff08ec20ba708db5c3de12555c2d260e17314696ee6ac2c7bc3957912e800fdfbea66412883375dbcc9d1ea8f932c4b36dff34ddd59c22081938a5
+  metadata.gz: fad6e4138146acb5e5afc4ad9b9522aad4179fecdd97dd97f822fcacac49eb8dcceaed6fde41ff09f397d8aa074f7366f28175fb3e26d62acc7fb7126065ff2a
+  data.tar.gz: ea01b9e4e5ca7d82e9e26f51907a62609a6c1edfcf994735031cd576810bdec80c23785b881609c3eaffecdb23d91d86b4ac7269305015093a5d3e9cc8364601

data/Gemfile.lock

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

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

@@ -2,17 +2,45 @@
 # image_tag options
 options ||= {}
 alt = options[:alt]
-width = options[:width]
-height = options[:height]
 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')
+  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 = " 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
+parameters += " alt=\"#{ alt }\"" if alt
+parameters += " width=\"#{ width }\"" if width
+parameters += " height=\"#{ height }\"" if height
+parameters += " class=\"#{ klass }\"" if klass
 %>
 <% 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]

data/lib/kamifusen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamifusen
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 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-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails