kamifusen 0.9.3 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39fcc15893a5fea23ae7100f394582cb123e3dbe1b1d24351cd1b6a1b51dea12
-  data.tar.gz: 628dac26bf2eb4790073755477679a56bc3c8dbc4a67b02201d3aded41f64767
+  metadata.gz: 3f238efa9930dad4bbd2b9986e601120870e7a0f96e2628c2a8d7b217c284e87
+  data.tar.gz: 3bc265f3e7deee21f942bb8391c77426bcc335fff4bd7d4bb05adc7f178febe5
 SHA512:
-  metadata.gz: 818bb709d661c9908104cddbe90496950eafbb487d035f22efdd02cda3524b88e77e6cb60cca147bd19617cdca8c8691c13dc8a3e5416b9c73ac2c3d8c72c049
-  data.tar.gz: ff9fef8645419e0330affbbfd98d187256803d66001e35aac5038fd3570728ecaa599afd6ce764ef57033637c4c858ebeecc1f6eb75d151e807dafe3f07f2391
+  metadata.gz: f35d8b955ca59cf265cbae61e229f68a0663d8e091a8216e8fbcacc785d3a6b0e4344cfc9a12f6c5f89ede49cab4835deded944f50764370909b74f773971033
+  data.tar.gz: 8ef30b63560714cc9b3f35cf1367554aec03f11ce4da37eac904346860d380b2367494e1dd1b79ccf1730c33f334473e3fa8ab5d326bc66ce06975f407517772

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kamifusen (0.9.3)
+    kamifusen (1.0)
       image_processing
       rails
 
@@ -94,7 +94,7 @@ GEM
     mini_mime (1.0.3)
     minitest (5.14.4)
     nio4r (2.5.7)
-    nokogiri (1.11.6-x86_64-darwin)
+    nokogiri (1.11.7-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.1.1)

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,13 +17,28 @@ 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
-  srcset_webp = sizes.map { |size| "#{ url_for source.variant(resize: "#{size}>", format: :webp, quality: quality) } #{ size } vw" }.join(', ')
-  srcset_default = sizes.map { |size| "#{ url_for source.variant(resize: "#{size}>", quality: quality) } #{ size } vw" }.join(', ')
-  default = url_for source.variant(resize: "#{sizes.max}>", quality: quality)
+  if width
+    width_retina = width * 2
+    sizes.reject! { |size| size > width_retina }
+    sizes << width_retina
+    sizes.uniq!
+  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="<%= srcset_webp %>">
+    <% if Kamifusen.with_webp %>
+      <source srcset="<%= srcset_webp %>">
+    <% end %>
     <img src="<%= default %>" srcset="<%= srcset_default %>"<%= raw parameters %>>
   </picture>
 <% else %>

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.3"
+  VERSION = "1.0"
 end

metadata

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