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

Merge pull request #689 from wazeHQ/fix_asset_hash_ignore

Browse source 
fix Middleman::Util.path_match to work with string matchers
This commit is contained in:
Thomas Reynolds 2012-12-18 15:21:27 -08:00
parent 94e9bc1a17 b084982923
commit 642ee42b4f
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/util.rb
View file

@ -90,7 +90,9 @@ module Middleman
# @param path A path as a string # @param path A path as a string
# @return [Boolean] Whether the path matches the matcher # @return [Boolean] Whether the path matches the matcher
def self.path_match(matcher, path) def self.path_match(matcher, path)
if matcher.respond_to? :match if matcher.is_a? String
path.match matcher
elsif matcher.respond_to? :match
matcher.match path matcher.match path
elsif matcher.respond_to? :call elsif matcher.respond_to? :call
matcher.call path matcher.call path

29
middleman-more/features/asset_hash.feature
View file

@ -104,3 +104,32 @@ Feature: Assets get a file hash appended to their and references to them are upd
Then I should see 'Added by Rack filter' Then I should see 'Added by Rack filter'
When I go to "stylesheets/site-50eaa978.css" When I go to "stylesheets/site-50eaa978.css"
Then I should see 'Not Found' Then I should see 'Not Found'
Scenario: Hashed-asset files are not produced for ignored paths
Given a fixture app "asset-hash-app"
And a file named "config.rb" with:
"""
activate :asset_hash, :ignore => [%r(javascripts/*), 'images/*']
activate :relative_assets
activate :directory_indexes
"""
And a successfully built app at "asset-hash-app"
When I cd to "build"
Then the following files should exist:
| index.html |
| apple-touch-icon.png |
| favicon.ico |
| images/100px.png |
| images/100px.jpg |
| images/100px.gif |
| javascripts/application.js |
| stylesheets/site-50eaa978.css |
| index.html |
| subdir/index.html |
| other/index.html |
And the following files should not exist:
| images/100px-1242c368.png |
| images/100px-5fd6fb90.jpg |
| images/100px-5fd6fb90.gif |
| javascripts/application-1d8d5276.js |
| stylesheets/site.css |