kamifusen 0.9.2 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61185a31bdae5117672878baf5e5f05bf66e1ae8288420d54b9614a8be040176
-  data.tar.gz: 4a50a5934a684287b428503d17f0f25c400089b17d69ebffd3b14ebebae19436
+  metadata.gz: 2664cf5dea01a7294d0f2c9b017b2d6bd00a3d0a81daaa161f95f924ee62479e
+  data.tar.gz: 5301c3d3ad0733b2a7376f3a8a417b4a02d74c59eebf35f5cde3906e2e179523
 SHA512:
-  metadata.gz: d7ada36299ca1dd019e5dc36431b86bb7af361eef886a92056a1c79066ae83b1e5453ed0320739bed31b0393905ace82fa91a4e7c2dc1b4da259f946a124a986
-  data.tar.gz: 3d8845a6231bc7429bb6977aaa0289ca9bef05cda5daaf56bd287921c266930365043f848734a4a33b50a9382cfe161d893af8e1282d59b2aed2d8bf2d1a34ed
+  metadata.gz: 3c06c337ed793d477bd3dd9539517c4ba09011e8c0e801b084e8ae477991dc168f45d63165fa4754170003b60aab1ce0ef886eacd98bf2a80823f9dc7ab81eda
+  data.tar.gz: 69acef22af9cb3beb364f593f7fb6005e564f3f93ec95af6005bf3255b166715cb79f11fd3253e56f1fc0e3b1c6cb09f1d171126236a148bb180b737736fa5a0

data/Gemfile.lock

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

data/README.md

@@ -2,6 +2,34 @@
 
 ![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
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'kamifusen'
+```
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install kamifusen
+
+In the views, use (where object is an active record model, and image is an active storage attachment):
+
+```erb
+<%= kamifusen_tag object.image, alt: 'A nice image' %>
+```
+
+If you want to disable webp, in config/initializers/kamifusen.rb:
+
+```ruby
+Kamifusen.with_webp = false
+```
+
 ## Usage
 
 Simply use `kamifusen_tag` instead of `image_tag` in your rails views.## What's the problem?
@@ -76,11 +104,13 @@ Webp and AVIF are more efficient formats than jpg and png. They allow better com
 https://sebousan.github.io/kamifusen/
 
 The new helper is:
+
 ```erb
 <%= kamifusen_tag object.image, alt: 'A nice image' %>
 ```
 
 It generates a code like:
+
 ```html
 <picture>
   <source srcset="image-800w.avif, image-1600w.avif 2x" type="image/avif"  media="(min-width: 800px)">
@@ -93,22 +123,6 @@ It generates a code like:
 </picture>
 ```
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'kamifusen'
-```
-
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
-
-    $ gem install kamifusen
-
 ## References
 
 - https://developer.mozilla.org/fr/docs/Learn/HTML/Multimedia_and_embedding/Responsive_images

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

@@ -17,14 +17,35 @@ parameters += " class=\"#{ options[:class] }\"" if klass
   sizes = [320, 576, 640, 768, 992, 1152, 1200, 1400, 1536, 1984, 2400]
   quality = 80
   # Computing
-  sizes.reject! { |size| size > width * 2 } if width
-  webps = sizes.map { |size| "#{ url_for source.variant(resize: "#{size}>", format: :webp, quality: quality) } #{ size } vw" }.join(', ')
-  jpgs = sizes.map { |size| "#{ url_for source.variant(resize: "#{size}>", format: :jpg, quality: quality) } #{ size } vw" }.join(', ')
-  default = url_for source.variant(resize: "#{sizes.max}>", format: :jpg, quality: quality)
+  if width
+    width_retina = width * 2
+    # If we ask for a 175px width, we should have 320 and 576 sizes
+    size_is_too_big = false
+    sizes.reject! do |size|
+      # If the previous size was too big, we should reject this one
+      should_reject_this_size = size_is_too_big
+      # If this size is the first "too big" size, we should take it
+      size_is_too_big = size > width_retina
+      should_reject_this_size
+    end
+  end
+  default_width = 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"
+    }.join(', ')
+  end
+  srcset_default = sizes.map { |size|
+    "#{ url_for source.variant(resize: "#{size}>", quality: quality) } #{ size }w"
+  }.join(', ')
+  default = url_for source.variant(resize: "#{default_width}>", quality: quality)
   %>
   <picture>
-    <source srcset="<%= webps %>">
-    <img src="<%= default %>" srcset="<%= jpgs %>"<%= raw parameters %>>
+    <% if Kamifusen.with_webp %>
+      <source srcset="<%= srcset_webp %>">
+    <% end %>
+    <img src="<%= default %>" srcset="<%= srcset_default %>"<%= raw parameters %>>
   </picture>
 <% else %>
   <picture>

data/lib/kamifusen.rb

@@ -5,8 +5,13 @@ require "kamifusen/railtie"
 require "kamifusen/view_helper"
 
 module Kamifusen
+
+  mattr_accessor :with_webp
+  @@with_webp = true
+
   class Engine < ::Rails::Engine
   end
+
   class Error < StandardError
   end
 end

data/lib/kamifusen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamifusen
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.7
 platform: ruby
 authors:
 - Sébastien Moulène
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails