propshaft 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cec588585c21b06e765dbf70ac6f0d3a4b9ad2826c8a11120553a8db0931559
-  data.tar.gz: dde9f2d2a7095731ea93585e237421b73adc4acc71218ef574e566468796d1eb
+  metadata.gz: 9bdd01776a4cf66e324271ccb59f41d8473b2863c75ace4d2d75f7295e2fad36
+  data.tar.gz: c1e8d1e3a3bfaee8ee77bd53b760bc272df4d25f4fc4c494eb14e99bc125acd9
 SHA512:
-  metadata.gz: c372a207074f656261b8be407d224780678fd68e6caf645323c898ca06cb04f4cc0e1b2ab2ac2d59179162bb3a6c1e137297635aef8c49d1a0e4b3d279e609c6
-  data.tar.gz: 80c3963e4963ae52b19793b8de066a173b1227a5b6ea1d1ff4420f88b1939a09f2a476fd55e52a4a18fe688c53bc0862756700723557a108d052441ade893259
+  metadata.gz: fddd9f7d38b01958b449f966143894f065d8a0c35a51dcd0b5234230daf3ac7897107289af615f6484d253f883d6c2c5351a6281b1fd0f9465efd3df0d92e6ad
+  data.tar.gz: 26f5105052b942c55f41f6f049eb3e28c1200231a51edad58c41645b936f51fbe98721ae1823b2ec293243c369cadb657368be4afee35747450fb01d948cee93

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

@@ -34,12 +34,13 @@ module Propshaft
       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)
 
       if config.assets.server
         app.routes.prepend do
-          mount app.assets.server => app.assets.config.prefix
+          mount app.assets.server, at: app.assets.config.prefix
         end
       end
 

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)[^.]+\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.0"
+  VERSION = "1.0.0"
 end

data/lib/propshaft.rb

@@ -1,5 +1,6 @@
 require "active_support"
 require "active_support/core_ext/module/attribute_accessors"
+require "active_support/core_ext/module/delegation"
 require "logger"
 
 module Propshaft

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propshaft
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-09-09 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.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Deliver assets for Rails.