propshaft 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb19ffec4a1b49b3b461cb49ef3f726923bbb3b3a0c4b86e26eaed855208572
-  data.tar.gz: 9412606330821085f921519f5a09e96080f49be193a2a675be063dabe8fc1dcd
+  metadata.gz: '093a9091a76c74f7885e10c18b605647bdf42ff97c0f670adc7ff35aa524b659'
+  data.tar.gz: f82c8fc8f47d681bd32e3924a8e2bab63c9755bd1581c3179b48d2091de617eb
 SHA512:
-  metadata.gz: 6fa6e1ab77e53f99a3270567dfda307e798af395e87ff4ecebc47ddadf33839be364d23f24168d7c9050d8844ae9d2ebd119b9bd5bf722ac61c1a98fc7a82312
-  data.tar.gz: 4cdb5cc250bef4cfb43cf4d58cbecaa0fe001ac3f3fae51906733ff64b53f06388899f1c26f0aa5e06b4f98b000e294ccb2688e93c15bd4c546500b40c085f19
+  metadata.gz: 97ae388c2636971782fba9b6cbb83146e6117e5da8df0139d1abdc99c2da32a614117b30b9aeddc0e8ab9ab79fbb8b3497d51177b34a7af57b37dec3a1ce0fbd
+  data.tar.gz: 4977d80862d034f79345a163afa2faeb900b703ec2b6558aab35d7f9baa5d2a1d09e3ca38fe51d7439cb4c31b38cb1ae314131bf353b61789ae3e6d7db2fc9af

data/README.md

@@ -18,7 +18,7 @@ With Rails 7+, you can start a new application with propshaft using `rails new m
 
 Propshaft makes all the assets from all the paths it's been configured with through `config.assets.paths` available for serving and will copy all of them into `public/assets` when precompiling. This is unlike Sprockets, which did not copy over assets that hadn't been explicitly included in one of the bundled assets. 
 
-You can however exempt directories that have been added through the `config.assets.excluded_paths`. This is useful if you're for example using `app/assets/stylesheets` exclusively as a set of inputs to a compiler like Dart Sass for Rails, and you don't want these input files to be part of the load path.
+You can however exempt directories that have been added through the `config.assets.excluded_paths`. This is useful if you're for example using `app/assets/stylesheets` exclusively as a set of inputs to a compiler like Dart Sass for Rails, and you don't want these input files to be part of the load path. (Remember you need to add full paths, like `Rails.root.join("app/assets/stylesheets")`).
 
 These assets can be referenced through their logical path using the normal helpers like `asset_path`, `image_tag`, `javascript_include_tag`, and all the other asset helper tags. These logical references are automatically converted into digest-aware paths in production when `assets:precompile` has been run (through a JSON mapping file found in `public/assets/.manifest.json`).
 

data/lib/propshaft/compilers/css_asset_urls.rb

@@ -3,7 +3,7 @@
 class Propshaft::Compilers::CssAssetUrls
   attr_reader :assembly
 
-  ASSET_URL_PATTERN = /url\(\s*["']?(?!(?:\#|data|http))([^"'\s)]+)\s*["']?\)/
+  ASSET_URL_PATTERN = /url\(\s*["']?(?!(?:\#|data|http))([^"'\s?#)]+)([#?][^"']+)?\s*["']?\)/
 
   def initialize(assembly)
     @assembly = assembly

data/lib/propshaft/load_path.rb

@@ -4,7 +4,7 @@ class Propshaft::LoadPath
   attr_reader :paths, :version
 
   def initialize(paths = [], version: nil)
-    @paths   = Array(paths).collect { |path| Pathname.new(path) }
+    @paths = dedup(paths)
     @version = version
   end
 
@@ -65,4 +65,12 @@ class Propshaft::LoadPath
     def clear_cache
       @cached_assets_by_path = nil
     end
+
+    def dedup(paths)
+      [].tap do |deduped|
+        Array(paths).sort.each do |path|
+          deduped << Pathname.new(path) if deduped.blank? || !path.to_s.start_with?(deduped.last.to_s)
+        end
+      end
+    end
 end

data/lib/propshaft/version.rb

@@ -1,3 +1,3 @@
 module Propshaft
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propshaft
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack