shimmer 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557b926b9a2cf8f02c044f15d4a5cd174ffd79c7882fa338f81facf5ca29626d
-  data.tar.gz: dcf50f8c696654a586c0c9bfce088fe54beb7d1ae571e6202946fb7395edaf2d
+  metadata.gz: fa3d1482f1b06e46680603bff5b30b0bb5b65fa2cc1e614dc7dd770b32854180
+  data.tar.gz: fb9824638cb575b87d6f904dd7ae4ad46d73a5fab3307c913863e59a7fbfef63
 SHA512:
-  metadata.gz: 5b09d05c6dc817fe747796540fb4c3cf625e42b84313555e8d3a48f73969ac67ee5b3fc528af056d6cd1f08a718c9dcddab65147a606649ebd1a46c81ba7ea8d
-  data.tar.gz: 11b0a1a52dbb32986d8a760ff52efea2ae7b3c734678bc672828fbbd911264c5bf553d973a129fc1d923fb04719a691e2b385e0eb6da77490e2bd08f478e1e26
+  metadata.gz: 9f2d78f02e3bbd3815ec7f72311026a9e08b3aa635eaaa372c315e50112299bb2c3b58f506d980473a18f34041165eff8233f5325add59c41a4097411901f18d
+  data.tar.gz: ed6698ede442254af839174bb6d530cbaecc59b810772c68ece8a729f4dd48565abae3ffbb5d7570e32d6d8748780600a7b839f6bab48da26ca05b662f4c3438

data/README.md

@@ -140,7 +140,7 @@ Then, if there are specific cops you want to use in the specific project you are
 
 `ActiveStorage` is great, but serving of files, especially behind a CDN, can be complicated to get right. Shimmer has your back.
 
-It overrides `image_tag` and automatically resizes your image and creates a static, cacheable URL.
+It overrides `image_tag` and automatically resizes your image, converts it to WebP, and creates a static, cacheable URL.
 
 ```ruby
 # use an image tag

data/lib/shimmer/controllers/files_controller.rb

@@ -5,11 +5,14 @@ module Shimmer
     def show
       expires_in 1.year, public: true
       request.session_options[:skip] = true # prevents a session cookie from being set (would prevent caching on CDNs)
+
       proxy = FileProxy.restore(params.require(:id))
-      send_data proxy.file,
+      send_data(
+        proxy.file,
         filename: proxy.filename.to_s,
         type: proxy.content_type,
         disposition: "inline"
+      )
     rescue ActiveRecord::RecordNotFound, ActiveStorage::FileNotFoundError
       head :not_found
     end

data/lib/shimmer/utils/file_helper.rb

@@ -15,23 +15,31 @@ module Shimmer
     def image_tag(source, **options)
       return nil if source.blank?
 
-      if source.is_a?(ActiveStorage::Variant) || source.is_a?(ActiveStorage::Attached) || source.is_a?(ActiveStorage::Attachment) || source.is_a?(ActionText::Attachment)
+      if source.is_a?(ActiveStorage::Variant) ||
+          source.is_a?(ActiveStorage::VariantWithRecord) ||
+          source.is_a?(ActiveStorage::Attached) ||
+          source.is_a?(ActiveStorage::Attachment) ||
+          (Object.const_defined?("ActionText::Attachment") && source.is_a?(ActionText::Attachment))
         attachment = source
         width = options[:width]
         height = options[:height]
         source = image_file_path(source, width: width, height: height)
         options[:loading] ||= :lazy
-        options[:srcset] = "#{source} 1x, #{image_file_path(attachment, width: width.to_i * 2, height: height ? height.to_i * 2 : nil)} 2x" if options[:width].present?
+        if options[:width].present?
+          source_2x = image_file_path(attachment, width: width.to_i * 2, height: height ? height.to_i * 2 : nil)
+          options[:srcset] = "#{source} 1x, #{source_2x} 2x"
+        end
       end
+
       super(source, options)
     end
 
-    def image_file_path(source, width: nil, height: nil)
-      image_file_proxy(source, width: width, height: height, return_type: :path)
+    def image_file_path(source, **)
+      image_file_proxy(source, **, return_type: :path)
     end
 
-    def image_file_url(source, width: nil, height: nil)
-      image_file_proxy(source, width: width, height: height, return_type: :url)
+    def image_file_url(source, **)
+      image_file_proxy(source, **, return_type: :url)
     end
 
     def image_file_proxy(source, width: nil, height: nil, return_type: nil)

data/lib/shimmer/utils/file_proxy.rb

@@ -5,25 +5,21 @@ module Shimmer
     attr_reader :blob_id
 
     delegate :message_verifier, to: :class
-    delegate :content_type, :filename, to: :blob
+    delegate :content_type, :filename, to: :variant
 
     class << self
       def restore(id)
         blob_id, resize = message_verifier.verified(id)
-
-        if resize.is_a?(String)
-          width, height = legacy_resize_string_to_tuple(resize)
-        elsif resize.is_a?(Array)
-          width, height = resize
-        end
+        width, height = parse_resize(resize)
 
         new(blob_id: blob_id, width: width, height: height)
       end
 
-      # In the past, we generated the IDs with ImageMagick style "200x200>" strings. We don't do that anymore, but to prevent all old URLs breaking and caches invalidating at once, we grandfather these URLs in.
-      def legacy_resize_string_to_tuple(resize)
+      def parse_resize(resize)
         return if resize.blank?
+        return resize if resize.is_a?(Array)
 
+        # In the past, we generated the IDs with ImageMagick style "200x200>" strings. We don't do that anymore, but to prevent all old URLs breaking and caches invalidating at once, we grandfather these URLs in.
         matches = resize.match(/(?<width>\d*)x(?<height>\d*)/)
 
         [
@@ -54,12 +50,13 @@ module Shimmer
       @blob ||= ActiveStorage::Blob.find(blob_id)
     end
 
-    def resizeable?
-      @resize.present? && blob.content_type.exclude?("svg")
-    end
-
     def variant
-      @variant ||= resizeable? ? blob.representation(resize_to_limit: @resize).processed : blob
+      @variant ||= if blob.representable?
+        options = {resize_to_limit: @resize, format: "webp"}
+        blob.representation(options.compact).processed
+      else
+        blob
+      end
     end
 
     def file

data/lib/shimmer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shimmer
-  VERSION = "0.0.42"
+  VERSION = "0.0.43"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - Jens Ravens
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-04-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email: