merge

bin/mm-server

@@ -6,7 +6,7 @@ require 'optparse'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 
 env = ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
-options = { :Port => 4567, :Host => 'localhost', :AccessLog => [] }
+options = { :Port => 4567, :AccessLog => [] }
 
 OptionParser.new { |opts|
   opts.banner = "Usage: mm-server [rack options]"

lib/middleman/features/minify_javascript.rb

@@ -21,11 +21,14 @@ END
       
       compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
       Dir[File.join(Middleman::Base.build_dir, Middleman::Base.js_dir, "**", "*.js")].each do |path|
-        compressed_js = compressor.compress(File.read(path))
+        lines = IO.readlines(path)
+        if lines.length > 1
+          compressed_js = compressor.compress(lines.join($/))
           File.open(path, 'w') { |f| f.write(compressed_js) }
           say "<%= color('#{"[COMPRESSED]".rjust(12)}', :yellow) %>  " + path.gsub(Middleman::Base.build_dir+"/", '')
         end
       end
+    end
   end if Middleman::Base.environment == "build"
 end
 

lib/middleman/templater+dynamic_renderer.rb

@@ -14,10 +14,12 @@ end
 
 class Templater::Actions::Template
   def render
+    @render_cache ||= begin
       # The default render just requests the page over Rack and writes the response
       request_path = destination.gsub(File.join(Dir.pwd, Middleman::Base.build_dir), "")
       browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base))
       browser.get(request_path)
       browser.last_response.body
     end
+  end
 end