minifiy inline js

This commit is contained in:
Matthias Döring 2011-05-29 17:26:58 +02:00
parent cc73d4c2c6
commit 57c80f00e7
4 changed files with 43 additions and 13 deletions

View file

@ -1,12 +1,20 @@
Feature: Minify Javascript Feature: Minify Javascript
In order reduce bytes sent to client and appease YSlow In order reduce bytes sent to client and appease YSlow
Background:
Given current environment is "build"
Scenario: Rendering inline js with the feature disabled Scenario: Rendering inline js with the feature disabled
Given "minify_javascript" feature is "disabled" Given "minify_javascript" feature is "disabled"
When I go to "/inline-js.html" When I go to "/inline-js.html"
Then I should see "10" lines Then I should see "10" lines
# Scenario: Rendering inline js with the feature enabled Scenario: Rendering inline js with the feature enabled
# Given "minify_javascript" feature is "enabled" Given "minify_javascript" feature is "enabled"
# When I go to "/inline-js.html" When I go to "/inline-js.html"
# Then I should see "1" lines Then I should see "5" lines
Scenario: Rendering inline js (coffeescript) with the feature enabled
Given "minify_javascript" feature is "enabled"
When I go to "/inline-coffeescript.html"
Then I should see "5" lines

View file

@ -2,9 +2,14 @@ Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
if state == "enabled" if state == "enabled"
Middleman::Server.activate(feature.to_sym) Middleman::Server.activate(feature.to_sym)
end end
Middleman::Server.environment = @current_env || :development
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new)) @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
end end
Given /^current environment is "([^\"]*)"$/ do |env|
@current_env = env.to_sym
end
Given /^the Server is running$/ do Given /^the Server is running$/ do
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new)) @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
end end

View file

@ -4,4 +4,4 @@
should(); should();
all.be(); all.be();
on = { one: line }; on = { one: line };
}); })();

View file

@ -28,6 +28,23 @@ module Middleman
response = [minified] response = [minified]
end end
if env["PATH_INFO"].match(/\.html$/)
compressor = ::Uglifier.new
uncompressed_source = response.join
minified = uncompressed_source.gsub(/(<scri.*?\/\/<!\[CDATA\[\n)(.*?)(\/\/\]\].*?<\/script>)/m) do |m|
first = $1
uncompressed_source = $2
last = $3
minified_js = compressor.compile(uncompressed_source)
first << minified_js << "\n" << last
end
headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
response = [minified]
end
[status, headers, response] [status, headers, response]
end end
end end