kamifusen 0.9.4 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41dd3944d46e1a212cf3a6e14da73f4bd8dfb056f3fccf0f8026d21b0eca0fd
-  data.tar.gz: 3876941a440dd4008facad81570cd36099f9d71b2ec26b306cf790086e8fede8
+  metadata.gz: 87b7ea289164bd1a3be5022b75ac1f9c9b8a0151b08219579d44a83403ad03cf
+  data.tar.gz: ed491636014069469b311b19c7d80175ed2cd6d757b87ce938a1170129ea9f88
 SHA512:
-  metadata.gz: 383d1ce548824cb02a1131e307457fe06a33bca1a0b661d39f79aca8e7de92eba8258bd7a13a3aaea17ca6bd54448a3f175e274b4feec9de38515dd1e2a70a13
-  data.tar.gz: 0d610001c0da70a6433722f2bbc38e27fdd505d17e60b37d9d485f36994b9052a52a8c60bc336e2ef69fcfaf8bbd632e744abf719fca2165cdd2453cbebb861a
+  metadata.gz: 418792aa2edb5b1534a5450a893fa74338a43bd92d773715b303eb8e675bfc0359abb3925aec6cb70cc7e2e0bf1286f16e1d2bb0d3aea6e62cc16e402dffbee4
+  data.tar.gz: d00ba390039160dee9ae0e4f5c7354f2f0300becf19c794aa10665688403361ea0625673a3253eb66b9c8ca3cb26ad7512f688f5587daca93bdb9ae990b63036

data/Gemfile

@@ -8,3 +8,5 @@ gemspec
 gem "rake", "~> 13.0"
 
 gem "rubocop", "~> 1.7"
+
+gem "byebug"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kamifusen (0.9.4)
+    kamifusen (1.1)
       image_processing
       rails
 
@@ -69,10 +69,11 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.8)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     erubi (1.10.0)
-    ffi (1.15.0)
+    ffi (1.15.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.8.10)
@@ -83,7 +84,7 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.9.1)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -94,7 +95,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)
@@ -136,16 +137,16 @@ GEM
       ffi (~> 1.0)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rubocop (1.15.0)
+    rubocop (1.16.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.2)
@@ -171,6 +172,7 @@ PLATFORMS
   x86_64-darwin-20
 
 DEPENDENCIES
+  byebug
   kamifusen!
   listen
   rake (~> 13.0)

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,17 +17,32 @@ 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 %>">
-    <img src="<%= default %>" srcset="<%= srcset_default %>"<%= raw parameters %>>
+    <% if Kamifusen.with_webp %>
+      <source srcset="<%= srcset_webp %>" type="image/webp">
+    <% end %>
+    <img src="<%= default %>" srcset="<%= srcset_default %>" type="<%= source.content_type %>"<%= raw parameters %>>
   </picture>
 <% else %>
   <picture>
-    <img src="<%= url_for source %>"<%= raw parameters %>>
+    <img src="<%= url_for source %>" type="<%= source.content_type %>"<%= 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.4"
+  VERSION = "1.1"
 end

metadata

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