From ae743ac4db038acd47cfc19f8cf14f99dcb063a9 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Sat, 13 Oct 2012 13:12:21 -0700 Subject: [PATCH] Conform to the rack specs, with help from Rack::Lint --- middleman-core/lib/middleman-core/core_extensions/request.rb | 3 +++ middleman-more/lib/middleman-more/extensions/asset_hash.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/core_extensions/request.rb b/middleman-core/lib/middleman-core/core_extensions/request.rb index 7b4e2320..09e380bf 100644 --- a/middleman-core/lib/middleman-core/core_extensions/request.rb +++ b/middleman-core/lib/middleman-core/core_extensions/request.rb @@ -1,6 +1,7 @@ # Built on Rack require "rack" require "rack/file" +require "rack/lint" module Middleman module CoreExtensions @@ -75,6 +76,8 @@ module Middleman def to_rack_app(&block) inner_app = inst(&block) + app.use Rack::Lint + (@middleware || []).each do |m| app.use(m[0], *m[1], &m[2]) end diff --git a/middleman-more/lib/middleman-more/extensions/asset_hash.rb b/middleman-more/lib/middleman-more/extensions/asset_hash.rb index 32326f15..c8768025 100644 --- a/middleman-more/lib/middleman-more/extensions/asset_hash.rb +++ b/middleman-more/lib/middleman-more/extensions/asset_hash.rb @@ -66,7 +66,7 @@ module Middleman status, headers, response = @rack_app.call(env) # We don't want to use this middleware when rendering files to figure out their hash! - return [status, headers, response] if env["bypass_asset_hash"] + return [status, headers, response] if env["bypass_asset_hash"] == 'true' path = @middleman_app.full_path(env["PATH_INFO"]) dirpath = Pathname.new(File.dirname(path))