Fixed assets precompile regex #2876
Conversation
|
@alex3 can you provide a test case for this? |
|
/cc @josh |
|
This pull request is related to bug #1913 The orignal regex appears to want to include files that are not .js or .css files, but as you say is too broad. |
|
@guilleiguaran I just wrote and pushed a test case for this. The commits are squashed into one. |
|
Can I suggest that you add sanity tests for images and the other file types (including with multiple dots) that this is supposed to capture? |
|
@rhulse I think the other tests test for images. Maybe an image named something like Also, should I push a new commit or squash it into one again? |
|
I would expect so. I suggested the extra tests because I spent some time (unsuccessfully) trying to fix that regex! I wonder if it's worth covering off underscores and dashes too. If this breaks there will be a lot of head-scratching and gnashing of teeth. :-) |
|
@alex3 +1 to rhulse suggestion, please add those tests and I will merge the pull request |
|
suggestions:
And NOT match:
:-) ! |
|
@rhulse @spastorino All that in one test or a couple of them? |
|
@alex3 as you find it better, perhaps you can iterate over a bunch of valid / invalid file names checking if they have been precompiled or not |
|
Would it be a appropriate to extract the creation of this array into its own method, which can then include more comprehensive documentation on the intent? It may avoid future issues if there is refactoring. |
|
@spastorino I just pushed a new (squashed) commit with the updated regex and a pretty comprehensive test. I've included all of @rhulse's suggestions in the test. @rhulse That would probably be better but I think that should be a separate pull request. |
| @@ -37,7 +37,7 @@ module Rails | |||
| @assets = ActiveSupport::OrderedOptions.new | |||
| @assets.enabled = false | |||
| @assets.paths = [] | |||
| @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ] | |||
| @assets.precompile = [ /^[^.].*(\.(?!js$|css$)[^.]+)+\.*$|^[^.](?:(?!\.).)*\.*$/, /application.(css|js)$/ ] | |||
There was a problem hiding this comment.
Gnarly!
Good luck maintaing that regexp, rails core :)
There was a problem hiding this comment.
lol, good luck to you too since you're part of the core :P
There was a problem hiding this comment.
Yeah, use a regex and now you have two problems. ;-)
There was a problem hiding this comment.
Perhaps I should split that regexp into two, and put each regexp on its own line with a comment explaining what it does?
There was a problem hiding this comment.
I think putting this in a method on its own would 'minimize' the issue. If maintenance is a concern it could be more verbose in compiling the array.
|
Protip: This logic is now apart of rails itself. You can hack it. https://github.com/rails/rails/blob/master/actionpack/lib/sprockets/assets.rake#L27-31 Maybe allow |
|
@josh See most recent commits. |
|
@guilleiguaran Thanks, just pushed a new commit with your suggestion. |
| @@ -37,7 +37,8 @@ module Rails | |||
| @assets = ActiveSupport::OrderedOptions.new | |||
| @assets.enabled = false | |||
| @assets.paths = [] | |||
| @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ] | |||
| @assets.precompile = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) && path[0] != '.' }, | |||
There was a problem hiding this comment.
To ignore dot files like .gitkeep or something
There was a problem hiding this comment.
Dot files should already be ignored by sprockets.
There was a problem hiding this comment.
Oh, didn't know that... should I remove the path[0] != '.'?
There was a problem hiding this comment.
All right, I'll have to change the test too.
|
Let me know if this is ready for merge and you want me to squash the commits. |
|
I think this is ready to go, please rebase and squash the commits |
|
@spastorino squashed |
|
@alex3 the pull request cannot be merged, can you rebase it on top of the current master? |
|
@spastorino done |
Fixed assets precompile regex
Fixed assets precompile regex
The original regex was matching things like
jquery.min.jsand putting a lot of junk (likejquery-#{digest}.min.js) inpublic/assets/that shouldn't be there. The new regex matches everything except files ending with .js or .css (as was intended).