deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into master

Browse source
This commit is contained in:
James 2016-03-22 17:35:21 +00:00
parent f5a668d380 9d29cd58de
commit cc25c784f9
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
middleman-core/features/asset_hash.feature
View file

@ -283,8 +283,15 @@ Feature: Assets get file hashes appended to them and references to them are upda
When I cd to "build" When I cd to "build"
Then the following files should exist: Then the following files should exist:
| javascripts/jquery.min-276c87ff.js | | javascripts/jquery.min-276c87ff.js |
| stylesheets/test-7de2ad06.css |
And the following files should not exist: And the following files should not exist:
| javascripts/jquery.min.js | | javascripts/jquery.min.js |
And the file "stylesheets/test-7de2ad06.css" should contain:
"""
.no-bug{background-image:url(/images/100px-5fd6fb90.jpg)}
.bug{content:"";background-image:url(/images/100px-5fd6fb90.jpg)}
.no-bug{content:""; background-image:url(/images/100px-5fd6fb90.jpg)}
"""
Scenario: Source map paths include the hash Scenario: Source map paths include the hash
Given a successfully built app at "asset-hash-source-map" Given a successfully built app at "asset-hash-source-map"

BIN
middleman-core/fixtures/asset-hash-minified-app/source/images/100px.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 334 B

3
middleman-core/fixtures/asset-hash-minified-app/source/stylesheets/test.css Normal file
View file

@ -0,0 +1,3 @@
.no-bug{background-image:url(/images/100px.jpg)}
.bug{content:"";background-image:url(/images/100px.jpg)}
.no-bug{content:""; background-image:url(/images/100px.jpg)}

2
middleman-core/lib/middleman-core/util/rack.rb
View file

@ -22,7 +22,7 @@ module Middleman
Contract String, String, ArrayOf[String], Proc => String Contract String, String, ArrayOf[String], Proc => String
def rewrite_paths(body, _path, exts, &_block) def rewrite_paths(body, _path, exts, &_block)
matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)>]+(#{::Regexp.union(exts)}))/ matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)\(>]+(#{::Regexp.union(exts)}))/
url_fn_prefix = 'url(' url_fn_prefix = 'url('