Merge pull request #56 from matt-hh/coffee-filter

coffee filter + minify inline javascript
This commit is contained in:
Thomas Reynolds 2011-06-02 10:37:16 -07:00
commit 93f919f309
9 changed files with 59 additions and 14 deletions

View file

@ -5,3 +5,8 @@ Feature: Support coffee-script
Given the Server is running
When I go to "/javascripts/coffee_test.js"
Then I should see "Array.prototype.slice"
Scenario: Rendering coffee-script with :coffeescript haml-filter
Given the Server is running
When I go to "/inline-coffeescript.html"
Then I should see "Array.prototype.slice"

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

@ -1,6 +1,7 @@
with_layout false do
page "/inline-css.html"
page "/inline-js.html"
page "/inline-coffeescript.html"
end
get "/page-class.html" do

View file

@ -0,0 +1,3 @@
:coffeescript
race = (winner, runners...) ->
print winner, runners

View file

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

View file

@ -28,6 +28,27 @@ module Middleman
response = [minified]
end
if env["PATH_INFO"].match(/\.html$/)
compressor = ::Uglifier.new
if response.is_a?(::Rack::File) or response.is_a?(Sinatra::Helpers::StaticFile)
uncompressed_source = File.read(response.path)
else
uncompressed_source = response.join
end
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

View file

@ -1,4 +1,5 @@
require "haml"
require "coffee-filter"
module Middleman
module Renderers

View file

@ -30,6 +30,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
s.add_runtime_dependency("uglifier", ["~> 0.5.0"])
s.add_runtime_dependency("haml", ["~> 3.1.0"])
s.add_runtime_dependency("coffee-filter", ["~> 0.1.0"])
s.add_runtime_dependency("sass", ["~> 3.1.0"])
s.add_runtime_dependency("compass", ["~> 0.11.1"])
s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])