propshaft 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea8c536e8ee4cd0229dd706a6689d8e52d13a63533fb1f2d5e19835f3a853f2
-  data.tar.gz: fdd5faee6f39306a3bd12f0d3b008b31554b2576637f14497640dd886d38d865
+  metadata.gz: 88560fd134482bd4d44518bde9a6813be01d538f16409be833e36664a3c998bc
+  data.tar.gz: df495a737f633966e4aa8f7837400353ec2bc9166142e38a94b7d50350c2e092
 SHA512:
-  metadata.gz: 684f7db0156395a7376f7f1788576a7f5bbfaef1ccbe44af0fb2bf2ce315c6acdc45e2f5e368df3d580e6e54c741a80d50bd7cb0db6976909662b40a65184f0c
-  data.tar.gz: ad626da00dd0f678abe3d5ea4ce26975c38e02906fdc14de6aa244cdb0902382dd25caf495e9d32e0da3d89ad9b260dce2bdf992a1f925a65fdaeea0494bf355
+  metadata.gz: f27ba3bd99cbbaeb643f466c8d37051a988809c1415ccdec2eff5577506eeeed8f4c772167e8afe461b349bb4b4e75aa22bedde7c256d023796929296d1c00e1
+  data.tar.gz: 571d8052e3b16c7d779c55433d27c268f0ceb387213ca4b0220a200dc30885e15accc855075e4fbcf95ea71c887ff071bfa25caaa8330f0e9a5c87c33c10076f

data/lib/propshaft/assembly.rb

@@ -34,8 +34,11 @@ class Propshaft::Assembly
     end
   end
 
-  def server
-    Propshaft::Server.new(self)
+  def prefix
+    @prefix ||= begin
+      prefix = config.prefix || "/"
+      prefix.end_with?("/") ? prefix : "#{prefix}/"
+    end
   end
 
   def processor

data/lib/propshaft/helper.rb

@@ -70,7 +70,9 @@ module Propshaft
     #
     #   stylesheet_link_tag :all    # All stylesheets in load path
     #   stylesheet_link_tag :app    # Only app/assets stylesheets
-    def stylesheet_link_tag(*sources, **options)
+    def stylesheet_link_tag(*sources)
+      options = sources.extract_options!
+
       case sources.first
       when :all
         sources = all_stylesheets_paths
@@ -95,7 +97,9 @@ module Propshaft
     #   javascript_include_tag "application", integrity: true
     #   # => <script src="/assets/application-abc123.js"
     #   #           integrity="sha256-xyz789..."></script>
-    def javascript_include_tag(*sources, **options)
+    def javascript_include_tag(*sources)
+      options = sources.extract_options!
+
       _build_asset_tags(sources, options, :javascript) { |source, opts| super(source, opts) }
     end
 

data/lib/propshaft/manifest.rb

@@ -134,6 +134,19 @@ module Propshaft
       @entries[logical_path]
     end
 
+    # Removes a manifest entry by its logical path.
+    #
+    # ==== Parameters
+    #
+    # * +logical_path+ - The logical path of the asset to remove
+    #
+    # ==== Returns
+    #
+    # The removed manifest entry, or +nil+ if not found.
+    def delete(logical_path)
+      @entries.delete(logical_path)
+    end
+
     # Converts the manifest to JSON format.
     #
     # The JSON representation maps logical paths to hash representations of

data/lib/propshaft/railtie.rb

@@ -42,14 +42,6 @@ module Propshaft
         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, at: app.assets.config.prefix
-        end
-      end
-
       ActiveSupport.on_load(:action_view) do
         include Propshaft::Helper
       end
@@ -71,6 +63,13 @@ module Propshaft
       end
     end
 
+    initializer "propshaft.assets_middleware", group: :all do |app|
+      app.assets = Propshaft::Assembly.new(app.config.assets)
+      if config.assets.server
+        app.middleware.insert_after ::ActionDispatch::Static, Propshaft::Server, app.assets
+      end
+    end
+
     rake_tasks do
       load "propshaft/railties/assets.rake"
     end

data/lib/propshaft/server.rb

@@ -2,30 +2,39 @@ require "rack/utils"
 require "rack/version"
 
 class Propshaft::Server
-  def initialize(assembly)
+  def initialize(app, assembly)
+    @app = app
     @assembly = assembly
   end
 
   def call(env)
     execute_cache_sweeper_if_updated
-    path, digest = extract_path_and_digest(env)
-
-    if (asset = @assembly.load_path.find(path)) && asset.fresh?(digest)
-      compiled_content = asset.compiled_content
-
-      [
-        200,
-        {
-          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 ]
-      ]
+
+    path = env["PATH_INFO"]
+    method = env["REQUEST_METHOD"]
+
+    if (method == "GET" || method == "HEAD") && path.start_with?(@assembly.prefix)
+      path, digest = extract_path_and_digest(path)
+
+      if (asset = @assembly.load_path.find(path)) && asset.fresh?(digest)
+        compiled_content = asset.compiled_content
+
+        [
+          200,
+          {
+            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"
+          },
+          method == "HEAD" ? [] : [ compiled_content ]
+        ]
+      else
+        [ 404, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "9" }, [ "Not found" ] ]
+      end
     else
-      [ 404, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "9" }, [ "Not found" ] ]
+      @app.call(env)
     end
   end
 
@@ -34,10 +43,11 @@ class Propshaft::Server
   end
 
   private
-    def extract_path_and_digest(env)
-      full_path = Rack::Utils.unescape(env["PATH_INFO"].to_s.sub(/^\//, ""))
+    def extract_path_and_digest(path)
+      path = path.delete_prefix(@assembly.prefix)
+      path = Rack::Utils.unescape(path)
 
-      Propshaft::Asset.extract_path_and_digest(full_path)
+      Propshaft::Asset.extract_path_and_digest(path)
     end
 
     if Gem::Version.new(Rack::RELEASE) < Gem::Version.new("3")
@@ -47,6 +57,8 @@ class Propshaft::Server
     end
 
     def execute_cache_sweeper_if_updated
-      @assembly.load_path.cache_sweeper.execute_if_updated
+      if @assembly.config.sweep_cache
+        @assembly.load_path.cache_sweeper.execute_if_updated
+      end
     end
 end

data/lib/propshaft/version.rb

@@ -1,3 +1,3 @@
 module Propshaft
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propshaft
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - David Heinemeier Hansson