kamifusen 0.9.1 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba4cc594fa4ab1ae8205a187f84b2815265127fed09c3cc3a46da87808068f1
-  data.tar.gz: d82f0bf97ded7f442deb90c6647918ceb312a5197a2e313bee1adebb40b1e4d2
+  metadata.gz: a689acadb87e346abfda6e357a1de05daf496622275dacc35d4b1f4c3464f3f9
+  data.tar.gz: e21c4b4e6048ea0ba35709bfad5b364e2292ac9cbb7767c655b51d2913e63fd8
 SHA512:
-  metadata.gz: dc71b4eba1b972abf61e8204e69940589e35828d8200b47aff400524402fd071890972988d0c7af978ae602e1b11ef64ecc4229a58ee705509f639de5daa772a
-  data.tar.gz: 2d6bd8e27099ccfe668c1066fbd4b6e5a9456956a54d084e00bef16e3ffd3203c12210b985801d42d843fac6e290c3e263d94a4159f042a0e32839745d2742e0
+  metadata.gz: d44f3179b6a02b35c880d083a9b8a4232ee14e01564ef29017a45430f0acfcac328fac44b5d374dd32ecbb69de4ebd5e463d9351279404fabe5840126352c7a4
+  data.tar.gz: 46501974677fab6ae5749705991dded8bdfddd0b223e76b8eea9048eb67ee642f942ad99df046bd26e57f4728d38e7c7684faea09cfa75f1a0b7fdc19d48e6b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Kamifusen (0.1.1)
+    kamifusen (0.9.6)
       image_processing
       rails
 
@@ -94,7 +94,7 @@ GEM
     mini_mime (1.0.3)
     minitest (5.14.4)
     nio4r (2.5.7)
-    nokogiri (1.11.4-x86_64-darwin)
+    nokogiri (1.11.6-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.1.1)
@@ -162,7 +162,7 @@ GEM
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.0.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.4.2)
@@ -171,7 +171,7 @@ PLATFORMS
   x86_64-darwin-20
 
 DEPENDENCIES
-  Kamifusen!
+  kamifusen!
   listen
   rake (~> 13.0)
   rubocop (~> 1.7)

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

@@ -1,18 +1,41 @@
 <%
 # image_tag options
+options ||= {}
 alt = options[:alt]
 width = options[:width]
 height = options[:height]
-# kamifusen settings
-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)
+klass = options[: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
 %>
-<picture>
-  <source srcset="<%= webps %>">
-  <img src="<%= default %>" srcset="<%= jpgs %>" alt="<%= alt %>" loading="lazy" decoding="async"<%= raw " width=\"#{ width }\"" if width %><%= raw " height=\"#{ height}\"" if height %>>
-</picture>
+<% if source.variable? %>
+  <%
+  # kamifusen settings
+  sizes = [320, 576, 640, 768, 992, 1152, 1200, 1400, 1536, 1984, 2400]
+  quality = 80
+  # Computing
+  sizes.reject! { |size| size > width * 2 } if 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: "#{sizes.max}>", quality: quality)
+  %>
+  <picture>
+    <% if Kamifusen.with_webp %>
+      <source srcset="<%= srcset_webp %>">
+    <% end %>
+    <img src="<%= default %>" srcset="<%= srcset_default %>"<%= raw parameters %>>
+  </picture>
+<% else %>
+  <picture>
+    <img src="<%= url_for source %>"<%= raw parameters %>>
+  </picture>
+<% end %>

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.1"
+  VERSION = "0.9.6"
 end

metadata

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