propshaft 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01db7988c70a623917c5239f4b76cef03e3364b86f3bb1b9850691d1045d3e1
-  data.tar.gz: 066dab4410e31551036e8f539cb351b8c4a6d7c53ae9bd02343b228be16fc85f
+  metadata.gz: 32316706959e2a09f2ac10010fb76ddc25ddfab8ba6a8b06cfb71dc0e75c0deb
+  data.tar.gz: 1b6c3074c0a8f4c0d21287d6c27689bb443e7a58c18a690420f932709a244c44
 SHA512:
-  metadata.gz: 7b09d882ebf32f6afda261a3dbf32ab322e25b1756b802b70e4b6b16f73f3d91404e8b51be6e5c54a1335332744305d3d149712136cbbdabc67b258229178b9f
-  data.tar.gz: 65a13d00417ff13f2678660038ebb7f33074e56b0277b7c51e9df170f9e393ec17cd5ff5ddc888b4e24c469df33ba4f5d8acb19ecf5a2b7626d41c22dac0d781
+  metadata.gz: 8a8cfb18503c100507681ee4da2e76d8493898de8f79cfab01b7b640b92affed80ab3a135f7eb8514a53d2e6d11943e3500c6681ac879d14367fcfa5d5f8432f
+  data.tar.gz: c5e47f07a0d52306a11bb132f0ad7139b208eeb5cd9396d6274423b4de8b2deed013895107027ced61f4887d5aaeee413ae9e41065a74c022a4c4529572d4048

data/lib/propshaft/asset.rb

@@ -32,6 +32,10 @@ class Propshaft::Asset
     end
   end
 
+  def fresh?(digest)
+    self.digest == digest || already_digested?
+  end
+
   def ==(other_asset)
     logical_path.hash == other_asset.logical_path.hash
   end

data/lib/propshaft/compilers/css_asset_urls.rb

@@ -1,13 +1,30 @@
+# frozen_string_literal: true
+
 class Propshaft::Compilers::CssAssetUrls
   attr_reader :assembly
 
+  ASSET_URL_PATTERN = /url\(\s*["']?(?!(?:\#|data|http))([^"'\s)]+)\s*["']?\)/
+
   def initialize(assembly)
     @assembly = assembly
   end
 
-  def compile(input)
-    input.gsub(/asset-path\(["']([^"')]+)["']\)/) do |match|
-      %[url("#{assembly.config.prefix}/#{assembly.load_path.find($1).digested_path}")]
-    end
+  def compile(logical_path, input)
+    input.gsub(ASSET_URL_PATTERN) { asset_url resolve_path(logical_path.dirname, $1) }
   end
+
+  private
+    def resolve_path(directory, filename)
+      if filename.start_with?("../")
+        Pathname.new(directory + filename).relative_path_from("").to_s
+      elsif filename.start_with?("/")
+        filename.delete_prefix("/").to_s
+      else
+        (directory + filename.delete_prefix("./")).to_s
+      end
+    end
+
+    def asset_url(resolved_path)
+      %[url("#{assembly.config.prefix}/#{assembly.load_path.find(resolved_path).digested_path}")]
+    end
 end

data/lib/propshaft/compilers.rb

@@ -23,7 +23,7 @@ class Propshaft::Compilers
     if relevant_registrations = registrations[asset.content_type.to_s]
       asset.content.dup.tap do |input|
         relevant_registrations.each do |compiler|
-          input.replace compiler.new(assembly).compile(input)
+          input.replace compiler.new(assembly).compile(asset.logical_path, input)
         end
       end
     else

data/lib/propshaft/processor.rb

@@ -16,6 +16,10 @@ class Propshaft::Processor
     compress_assets
   end
 
+  def clean
+    FileUtils.rm_r(output_path) if File.exist?(output_path)
+  end
+
   private
     def ensure_output_path_exists
       FileUtils.mkdir_p output_path

data/lib/propshaft/railtie.rb

@@ -46,6 +46,11 @@ module Propshaft
         task precompile: :environment do
           Rails.application.assets.processor.process
         end
+
+        desc "Remove config.assets.output_path"
+        task clean: :environment do
+          Rails.application.assets.processor.clean
+        end
       end
     end
 

data/lib/propshaft/server.rb

@@ -8,16 +8,17 @@ class Propshaft::Server
   def call(env)
     path, digest = extract_path_and_digest(env)
 
-    if (asset = @assembly.load_path.find(path)) && asset.digest == digest
+    if (asset = @assembly.load_path.find(path)) && asset.fresh?(digest)
       compiled_content = @assembly.compilers.compile(asset)
 
       [ 
         200, 
         {
-          "Content-Length" => compiled_content.length.to_s,
-          "Content-Type"   => asset.content_type,
-          "ETag"           => asset.digest,
-          "Cache-Control"  => "public, max-age=31536000, immutable"
+          "Content-Length"  => compiled_content.length.to_s,
+          "Content-Type"    => asset.content_type.to_s,
+          "Accept-Encoding" => "Vary",
+          "ETag"            => asset.digest,
+          "Cache-Control"   => "public, max-age=31536000, immutable"
         },
         [ compiled_content ]
       ]
@@ -29,9 +30,9 @@ class Propshaft::Server
   private
     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]
+      digest    = full_path[/-([0-9a-f]{7,128})\.(?!digested)[^.]+\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.7"
+  VERSION = "0.2.0"
 end

metadata

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