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

coffee filter + minify inline javascript

features/coffee-script.feature

@@ -1,7 +1,12 @@
 Feature: Support coffee-script
   In order to offer an alternative when writing Javascript
-  
+
   Scenario: Rendering 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"

features/minify_javascript.feature

@@ -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

features/step_definitions/middleman_steps.rb

@@ -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

fixtures/test-app/config.rb

@@ -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

fixtures/test-app/source/inline-coffeescript.html.haml

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

fixtures/test-app/source/inline-js.html.haml

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

lib/middleman/features/minify_javascript/rack.rb

@@ -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,31 @@ module Middleman
           headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
           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
-    
+
   end
 end

lib/middleman/renderers/haml.rb

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

middleman.gemspec

@@ -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"])