propshaft 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eb4dab520f6e9bc958d7ea65ed10531ab418ac34c3daefdcec0b4d61094bcdd
-  data.tar.gz: 8d76024de20625ee78b0cc8409a2e74b66ac0ccd8203ba14e263d89b649da21d
+  metadata.gz: b03a78a54847aa4fb74c996259230818db5262c8c246367f4826dd222f763d62
+  data.tar.gz: c393121a10fcb3cd1b151077869673260afdf99d4a7294dd88b8f600e3debe55
 SHA512:
-  metadata.gz: 5f8fbd11cd6a8a9031be35139887e1cec8e3823a4eb68e79ad61df91a307aa1222927fd8d87316c6b55df979cdd91f57bc4d653e092190a1b7933db175e44f14
-  data.tar.gz: 70a5ad6e8382e5dafc4bed6b26e1f9ba5008f6bd536961393b807cbb47580dbfc95c1c1cbe04b1b4954968213c2aa112ed822e156fe8f044209bade7ccc79de8
+  metadata.gz: f2807deda69e1f1ddb336985b69c4f2f617398450402ca60de1917599f5e6a8ad5b483386ffcd85cd62f3729ff9fb16d7a2d487e39e15de160c29342d03d4ba1
+  data.tar.gz: d16949bc2e7b81634d310413ea0f29065dfbe9eb4e421fb2321b9709ef460c82eaf93b2ab73d07de23dbd8111730d7755a1995081d8986d96ed28916940b8e94

data/README.md

@@ -4,10 +4,10 @@ Propshaft is an asset pipeline library for Rails. It's built for era where bundl
 
 So that's what Propshaft doesn't do. Here's what it actually does provide:
 
-1. Configurable load path: You can register directories from multiple places in your app and gems, and reference assets from all of these paths as though they were one.
-1. Digest processing: All assets in the load path will be copied (or compiled) in a precompilation step for production that also stamps all of them with a digest hash, so you can use long-expiry cache headers for better performance. The digested assets can be referred to through their logical path because the processing leaves a manifest file that provides a way to translate.
-1. Development server: There's no need to precompile the assets in development. You can refer to them via the same asset_path helpers and they'll be served by a development server.
-1. Basic compiler step: Propshaft was explicitly not designed to provide full transpiler capabilities. You can get that better elsewhere. But it does offer a simple input->output compiler setup that by default is used to translate `asset-path` function calls in CSS to `url(digested-asset)` instead.
+1. **Configurable load path**: You can register directories from multiple places in your app and gems, and reference assets from all of these paths as though they were one.
+1. **Digest stamping**: All assets in the load path will be copied (or compiled) in a precompilation step for production that also stamps all of them with a digest hash, so you can use long-expiry cache headers for better performance. The digested assets can be referred to through their logical path because the processing leaves a manifest file that provides a way to translate.
+1. **Development server**: There's no need to precompile the assets in development. You can refer to them via the same asset_path helpers and they'll be served by a development server.
+1. **Basic compilers**: Propshaft was explicitly not designed to provide full transpiler capabilities. You can get that better elsewhere. But it does offer a simple input->output compiler setup that by default is used to translate `asset-path` function calls in CSS to `url(digested-asset)` instead.
 
 
 ## Installation

data/lib/propshaft/compilers/css_asset_urls.rb

@@ -7,7 +7,7 @@ class Propshaft::Compilers::CssAssetUrls
 
   def compile(input)
     input.gsub(/asset-path\(["']([^"')]+)["']\)/) do |match|
-      %[url("/#{assembly.config.prefix}/#{assembly.load_path.find($1).digested_path}")]
+      %[url("#{assembly.config.prefix}/#{assembly.load_path.find($1).digested_path}")]
     end
   end
 end

data/lib/propshaft/railtie.rb

@@ -18,15 +18,6 @@ module Propshaft
     config.assets.prefix    = "/assets"
     config.assets.compilers = [ [ "text/css", Propshaft::Compilers::CssAssetUrls ] ]
 
-    # Compatibility shiming (need to provide log warnings when used)
-    config.assets.precompile     = []
-    config.assets.debug          = nil
-    config.assets.quiet          = nil
-    config.assets.compile        = nil
-    config.assets.version        = nil
-    config.assets.css_compressor = nil
-    config.assets.js_compressor  = nil
-
     config.after_initialize do |app|
       config.assets.output_path ||=
         Pathname.new(File.join(app.config.paths["public"].first, app.config.assets.prefix))
@@ -50,5 +41,14 @@ module Propshaft
         end
       end
     end
+
+    # Compatibility shiming (need to provide log warnings when used)
+    config.assets.precompile     = []
+    config.assets.debug          = nil
+    config.assets.quiet          = nil
+    config.assets.compile        = nil
+    config.assets.version        = nil
+    config.assets.css_compressor = nil
+    config.assets.js_compressor  = nil
   end
 end

data/lib/propshaft/resolver/dynamic.rb

@@ -8,7 +8,7 @@ module Propshaft::Resolver
 
     def resolve(logical_path)
       if asset = load_path.find(logical_path)
-        File.join prefix, asset.logical_path
+        File.join prefix, asset.digested_path
       end
     end
   end

data/lib/propshaft/server.rb

@@ -6,7 +6,9 @@ class Propshaft::Server
   end
 
   def call(env)
-    if asset = @assembly.load_path.find(requested_path(env))
+    path, digest = extract_path_and_digest(env)
+
+    if (asset = @assembly.load_path.find(path)) && asset.digest == digest
       compiled_content = @assembly.compilers.compile(asset)
 
       [ 
@@ -15,7 +17,7 @@ class Propshaft::Server
           "Content-Length" => compiled_content.length.to_s,
           "Content-Type"   => asset.content_type,
           "ETag"           => asset.digest,
-          "Cache-Control"  => "public, must-revalidate"
+          "Cache-Control"  => "public, max-age=31536000, immutable"
         },
         [ compiled_content ]
       ]
@@ -25,7 +27,11 @@ class Propshaft::Server
   end
 
   private
-    def requested_path(env)
-      Rack::Utils.unescape(env["PATH_INFO"].to_s.sub(/^\//, ""))
+    def extract_path_and_digest(env)
+      full_path = Rack::Utils.unescape(env["PATH_INFO"].to_s.sub(/^\//, ""))
+      digest    = full_path[/-([0-9a-f]{7,128})\.[^.]+\z/, 1]
+      path      = digest ? full_path.sub("-#{digest}", "") : full_path
+      
+      [ path, digest ]
     end
 end

data/lib/propshaft/version.rb

@@ -1,3 +1,3 @@
 module Propshaft
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propshaft
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-19 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails