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

Merge pull request #397 from bhollis/master

Browse source 
Prevent Sprockets from generating different hashes based on Sprockets version number
This commit is contained in:
Thomas Reynolds 2012-04-28 09:43:18 -07:00
parent 593cdb27aa 9d811e0cf7
commit 26fdff0c68
2 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,8 +7,8 @@ Feature: Assets get a file hash appended to their and references to them are upd
| images/100px-1242c368.png | | images/100px-1242c368.png |
| images/100px-5fd6fb90.jpg | | images/100px-5fd6fb90.jpg |
| images/100px-5fd6fb90.gif | | images/100px-5fd6fb90.gif |
| javascripts/application-570e5d45.js | | javascripts/application-df677242.js |
| stylesheets/site-d9d84711.css | | stylesheets/site-ed8c2d12.css |
| index.html | | index.html |
| subdir/index.html | | subdir/index.html |
| other/index.html | | other/index.html |
@ -19,50 +19,50 @@ Feature: Assets get a file hash appended to their and references to them are upd
| javascripts/application.js | | javascripts/application.js |
| stylesheets/site.css | | stylesheets/site.css |
And the file "javascripts/application-570e5d45.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'" And the file "javascripts/application-df677242.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
And the file "stylesheets/site-d9d84711.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')" And the file "stylesheets/site-ed8c2d12.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
And the file "index.html" should contain 'href="stylesheets/site-d9d84711.css"' And the file "index.html" should contain 'href="stylesheets/site-ed8c2d12.css"'
And the file "index.html" should contain 'src="javascripts/application-570e5d45.js"' And the file "index.html" should contain 'src="javascripts/application-df677242.js"'
And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"' And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
And the file "subdir/index.html" should contain 'href="../stylesheets/site-d9d84711.css"' And the file "subdir/index.html" should contain 'href="../stylesheets/site-ed8c2d12.css"'
And the file "subdir/index.html" should contain 'src="../javascripts/application-570e5d45.js"' And the file "subdir/index.html" should contain 'src="../javascripts/application-df677242.js"'
And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"' And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
And the file "other/index.html" should contain 'href="../stylesheets/site-d9d84711.css"' And the file "other/index.html" should contain 'href="../stylesheets/site-ed8c2d12.css"'
And the file "other/index.html" should contain 'src="../javascripts/application-570e5d45.js"' And the file "other/index.html" should contain 'src="../javascripts/application-df677242.js"'
And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"' And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
Scenario: Hashed assets work in preview server Scenario: Hashed assets work in preview server
Given the Server is running at "asset-hash-app" Given the Server is running at "asset-hash-app"
When I go to "/" When I go to "/"
Then I should see 'href="stylesheets/site-d9d84711.css"' Then I should see 'href="stylesheets/site-ed8c2d12.css"'
And I should see 'src="javascripts/application-570e5d45.js"' And I should see 'src="javascripts/application-df677242.js"'
And I should see 'src="images/100px-5fd6fb90.jpg"' And I should see 'src="images/100px-5fd6fb90.jpg"'
When I go to "/subdir/" When I go to "/subdir/"
Then I should see 'href="../stylesheets/site-d9d84711.css"' Then I should see 'href="../stylesheets/site-ed8c2d12.css"'
And I should see 'src="../javascripts/application-570e5d45.js"' And I should see 'src="../javascripts/application-df677242.js"'
And I should see 'src="../images/100px-5fd6fb90.jpg"' And I should see 'src="../images/100px-5fd6fb90.jpg"'
When I go to "/other/" When I go to "/other/"
Then I should see 'href="../stylesheets/site-d9d84711.css"' Then I should see 'href="../stylesheets/site-ed8c2d12.css"'
And I should see 'src="../javascripts/application-570e5d45.js"' And I should see 'src="../javascripts/application-df677242.js"'
And I should see 'src="../images/100px-5fd6fb90.jpg"' And I should see 'src="../images/100px-5fd6fb90.jpg"'
When I go to "/javascripts/application-570e5d45.js" When I go to "/javascripts/application-df677242.js"
Then I should see "img.src = '/images/100px-5fd6fb90.jpg'" Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
When I go to "/stylesheets/site-d9d84711.css" When I go to "/stylesheets/site-ed8c2d12.css"
Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')" Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
Scenario: Enabling an asset host still produces hashed files and references Scenario: Enabling an asset host still produces hashed files and references
Given the Server is running at "asset-hash-host-app" Given the Server is running at "asset-hash-host-app"
When I go to "/" When I go to "/"
Then I should see 'href="http://middlemanapp.com/stylesheets/site-0ac82771.css"' Then I should see 'href="http://middlemanapp.com/stylesheets/site-e5a31a3e.css"'
And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
When I go to "/subdir/" When I go to "/subdir/"
Then I should see 'href="http://middlemanapp.com/stylesheets/site-0ac82771.css"' Then I should see 'href="http://middlemanapp.com/stylesheets/site-e5a31a3e.css"'
And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
When I go to "/other/" When I go to "/other/"
Then I should see 'href="http://middlemanapp.com/stylesheets/site-0ac82771.css"' Then I should see 'href="http://middlemanapp.com/stylesheets/site-e5a31a3e.css"'
And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"' And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
# Asset helpers don't appear to work from Compass right now # Asset helpers don't appear to work from Compass right now
# When I go to "/stylesheets/site-0ac82771.css" # When I go to "/stylesheets/site-e5a31a3e.css"
# Then I should see "background-image: url('http://middlemanapp.com/images/100px-5fd6fb90.jpg')" # Then I should see "background-image: url('http://middlemanapp.com/images/100px-5fd6fb90.jpg')"
Scenario: The asset hash should change when a SASS or Sprockets partial changes Scenario: The asset hash should change when a SASS or Sprockets partial changes
@ -73,12 +73,12 @@ Feature: Assets get a file hash appended to their and references to them are upd
font-size: 14px font-size: 14px
""" """
When I go to "/partials/" When I go to "/partials/"
Then I should see 'href="../stylesheets/uses_partials-e81dd9b4.css' Then I should see 'href="../stylesheets/uses_partials-8b948098.css'
And the file "source/stylesheets/_partial.sass" has the contents And the file "source/stylesheets/_partial.sass" has the contents
""" """
body body
font-size: 18px !important font-size: 18px !important
""" """
When I go to "/partials/" When I go to "/partials/"
Then I should see 'href="../stylesheets/uses_partials-ba3ef309.css' Then I should see 'href="../stylesheets/uses_partials-1f9f0ed2.css'

12
middleman-more/lib/middleman-more/core_extensions/sprockets.rb
View file

@ -52,8 +52,6 @@ module Middleman::CoreExtensions::Sprockets
@app = app @app = app
super app.source_dir super app.source_dir
digest = Digest::SHA1
# Make the app context available to Sprockets # Make the app context available to Sprockets
context_class.send(:define_method, :app) { app } context_class.send(:define_method, :app) { app }
context_class.class_eval do context_class.class_eval do
@ -75,6 +73,16 @@ module Middleman::CoreExtensions::Sprockets
append_path app.css_dir append_path app.css_dir
end end
# Override Sprockets' default digest function to *not*
# change depending on the exact Sprockets version. It still takes
# into account "version" which is a user-suppliable version
# number that can be used to force assets to have a new
# hash.
def digest
@digest ||= Digest::SHA1.new.update(version.to_s)
@digest.dup
end
# During development, don't use the asset cache # During development, don't use the asset cache
def find_asset(path, options = {}) def find_asset(path, options = {})
expire_index! if @app.development? expire_index! if @app.development?