middleman 2.0.0.rc1 → 2.0.0.rc2

data/README.md

@@ -0,0 +1,16 @@
+# middleman
+
+The Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml, Sass, and CoffeeScript producing only the cleanest and efficient markup.
+
+## Getting Started
+
+Everything you need to know is on the official site: 
+http://middlemanapp.com
+
+## Mailing List
+
+If you have questions, answers can be found on community forum: https://convore.com/middleman/
+
+## Copyright
+
+Copyright (c) 2010 Thomas Reynolds. See LICENSE for details.

data/features/sprockets.feature

@@ -0,0 +1,6 @@
+Feature: Sprockets
+
+  Scenario: Sprockets require
+    Given the Server is running
+    When I go to "/javascripts/sprockets_base.js"
+    Then I should see "sprockets_sub_function"

data/features/step_definitions/builder_steps.rb

@@ -14,7 +14,7 @@ end
 
 Given /^cleanup built test app$/ do
   target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build")
-  # FileUtils.rm_rf(target)
+  FileUtils.rm_rf(target)
 end
 
 Then /^"([^"]*)" should exist and include "([^"]*)"$/ do |target_file, expected|

data/fixtures/test-app/source/index.html.haml

@@ -1 +1,6 @@
-%h1 Welcome
+%h1 Welcome
+
+:markdown
+  ## H2
+  
+  Paragraph

data/fixtures/test-app/source/javascripts/sprockets_base.js

@@ -0,0 +1,5 @@
+//= require "sprockets_sub"
+
+function base() {
+  
+}

data/fixtures/test-app/source/javascripts/sprockets_sub.js

@@ -0,0 +1,3 @@
+function sprockets_sub_function() {
+  
+}

data/lib/middleman.rb

@@ -73,6 +73,9 @@ module Middleman
   end
   
   module CoreExtensions
+    # Add Rack::Builder.map support
+    autoload :RackMap,       "middleman/core_extensions/rack_map"
+    
     # Custom Feature API
     autoload :Features,      "middleman/core_extensions/features"
   
@@ -91,6 +94,12 @@ module Middleman
     
     # Extended version of Padrino's rendering
     autoload :Rendering,      "middleman/core_extensions/rendering"
+    
+    # Compass framework for Sass
+    autoload :Compass,         "middleman/core_extensions/compass"
+    
+    # Sprockets 2
+    autoload :Sprockets,       "middleman/core_extensions/sprockets"
   
     # Pass custom options to views
     autoload :Routing,        "middleman/core_extensions/routing"
@@ -101,34 +110,28 @@ module Middleman
     # relative to the root of the project or use an absolute URL.
     autoload :RelativeAssets,      "middleman/features/relative_assets"
 
-    # AssetHost allows you to setup multiple domains to host your static assets.
-    # Calls to asset paths in dynamic templates will then rotate through each of
-    # the asset servers to better spread the load.
+    # AssetHost allows you to setup multiple domains to host your static
+    # assets. Calls to asset paths in dynamic templates will then rotate
+    # through each of the asset servers to better spread the load.
     autoload :AssetHost,           "middleman/features/asset_host"
 
     # CacheBuster adds a query string to assets in dynamic templates to avoid
     # browser caches failing to update to your new content.
     autoload :CacheBuster,         "middleman/features/cache_buster"
 
-    # AutomaticImageSizes inspects the images used in your dynamic templates and
-    # automatically adds width and height attributes to their HTML elements.
+    # AutomaticImageSizes inspects the images used in your dynamic templates
+    # and automatically adds width and height attributes to their HTML
+    # elements.
     autoload :AutomaticImageSizes, "middleman/features/automatic_image_sizes"
 
-    # UglyHaml enables the non-indented output format from Haml templates. Useful
-    # for somewhat obfuscating the output and hiding the fact that you're using Haml.
-    autoload :UglyHaml,            "middleman/features/ugly_haml"
-
     # MinifyCss uses the YUI compressor to shrink CSS files
     autoload :MinifyCss,           "middleman/features/minify_css"
 
     # MinifyJavascript uses the YUI compressor to shrink JS files
     autoload :MinifyJavascript,    "middleman/features/minify_javascript"
 
-    # CodeRay is a syntax highlighter.
-    autoload :CodeRay,             "middleman/features/code_ray"
-
-    # Lorem provides a handful of helpful prototyping methods to generate words,
-    # paragraphs, fake images, names and email addresses.
+    # Lorem provides a handful of helpful prototyping methods to generate
+    # words, paragraphs, fake images, names and email addresses.
     autoload :Lorem,               "middleman/features/lorem"
 
     # Treat project as a blog
@@ -140,8 +143,8 @@ module Middleman
     # Automatically resize images for mobile devises
     # autoload :TinySrc,             "middleman/features/tiny_src"
 
-    # LiveReload will auto-reload browsers with the live reload extension installed after changes
-    # Currently disabled and untested.
+    # LiveReload will auto-reload browsers with the live reload extension
+    # installed after changes. Currently disabled and untested.
     # autoload :LiveReload,          "middleman/features/live_reload"
   end
 end

data/lib/middleman/core_extensions/compass.rb

@@ -0,0 +1,59 @@
+module Middleman::CoreExtensions::Compass
+  class << self
+    def registered(app)
+      app.extend ClassMethods
+        
+      require "compass"
+      
+      # Susy grids
+      begin
+        require "susy"
+      rescue LoadError
+      end
+
+      app.after_feature_init do
+        views_root = File.basename(app.views)
+        ::Compass.configuration do |config|
+          config.cache            = false # For sassc files
+          config.project_path          = app.root
+          config.sass_dir              = File.join(views_root, app.css_dir)
+          config.output_style          = :nested
+          config.fonts_dir             = File.join(views_root, app.fonts_dir)
+          config.css_dir               = File.join(views_root, app.css_dir)
+          config.images_dir            = File.join(views_root, app.images_dir)      
+          config.http_images_path      = app.http_images_path rescue File.join(app.http_prefix || "/", app.images_dir)
+          config.http_stylesheets_path = app.http_css_path rescue File.join(app.http_prefix || "/", app.css_dir)
+          config.asset_cache_buster :none
+
+          config.add_import_path(config.sass_dir)
+        end
+
+        # configure :build do
+        #   build_root = File.basename(self.build_dir)
+        #   ::Compass.configuration do |config|
+        #     config.css_dir    = File.join(build_root, self.css_dir)
+        #     config.images_dir = File.join(build_root, self.images_dir)
+        #   end
+        # end
+        
+        app.execute_after_compass_init!
+        
+        app.set :sass, ::Compass.configuration.to_sass_engine_options
+      end
+    end
+    alias :included :registered
+  end
+  
+  module ClassMethods
+    # Add a block/proc to be run after features have been setup
+    def after_compass_init(&block)
+      @run_after_compass ||= []
+      @run_after_compass << block
+    end
+    
+    def execute_after_compass_init!
+      @run_after_compass ||= []
+      @run_after_compass.each { |block| class_eval(&block) }
+    end
+  end
+end

data/lib/middleman/core_extensions/features.rb

@@ -33,7 +33,7 @@ module Middleman::CoreExtensions::Features
   # The Feature API is itself a Feature. Mind blowing!
   class << self
     def registered(app)
-      app.set :default_extensions, []
+      app.set :default_features, []
       app.extend ClassMethods
     end
     alias :included :registered
@@ -84,7 +84,7 @@ module Middleman::CoreExtensions::Features
       end
       
       # Add in defaults
-      default_extensions.each do |ext|
+      default_features.each do |ext|
         activate ext
       end
       

data/lib/middleman/core_extensions/front_matter.rb

@@ -7,10 +7,20 @@ module Middleman::CoreExtensions::FrontMatter
       app.extend ClassMethods
       
       ::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
+      ::Tilt.prefer(RDiscountTemplate)
+      
       ::Tilt::register RedClothTemplate,  'textile'
+      ::Tilt.prefer(RedClothTemplate)
+      
       ::Tilt::register ERBTemplate,       'erb', 'rhtml'
+      ::Tilt.prefer(ERBTemplate)
+      
       ::Tilt::register SlimTemplate,      'slim'
+      ::Tilt.prefer(SlimTemplate)
+      
       ::Tilt::register HamlTemplate,      'haml'
+      ::Tilt.prefer(HamlTemplate)
       
       app.before do
         result = resolve_template(request.path_info, :raise_exceptions => false)
@@ -64,6 +74,9 @@ module Middleman::CoreExtensions::FrontMatter
   class RDiscountTemplate < ::Tilt::RDiscountTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
+  class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
+    include Middleman::CoreExtensions::FrontMatter::YamlAware
+  end
   
   class RedClothTemplate < ::Tilt::RedClothTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware

data/lib/middleman/core_extensions/rack_map.rb

@@ -0,0 +1,34 @@
+module Middleman::CoreExtensions::RackMap
+  class << self
+    def registered(app)
+      app.extend ClassMethods
+    end
+    alias :included :registered
+  end
+  
+  module ClassMethods
+    def map(path, &block)
+      @maps ||= []
+      @maps << [path, block]
+    end
+  
+    def maps
+      @maps || []
+    end
+  
+    # Creates a Rack::Builder instance with all the middleware set up and
+    # an instance of this class as end point.
+    def build(*args, &bk)
+      builder = ::Rack::Builder.new
+      builder.use ::Sinatra::ShowExceptions       if show_exceptions?
+      builder.use ::Rack::CommonLogger   if logging?
+      builder.use ::Rack::Head
+      middleware.each { |c,a,b| builder.use(c, *a, &b) }
+      maps.each { |p,b| builder.map(p, &b) }
+      builder.map "/" do
+        run Middleman::Server.new!(*args, &bk)
+      end
+      builder
+    end
+  end
+end

data/lib/middleman/core_extensions/routing.rb

@@ -11,11 +11,7 @@ module Middleman::CoreExtensions::Routing
     alias :included :registered
   end
   
-  module ClassMethods
-    def current_layout
-      @layout
-    end
-    
+  module ClassMethods    
     def path_to_index(path)
       parts = path ? path.split('/') : []
       if parts.last.nil? || parts.last.split('.').length == 1
@@ -30,12 +26,12 @@ module Middleman::CoreExtensions::Routing
     #   page "/admin/login.html"
     # end
     def with_layout(layout_name, &block)
-      old_layout = current_layout
+      old_layout = settings.layout
     
-      layout(layout_name)
+      set :layout, layout_name
       class_eval(&block) if block_given?
     ensure
-      layout(old_layout)
+      set :layout, old_layout
     end
   
     # The page method allows the layout to be set on a specific path
@@ -49,7 +45,7 @@ module Middleman::CoreExtensions::Routing
       paths << "#{url}/" if url.length > 1 && url.split("/").last.split('.').length <= 1
       paths << "#{path_to_index(url)}"
 
-      options[:layout] = current_layout if options[:layout].nil?
+      options[:layout] = settings.layout if options[:layout].nil?
 
       paths.each do |p|
         get(p) do

data/lib/middleman/core_extensions/sprockets.rb

@@ -0,0 +1,51 @@
+require "sprockets"
+
+module Middleman::CoreExtensions::Sprockets
+  class << self
+    def registered(app)
+      app.set :js_compressor, false
+      
+      app.map "/#{app.js_dir}" do
+        run JavascriptEnvironment.new(app)
+      end
+      # app.map "/#{app.css_dir}" do
+      #   run StylesheetEnvironment.new(app)
+      # end
+    end
+    alias :included :registered
+  end
+
+  class MiddlemanEnvironment < Sprockets::Environment
+    def initialize(app)
+      super File.expand_path(app.views)
+    end
+  end
+    
+  class JavascriptEnvironment < MiddlemanEnvironment
+    def initialize(app)
+      super
+
+      # Disable css
+      unregister_processor "text/css", ::Sprockets::DirectiveProcessor
+      
+      self.js_compressor = app.settings.js_compressor
+
+      # configure search paths
+      javascripts_path = File.join(File.expand_path(app.views), app.js_dir)
+      append_path javascripts_path
+    end
+  end
+  
+  # class StylesheetEnvironment < MiddlemanEnvironment
+  #   def initialize(app)
+  #     super
+  # 
+  #     # Disable js
+  #     unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
+  # 
+  #     # configure search paths
+  #     stylesheets_path = File.join(File.expand_path(app.views), app.css_dir)
+  #     append_path stylesheets_path
+  #   end
+  # end
+end

data/lib/middleman/features/asset_host.rb

@@ -1,7 +1,7 @@
 module Middleman::Features::AssetHost
   class << self
     def registered(app)
-      app.after_feature_init do
+      app.after_compass_init do
         if app.asset_host.is_a?(Proc)
           ::Compass.configuration.asset_host(&app.asset_host)
         end

data/lib/middleman/features/cache_buster.rb

@@ -16,7 +16,7 @@ module Middleman::Features::CacheBuster
 
           if File.readable?(real_path_static)
             http_path << "?" + File.mtime(real_path_static).strftime("%s") 
-          elsif app.environment == :build
+          elsif app.build?
             real_path_dynamic = File.join(app.root, app.build_dir, prefix, path)
             http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
           end
@@ -25,7 +25,7 @@ module Middleman::Features::CacheBuster
         end
       end
 
-      app.after_feature_init do 
+      app.after_compass_init do 
         ::Compass.configuration do |config|
           config.asset_cache_buster do |path, real_path|
             real_path = real_path.path if real_path.is_a? File

data/lib/middleman/features/live_reload.rb

@@ -1,7 +1,7 @@
 module Middleman::Features::LiveReload
   class << self
     def registered(app)
-      return unless Middleman::Server.environment == :development
+      return unless Middleman::Server.development?
 
       begin
         require 'livereload'

data/lib/middleman/features/minify_css.rb

@@ -1,7 +1,7 @@
 module Middleman::Features::MinifyCss
   class << self
     def registered(app)
-      app.after_feature_init do
+      app.after_compass_init do
         ::Compass.configuration.output_style = :compressed
       end
     end

data/lib/middleman/features/minify_javascript.rb

@@ -1,12 +1,43 @@
 module Middleman::Features::MinifyJavascript
   class << self
     def registered(app)
-      # Only do minification on build or prod mode
-      return unless [:build, :production].include? app.environment
-
-      require "middleman/features/minify_javascript/rack"
-      app.use Middleman::Rack::MinifyJavascript
+      require 'uglifier'
+      app.set :js_compressor, ::Uglifier.new
+      app.use InlineJavascriptRack
     end
     alias :included :registered
   end
+
+  class InlineJavascriptRack
+    def initialize(app, options={})
+      @app = app
+    end
+
+    def call(env)
+      status, headers, response = @app.call(env)
+
+      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

data/lib/middleman/renderers/coffee_script.rb

@@ -1,12 +1,8 @@
-module Middleman
-  module Renderers
-    module CoffeeScript
-      class << self
-        def registered(app)
-          require "coffee_script"
-        end
-        alias :included :registered
-      end
+module Middleman::Renderers::CoffeeScript
+  class << self
+    def registered(app)
+      require "coffee_script"
     end
+    alias :included :registered
   end
 end

data/lib/middleman/renderers/haml.rb

@@ -1,43 +1,31 @@
-require "haml"
-require "coffee-filter"
+module Middleman::Renderers::Haml
+  class << self
+    def registered(app)
+      # Base library
+      require "haml"
 
-module Middleman
-  module Renderers
-    module Haml
-      class << self
-        def registered(app)
-          app.helpers Middleman::Renderers::Haml::Helpers
-        end
-        alias :included :registered
+      # Coffee-script filter for Haml
+      begin
+        require "coffee-filter"
+      rescue LoadError
       end
       
-      module Helpers
-        def haml_partial(name, options = {})
-          partial(name, options)
-        end
+      # Code-ray Syntax highlighting
+      begin
+        require 'haml-coderay'
+      rescue LoadError
       end
+      
+      app.helpers Helpers
+      
+      #app.set :haml, app.settings.haml.merge({ :ugly_haml => true })
+    end
+    alias :included :registered
+  end
   
-      module Table
-        include ::Haml::Filters::Base
-
-        def render(text)
-          output = '<div class="table"><table cellspacing="0" cellpadding="0">'
-          line_num = 0
-          text.each_line do |line|
-            line_num += 1
-            next if line.strip.empty?
-            output << %Q{<tr class="#{(line_num % 2 == 0) ? "even" : "odd" }#{(line_num == 1) ? " first" : "" }">}
-
-            columns = line.split("|").map { |p| p.strip }
-            columns.each_with_index do |col, i|
-              output << %Q{<td class="col#{i+1}">#{col}</td>}
-            end
-
-            output << "</tr>"
-          end
-          output + "</table></div>"
-        end
-      end
+  module Helpers
+    def haml_partial(name, options = {})
+      render(name, options)
     end
   end
 end

data/lib/middleman/renderers/markdown.rb

@@ -1,12 +1,11 @@
-module Middleman
-  module Renderers
-    module Markdown
-      class << self
-        def registered(app)
-          require "rdiscount"
-        end
-        alias :included :registered
+module Middleman::Renderers::Markdown
+  class << self
+    def registered(app)
+      app.set :markdown, ::Tilt::RDiscountTemplate
+      app.after_feature_init do
+        ::Tilt.prefer(app.settings.markdown)
       end
     end
+    alias :included :registered
   end
 end

data/lib/middleman/renderers/sass.rb

@@ -1,83 +1,61 @@
 require "sass"
 require "sass/plugin"
-require "compass"
-require "susy"
 
-module Middleman
-  module Renderers
-    module Sass
-      class << self
-        def registered(app)
-          app.after_feature_init do
-            views_root = File.basename(self.views)
-            ::Compass.configuration do |config|
-              config.cache_path            = File.join(self.root, ".sass-cache") # For sassc files
-              config.project_path          = self.root
-              config.sass_dir              = File.join(views_root, self.css_dir)
-              config.output_style          = :nested
-              config.fonts_dir             = File.join(views_root, self.fonts_dir)
-              config.css_dir               = File.join(views_root, self.css_dir)
-              config.images_dir            = File.join(views_root, self.images_dir)      
-              config.http_images_path      = self.http_images_path rescue File.join(self.http_prefix || "/", self.images_dir)
-              config.http_stylesheets_path = self.http_css_path rescue File.join(self.http_prefix || "/", self.css_dir)
-              config.asset_cache_buster :none
-
-              config.add_import_path(config.sass_dir)
-            end
-
-            configure :build do
-              build_root = File.basename(self.build_dir)
-              ::Compass.configuration do |config|
-                config.css_dir    = File.join(build_root, self.css_dir)
-                config.images_dir = File.join(build_root, self.images_dir)
-              end
-            end
-          end
-        end
-        alias :included :registered
-      end
+module Middleman::Renderers::Sass
+  class << self
+    def registered(app)
+      # Default sass options
+      app.set :sass, {}
     end
+    alias :included :registered
   end
-end
+  
+  class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
+    def sass_options
+      return super if basename.nil?
+
+      location_of_sass_file = if Middleman::Server.build?
+        File.join(Middleman::Server.root, Middleman::Server.build_dir)
+      else
+        Middleman::Server.views
+      end
 
-class Tilt::SassPlusCSSFilenameTemplate < Tilt::SassTemplate
-  def sass_options
-    return super if basename.nil?
-    
-    location_of_sass_file = Middleman::Server.environment == :build ? 
-                              File.join(Middleman::Server.root, Middleman::Server.build_dir) : 
-                              Middleman::Server.views
+      parts = basename.split('.')
+      parts.pop
+      css_filename = File.join(location_of_sass_file, Middleman::Server.css_dir, parts.join("."))
+      super.merge(Middleman::Server.settings.sass).merge(:css_filename => css_filename)
+    end
 
-    parts = basename.split('.')
-    parts.pop
-    css_filename = File.join(location_of_sass_file, Middleman::Server.css_dir, parts.join("."))
-    super.merge(::Compass.configuration.to_sass_engine_options).merge(:css_filename => css_filename)
-  end
-  
-  def evaluate(scope, locals, &block)
-    begin
-      super
-    rescue Sass::SyntaxError => e
-      Sass::SyntaxError.exception_to_css(e, :full_exception => true)
+    def evaluate(scope, locals, &block)
+      begin
+        super
+      rescue Sass::SyntaxError => e
+        Sass::SyntaxError.exception_to_css(e, :full_exception => true)
+      end
     end
   end
-end
-Tilt.register 'sass', Tilt::SassPlusCSSFilenameTemplate
+  ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
+  ::Tilt.prefer(SassPlusCSSFilenameTemplate)
 
-class Tilt::ScssPlusCSSFilenameTemplate < Tilt::SassPlusCSSFilenameTemplate
-  def sass_options
-    super.merge(:syntax => :scss)
+  class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
+    def sass_options
+      super.merge(:syntax => :scss)
+    end
   end
+  ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate
+  ::Tilt.prefer(ScssPlusCSSFilenameTemplate)
 end
-Tilt.register 'scss', Tilt::ScssPlusCSSFilenameTemplate
-
 
+# Use sass settings in Haml filters
+# Other, tilt-based filters (like those used in Slim) will
+# work automatically.
 module Middleman::Renderers::Haml
   module Sass
     include ::Haml::Filters::Base
 
     def render(text)
-      ::Sass::Engine.new(text, ::Compass.configuration.to_sass_engine_options).render
+      sass_options = Middleman::Server.settings.sass
+      ::Sass::Engine.new(text, sass_options).render
     end
   end
 end

data/lib/middleman/renderers/slim.rb

@@ -1,12 +1,8 @@
-module Middleman
-  module Renderers
-    module Slim
-      class << self
-        def registered(app)
-          require "slim"
-        end
-        alias :included :registered
-      end
+module Middleman::Renderers::Slim
+  class << self
+    def registered(app)
+      require "slim"
     end
+    alias :included :registered
   end
 end

data/lib/middleman/server.rb

@@ -3,6 +3,21 @@ require "sinatra/base"
 
 module Middleman
   class Server < Sinatra::Base
+    class << self
+      # Override Sinatra's set to accept a block
+      # Specifically for the asset_host feature
+      def set(option, value=self, &block)
+        if block_given?
+          value = Proc.new { block }
+        end
+      
+        super(option, value, &nil)
+      end
+      
+      # Convenience method to check if we're in build mode
+      def build?; environment == :build; end
+    end
+    
     # Basic Sinatra config
     set :app_file,    __FILE__
     set :root,        ENV["MM_DIR"] || Dir.pwd
@@ -28,12 +43,21 @@ module Middleman
     
     set :views, "source"
     
+    # Add Rack::Builder.map to Sinatra
+    register Middleman::CoreExtensions::RackMap
+    
     # Activate custom features
     register Middleman::CoreExtensions::Features
     
     # Setup custom rendering
     register Middleman::CoreExtensions::Rendering
     
+    # Compass framework
+    register Middleman::CoreExtensions::Compass
+    
+    # Sprockets asset handling
+    register Middleman::CoreExtensions::Sprockets
+    
     # Setup asset path pipeline
     register Middleman::CoreExtensions::Assets
     
@@ -49,22 +73,12 @@ module Middleman
     # Parse YAML from templates
     register Middleman::CoreExtensions::FrontMatter
     
-    set :default_extensions, [
+    set :default_features, [
       :lorem
     ]
     
-    # Override Sinatra's set to accept a block
-    # Specifically for the asset_host feature
-    def self.set(option, value=self, &block)
-      if block_given?
-        value = Proc.new { block }
-      end
-      
-      super(option, value, &nil)
-    end
-    
     # Default layout name
-    layout :layout
+    set :layout, :layout
 
     # This will match all requests not overridden in the project's config.rb
     not_found do
@@ -98,15 +112,23 @@ module Middleman
       
       options.merge!(request['custom_options'] || {})
       
-      old_layout = settings.current_layout
-      settings.layout(options[:layout]) if !options[:layout].nil?
-      layout = settings.fetch_layout_path.to_sym
-      layout = false if options[:layout] == false or request.path_info =~ /\.(css|js)$/
+      old_layout = settings.layout
+      settings.set :layout, options[:layout] if !options[:layout].nil?
+      
+      layout = if settings.layout
+        if options[:layout] == false || request.path_info =~ /\.(css|js)$/
+          false
+        else
+          settings.fetch_layout_path(settings.layout).to_sym
+        end
+      else
+        false
+      end
       
       render_options = { :layout => layout }
       render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine
       result = render(request.path_info, render_options)
-      settings.layout(old_layout)
+      settings.set :layout, old_layout
       
       if result
         content_type mime_type(File.extname(request.path_info)), :charset => 'utf-8'

data/lib/middleman/templates/default/config.tt

@@ -1,7 +1,17 @@
+# Susy grids in Compass
+# First: gem install compass-susy-plugin
+# require 'susy'
+
 # CodeRay syntax highlighting in Haml
-# activate :code_ray
+# First: gem install haml-coderay
+# require 'haml-coderay'
+
+# CoffeeScript filters in Haml
+# First: gem install coffee-filter
+# require 'coffee-filter'
 
-# Automatic sitemaps (gem install middleman-slickmap)
+# Automatic sitemaps
+# First: gem install middleman-slickmap
 # require "middleman-slickmap"
 # activate :slickmap
 
@@ -15,11 +25,11 @@
 # page "/path/to/file.html", :layout => :otherlayout
 
 # Helpers
-helpers do
-  def some_helper(*args)
-    "Helping"
-  end
-end
+# helpers do
+#   def some_helper(*args)
+#     "Helping"
+#   end
+# end
 
 <% if options[:css_dir] != "stylesheets" -%>
 set :css_dir, "<%= options[:css_dir] -%>"
@@ -56,12 +66,10 @@ configure :build do
   # Use relative URLs
   # activate :relative_assets
   
-  # Compress PNGs after build (gem install middleman-smusher)
+  # Compress PNGs after build
+  # First: gem install middleman-smusher
   # require "middleman-smusher"
   # activate :smusher
-
-  # Generate ugly/obfuscated HTML from Haml
-  # activate :ugly_haml
   
   # Or use a different image path
   # set :http_path, "/Content/images/"

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/middleman.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Thomas Reynolds"]
   s.email       = ["tdreyno@gmail.com"]
-  s.homepage    = "http://wiki.github.com/tdreyno/middleman"
-  s.summary     = "A static site generator based on Sinatra. Providing Haml, Sass, Compass, Less, Coffee Script and including minification, compression and cache busting."
+  s.homepage    = "http://middlemanapp.com"
+  s.summary     = "A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting."
 
   s.rubyforge_project = "middleman"
 
@@ -29,11 +29,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("uglifier", ["~> 0.5.0"])
   s.add_runtime_dependency("slim", ["~> 0.9.4"])
   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.3"])
-  s.add_runtime_dependency("compass-susy-plugin", ["~> 0.9.0"])
-  s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
+  s.add_runtime_dependency("sprockets", ["2.0.0.beta.10"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
   s.add_development_dependency("spork", ["~> 0.9.0.rc8"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])

metadata

@@ -2,7 +2,7 @@
 name: middleman
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -07:00
+date: 2011-07-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,126 +135,104 @@ dependencies:
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: coffee-filter
+  name: sass
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 3.1.0
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: sass
+  name: compass
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        version: 0.11.3
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: compass
+  name: sprockets
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.11.3
+        version: 2.0.0.beta.10
   type: :runtime
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: compass-susy-plugin
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.0
-  type: :runtime
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.2.0
-  type: :runtime
-  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.7.0
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: spork
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.9.0.rc8
   type: :development
-  version_requirements: *id018
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.10.0
   type: :development
-  version_requirements: *id019
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.8.7
   type: :development
-  version_requirements: *id020
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id022
+  version_requirements: *id020
 description: 
 email: 
 - tdreyno@gmail.com
@@ -274,7 +252,7 @@ files:
 - CHANGELOG
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - bin/mm-build
 - bin/mm-init
@@ -293,6 +271,7 @@ files:
 - features/page_alias_and_layouts.feature
 - features/scss-support.feature
 - features/slim.feature
+- features/sprockets.feature
 - features/step_definitions/asset_host_steps.rb
 - features/step_definitions/builder_steps.rb
 - features/step_definitions/generator_steps.rb
@@ -333,6 +312,8 @@ files:
 - fixtures/test-app/source/javascripts/auto-js/sub/auto-js.js
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
+- fixtures/test-app/source/javascripts/sprockets_base.js
+- fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
 - fixtures/test-app/source/layouts/custom.haml
 - fixtures/test-app/source/padrino_test.html.haml
@@ -357,27 +338,27 @@ files:
 - lib/middleman/builder.rb
 - lib/middleman/config.ru
 - lib/middleman/core_extensions/assets.rb
+- lib/middleman/core_extensions/compass.rb
 - lib/middleman/core_extensions/data.rb
 - lib/middleman/core_extensions/default_helpers.rb
 - lib/middleman/core_extensions/features.rb
 - lib/middleman/core_extensions/front_matter.rb
+- lib/middleman/core_extensions/rack_map.rb
 - lib/middleman/core_extensions/rendering.rb
 - lib/middleman/core_extensions/routing.rb
+- lib/middleman/core_extensions/sprockets.rb
 - lib/middleman/features/asset_host.rb
 - lib/middleman/features/automatic_image_sizes.rb
 - lib/middleman/features/automatic_image_sizes/fastimage.rb
 - lib/middleman/features/blog.rb
 - lib/middleman/features/cache_buster.rb
-- lib/middleman/features/code_ray.rb
 - lib/middleman/features/live_reload.rb
 - lib/middleman/features/lorem.rb
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
-- lib/middleman/features/minify_javascript/rack.rb
 - lib/middleman/features/proxy.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/tiny_src.rb
-- lib/middleman/features/ugly_haml.rb
 - lib/middleman/renderers/coffee_script.rb
 - lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/markdown.rb
@@ -422,7 +403,7 @@ files:
 - lib/middleman/version.rb
 - middleman.gemspec
 has_rdoc: true
-homepage: http://wiki.github.com/tdreyno/middleman
+homepage: http://middlemanapp.com
 licenses: []
 
 post_install_message: 
@@ -448,7 +429,7 @@ rubyforge_project: middleman
 rubygems_version: 1.3.9.2
 signing_key: 
 specification_version: 3
-summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass, Less, Coffee Script and including minification, compression and cache busting.
+summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting.
 test_files: 
 - features/builder.feature
 - features/coffee-script.feature
@@ -464,6 +445,7 @@ test_files:
 - features/page_alias_and_layouts.feature
 - features/scss-support.feature
 - features/slim.feature
+- features/sprockets.feature
 - features/step_definitions/asset_host_steps.rb
 - features/step_definitions/builder_steps.rb
 - features/step_definitions/generator_steps.rb
@@ -504,6 +486,8 @@ test_files:
 - fixtures/test-app/source/javascripts/auto-js/sub/auto-js.js
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
+- fixtures/test-app/source/javascripts/sprockets_base.js
+- fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
 - fixtures/test-app/source/layouts/custom.haml
 - fixtures/test-app/source/padrino_test.html.haml

data/README.rdoc

@@ -1,15 +0,0 @@
-= middleman
-
-The Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml, Sass, Less and CoffeeScript producing only the cleanest and efficient markup.
-
-== Getting Started
-
-Everything you need to know is on the wiki: http://github.com/tdreyno/middleman/wiki
-
-== Mailing List
-
-If you have questions, answers can be found on community forum: https://convore.com/middleman/
-
-== Copyright
-
-Copyright (c) 2010 Thomas Reynolds. See LICENSE for details.

data/lib/middleman/features/code_ray.rb

@@ -1,12 +0,0 @@
-module Middleman::Features::CodeRay
-  class << self
-    def registered(app)
-      begin
-        require 'haml-coderay'
-      rescue LoadError
-        puts "CodeRay not available. Install it with: gem install haml-coderay"
-      end
-    end
-    alias :included :registered
-  end
-end

data/lib/middleman/features/minify_javascript/rack.rb

@@ -1,57 +0,0 @@
-begin
-  require 'uglifier'
-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
-      end
-
-      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
-            uncompressed_source = response.join
-          end
-          minified = compressor.compile(uncompressed_source)
-          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

data/lib/middleman/features/ugly_haml.rb

@@ -1,8 +0,0 @@
-module Middleman::Features::UglyHaml
-  class << self
-    def registered(app)
-      app.set :haml, app.settings.haml.merge({ :ugly_haml => true })
-    end
-    alias :included :registered
-  end
-end