klenod-rack 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da0254b4f023e6c27c74ffaf5d393d09685a6a78a0cc861a3de363db67a2d54
-  data.tar.gz: 1d5a11fde09ce76fa871859c093a2ae14caf32536e5c5b80ef37043431239281
+  metadata.gz: 7f174f0692b93ef18d2d3e80f98f9d728b2fa6afcb1356adccec2b93234a3241
+  data.tar.gz: a3d5423c1cb1f2885bd07a4cd2c2114c36445f3604485a8e7eda41ee8b59388d
 SHA512:
-  metadata.gz: 9d6f366e05644e71692043fb26c8d6be87c574a40443b2ded9d8dc75362faa9c125769880dfc3c6ba85866529d57a2242de7b888ab0f69fdd18d5bc551eb13fa
-  data.tar.gz: e5de5c08b8b44ee4e2a5b86dfde61ebcc2fee0f8b43c8dc67ab110604c6443951d3cd78295684f4ee33d01f4fd377b82d9746fc1e11e0292c6859c3f9e378509
+  metadata.gz: bf0eee2068c7ffe800bff1f94f0f12aefd88e4463fc1d93f135c7cba5d1c775c77b6c94cb41c23a939c0b0ae927bd1d9849e670836bcb7aaacf7aa5e9ede4ced
+  data.tar.gz: d31adabf9589421525909d5d9b8a67607a7cefa9d019256b21f38ab737fe881bf360c5cd97c9d6611e20891015d2eeed86baeb06f82ab7d5b6db17b6680a9927

data/README.md

@@ -14,5 +14,10 @@ Use this gem when exposing Klenod assets from a Rack-compatible server:
 ```ruby
 require "klenod/rack"
 
-assets = Klenod::Rack::AssetApp.new(bundle, assets_dir: "public")
+assets = Klenod::Rack::AssetApp.new(bundle, assets_dir: "public", base: bundle.base)
 ```
+
+Assets are written directly under `assets_dir` using their root-relative output paths.
+`AssetApp` maps an origin-relative build base such as `/assets/` or `/.assets/` to
+those files. For an external base such as a CDN URL, use `path_prefix:` to choose
+the local path it should serve.

data/lib/klenod/rack/asset_app.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "http/accept"
+require "klenod/runtime/asset_url"
 
 module Klenod
   module Rack
@@ -19,14 +20,15 @@ module Klenod
     class AssetApp
       CACHE_CONTROL = "public, max-age=31536000, immutable"
 
-      def initialize(source, app: nil, assets_dir: nil, path_prefix: "/assets/")
+      def initialize(source, app: nil, assets_dir: nil, path_prefix: "/assets/", base: nil)
         @source = source
         @app = app
         @assets_dir = assets_dir
-        @path_prefix = path_prefix
+        @base = base && Runtime::AssetUrl.normalize(base)
+        @path_prefix = @base ? (Runtime::AssetUrl.path_prefix(@base) || path_prefix) : path_prefix
       end
 
-      attr_reader :source, :app, :assets_dir, :path_prefix
+      attr_reader :source, :app, :assets_dir, :path_prefix, :base
 
       def call(env)
         response = response_for(env.fetch("PATH_INFO", ""), env)
@@ -39,7 +41,7 @@ module Klenod
       def response_for(path, env = {})
         return nil unless asset_path?(path)
 
-        asset = source.asset(path)
+        asset = asset_for(asset_output_path(path))
         brotli_available = brotli_asset_available?(asset)
         compressed = brotli_available && accepts_brotli?(env.fetch("HTTP_ACCEPT_ENCODING", ""))
         body = compressed ? brotli_asset_bytes(asset) : asset_bytes(asset)
@@ -70,6 +72,16 @@ module Klenod
         path.start_with?(path_prefix)
       end
 
+      def asset_output_path(path)
+        "/#{path.delete_prefix(path_prefix)}"
+      end
+
+      def asset_for(output_path)
+        source.asset(output_path)
+      rescue KeyError
+        source.asset("#{Runtime::AssetUrl::LEGACY_OUTPUT_PREFIX}#{output_path.delete_prefix("/")}")
+      end
+
       def asset_bytes(asset)
         if source.respond_to?(:asset_bytes)
           source.asset_bytes(asset.output_path, assets_dir: assets_dir)

data/lib/klenod/rack/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Rack
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-rack
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: http-accept
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 4.0.6
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="