kamifusen 1.10.6 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f81ea0cd46f224d042bb77f6610bc4e676ec53e14ad82c617837776fa07e73
-  data.tar.gz: 28be3a228293b600cdc2e812851e5204a72cd68c3b05c2b456cbc65dce258bfc
+  metadata.gz: 65c261931b31f7261f7ecb8eef7c33acefffc4d376277bbf51849a2bef265e72
+  data.tar.gz: 2e9a99e1178698daa9e755a3c57255b5b64d9bed7e325abc7fa2c674dbf0d02d
 SHA512:
-  metadata.gz: f6e28fa4ac6f70e3e122597da28952f095900993ef84139d13ce54b6678540594cb4ded2afff8451377cdc316f8853af6b84ed851b7599d5071b3683f0eb72f0
-  data.tar.gz: 62358c3da9d59aa816b8a6d4da3daa899746736365d106f508a97a80e6d7b531f3a3de9ae47282d8dfcd7c1cd121619a1a7d56318308237e8bc004710d615190
+  metadata.gz: 1060a04a694115c734ddf368d103094de0eddafdcf3c82a9cfdb13b66f01aa9325dbb097ebcbd065d960c6d408bc75096bb7cdc4ad282ec807cb7d8251910ca4
+  data.tar.gz: f5bb7e006824b81be617c50901c61fa93ae871a307fc1a75b948ddefdc8b298ceb263d191083992a1a0c8356d281abf2b4f3f9c8cee85bf9d14c233a23de58e7

data/.gitignore

@@ -2,10 +2,7 @@
 /.yardoc
 /_yardoc/
 /coverage/
-/doc/
-/pkg/
 /spec/reports/
-/tmp/
 /.bundle/
 /doc/
 /log/*.log
@@ -17,3 +14,4 @@
 /test/dummy/storage/
 /test/dummy/tmp/
 .byebug_history
+.DS_Store

data/Gemfile.lock

@@ -1,90 +1,98 @@
 PATH
   remote: .
   specs:
-    kamifusen (1.10.6)
+    kamifusen (1.11.2)
       image_processing
       rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.2.2)
+      actionview (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (7.0.2.2)
+      activesupport (= 7.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (7.0.2.2)
+      activesupport (= 7.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      marcel (~> 1.0.0)
+    activemodel (7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activerecord (7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activestorage (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.1)
+    activesupport (7.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     builder (3.2.4)
     byebug (11.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
+    digest (3.1.0)
     erubi (1.10.0)
     ffi (1.15.4)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    io-wait (0.2.1)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.12.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -93,11 +101,28 @@ GEM
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.21.0)
     parser (3.0.2.0)
@@ -106,32 +131,32 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails (7.0.2.2)
+      actioncable (= 7.0.2.2)
+      actionmailbox (= 7.0.2.2)
+      actionmailer (= 7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actiontext (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.2.2)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.0.0)
     rake (13.0.6)
     rb-fsevent (0.11.0)
@@ -153,22 +178,17 @@ GEM
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.1)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    thor (1.1.0)
+    strscan (3.0.1)
+    thor (1.2.1)
+    timeout (0.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -183,4 +203,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.30
+   2.3.2

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

@@ -51,22 +51,6 @@ if data
     parameters += " data-#{entry.first.to_s}=\"#{entry.last}\""
   end
 end
-
-
-def kamifusen_process(variant, active_storage_direct_url)
-  if active_storage_direct_url
-    begin
-      # Pour générer la processed url, il faut savoir où sont stockées les images
-      # https://discuss.rubyonrails.org/t/define-host-so-absolute-urls-work-in-development-and-test/75085
-      # https://stackoverflow.com/questions/60425407/uriinvalidurierror-bad-uriis-not-uri-nil-active-storage-service-url
-      url = variant.processed.url
-    rescue
-      # Not compatible with DiskService, which returns a URI::InvalidURIError
-    end
-  end
-  url ||= url_for(variant)
-  url
-end
 %>
 <% if source.variable? %>
   <%
@@ -82,26 +66,26 @@ end
   if Kamifusen.with_webp
     srcset_webp = variant_sizes.map { |size|
       variant = source.variant(resize: "#{size}>", format: :webp, quality: quality)
-      "#{ kamifusen_process(variant, active_storage_direct_url) } #{size}w"
+      "#{ Kamifusen.process(variant, active_storage_direct_url) } #{size}w"
     }.join(', ')
   end
   srcset_default = variant_sizes.map { |size|
     variant = source.variant(resize: "#{size}>", quality: quality)
-    "#{ kamifusen_process(variant, active_storage_direct_url) } #{size}w"
+    "#{ Kamifusen.process(variant, active_storage_direct_url) } #{size}w"
   }.join(', ')
   variant = source.variant(resize: "#{default_width}>", quality: quality)
-  default = kamifusen_process(variant, active_storage_direct_url)
+  default = Kamifusen.process(variant, active_storage_direct_url)
   %>
   <picture<%= " class=\"#{picture_class}\"".html_safe unless picture_class.blank? %>>
     <% if Kamifusen.with_webp %>
-      <source srcset="<%= srcset_webp %>"
+      <source srcset="<%= raw srcset_webp %>"
               <%= " sizes=\"#{sizes_value}\"".html_safe unless sizes.empty? %>
               type="image/webp">
     <% end %>
-    <source srcset="<%= srcset_default %>"
+    <source srcset="<%= raw srcset_default %>"
             <%= " sizes=\"#{sizes_value}\"".html_safe unless sizes.empty? %>
             type="<%= source.content_type %>">
-    <img src="<%= default %>" <%= raw parameters %>>
+    <img src="<%= raw default %>" <%= raw parameters %>>
   </picture>
 <% else %>
   <picture>

data/lib/kamifusen/processor.rb

@@ -0,0 +1,60 @@
+module Kamifusen
+  class Processor
+    attr_reader :variant, :active_storage_direct_url
+
+    def initialize(variant, active_storage_direct_url = false)
+      @variant = variant
+      @active_storage_direct_url = active_storage_direct_url
+    end
+
+    def url
+      Kamifusen.keycdn.present? ? keycdn_url
+                                : active_storage_url
+    end
+
+    protected
+
+    def keycdn_url
+      url = "#{Kamifusen.keycdn}/#{variant.blob.key}?"
+      transformations = variant.variation.transformations
+      url += "format=#{transformations[:format]}&" if transformations.has_key? :format
+      url += "quality=#{transformations[:quality]}&" if transformations.has_key? :quality
+      if transformations.has_key? :resize
+        resize = transformations[:resize]
+        # 100>
+        if '>'.in? resize
+          width = resize.split('>').first.to_i
+          url += "width=#{width}&"
+        end
+      end
+      url
+    end
+
+    def active_storage_url
+      url = nil
+      url = processed_url if active_storage_direct_url
+      url ||= smart_url
+      url ||= explicit_url
+      url
+    end
+
+    def processed_url
+      # Pour générer la processed url, il faut savoir où sont stockées les images
+      # https://discuss.rubyonrails.org/t/define-host-so-absolute-urls-work-in-development-and-test/75085
+      # https://stackoverflow.com/questions/60425407/uriinvalidurierror-bad-uriis-not-uri-nil-active-storage-service-url
+      variant.processed.url
+    rescue
+      # Not compatible with DiskService, which returns a URI::InvalidURIError
+    end
+
+    def smart_url
+      Rails.application.routes.url_helpers.url_for(variant)
+    rescue
+      # Host might not be defined
+    end
+
+    def explicit_url
+      Rails.application.routes.url_helpers.rails_representation_path(variant, only_path: true)
+    end
+  end
+end

data/lib/kamifusen/version.rb

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

data/lib/kamifusen.rb

@@ -3,12 +3,24 @@
 require "kamifusen/version"
 require "kamifusen/railtie"
 require "kamifusen/view_helper"
+require "kamifusen/processor"
 
 module Kamifusen
 
+  def self.config
+    yield self
+  end
+
+  def self.process(variant, active_storage_direct_url = false)
+    Processor.new(variant, active_storage_direct_url).url
+  end
+
   mattr_accessor :with_webp
   @@with_webp = true
 
+  mattr_accessor :keycdn
+  @@keycdn = nil
+
   mattr_accessor :sizes
   @@sizes = [
     100, # small formats

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kamifusen
 version: !ruby/object:Gem::Version
-  version: 1.10.6
+  version: 1.11.2
 platform: ruby
 authors:
 - Sébastien Moulène
 - Arnaud Levy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,8 +89,10 @@ files:
 - bin/setup
 - docs/index.html
 - docs/test_01.html
+- image.jpg
 - kamifusen.gemspec
 - lib/kamifusen.rb
+- lib/kamifusen/processor.rb
 - lib/kamifusen/railtie.rb
 - lib/kamifusen/version.rb
 - lib/kamifusen/view_helper.rb
@@ -100,7 +102,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sebousan/kamifusen
   source_code_uri: https://github.com/sebousan/kamifusen
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Images, light as balloons
 test_files: []