propshaft 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a149fdc0fb45487422a71e21df47105ee0071e23f752f596f54cd98400bc99e2
-  data.tar.gz: 9dcd99aa258a91aa99ac46f1da9379712d836f06c42cd8ce9e6df8b020cc94c6
+  metadata.gz: 56736cd8d13ffa9511e5cd47d39e3d3849f66484f0ba489686b75aa5a5c57936
+  data.tar.gz: 7adfc7103ca6694027ad577b7cd14bf6972227f02bdf0bd0659d508371afdfad
 SHA512:
-  metadata.gz: 79779f26c1d121049451c5a8d7545e9fbfbcdd2b01a966f89fa0a23aa2b140ea2932828bd4c1b9edbab8be106366f8f92f9daa91bfa1c7af2207619a6fcce9fe
-  data.tar.gz: 7f609b53f85ef6bdeb53972c11d9a54301cd974c7d5573d5d93fbeb043daed863e08407bb95b45d7c8a55a122770dcb5f9f8b2d55f6830c2adbb5465281613ad
+  metadata.gz: 67c4c686072bc75784519f8043225b9bb462a19a74a2617ec1628a25cb701bad1aabe05a873126038718b6bd18ba9d51f47cdd0daa89418186996832a0f5707c
+  data.tar.gz: f476c9aff5b7975df5815095bdf1917eeb748ee1c9ebab0f058aa670863597a6d4794c77b3bd379eafb355c83b9fa8008b366796ad52188d7804410f93c8ec33

data/README.md

@@ -49,7 +49,7 @@ But for greenfield apps using the default import-map approach, Propshaft can als
 
 ## Will Propshaft replace Sprockets as the Rails default?
 
-Most likely, but Sprockets need to be supported as well for a long time to come. Plenty of apps and gems were built on Sprocket features, and they won't be migrating soon. Still working out the compatibility story. This is very much alpha software at the moment.
+Most likely, but Sprockets need to be supported as well for a long time to come. Plenty of apps and gems were built on Sprocket features, and they won't be migrating soon. Still working out the compatibility story. This is very much beta software at the moment.
 
 
 ## License

data/lib/propshaft/assembly.rb

@@ -4,8 +4,8 @@ require "propshaft/resolver/static"
 require "propshaft/server"
 require "propshaft/processor"
 require "propshaft/compilers"
-require "propshaft/compilers/css_asset_urls"
-require "propshaft/compilers/source_mapping_urls"
+require "propshaft/compiler/css_asset_urls"
+require "propshaft/compiler/source_mapping_urls"
 
 class Propshaft::Assembly
   attr_reader :config

data/lib/propshaft/asset.rb

@@ -2,15 +2,10 @@ require "digest/sha1"
 require "action_dispatch/http/mime_type"
 
 class Propshaft::Asset
-  PREDIGESTED_REGEX = /-([0-9a-zA-Z]{7,128}\.digested)/
-
   attr_reader :path, :logical_path, :version
 
   def initialize(path, logical_path:, version: nil)
-    @path         = path
-    @digest       = logical_path.to_s[PREDIGESTED_REGEX, 1]
-    @logical_path = Pathname.new(@digest ? logical_path.sub("-#{@digest}", "") : logical_path)
-    @version      = version
+    @path, @logical_path, @version = path, Pathname.new(logical_path), version
   end
 
   def content
@@ -30,14 +25,23 @@ class Propshaft::Asset
   end
 
   def digested_path
-    logical_path.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
+    if already_digested?
+      logical_path
+    else
+      logical_path.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
+    end
   end
 
   def fresh?(digest)
-    self.digest == digest
+    self.digest == digest || already_digested?
   end
 
   def ==(other_asset)
     logical_path.hash == other_asset.logical_path.hash
   end
+
+  private
+    def already_digested?
+      logical_path.to_s =~ /-([0-9a-zA-Z]{7,128})\.digested/
+    end
 end

data/lib/propshaft/{compilers → compiler}/css_asset_urls.rb

@@ -1,15 +1,10 @@
 # frozen_string_literal: true
 
-class Propshaft::Compilers::CssAssetUrls
-  attr_reader :assembly, :url_prefix
+require "propshaft/compiler"
 
+class Propshaft::Compiler::CssAssetUrls < Propshaft::Compiler
   ASSET_URL_PATTERN = /url\(\s*["']?(?!(?:\#|%23|data|http|\/\/))([^"'\s?#)]+)([#?][^"')]+)?\s*["']?\)/
 
-  def initialize(assembly)
-    @assembly   = assembly
-    @url_prefix = File.join(assembly.config.host.to_s, assembly.config.prefix.to_s).chomp("/")
-  end
-
   def compile(logical_path, input)
     input.gsub(ASSET_URL_PATTERN) { asset_url resolve_path(logical_path.dirname, $1), logical_path, $2, $1 }
   end

data/lib/propshaft/{compilers → compiler}/source_mapping_urls.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-class Propshaft::Compilers::SourceMappingUrls
-  attr_reader :assembly
+require "propshaft/compiler"
 
-  SOURCE_MAPPING_PATTERN = %r{^(//|/\*)# sourceMappingURL=(.+\.map)}
-
-  def initialize(assembly)
-    @assembly = assembly
-  end
+class Propshaft::Compiler::SourceMappingUrls < Propshaft::Compiler
+  SOURCE_MAPPING_PATTERN = %r{(//|/\*)# sourceMappingURL=(.+\.map)(\s*?\*\/)?\s*?\Z}
 
   def compile(logical_path, input)
-    input.gsub(SOURCE_MAPPING_PATTERN) { source_mapping_url(asset_path($2, logical_path), $1) }
+    input.gsub(SOURCE_MAPPING_PATTERN) { source_mapping_url(asset_path($2, logical_path), $1, $3) }
   end
 
   private
@@ -22,12 +18,12 @@ class Propshaft::Compilers::SourceMappingUrls
       end
     end
 
-    def source_mapping_url(resolved_path, comment)
+    def source_mapping_url(resolved_path, comment_start, comment_end)
       if asset = assembly.load_path.find(resolved_path)
-        "#{comment}# sourceMappingURL=#{assembly.config.prefix}/#{asset.digested_path}"
+        "#{comment_start}# sourceMappingURL=#{url_prefix}/#{asset.digested_path}#{comment_end}"
       else
         Propshaft.logger.warn "Removed sourceMappingURL comment for missing asset '#{resolved_path}' from #{resolved_path}"
-        nil
+        "#{comment_start}#{comment_end}"
       end
     end
 end

data/lib/propshaft/compiler.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# Base compiler from which other compilers can inherit
+class Propshaft::Compiler
+  attr_reader :assembly
+
+  def initialize(assembly)
+    @assembly = assembly
+  end
+
+  # Override this in a specific compiler
+  def compile(logical_path, input)
+    raise NotImplementedError
+  end
+
+  private
+    def url_prefix
+      @url_prefix ||= File.join(assembly.config.relative_url_root.to_s, assembly.config.prefix.to_s).chomp("/")
+    end
+end

data/lib/propshaft/helper.rb

@@ -3,5 +3,23 @@ module Propshaft
     def compute_asset_path(path, options = {})
       Rails.application.assets.resolver.resolve(path) || raise(MissingAssetError.new(path))
     end
+
+    # Add an option to call `stylesheet_link_tag` with `:all` to include every css file found on the load path.
+    def stylesheet_link_tag(*sources)
+      if sources.first == :all
+        super *all_stylesheets_paths
+      else
+        super
+      end
+    end
+
+    # Returns a sorted and unique array of logical paths for all stylesheets in the load path.
+    def all_stylesheets_paths
+      Rails.application.assets.load_path
+        .assets(content_types: [ Mime::EXTENSION_LOOKUP["css"] ])
+        .collect { |css| css.logical_path.to_s }
+        .sort
+        .uniq
+    end
   end
 end

data/lib/propshaft/load_path.rb

@@ -48,8 +48,7 @@ class Propshaft::LoadPath
         paths.each do |path|
           without_dotfiles(all_files_from_tree(path)).each do |file|
             logical_path = file.relative_path_from(path)
-            asset = Propshaft::Asset.new(file, logical_path: logical_path, version: version)
-            mapped[asset.logical_path.to_s] ||= asset
+            mapped[logical_path.to_s] ||= Propshaft::Asset.new(file, logical_path: logical_path, version: version)
           end if path.exist?
         end
       end

data/lib/propshaft/output_path.rb

@@ -42,7 +42,7 @@ class Propshaft::OutputPath
       modified_at = [ 0, Time.now - mtime ].max
       modified_at < expires_at || limit < count
     end
-
+  
     def remove(path)
       FileUtils.rm(@path.join(path))
       Propshaft.logger.info "Removed #{path}"

data/lib/propshaft/railtie.rb

@@ -11,13 +11,13 @@ module Propshaft
     config.assets.prefix         = "/assets"
     config.assets.quiet          = false
     config.assets.compilers      = [
-      [ "text/css", Propshaft::Compilers::CssAssetUrls ],
-      [ "text/css", Propshaft::Compilers::SourceMappingUrls ],
-      [ "text/javascript", Propshaft::Compilers::SourceMappingUrls ]
+      [ "text/css", Propshaft::Compiler::CssAssetUrls ],
+      [ "text/css", Propshaft::Compiler::SourceMappingUrls ],
+      [ "text/javascript", Propshaft::Compiler::SourceMappingUrls ]
     ]
     config.assets.sweep_cache = Rails.env.development?
     config.assets.server = Rails.env.development? || Rails.env.test?
-    config.assets.host = nil
+    config.assets.relative_url_root = nil
 
     # Register propshaft initializer to copy the assets path in all the Rails Engines.
     # This makes possible for us to keep all `assets` config in this Railtie, but still
@@ -31,7 +31,7 @@ module Propshaft
     end
 
     config.after_initialize do |app|
-      config.assets.host = app.config.asset_host
+      config.assets.relative_url_root ||= app.config.relative_url_root
       config.assets.output_path ||=
         Pathname.new(File.join(app.config.paths["public"].first, app.config.assets.prefix))
 

data/lib/propshaft/railties/assets.rake

@@ -4,7 +4,7 @@ namespace :assets do
     Rails.application.assets.processor.process
     if Rails.env.development?
       puts "Warning: You are precompiling assets in development. Rails will not " \
-        "serve any changed assets until you delete public/assets/.manifest.json"
+        "serve any changed assets until you delete public#{Rails.application.config.assets.prefix}/.manifest.json"
     end
   end
 

data/lib/propshaft/server.rb

@@ -14,16 +14,16 @@ class Propshaft::Server
       [
         200,
         {
-          "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"
+          Rack::CONTENT_LENGTH  => compiled_content.length.to_s,
+          Rack::CONTENT_TYPE    => asset.content_type.to_s,
+          VARY                  => "Accept-Encoding",
+          Rack::ETAG            => asset.digest,
+          Rack::CACHE_CONTROL   => "public, max-age=31536000, immutable"
         },
         [ compiled_content ]
       ]
     else
-      [ 404, { "content-type" => "text/plain", "content-length" => "9" }, [ "Not found" ] ]
+      [ 404, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "9" }, [ "Not found" ] ]
     end
   end
 
@@ -34,9 +34,15 @@ 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-zA-Z]{7,128}(?:\.digested)?)\.[^.]+\z/, 1]
+      digest    = full_path[/-([0-9a-zA-Z]{7,128})\.(?!digested)[^.]+\z/, 1]
       path      = digest ? full_path.sub("-#{digest}", "") : full_path
 
       [ path, digest ]
     end
+
+    if Gem::Version.new(Rack::RELEASE) < Gem::Version.new("3")
+      VARY = "Vary"
+    else
+      VARY = "vary"
+    end
 end

data/lib/propshaft/version.rb

@@ -1,3 +1,3 @@
 module Propshaft
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propshaft
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-04 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -78,9 +78,10 @@ files:
 - lib/propshaft.rb
 - lib/propshaft/assembly.rb
 - lib/propshaft/asset.rb
+- lib/propshaft/compiler.rb
+- lib/propshaft/compiler/css_asset_urls.rb
+- lib/propshaft/compiler/source_mapping_urls.rb
 - lib/propshaft/compilers.rb
-- lib/propshaft/compilers/css_asset_urls.rb
-- lib/propshaft/compilers/source_mapping_urls.rb
 - lib/propshaft/errors.rb
 - lib/propshaft/helper.rb
 - lib/propshaft/load_path.rb
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Deliver assets for Rails.