middleman 0.9.17 → 0.9.18

data/Rakefile

@@ -11,6 +11,8 @@ begin
     gem.authors = ["Thomas Reynolds"]
     gem.rubyforge_project = "middleman"
     gem.executables = %w(mm-init mm-build mm-server)
+    gem.add_dependency("thin")
+    gem.add_dependency("shotgun")
     gem.add_dependency("templater")
     gem.add_dependency("sprockets")
     gem.add_dependency("sinatra")

data/VERSION

@@ -1 +1 @@
-0.9.17
+0.9.18

data/bin/mm-build

@@ -6,7 +6,7 @@ ENV['MM_ENV'] = "build"
 require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
 require 'middleman/builder'
 
-Middleman::Base.init!
+#Middleman::Base.init!
 Middleman::Builder.init!
 
 Middleman::Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))

data/bin/mm-server

@@ -5,15 +5,39 @@ require 'optparse'
 # Require Middleman
 require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 
+env = ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
+options = { :Port => 4567, :AccessLog => [] }
+
+OptionParser.new { |opts|
+  opts.banner = "Usage: mm-server [rack options]"
+  opts.separator ""
+  opts.separator "Rack options:"
+  opts.on("-p", "--port PORT", "use PORT (default: 4567)") { |port|
+    options[:Port] = port
+  }
+  opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e|
+    env = e
+  }
+  opts.on("--debug", "Debug mode") {
+    ::Middleman::Base.set :logging, true
+  }
+  
+  opts.parse! ARGV
+}
+
+ENV['RACK_ENV'] = env
+
 class Middleman::Base
   set :root, Dir.pwd
+end
+
+require 'shotgun'
+config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
+app = Shotgun.new(config, lambda { |inner_app| Middleman::Base })
 
-  OptionParser.new { |op|
-    op.on('-e env')    { |val| set :environment, val.to_sym }
-    op.on('-s server') { |val| set :server, val }
-    op.on('-p port')   { |val| set :port, val.to_i }
-  }.parse!(ARGV.dup)
+require 'thin'
+Thin::Logging.silent = true
 
-  # Start Middleman
-  run!
+Rack::Handler::Thin.run app, options do |inst|
+  puts "== The Middleman is standing watch on port #{options[:Port]}"
 end

data/lib/middleman/base.rb

@@ -8,49 +8,44 @@ module Middleman
   class Base < Sinatra::Base
     set :app_file, __FILE__
     set :root, Dir.pwd
+    set :reload, false
+    set :logging, false
     set :environment, ENV['MM_ENV'] || :development
-    set :supported_formats, ["erb"]
+    set :supported_formats, %w(erb)
     set :index_file, "index.html"
     set :js_dir, "javascripts"
     set :css_dir, "stylesheets"
     set :images_dir, "images"
     set :build_dir, "build"
     set :http_prefix, "/"
-
-    # Features enabled by default
-    enable :compass
-    enable :content_for
-    enable :sprockets
     
-    # Features disabled by default
-    disable :slickmap
-    disable :cache_buster
-    disable :minify_css
-    disable :minify_javascript
-    disable :relative_assets
-    disable :maruku
-    disable :smush_pngs
+    use Rack::ConditionalGet if environment == :development
+    
+    @@features = []
     
-    # Default build features
-    configure :build do
-      enable :minify_css
-      enable :minify_javascript
-      enable :cache_buster
+    def self.enable(*opts)
+      @@features << opts
+      super
     end
-  
+    
+    def self.disable(*opts)
+      @@features -= opts
+      super
+    end
+    
     # Rack helper for adding mime-types during local preview
     def self.mime(ext, type)
       ext = ".#{ext}" unless ext.to_s[0] == ?.
-      Rack::Mime::MIME_TYPES[ext.to_s] = type
+      ::Rack::Mime::MIME_TYPES[ext.to_s] = type
     end
-    
+
     # Convenience function to discover if a tempalte exists for the requested renderer (haml, sass, etc)
     def template_exists?(path, renderer=nil)
       template_path = path.dup
       template_path << ".#{renderer}" if renderer
       File.exists? File.join(options.views, template_path)
     end
-    
+
     # Base case renderer (do nothing), Should be over-ridden
     module StaticRender
       def render_path(path)
@@ -62,84 +57,74 @@ module Middleman
       end
     end
     include StaticRender
-  
-    # Disable static asset handling in Rack, so we can customize it here
-    disable :static
-    
+
     # This will match all requests not overridden in the project's init.rb
     not_found do
       # Normalize the path and add index if we're looking at a directory
       path = request.path
       path << options.index_file if path.match(%r{/$})
       path.gsub!(%r{^/}, '')
-    
+
       # If the enabled renderers succeed, return the content, mime-type and an HTTP 200
       if content = render_path(path)
         content_type media_type(File.extname(path)), :charset => 'utf-8'
         status 200
         content
       else
-        # If no template handler renders the template, return the static file if it exists
-        path = File.join(options.public, request.path)
-        if !File.directory?(path) && File.exists?(path)
-          status 200
-          send_file(path)
-        else
-          status 404
-        end
+        status 404
       end
     end
-    
-    # Copy, pasted & edited version of the setup in Sinatra.
-    # Basically just changed the app's name and call out feature & configuration init.
-    def self.run!(options={}, &block)
-      init!
-      set options
-      handler      = detect_rack_handler
-      handler_name = handler.name.gsub(/.*::/, '')
-      puts "== The Middleman is standing watch on port #{port}"
-      handler.run self, :Host => host, :Port => port do |server|
-        trap(:INT) do
-          ## Use thins' hard #stop! if available, otherwise just #stop
-          server.respond_to?(:stop!) ? server.stop! : server.stop
-          puts "\n== The Middleman has ended his patrol"
-        end
-      
-        if block_given?
-          block.call
-          ## Use thins' hard #stop! if available, otherwise just #stop
-          server.respond_to?(:stop!) ? server.stop! : server.stop
-        end
-      end
-    rescue Errno::EADDRINUSE => e
-      puts "== The Middleman is already standing watch on port #{port}!"
+  end
+end
+
+# Haml is required & includes helpers
+require "middleman/haml"
+require "middleman/sass"
+require 'sinatra/content_for'
+require 'middleman/helpers'
+require 'middleman/rack/static'
+require 'middleman/rack/sprockets'
+
+class Middleman::Base
+  helpers Sinatra::ContentFor
+  helpers Middleman::Helpers
+  
+  use Middleman::Rack::Static
+  use Middleman::Rack::Sprockets
+  
+  enable :compass
+  
+  # Features disabled by default
+  disable :slickmap
+  disable :cache_buster
+  disable :minify_css
+  disable :minify_javascript
+  disable :relative_assets
+  disable :maruku
+  disable :smush_pngs
+  
+  # Default build features
+  configure :build do
+    enable :minify_css
+    enable :minify_javascript
+    enable :cache_buster
+  end
+  
+  def self.new(*args, &bk)
+    # Check for and evaluate local configuration
+    local_config = File.join(self.root, "init.rb")
+    if File.exists? local_config
+      puts "== Reading:  Local config" if logging?
+      class_eval File.read(local_config)
     end
     
-    # Require the features for this project
-    def self.init!(quiet=false)
-      # Built-in helpers
-      require 'middleman/helpers'
-      helpers Middleman::Helpers
-
-      # Haml is required & includes helpers
-      require "middleman/features/haml"
-      
-      # Check for and evaluate local configuration
-      local_config = File.join(self.root, "init.rb")
-      if File.exists? local_config
-        puts "== Local config at: #{local_config}" unless quiet
-        class_eval File.read(local_config)
-      end
-      
-      # loop over enabled feature
-      features_path = File.expand_path("features/*.rb", File.dirname(__FILE__))
-      Dir[features_path].each do |f|
-        feature_name = File.basename(f, '.rb')
-        option_name = :"#{feature_name}?"
-        if respond_to?(option_name) && send(option_name) === true
-          require "middleman/features/#{feature_name}"
-        end
-      end
+    # loop over enabled feature
+    @@features.flatten.each do |feature_name|
+      next unless send(:"#{feature_name}?")
+      puts "== Enabling: #{feature_name.capitalize}" if logging?
+      require "middleman/features/#{feature_name}"
     end
+    
+    super
   end
 end

data/lib/middleman/builder.rb

@@ -1,6 +1,5 @@
 require 'templater'
 require 'middleman/templater+dynamic_renderer.rb'
-require 'rack/test' # Use Rack::Test to access Sinatra without starting up a full server
 
 # Placeholder for any methods the builder needs to abstract to allow feature integration
 module Middleman
@@ -37,9 +36,12 @@ module Middleman
     end
 
     def self.init!
-      glob! File.basename(Middleman::Base.public), Middleman::Base.supported_formats
+      glob! File.basename(Middleman::Base.public), []
       glob! File.basename(Middleman::Base.views),  Middleman::Base.supported_formats
     end
+    
+    def after_run
+    end
   end
   
   module Generators

data/lib/middleman/config.ru

@@ -0,0 +1,2 @@
+require 'middleman'
+run Middleman::Base

data/lib/middleman/features/cache_buster.rb

@@ -1,15 +1,13 @@
-class Middleman::Base
+class << Middleman::Base
   alias_method :pre_cache_buster_asset_url, :asset_url
-  helpers do
-    def asset_url(path, prefix="")
-      http_path = pre_cache_buster_asset_url(path, prefix)
-      if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
-        http_path
-      else
-        real_path = File.join(self.class.environment == "build" ? options.build_dir : options.public, prefix, path)
-        http_path << "?" + File.mtime(real_path).strftime("%s") if File.readable?(real_path)        
-        http_path
-      end
+  def asset_url(path, prefix="", request=nil)
+    http_path = pre_cache_buster_asset_url(path, prefix, request)
+    if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
+      http_path
+    else
+      real_path = File.join(self.public, prefix, path)
+      http_path << "?" + File.mtime(real_path).strftime("%s") if File.readable?(real_path)        
+      http_path
     end
   end
 end

data/lib/middleman/features/compass.rb

@@ -1,5 +1,3 @@
-require 'compass'
-
 class Middleman::Base
   configure do
     ::Compass.configuration do |config|

data/lib/middleman/features/minify_javascript.rb

@@ -12,20 +12,24 @@ module Middleman
 END
       end
     end
+  end
   
-    module StaticJavascript
-      def render_path(path)
-        if template_exists?(path, :js)
-          compressor = YUI::JavaScriptCompressor.new(:munge => true)
-          compressor.compress(super)
-        else
-          super
+  class Builder
+    alias_method :pre_yui_after_run, :after_run
+    def after_run
+      pre_yui_after_run
+      
+      compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
+      Dir[File.join(Middleman::Base.build_dir, Middleman::Base.js_dir, "**", "*.js")].each do |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
-  
-  class Base
-    include Middleman::Minified::StaticJavascript
-  end
-end
+  end if Middleman::Base.environment == "build"
+end
+
+Middleman::Base.supported_formats << "js"

data/lib/middleman/features/relative_assets.rb

@@ -1,30 +1,24 @@
-class Middleman::Base
-  if compass?
-    configure do
-      ::Compass.configuration do |config|
-        config.relative_assets = true
-      end
-    end
-  end
-  
-  helpers do
-    alias_method :pre_relative_asset_url, :asset_url
-    def asset_url(path, prefix="")
-      path = pre_relative_asset_url(path, prefix)
-      if path.include?("://")
-        path
+::Compass.configuration do |config|
+  config.relative_assets = true
+end
+
+class << Middleman::Base
+  alias_method :pre_relative_asset_url, :asset_url
+  def asset_url(path, prefix="", request=nil)
+    path = pre_relative_asset_url(path, prefix, request)
+    if path.include?("://")
+      path
+    else
+      path = path[1,path.length-1] if path[0,1] == '/'
+      request_path = request.path_info.dup
+      request_path << self.class.index_file if path.match(%r{/$})
+      request_path.gsub!(%r{^/}, '')
+      parts = request_path.split('/')
+    
+      if parts.length > 1
+        "../" * (parts.length - 1) + path
       else
-        path = path[1,path.length-1] if path[0,1] == '/'
-        request_path = request.path_info.dup
-        request_path << options.index_file if path.match(%r{/$})
-        request_path.gsub!(%r{^/}, '')
-        parts = request_path.split('/')
-      
-        if parts.length > 1
-          "../" * (parts.length - 1) + path
-        else
-          path
-        end
+        path
       end
     end
   end

data/lib/middleman/{features/haml.rb → haml.rb}

@@ -1,4 +1,4 @@
-require 'haml'
+require "haml"
 
 module Middleman
   module Haml
@@ -62,71 +62,8 @@ module Middleman
       end
     end
   end
-  
-  module Sass  
-    def self.included(base)
-      base.supported_formats << "sass"
-    end
-  
-    def render_path(path)
-      if template_exists?(path, :sass)
-        begin
-          static_version = options.public + request.path_info
-          send_file(static_version) if File.exists? static_version
-
-          location_of_sass_file = options.environment == "build" ? File.join(options.build_dir, options.css_dir) : "public"
-          css_filename = File.join(Dir.pwd, location_of_sass_file) + request.path_info
-          sass(path.to_sym, Compass.sass_engine_options.merge({ :css_filename => css_filename }))
-        rescue Exception => e
-          sass_exception_string(e)
-        end
-      else
-        super
-      end
-    end
-  
-    # Handle Sass errors
-    def sass_exception_string(e)
-      e_string = "#{e.class}: #{e.message}"
-
-      if e.is_a? ::Sass::SyntaxError
-        e_string << "\non line #{e.sass_line}"
-
-        if e.sass_filename
-          e_string << " of #{e.sass_filename}"
-
-          if File.exists?(e.sass_filename)
-            e_string << "\n\n"
-
-            min = [e.sass_line - 5, 0].max
-            begin
-              File.read(e.sass_filename).rstrip.split("\n")[
-                min .. e.sass_line + 5
-              ].each_with_index do |line, i|
-                e_string << "#{min + i + 1}: #{line}\n"
-              end
-            rescue
-              e_string << "Couldn't read sass file: #{e.sass_filename}"
-            end
-          end
-        end
-      end
-      <<END
-/*
-#{e_string}
-
-Backtrace:\n#{e.backtrace.join("\n")}
-*/
-body:before {
-  white-space: pre;
-  font-family: monospace;
-  content: "#{e_string.gsub('"', '\"').gsub("\n", '\\A ')}"; }
-END
-    end
-  end
 end
 
 class Middleman::Base
   include Middleman::Haml::Renderer
-  include Middleman::Sass
 end

data/lib/middleman/helpers.rb

@@ -1,4 +1,11 @@
 module Middleman
+  class Base
+    def self.asset_url(path, prefix="", request=nil)
+      base_url = File.join(self.http_prefix, prefix)
+      path.include?("://") ? path : File.join(base_url, path)
+    end
+  end
+  
   module Helpers
     def page_classes(*additional)
       path = request.path_info
@@ -14,16 +21,15 @@ module Middleman
       classes.join(' ')
     end
     
+    def asset_url(path, prefix="")
+      self.class.asset_url(path, prefix, request)
+    end
+    
     def link_to(title, url="#", params={})
       params.merge!(:href => url)
       params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
       %Q{<a #{params}>#{title}</a>}
     end
-    
-    def asset_url(path, prefix="")
-      base_url = File.join(options.http_prefix, prefix)
-      path.include?("://") ? path : File.join(base_url, path)
-    end
 
     def image_tag(path, params={})
       params[:alt] ||= ""

data/lib/middleman/rack/sprockets.rb

@@ -0,0 +1,34 @@
+begin
+  require 'sprockets'
+  require 'middleman/rack/sprockets+ruby19' # Sprockets ruby 1.9 duckpunch
+rescue LoadError
+  puts "Sprockets not available. Install it with: gem install sprockets"
+end
+  
+module Middleman
+  module Rack
+    class Sprockets
+      def initialize(app, options={})
+        @app = app
+      end
+
+      def call(env)
+        path   = env["PATH_INFO"]
+        source = File.join(Middleman::Base.views, path)
+            
+        if path.match(/\.js$/) && File.exists?(source)
+          secretary = ::Sprockets::Secretary.new( :root   => Middleman::Base.root,
+                                                  :source_files => [ File.join("views", path) ],
+                                                  :load_path    => [ File.join("public", Middleman::Base.js_dir),
+                                                                     File.join("views", Middleman::Base.js_dir) ])
+
+          [200, { "Content-Type" => "text/javascript" }, [secretary.concatenation.to_s]]
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
+
+Middleman::Base.supported_formats << "js"

data/lib/middleman/rack/static.rb

@@ -0,0 +1,21 @@
+module Middleman
+  module Rack
+    class Static
+      def initialize(app, options={})
+        @app = app
+        root = Middleman::Base.public
+        @file_server = ::Rack::File.new(root)
+      end
+
+      def call(env)
+        path = env["PATH_INFO"]
+        file_path = File.join(Middleman::Base.public, path)
+        if path.include?("favicon.ico") || (File.exists?(file_path) && !File.directory?(file_path))
+          @file_server.call(env)
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/middleman/sass.rb

@@ -0,0 +1,70 @@
+require "sass"
+require 'compass'
+
+module Middleman
+  module Sass  
+    def self.included(base)
+      base.supported_formats << "sass"
+    end
+
+    def render_path(path)
+      if template_exists?(path, :sass)
+        begin
+          static_version = options.public + request.path_info
+          send_file(static_version) if File.exists? static_version
+
+          location_of_sass_file = options.environment == "build" ? File.join(options.build_dir, options.css_dir) : "public"
+          css_filename = File.join(Dir.pwd, location_of_sass_file) + request.path_info
+          sass(path.to_sym, ::Compass.sass_engine_options.merge({ :css_filename => css_filename }))
+        rescue Exception => e
+          sass_exception_string(e)
+        end
+      else
+        super
+      end
+    end
+
+    # Handle Sass errors
+    def sass_exception_string(e)
+      e_string = "#{e.class}: #{e.message}"
+
+      if e.is_a? ::Sass::SyntaxError
+        e_string << "\non line #{e.sass_line}"
+
+        if e.sass_filename
+          e_string << " of #{e.sass_filename}"
+
+          if File.exists?(e.sass_filename)
+            e_string << "\n\n"
+
+            min = [e.sass_line - 5, 0].max
+            begin
+              File.read(e.sass_filename).rstrip.split("\n")[
+                min .. e.sass_line + 5
+              ].each_with_index do |line, i|
+                e_string << "#{min + i + 1}: #{line}\n"
+              end
+            rescue
+              e_string << "Couldn't read sass file: #{e.sass_filename}"
+            end
+          end
+        end
+      end
+      <<END
+/*
+#{e_string}
+
+Backtrace:\n#{e.backtrace.join("\n")}
+*/
+body:before {
+white-space: pre;
+font-family: monospace;
+content: "#{e_string.gsub('"', '\"').gsub("\n", '\\A ')}"; }
+END
+    end
+  end
+end
+
+class Middleman::Base
+  include Middleman::Sass
+end

data/lib/middleman/templater+dynamic_renderer.rb

@@ -1,3 +1,5 @@
+require 'rack/test' # Use Rack::Test to access Sinatra without starting up a full server
+
 # Monkey-patch to use a dynamic renderer
 class Templater::Actions::File
   def identical?
@@ -12,20 +14,12 @@ end
 
 class Templater::Actions::Template
   def render
-    # 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
-
-  def identical?
-    if File.exists?(destination)
-      extension = File.extname(source)
-      return true if !%w(.sass .js .haml).include?(extension) && File.exists?(source) && File.mtime(source) < File.mtime(destination)
-      File.read(destination) == render 
-    else
-      false
+    @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

data/middleman.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.9.17"
+  s.version = "0.9.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-10-22}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -30,20 +30,22 @@ Gem::Specification.new do |s|
      "lib/middleman.rb",
      "lib/middleman/base.rb",
      "lib/middleman/builder.rb",
+     "lib/middleman/config.ru",
      "lib/middleman/features/cache_buster.rb",
      "lib/middleman/features/compass.rb",
-     "lib/middleman/features/content_for.rb",
      "lib/middleman/features/growl.rb",
-     "lib/middleman/features/haml.rb",
      "lib/middleman/features/maruku.rb",
      "lib/middleman/features/minify_css.rb",
      "lib/middleman/features/minify_javascript.rb",
      "lib/middleman/features/relative_assets.rb",
      "lib/middleman/features/slickmap.rb",
      "lib/middleman/features/smush_pngs.rb",
-     "lib/middleman/features/sprockets+ruby19.rb",
-     "lib/middleman/features/sprockets.rb",
+     "lib/middleman/haml.rb",
      "lib/middleman/helpers.rb",
+     "lib/middleman/rack/sprockets+ruby19.rb",
+     "lib/middleman/rack/sprockets.rb",
+     "lib/middleman/rack/static.rb",
+     "lib/middleman/sass.rb",
      "lib/middleman/template/init.rbt",
      "lib/middleman/template/views/index.html.haml",
      "lib/middleman/template/views/layout.html.haml",
@@ -53,13 +55,13 @@ Gem::Specification.new do |s|
      "spec/builder_spec.rb",
      "spec/cache_buster_spec.rb",
      "spec/fixtures/sample/init.rb",
-     "spec/fixtures/sample/public/javascripts/empty-with-include.js",
      "spec/fixtures/sample/public/javascripts/to-be-included.js",
      "spec/fixtures/sample/public/static.html",
      "spec/fixtures/sample/public/stylesheets/static.css",
      "spec/fixtures/sample/views/_partial.haml",
      "spec/fixtures/sample/views/index.html.haml",
      "spec/fixtures/sample/views/inline-js.html.haml",
+     "spec/fixtures/sample/views/javascripts/empty-with-include.js",
      "spec/fixtures/sample/views/layout.haml",
      "spec/fixtures/sample/views/maruku.html.maruku",
      "spec/fixtures/sample/views/services/index.html.haml",
@@ -88,6 +90,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<thin>, [">= 0"])
+      s.add_runtime_dependency(%q<shotgun>, [">= 0"])
       s.add_runtime_dependency(%q<templater>, [">= 0"])
       s.add_runtime_dependency(%q<sprockets>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
@@ -99,6 +103,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<sdoc>, [">= 0"])
     else
+      s.add_dependency(%q<thin>, [">= 0"])
+      s.add_dependency(%q<shotgun>, [">= 0"])
       s.add_dependency(%q<templater>, [">= 0"])
       s.add_dependency(%q<sprockets>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
@@ -111,6 +117,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sdoc>, [">= 0"])
     end
   else
+    s.add_dependency(%q<thin>, [">= 0"])
+    s.add_dependency(%q<shotgun>, [">= 0"])
     s.add_dependency(%q<templater>, [">= 0"])
     s.add_dependency(%q<sprockets>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
@@ -123,3 +131,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sdoc>, [">= 0"])
   end
 end
+

data/spec/cache_buster_spec.rb

@@ -4,25 +4,15 @@ base = ::Middleman::Base
 base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
 
 describe "Cache Buster Feature" do
-  before do
+  it "should not append query string if off" do
     base.disable :cache_buster
-    base.init!(true)
-    @app = base.new
+    base.new
+    base.asset_url("stylesheets/static.css").should_not include("?")
   end
   
-  it "should not append query string if off" do
-    @app.asset_url("stylesheets/static.css").should_not include("?")
-  end
-end
-
-describe "Cache Buster Feature" do
-  before do
-    base.enable :cache_buster
-    base.init!(true)
-    @app = base.new
-  end
-
   it "should append query string if on" do
-    @app.asset_url("stylesheets/static.css").should include("?")
+    base.enable :cache_buster
+    base.new
+    base.asset_url("stylesheets/static.css").should include("?")
   end
 end

data/spec/fixtures/sample/views/javascripts/empty-with-include.js

@@ -0,0 +1 @@
+//= require <to-be-included>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -07:00
+date: 2009-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thin
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: shotgun
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: templater
   type: :runtime
@@ -137,20 +157,22 @@ files:
 - lib/middleman.rb
 - lib/middleman/base.rb
 - lib/middleman/builder.rb
+- lib/middleman/config.ru
 - lib/middleman/features/cache_buster.rb
 - lib/middleman/features/compass.rb
-- lib/middleman/features/content_for.rb
 - lib/middleman/features/growl.rb
-- lib/middleman/features/haml.rb
 - lib/middleman/features/maruku.rb
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/slickmap.rb
 - lib/middleman/features/smush_pngs.rb
-- lib/middleman/features/sprockets+ruby19.rb
-- lib/middleman/features/sprockets.rb
+- lib/middleman/haml.rb
 - lib/middleman/helpers.rb
+- lib/middleman/rack/sprockets+ruby19.rb
+- lib/middleman/rack/sprockets.rb
+- lib/middleman/rack/static.rb
+- lib/middleman/sass.rb
 - lib/middleman/template/init.rbt
 - lib/middleman/template/views/index.html.haml
 - lib/middleman/template/views/layout.html.haml
@@ -160,13 +182,13 @@ files:
 - spec/builder_spec.rb
 - spec/cache_buster_spec.rb
 - spec/fixtures/sample/init.rb
-- spec/fixtures/sample/public/javascripts/empty-with-include.js
 - spec/fixtures/sample/public/javascripts/to-be-included.js
 - spec/fixtures/sample/public/static.html
 - spec/fixtures/sample/public/stylesheets/static.css
 - spec/fixtures/sample/views/_partial.haml
 - spec/fixtures/sample/views/index.html.haml
 - spec/fixtures/sample/views/inline-js.html.haml
+- spec/fixtures/sample/views/javascripts/empty-with-include.js
 - spec/fixtures/sample/views/layout.haml
 - spec/fixtures/sample/views/maruku.html.maruku
 - spec/fixtures/sample/views/services/index.html.haml

data/lib/middleman/features/content_for.rb

@@ -1,9 +0,0 @@
-begin
-  require 'sinatra/content_for'
-
-  class Middleman::Base
-    helpers Sinatra::ContentFor
-  end
-rescue LoadError
-  puts "Sinatra::ContentFor not available. Install it with: gem install sinatra-content-for"
-end

data/lib/middleman/features/sprockets.rb

@@ -1,29 +0,0 @@
-begin
-  require 'sprockets'
-  require 'middleman/features/sprockets+ruby19' # Sprockets ruby 1.9 duckpunch
-rescue LoadError
-  puts "Sprockets not available. Install it with: gem install sprockets"
-end
-
-module Middleman
-  module Sprockets
-    def self.included(base)
-      base.supported_formats << "js"
-    end
-    
-    def render_path(path)
-      source = File.join(options.public, path)
-      if File.extname(path) == '.js' && File.exists?(source)
-        secretary = ::Sprockets::Secretary.new( :asset_root   => options.public,
-                                                :source_files => [source] )
-        secretary.concatenation.to_s
-      else
-        super
-      end
-    end
-  end
-end
-
-class Middleman::Base
-  include Middleman::Sprockets
-end

data/spec/fixtures/sample/public/javascripts/empty-with-include.js

@@ -1 +0,0 @@
-//= require "to-be-included"