shimmer 0.0.42 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557b926b9a2cf8f02c044f15d4a5cd174ffd79c7882fa338f81facf5ca29626d
-  data.tar.gz: dcf50f8c696654a586c0c9bfce088fe54beb7d1ae571e6202946fb7395edaf2d
+  metadata.gz: 43a551bb9b24c84773b363f1c409390b996e6d4cdb39feee930b4e29ffebc424
+  data.tar.gz: c49e0b734bc2f778558403d0f2d8205eed1559fd4ea474ff888e4f8d0fe35724
 SHA512:
-  metadata.gz: 5b09d05c6dc817fe747796540fb4c3cf625e42b84313555e8d3a48f73969ac67ee5b3fc528af056d6cd1f08a718c9dcddab65147a606649ebd1a46c81ba7ea8d
-  data.tar.gz: 11b0a1a52dbb32986d8a760ff52efea2ae7b3c734678bc672828fbbd911264c5bf553d973a129fc1d923fb04719a691e2b385e0eb6da77490e2bd08f478e1e26
+  metadata.gz: 1a12fe759f7cbab657a245594d21c05a0851e0550346a9357d59e2486ba29145678eed270acb0a0ea10bf625fca58dc77d98201875c884bd32a06d7e261596c7
+  data.tar.gz: 606d2a31214247a24274341ffa499cf97796569dee5bcb5c58e9bfaeec457ef59e5b865da2820d46d912300195cf32b66f9a35b298c9916fd745e4e7d06553a1

data/Gemfile.lock

@@ -76,8 +76,8 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
@@ -98,11 +98,11 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-playwright-driver (0.5.2)
+    capybara-playwright-driver (0.5.9)
       addressable
       capybara
       playwright-ruby-client (>= 1.16.0)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.6)
     connection_pool (2.4.1)
     crass (1.0.6)
     cssbundling-rails (1.4.1)
@@ -118,10 +118,7 @@ GEM
       railties (>= 6.1)
     drb (2.2.1)
     erubi (1.13.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.6)
@@ -141,7 +138,7 @@ GEM
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
-    logger (1.6.1)
+    logger (1.7.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -151,13 +148,14 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
-    matrix (0.4.2)
-    mime-types (3.6.0)
+    matrix (0.4.3)
+    mime-types (3.7.0)
       logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1001)
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0414)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
     minitest (5.25.1)
     msgpack (1.7.3)
     net-imap (0.5.0)
@@ -170,19 +168,20 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.19.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.19.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.26.3)
     parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    playwright-ruby-client (1.47.0)
+    playwright-ruby-client (1.59.1)
+      base64
       concurrent-ruby (>= 1.1.6)
       mime-types (>= 3.0)
     prism (1.2.0)
@@ -193,14 +192,14 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (6.0.1)
+    public_suffix (7.0.5)
     puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.21)
     rack-session (2.0.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
     rack_session_access (0.2.0)
       builder (>= 2.0.0)
@@ -243,7 +242,7 @@ GEM
       logger
     rdoc (6.7.0)
       psych (>= 4.0.0)
-    regexp_parser (2.9.2)
+    regexp_parser (2.12.0)
     reline (0.5.10)
       io-console (~> 0.5)
     rspec-core (3.13.2)
@@ -309,10 +308,8 @@ GEM
       railties (>= 3.1)
       slim (>= 3.0, < 6.0, != 5.0.0)
     sorbet-runtime (0.5.11611)
-    sqlite3 (2.1.1-aarch64-linux-gnu)
-    sqlite3 (2.1.1-arm64-darwin)
-    sqlite3 (2.1.1-x86_64-darwin)
-    sqlite3 (2.1.1-x86_64-linux-gnu)
+    sqlite3 (2.1.1)
+      mini_portile2 (~> 2.8.0)
     standard (1.35.0.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
@@ -355,6 +352,7 @@ GEM
 PLATFORMS
   aarch64-linux
   arm64-darwin-22
+  arm64-darwin-25
   x86_64-darwin-22
   x86_64-linux
 

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/utils/remote_navigation.rb

@@ -33,8 +33,8 @@ module Shimmer
       end
 
       helper_method :popover_path
-      def popover_path(url, id: nil, selector: nil, placement: nil)
-        "javascript:ui.popover.open(#{{url: url, id: id, selector: selector, placement: placement}.compact.to_json})"
+      def popover_path(url, id: nil, selector: nil, placement: nil, class_name: nil)
+        "javascript:ui.popover.open(#{{url: url, id: id, selector: selector, placement: placement, className: class_name}.compact.to_json})"
       end
 
       def shimmer_request?

data/lib/shimmer/version.rb

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

data/src/popover.ts

@@ -6,6 +6,7 @@ export interface PopoverOptions {
   url: string;
   selector?: HTMLElement | string;
   placement?: Placement;
+  className?: string;
 }
 
 export class PopoverPresenter {
@@ -43,7 +44,12 @@ export class Popover {
   private popper?: Popper;
   private popoverDiv?: HTMLDivElement;
 
-  async open({ url, selector, placement }: PopoverOptions): Promise<void> {
+  async open({
+    url,
+    selector,
+    placement,
+    className,
+  }: PopoverOptions): Promise<void> {
     const root =
       typeof selector === "string"
         ? document.querySelector(selector)
@@ -51,11 +57,15 @@ export class Popover {
     if (!root) {
       return;
     }
-    const popoverDiv = createElement(document.body, "popover");
+
+    const popoverClassName = ["popover", "popover--loading"];
+    if (className) {
+      popoverClassName.push(className);
+    }
+    const popoverDiv = createElement(document.body, popoverClassName.join(" "));
     const arrow = createElement(popoverDiv, "popover__arrow");
     arrow.setAttribute("data-popper-arrow", "true");
     const content = createElement(popoverDiv, "popover__content");
-    content.innerHTML = await getHTML(url);
     this.popper = createPopper(root, popoverDiv, {
       placement: placement ?? "auto",
       modifiers: [
@@ -68,7 +78,13 @@ export class Popover {
       ],
     });
     this.popoverDiv = popoverDiv;
+
     document.addEventListener("click", this.clickOutside);
+
+    const response = await getHTML(url);
+    content.innerHTML = response;
+    popoverDiv.classList.remove("popover--loading");
+    this.popper?.update();
   }
 
   async close(): Promise<void> {

metadata

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