assiette 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a187177bddf32e79959d651085f938025b48fc19fdaaacadd45d40b123752b1
-  data.tar.gz: 011cd619392df23a7a4f83d65b020615686390037cb3254dc026b5ba11f6918f
+  metadata.gz: 1267863146e1fa5c134f47f1cf797123609d8466690d3a39d9603fe9c35787ef
+  data.tar.gz: fcfbe591ac7de77fddb85bfe0d3b2cee0838ef30ac596aef612712b37294511a
 SHA512:
-  metadata.gz: c4c1634cd357063c7d38dcf3a9c12f74527a5c7b4fad59069c67c0fea8f14291c41e0c8e4a4a39f55bd399dc4e5d5c5af834768d2544296cf52c6ff4bd7565a6
-  data.tar.gz: 127a615aac3b7edb7e5338dd433cccb1f1a3a6994d3d0406cb8955d210ab0a427513310d37f7d88b905cab69a57b1730ce07564641e0e206835ac8299c572619
+  metadata.gz: d525c3fb1891574eac36d5b42ac82d5426b7a60e870a8001f4115edc15f32935e5559623a08ad849a6e580917788c25e16d39d64274deec47aa4291c3b399d8a
+  data.tar.gz: 3b35f41fec398a1ed00d3b18f2bec5167d14cd0af451d8cc838fa4f5957c21bf8d349e8fcc0a15d54ceeb788a9c78c0bb30e754baf44350c51961cf4e0836d53

data/lib/assiette/asset_handler.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require "digest/sha1"
+require "digest/sha2"
+require "base64"
+require "pathname"
+require_relative "version_tag"
+
+module Assiette
+  class AssetHandler
+    CONTENT_TYPES = {
+      ".js" => "application/javascript",
+      ".mjs" => "application/javascript",
+      ".css" => "text/css",
+      ".svg" => "image/svg+xml",
+      ".png" => "image/png",
+      ".ico" => "image/x-icon"
+    }.freeze
+
+    JS_EXTENSIONS = %w[.js .mjs].to_set.freeze
+
+    def initialize(root:, additional_directory_mappings: {})
+      @mappings = build_mappings(root, additional_directory_mappings)
+      @integrity_cache = {}
+      @integrity_mutex = Mutex.new
+      @modules_cache = nil
+      @modules_mutex = Mutex.new
+      @modules_version = nil
+    end
+
+    def resolve_file(path)
+      clean = path.sub(%r{\A/}, "")
+      @mappings.each do |prefix, root|
+        if prefix.empty?
+          relative = clean
+        elsif clean.start_with?(prefix + "/")
+          relative = clean[(prefix.length + 1)..]
+        elsif clean == prefix
+          next
+        else
+          next
+        end
+
+        abs = root.join(relative).cleanpath
+        next unless abs.to_s.start_with?(root.to_s + "/")
+        return abs if abs.exist? && abs.file?
+      end
+      nil
+    end
+
+    def absolute_asset_url_path(path, script_name = "")
+      clean = path.sub(%r{\A/}, "")
+      return nil unless resolve_file(clean)
+      "#{script_name}/#{clean}?v=#{Assiette.version_tag}"
+    end
+
+    def asset_integrity(path)
+      version_tag = Assiette.version_tag
+      @integrity_mutex.synchronize do
+        if @integrity_version != version_tag
+          @integrity_cache = {}
+          @integrity_version = version_tag
+        end
+        return @integrity_cache[path] if @integrity_cache.key?(path)
+
+        clean = path.sub(%r{\A/}, "")
+        @integrity_cache[path] = compute_integrity(clean, version_tag)
+      end
+    end
+
+    def js_modules
+      version_tag = Assiette.version_tag
+      @modules_mutex.synchronize do
+        return @modules_cache if @modules_version == version_tag
+
+        @modules_cache = @mappings.flat_map { |prefix, root|
+          Dir[File.join(root, "**/*.{js,mjs}")].filter_map { |abs|
+            next unless File.foreach(abs).any? { |line| line.match?(/\A\s*(import|export)\s/) }
+            relative = Pathname.new(abs).relative_path_from(root).to_s
+            mod_path = "/#{"#{prefix}/" unless prefix.empty?}#{relative}".squeeze("/")
+            {path: mod_path, integrity: asset_integrity(mod_path)}
+          }
+        }.uniq { |m| m[:path] }.sort_by { |m| m[:path] }
+
+        @modules_version = version_tag
+        @modules_cache
+      end
+    end
+
+    private
+
+    def build_mappings(root, additional_directory_mappings)
+      mappings = [["", Pathname.new(root).expand_path]]
+      additional_directory_mappings.each do |prefix, path|
+        clean_prefix = prefix.to_s.sub(%r{\A/}, "").chomp("/")
+        mappings << [clean_prefix, Pathname.new(path).expand_path]
+      end
+      mappings
+    end
+
+    def compute_integrity(clean, version_tag)
+      file_path = resolve_file(clean)
+      return nil unless file_path
+
+      raw = File.read(file_path)
+      ext = File.extname(clean)
+      served = case ext
+      when ".js", ".mjs" then Rewriter.rewrite_js_imports(raw, version_tag)
+      when ".css" then Rewriter.rewrite_css_urls(raw, version_tag)
+      else raw
+      end
+      "sha256-#{Base64.strict_encode64(Digest::SHA256.digest(served))}"
+    end
+  end
+end

data/lib/assiette/helpers.rb

@@ -7,7 +7,7 @@ module Assiette
     def assiette_asset_path(path)
       entry = request.env["assiette.stack"]&.last
       raise "No Assiette::Server in middleware stack" unless entry
-      entry[:server].absolute_asset_url_path(path, entry[:script_name])
+      entry[:handler].absolute_asset_url_path(path, entry[:script_name])
     end
 
     # Returns the SRI integrity hash for an asset, computed over the served
@@ -15,7 +15,7 @@ module Assiette
     def assiette_asset_integrity(path)
       entry = request.env["assiette.stack"]&.last
       raise "No Assiette::Server in middleware stack" unless entry
-      entry[:server].asset_integrity(path)
+      entry[:handler].asset_integrity(path)
     end
 
     # Generates a <link rel="stylesheet"> tag with SRI integrity.
@@ -30,7 +30,7 @@ module Assiette
     def assiette_modulepreload_tags
       entry = request.env["assiette.stack"]&.last
       raise "No Assiette::Server in middleware stack" unless entry
-      modules = entry[:server].js_modules
+      modules = entry[:handler].js_modules
       safe_join(modules.map { |mod|
         tag.link(rel: "modulepreload", href: assiette_asset_path(mod[:path]),
           integrity: mod[:integrity], crossorigin: "anonymous")

data/lib/assiette/rails_asset_url_helper.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Assiette
+  # Include this module into ActionView::Base to make standard Rails asset
+  # helpers (image_tag, stylesheet_link_tag, etc.) resolve paths through
+  # an Assiette::AssetHandler assigned to Rails.application.assets.
+  #
+  #   ActiveSupport.on_load(:action_view) do
+  #     include Assiette::RailsAssetUrlHelper
+  #   end
+  module RailsAssetUrlHelper
+    def compute_asset_path(source, options = {})
+      resolver = Rails.application.assets
+      if resolver.is_a?(Assiette::AssetHandler)
+        resolved = resolver.absolute_asset_url_path("/#{source}")
+        return resolved if resolved
+      end
+      super
+    end
+  end
+end

data/lib/assiette/railtie.rb

@@ -7,5 +7,11 @@ module Assiette
     generators do
       require_relative "../generators/assiette/install/install_generator"
     end
+
+    initializer "assiette.rails_asset_url_helper" do
+      ActiveSupport.on_load(:action_view) do
+        include Assiette::RailsAssetUrlHelper
+      end
+    end
   end
 end

data/lib/assiette/server.rb

@@ -1,40 +1,20 @@
 # frozen_string_literal: true
 
-require "digest/sha1"
-require "digest/sha2"
-require "base64"
-require "pathname"
-require_relative "rewriter"
-require_relative "version_tag"
-
 module Assiette
   class Server
-    CONTENT_TYPES = {
-      ".js" => "application/javascript",
-      ".mjs" => "application/javascript",
-      ".css" => "text/css",
-      ".svg" => "image/svg+xml",
-      ".png" => "image/png",
-      ".ico" => "image/x-icon"
-    }.freeze
-
-    JS_EXTENSIONS = %w[.js .mjs].to_set.freeze
-
     CACHE_CONTROL = "public, max-age=432000, must-revalidate"
 
-    def initialize(app, root:, additional_directory_mappings: {})
+    # Accepts either a pre-built handler or keyword args:
+    #   Server.new(app, handler)
+    #   Server.new(app, root: "...", additional_directory_mappings: {})
+    def initialize(app, handler = nil, root: nil, additional_directory_mappings: {})
       @app = app
-      @mappings = build_mappings(root, additional_directory_mappings)
-      @integrity_cache = {}
-      @integrity_mutex = Mutex.new
-      @modules_cache = nil
-      @modules_mutex = Mutex.new
-      @modules_version = nil
+      @handler = handler || AssetHandler.new(root: root, additional_directory_mappings: additional_directory_mappings)
     end
 
     def call(env)
       stack = (env["assiette.stack"] ||= [])
-      stack << {server: self, script_name: env["SCRIPT_NAME"].to_s}
+      stack << {handler: @handler, script_name: env["SCRIPT_NAME"].to_s}
 
       result = serve(env)
       return result if result
@@ -42,57 +22,8 @@ module Assiette
       @app.call(env)
     end
 
-    # Public API for helpers
-    def absolute_asset_url_path(path, script_name = "")
-      clean = path.sub(%r{\A/}, "")
-      return nil unless resolve_file(clean)
-      "#{script_name}/#{clean}?v=#{Assiette.version_tag}"
-    end
-
-    def asset_integrity(path)
-      version_tag = Assiette.version_tag
-      @integrity_mutex.synchronize do
-        if @integrity_version != version_tag
-          @integrity_cache = {}
-          @integrity_version = version_tag
-        end
-        return @integrity_cache[path] if @integrity_cache.key?(path)
-
-        clean = path.sub(%r{\A/}, "")
-        @integrity_cache[path] = compute_integrity(clean, version_tag)
-      end
-    end
-
-    def js_modules
-      version_tag = Assiette.version_tag
-      @modules_mutex.synchronize do
-        return @modules_cache if @modules_version == version_tag
-
-        @modules_cache = @mappings.flat_map { |prefix, root|
-          Dir[File.join(root, "**/*.{js,mjs}")].filter_map { |abs|
-            next unless File.foreach(abs).any? { |line| line.match?(/\A\s*(import|export)\s/) }
-            relative = Pathname.new(abs).relative_path_from(root).to_s
-            mod_path = "/#{"#{prefix}/" unless prefix.empty?}#{relative}".squeeze("/")
-            {path: mod_path, integrity: asset_integrity(mod_path)}
-          }
-        }.uniq { |m| m[:path] }.sort_by { |m| m[:path] }
-
-        @modules_version = version_tag
-        @modules_cache
-      end
-    end
-
     private
 
-    def build_mappings(root, additional_directory_mappings)
-      mappings = [["", Pathname.new(root).expand_path]]
-      additional_directory_mappings.each do |prefix, path|
-        clean_prefix = prefix.to_s.sub(%r{\A/}, "").chomp("/")
-        mappings << [clean_prefix, Pathname.new(path).expand_path]
-      end
-      mappings
-    end
-
     def serve(env)
       return unless env["REQUEST_METHOD"] == "GET" || env["REQUEST_METHOD"] == "HEAD"
 
@@ -100,10 +31,10 @@ module Assiette
       path_info = path_info.sub(%r{\A/}, "")
 
       extension = File.extname(path_info)
-      content_type = CONTENT_TYPES[extension]
+      content_type = AssetHandler::CONTENT_TYPES[extension]
       return unless content_type
 
-      file_path = resolve_file(path_info)
+      file_path = @handler.resolve_file(path_info)
       return unless file_path
 
       raw_bytes = File.binread(file_path)
@@ -117,7 +48,7 @@ module Assiette
       query = Rack::Utils.parse_query(env["QUERY_STRING"])
       tag = query["v"].to_s.empty? ? Assiette.version_tag : query["v"]
 
-      body = if JS_EXTENSIONS.include?(extension)
+      body = if AssetHandler::JS_EXTENSIONS.include?(extension)
         Rewriter.rewrite_js_imports(raw_bytes, tag)
       elsif extension == ".css"
         Rewriter.rewrite_css_urls(raw_bytes, tag)
@@ -134,39 +65,5 @@ module Assiette
 
       [200, headers, [body]]
     end
-
-    def resolve_file(path)
-      clean = path.sub(%r{\A/}, "")
-      @mappings.each do |prefix, root|
-        if prefix.empty?
-          relative = clean
-        elsif clean.start_with?(prefix + "/")
-          relative = clean[(prefix.length + 1)..]
-        elsif clean == prefix
-          next
-        else
-          next
-        end
-
-        abs = root.join(relative).cleanpath
-        next unless abs.to_s.start_with?(root.to_s + "/")
-        return abs if abs.exist? && abs.file?
-      end
-      nil
-    end
-
-    def compute_integrity(clean, version_tag)
-      file_path = resolve_file(clean)
-      return nil unless file_path
-
-      raw = File.read(file_path)
-      ext = File.extname(clean)
-      served = case ext
-      when ".js", ".mjs" then Rewriter.rewrite_js_imports(raw, version_tag)
-      when ".css" then Rewriter.rewrite_css_urls(raw, version_tag)
-      else raw
-      end
-      "sha256-#{Base64.strict_encode64(Digest::SHA256.digest(served))}"
-    end
   end
 end

data/lib/assiette/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Assiette
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/assiette.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require_relative "assiette/version"
-require_relative "assiette/version_tag"
-require_relative "assiette/rewriter"
-require_relative "assiette/server"
-require_relative "assiette/helpers"
-require_relative "assiette/railtie" if defined?(Rails::Railtie)
 
 module Assiette
+  autoload :Rewriter, File.expand_path("assiette/rewriter", __dir__)
+  autoload :AssetHandler, File.expand_path("assiette/asset_handler", __dir__)
+  autoload :Server, File.expand_path("assiette/server", __dir__)
+  autoload :Helpers, File.expand_path("assiette/helpers", __dir__)
+  autoload :RailsAssetUrlHelper, File.expand_path("assiette/rails_asset_url_helper", __dir__)
 end
+
+require_relative "assiette/railtie" if defined?(Rails::Railtie)

data/lib/generators/assiette/install/templates/initializer.rb.tt

@@ -6,20 +6,28 @@
 # This file runs during :load_config_initializers, which is before the
 # middleware stack is frozen (:build_middleware_stack) in Rails 8.1+.
 
-# Serve files from app/assets (JS modules, CSS, SVGs, etc.)
-Rails.application.config.middleware.use(
-  Assiette::Server,
-  root: Rails.root.join("app/assets")
+# Build a single handler that knows about app/assets and public/, and share
+# it between the Rack middleware (which serves the files) and the Rails
+# asset helpers (which generate URLs).
+handler = Assiette::AssetHandler.new(
+  root: Rails.root.join("app/assets"),
+  additional_directory_mappings: {
+    "/" => Rails.root.join("public")
+  }
 )
 
-# Serve files from public/ (favicons, static images, etc.)
-Rails.application.config.middleware.use(
-  Assiette::Server,
-  root: Rails.root.join("public")
-)
+# Serve files through the shared handler.
+Rails.application.config.middleware.use Assiette::Server, handler
+
+# Make the standard Rails asset helpers (asset_path, image_tag,
+# stylesheet_link_tag, javascript_include_tag, ...) resolve paths through
+# Assiette and pick up its ?v= cache-busting tag. Unknown assets fall back
+# to Rails' default behavior. Remove this line if you'd rather use only
+# the assiette_* helpers below.
+Rails.application.assets = handler
 
-# Make assiette_asset_path, assiette_stylesheet_tag, and
-# assiette_modulepreload_tags available in all views.
+# Also expose assiette_asset_path, assiette_stylesheet_tag, and
+# assiette_modulepreload_tags for templates that want them directly.
 ActiveSupport.on_load(:action_controller_base) do
   helper Assiette::Helpers
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: assiette
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Julik Tarkhanov
 bindir: bin
 cert_chain: []
-date: 2026-05-20 00:00:00.000000000 Z
+date: 2026-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -34,7 +34,9 @@ files:
 - LICENSE.txt
 - Rakefile
 - lib/assiette.rb
+- lib/assiette/asset_handler.rb
 - lib/assiette/helpers.rb
+- lib/assiette/rails_asset_url_helper.rb
 - lib/assiette/railtie.rb
 - lib/assiette/rewriter.rb
 - lib/assiette/server.rb