propshaft 0.9.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 196e08be5355cc2d0083425ec483ccf07f462643e81ef7e7768e69323bb4331b
-  data.tar.gz: 2eb14827138ff9ac43c131f2cfb90c79b36cae05c6e7ec8b465be11d9bdf566a
+  metadata.gz: 14ffc5b071d45f08f18e5f52fa2668f4630debf23d501c08e000d309c3a9b8fd
+  data.tar.gz: c210e3cd12d58e3df3c2a20c2b42d182ee66e13ae3d6653fd05272b3ad513e37
 SHA512:
-  metadata.gz: ca96acf2a13e721aa5d30e197bc98c787d6f2e3b978be337e995af90cd6242ead4031dc5d954d353db50020674a649326b97b9041c5973727c201326d134067c
-  data.tar.gz: e4aa381ac0a65f6f17cd40a798f48965423933f7adbd707d4a644fbf03426555ee49aa55ae95de0c69334afa88f88697141c29134a3a1b2b2d117c2fda089bfb
+  metadata.gz: bea78212ba31154621e6878b7e721abbc787e0594da6dadf6d6e587b213c9f587d6d554e74f5b79d361944ae43514c82efa30b49978d4faa776e21774ceb4fd6
+  data.tar.gz: 46de0996122fe99868d6a74a1d4f3c37c8897c6b760e0a7de9db36cc8794995ea6c753d792fd21ddde22d2d9fa1fd599aef055d94a42da49b36e1badeb5f5ca9

data/README.md

@@ -12,7 +12,7 @@ So that's what Propshaft doesn't do. Here's what it does provide:
 
 ## Installation
 
-With Rails 7+, you can start a new application with propshaft using `rails new myapp -a propshaft`. For existing applications, check the [upgrade guide](https://github.com/rails/propshaft/blob/main/UPGRADING.md) which contains step-by-step instructions.
+With Rails 8, Propshaft is the default asset pipeline for new applications. With Rails 7, you can start a new application with propshaft using `rails new myapp -a propshaft`. For existing applications, check the [upgrade guide](https://github.com/rails/propshaft/blob/main/UPGRADING.md) which contains step-by-step instructions.
 
 ## Usage
 
@@ -47,11 +47,6 @@ On the other hand, if you're already bundling JavaScript and CSS through a Node-
 But for greenfield apps using the default import-map approach, Propshaft can also work well, if you're able to deal with vanilla CSS.
 
 
-## Will Propshaft replace Sprockets as the Rails default?
-
-Most likely, but Sprockets needs 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
 
 Propshaft is released under the [MIT License](https://opensource.org/licenses/MIT).

data/lib/propshaft/assembly.rb

@@ -19,8 +19,8 @@ class Propshaft::Assembly
   end
 
   def resolver
-    @resolver ||= if manifest_path.exist?
-      Propshaft::Resolver::Static.new manifest_path: manifest_path, prefix: config.prefix
+    @resolver ||= if config.manifest_path.exist?
+      Propshaft::Resolver::Static.new manifest_path: config.manifest_path, prefix: config.prefix
     else
       Propshaft::Resolver::Dynamic.new load_path: load_path, prefix: config.prefix
     end
@@ -32,7 +32,7 @@ class Propshaft::Assembly
 
   def processor
     Propshaft::Processor.new \
-      load_path: load_path, output_path: config.output_path, compilers: compilers
+      load_path: load_path, output_path: config.output_path, compilers: compilers, manifest_path: config.manifest_path
   end
 
   def compilers
@@ -51,9 +51,4 @@ class Propshaft::Assembly
       asset.send(path_type)
     end
   end
-
-  private
-    def manifest_path
-      config.output_path.join(Propshaft::Processor::MANIFEST_FILENAME)
-    end
 end

data/lib/propshaft/asset.rb

@@ -4,12 +4,21 @@ require "action_dispatch/http/mime_type"
 class Propshaft::Asset
   attr_reader :path, :logical_path, :load_path
 
+  class << self
+    def extract_path_and_digest(digested_path)
+      digest = digested_path[/-([0-9a-zA-Z]{7,128})\.(?!digested)([^.]|.map)+\z/, 1]
+      path   = digest ? digested_path.sub("-#{digest}", "") : digested_path
+
+      [path, digest]
+    end
+  end
+
   def initialize(path, logical_path:, load_path:)
     @path, @logical_path, @load_path = path, Pathname.new(logical_path), load_path
   end
 
-  def content
-    File.binread(path)
+  def content(encoding: "ASCII-8BIT")
+    File.read(path, encoding: encoding)
   end
 
   def content_type

data/lib/propshaft/output_path.rb

@@ -26,7 +26,7 @@ class Propshaft::OutputPath
     Hash.new.tap do |files|
       all_files_from_tree(path).each do |file|
         digested_path = file.relative_path_from(path)
-        logical_path, digest = extract_path_and_digest(digested_path)
+        logical_path, digest = Propshaft::Asset.extract_path_and_digest(digested_path.to_s)
 
         files[digested_path.to_s] = {
           logical_path: logical_path.to_s,
@@ -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}"
@@ -51,11 +51,4 @@ class Propshaft::OutputPath
     def all_files_from_tree(path)
       path.children.flat_map { |child| child.directory? ? all_files_from_tree(child) : child }
     end
-
-    def extract_path_and_digest(digested_path)
-      digest = digested_path.to_s[/-([0-9a-f]{7,128})\.(?!digested)[^.]+\z/, 1]
-      path = digest ? digested_path.sub("-#{digest}", "") : digested_path
-
-      [path, digest]
-    end
 end

data/lib/propshaft/processor.rb

@@ -1,12 +1,11 @@
 require "propshaft/output_path"
 
 class Propshaft::Processor
-  MANIFEST_FILENAME = ".manifest.json"
+  attr_reader :load_path, :output_path, :compilers, :manifest_path
 
-  attr_reader :load_path, :output_path, :compilers
-
-  def initialize(load_path:, output_path:, compilers:)
+  def initialize(load_path:, output_path:, compilers:, manifest_path:)
     @load_path, @output_path = load_path, output_path
+    @manifest_path = manifest_path
     @compilers = compilers
   end
 
@@ -31,7 +30,8 @@ class Propshaft::Processor
 
 
     def write_manifest
-      File.open(output_path.join(MANIFEST_FILENAME), "wb+") do |manifest|
+      FileUtils.mkdir_p(File.dirname(manifest_path))
+      File.open(manifest_path, "wb+") do |manifest|
         manifest.write load_path.manifest.to_json
       end
     end

data/lib/propshaft/railtie.rb

@@ -1,5 +1,6 @@
 require "rails"
 require "active_support/ordered_options"
+require "propshaft"
 require "propshaft/quiet_assets"
 
 module Propshaft
@@ -31,9 +32,13 @@ module Propshaft
     end
 
     config.after_initialize do |app|
+      # Prioritize assets from within the application over assets of the same path from engines/gems.
+      config.assets.paths.sort_by! { |path| path.to_s.start_with?(Rails.root.to_s) ? 0 : 1 }
+
       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))
+      config.assets.manifest_path ||= config.assets.output_path.join(".manifest.json")
 
       app.assets = Propshaft::Assembly.new(app.config.assets)
 

data/lib/propshaft/resolver/dynamic.rb

@@ -12,9 +12,9 @@ module Propshaft::Resolver
       end
     end
 
-    def read(logical_path)
+    def read(logical_path, options = {})
       if asset = load_path.find(logical_path)
-        asset.content
+        asset.content(**options)
       end
     end
   end

data/lib/propshaft/resolver/static.rb

@@ -12,9 +12,9 @@ module Propshaft::Resolver
       end
     end
 
-    def read(logical_path)
+    def read(logical_path, encoding: "ASCII-8BIT")
       if asset_path = parsed_manifest[logical_path]
-        manifest_path.dirname.join(asset_path).read
+        File.read(manifest_path.dirname.join(asset_path), encoding: encoding)
       end
     end
 

data/lib/propshaft/server.rb

@@ -35,10 +35,8 @@ 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)([^.]|.map)+\z/, 1]
-      path      = digest ? full_path.sub("-#{digest}", "") : full_path
 
-      [ path, digest ]
+      Propshaft::Asset.extract_path_and_digest(full_path)
     end
 
     if Gem::Version.new(Rack::RELEASE) < Gem::Version.new("3")

data/lib/propshaft/version.rb

@@ -1,3 +1,3 @@
 module Propshaft
-  VERSION = "0.9.1"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propshaft
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Deliver assets for Rails.