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
In order reduce bytes sent to client and appease YSlow
Background:
Given current environment is "build"
Scenario: Rendering inline js with the feature disabled
Given "minify_javascript" feature is "disabled"
When I go to "/inline-js.html"
Then I should see "10" lines
# Scenario: Rendering inline js with the feature enabled
# Given "minify_javascript" feature is "enabled"
# When I go to "/inline-js.html"
# Then I should see "1" lines
Scenario: Rendering inline js with the feature enabled
Given "minify_javascript" feature is "enabled"
When I go to "/inline-js.html"
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"
Middleman::Server.activate(feature.to_sym)
end
Middleman::Server.environment = @current_env || :development
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
end
Given /^current environment is "([^\"]*)"$/ do |env|
@current_env = env.to_sym
end
Given /^the Server is running$/ do
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
end

View file

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

View file

@ -3,10 +3,10 @@ begin
rescue LoadError
puts "UglifyJS not available. Install it with: gem install uglifier"
end
module Middleman
module Rack
class MinifyJavascript
def initialize(app, options={})
@app = app
@ -14,10 +14,10 @@ module Middleman
def call(env)
status, headers, response = @app.call(env)
if env["PATH_INFO"].match(/\.js$/)
compressor = ::Uglifier.new
if response.is_a?(::Rack::File) or response.is_a?(Sinatra::Helpers::StaticFile)
uncompressed_source = File.read(response.path)
else
@ -27,10 +27,27 @@ module Middleman
headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
response = [minified]
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]
end
end
end
end