middleman 3.0.0.alpha.2 → 3.0.0.alpha.3

data/{features → lib/middleman}/step_definitions/generator_steps.rb

@@ -1,14 +1,14 @@
 require 'fileutils'
 
 Given /^generated directory at "([^\"]*)"$/ do |dirname|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
-  init_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "middleman init"))
+  target   = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
+  init_cmd = File.join(MIDDLEMAN_BIN_PATH, "middleman init")
   `cd #{File.dirname(target)} && #{init_cmd} #{File.basename(target)}`
 end
 
 Then /^template files should exist at "([^\"]*)"$/ do |dirname|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
-  template_glob = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "lib", "middleman", "templates", "default", "*/**/*")
+  target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
+  template_glob = File.join(MIDDLEMAN_ROOT_PATH, "lib", "middleman", "templates", "default", "*/**/*")
   
   Dir[template_glob].each do |f|
     next if File.directory?(f)
@@ -17,7 +17,7 @@ Then /^template files should exist at "([^\"]*)"$/ do |dirname|
 end
 
 Then /^empty directories should exist at "([^\"]*)"$/ do |dirname|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
+  target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
   
   %w(source/stylesheets source/javascripts source/images).each do |d|
     File.exists?("#{target}/#{d}").should be_true
@@ -25,6 +25,6 @@ Then /^empty directories should exist at "([^\"]*)"$/ do |dirname|
 end
 
 Then /^cleanup at "([^\"]*)"$/ do |dirname|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
+  target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
   FileUtils.rm_rf(target)
 end

data/{features/step_definitions/middleman_steps.rb → lib/middleman/step_definitions/server_steps.rb}

@@ -1,3 +1,5 @@
+require "rack/test"
+
 Given /^a clean server$/ do
   @initialize_commands = []
 end
@@ -20,11 +22,9 @@ Given /^current environment is "([^\"]*)"$/ do |env|
 end
 
 Given /^the Server is running at "([^\"]*)"$/ do |app_path|
-  root_dir = File.dirname(File.dirname(File.dirname(__FILE__)))
-
   initialize_commands = @initialize_commands || []
   initialize_commands.unshift lambda { 
-    set :root, File.join(root_dir, "fixtures", app_path)
+    set :root, File.join(PROJECT_ROOT_PATH, "fixtures", app_path)
     set :environment, @current_env || :development
   }
   

data/lib/middleman/templates/default/source/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :head do %>
   <title>The Middleman!</title>
-<% end%>
+<% end %>
 
 <h1>The Middleman is watching.</h1>

data/lib/middleman/version.rb

@@ -1,3 +1,9 @@
+# Using for version parsing
+require "rubygems"
+
 module Middleman
-  VERSION = "3.0.0.alpha.2"
+  VERSION = "3.0.0.alpha.3"
+  
+  # @private
+  GEM_VERSION = ::Gem::Version.create(VERSION)
 end

data/middleman-x86-mingw32.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
-  s.add_dependency("sprockets", ["~> 2.0"])
+  s.add_dependency("sprockets", ["~> 2.1.2"])
   s.add_dependency("sprockets-sass", ["~> 0.3.0"])
   s.add_dependency("guard", ["~> 0.8.8"])
   

data/middleman.gemspec

@@ -33,8 +33,8 @@ Gem::Specification.new do |s|
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
-  s.add_dependency("sprockets", ["~> 2.0"])
-  s.add_dependency("sprockets-sass", ["~> 0.3.0"])
+  s.add_dependency("sprockets", ["~> 2.1.2"])
+  s.add_dependency("sprockets-sass", ["~> 0.5.0"])
   s.add_dependency("guard", ["~> 0.8.8"])
   
   # OSX
@@ -48,7 +48,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency("cucumber", ["~> 1.1.0"])
   s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("rspec", ["~> 2.7.0"])
+  s.add_development_dependency("rdoc", ["~> 3.9.4"])
+  s.add_development_dependency("yard")
   s.add_development_dependency("jquery-rails")
-  s.add_development_dependency("bootstrap-rails")
+  s.add_development_dependency("bootstrap-rails", ["0.0.5"])
 end
 

metadata

@@ -1,461 +1,354 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: middleman
-version: !ruby/object:Gem::Version 
-  hash: -3702664392
+version: !ruby/object:Gem::Version
+  version: 3.0.0.alpha.3
   prerelease: 6
-  segments: 
-  - 3
-  - 0
-  - 0
-  - alpha
-  - 2
-  version: 3.0.0.alpha.2
 platform: ruby
-authors: 
+authors:
 - Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-19 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-11-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70122866510240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 3
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.3.5
-  version_requirements: *id001
-  name: rack
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866510240
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70122866509540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 2
-        - 11
+      - !ruby/object:Gem::Version
         version: 1.2.11
-  version_requirements: *id002
-  name: thin
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866509540
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70122866508800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 0
-        - 14
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.14.0
-  version_requirements: *id003
-  name: thor
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866508800
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &70122866508220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.3.1
-  version_requirements: *id004
-  name: tilt
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866508220
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70122866507720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  version_requirements: *id005
-  name: i18n
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866507720
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70122866507100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.6.1
-  version_requirements: *id006
-  name: rack-test
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866507100
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: &70122866506520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
-  version_requirements: *id007
-  name: uglifier
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866506520
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &70122866505860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.1.0
-  version_requirements: *id008
-  name: haml
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866505860
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70122866489660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 1
-        - 7
+      - !ruby/object:Gem::Version
         version: 3.1.7
-  version_requirements: *id009
-  name: sass
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866489660
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70122866489060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.1.0
-  version_requirements: *id010
-  name: activesupport
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866489060
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: &70122866488460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 53
-        segments: 
-        - 0
-        - 11
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.11.3
-  version_requirements: *id011
-  name: compass
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866488460
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: &70122866487840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.2.0
-  version_requirements: *id012
-  name: coffee-script
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866487840
+- !ruby/object:Gem::Dependency
+  name: execjs
+  requirement: &70122866487220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 2
-        - 7
+      - !ruby/object:Gem::Version
         version: 1.2.7
-  version_requirements: *id013
-  name: execjs
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866487220
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: &70122866486620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  version_requirements: *id014
-  name: sprockets
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 2.1.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866486620
+- !ruby/object:Gem::Dependency
+  name: sprockets-sass
+  requirement: &70122866486080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  version_requirements: *id015
-  name: sprockets-sass
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866486080
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70122866485560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 8
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.8.8
-  version_requirements: *id016
-  name: guard
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id017
-  name: rb-fsevent
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: *70122866485560
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70122866485120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id018
-  name: slim
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: *70122866485120
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: &70122866484200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id019
-  name: maruku
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70122866484200
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: &70122866482840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866482840
+- !ruby/object:Gem::Dependency
+  name: coffee-filter
+  requirement: &70122866323340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.1.1
-  version_requirements: *id020
-  name: coffee-filter
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866323340
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: &70122866322580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.2.0
-  version_requirements: *id021
-  name: liquid
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866322580
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70122866321980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
-  version_requirements: *id022
-  name: cucumber
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866321980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70122866321460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  version_requirements: *id023
-  name: rake
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866321460
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70122866320940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.7.0
-  version_requirements: *id024
-  name: rspec
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866320940
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70122866320420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id025
-  name: jquery-rails
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.9.4
+  type: :development
   prerelease: false
+  version_requirements: *70122866320420
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70122866319960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70122866319960
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &70122866319420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id026
-  name: bootstrap-rails
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70122866319420
+- !ruby/object:Gem::Dependency
+  name: bootstrap-rails
+  requirement: &70122866318800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.0.5
   type: :development
-description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
-email: 
+  prerelease: false
+  version_requirements: *70122866318800
+description: A static site generator based on Sinatra. Providing dozens of templating
+  languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification,
+  compression, cache busting, Yaml data (and more) an easy part of your development
+  cycle.
+email:
 - me@tdreyno.com
-executables: 
+executables:
 - middleman
-- mm-build
-- mm-init
-- mm-server
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .travis.yml
+- .yardopts
 - CHANGELOG
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/middleman
-- bin/mm-build
-- bin/mm-init
-- bin/mm-server
 - features/asset_host.feature
+- features/auto_layout.feature
 - features/automatic_image_sizes.feature
 - features/builder.feature
 - features/cache_buster.feature
+- features/chained_templates.feature
 - features/clean_build.feature
 - features/coffee-script.feature
+- features/content_for.feature
 - features/custom_layout_engines.feature
 - features/data.feature
 - features/directory_index.feature
@@ -472,18 +365,18 @@ files:
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/page_alias_and_layouts.feature
+- features/partials.feature
 - features/relative_assets.feature
 - features/scss-support.feature
 - features/slim.feature
 - features/sprockets.feature
 - features/sprockets_gems.feature
 - features/step_definitions/asset_host_steps.rb
-- features/step_definitions/builder_steps.rb
-- features/step_definitions/generator_steps.rb
-- features/step_definitions/middleman_steps.rb
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
-- features/tiny_src.feature
+- fixtures/chained-app/config.rb
+- fixtures/chained-app/data/article.yml
+- fixtures/chained-app/source/index.html.markdown.erb
 - fixtures/clean-app/config-complications.rb
 - fixtures/clean-app/config-empty.rb
 - fixtures/clean-app/config.rb
@@ -503,6 +396,12 @@ files:
 - fixtures/data-app/data/pages.yml
 - fixtures/data-app/source/index.html.haml
 - fixtures/data-app/source/layout.haml
+- fixtures/different-engine-layout/config.rb
+- fixtures/different-engine-layout/source/index.html.haml
+- fixtures/different-engine-layout/source/layout.erb
+- fixtures/engine-matching-layout/config.rb
+- fixtures/engine-matching-layout/source/index.html.erb
+- fixtures/engine-matching-layout/source/layout.erb
 - fixtures/fonts-app/config.rb
 - fixtures/fonts-app/source/fonts/StMarie-Thin.otf
 - fixtures/fonts-app/source/stylesheets/fonts.css.sass
@@ -513,10 +412,37 @@ files:
 - fixtures/ignore-app/source/articles/template.html.erb
 - fixtures/ignore-app/source/template.html.erb
 - fixtures/indexable-app/config.rb
+- fixtures/indexable-app/source/.htaccess
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
+- fixtures/manual-layout-missing/config.rb
+- fixtures/manual-layout-missing/source/index.html.erb
+- fixtures/manual-layout-override/config.rb
+- fixtures/manual-layout-override/source/index.html.erb
+- fixtures/manual-layout-override/source/layouts/another.erb
+- fixtures/manual-layout-override/source/layouts/custom.erb
+- fixtures/manual-layout/config.rb
+- fixtures/manual-layout/source/index.html.erb
+- fixtures/manual-layout/source/layouts/custom.erb
+- fixtures/multiple-layouts/config.rb
+- fixtures/multiple-layouts/source/index.html.erb
+- fixtures/multiple-layouts/source/layout.erb
+- fixtures/multiple-layouts/source/layout.haml
+- fixtures/no-layout/config.rb
+- fixtures/no-layout/source/index.html.erb
+- fixtures/partials-app/config.rb
+- fixtures/partials-app/source/_locals.erb
+- fixtures/partials-app/source/_main.erb
+- fixtures/partials-app/source/_main.haml
+- fixtures/partials-app/source/index.html.erb
+- fixtures/partials-app/source/locals.html.erb
+- fixtures/partials-app/source/second.html.haml
+- fixtures/partials-app/source/shared/_footer.erb
+- fixtures/partials-app/source/shared/_header.erb
+- fixtures/partials-app/source/sub/_local.erb
+- fixtures/partials-app/source/sub/index.html.erb
 - fixtures/relative-app/config.rb
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
@@ -533,6 +459,7 @@ files:
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/data/test2.json
+- fixtures/test-app/source/.htaccess
 - fixtures/test-app/source/_liquid_partial.liquid
 - fixtures/test-app/source/_partial.haml
 - fixtures/test-app/source/a_folder/needs_index.html
@@ -547,6 +474,9 @@ files:
 - fixtures/test-app/source/auto-js/index.html.haml
 - fixtures/test-app/source/auto-js/sub/auto-js.html.haml
 - fixtures/test-app/source/cache-buster.html.haml
+- fixtures/test-app/source/content_for_erb.html.erb
+- fixtures/test-app/source/content_for_haml.html.haml
+- fixtures/test-app/source/content_for_slim.html.slim
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
@@ -555,8 +485,10 @@ files:
 - fixtures/test-app/source/former_padrino_test.html.haml
 - fixtures/test-app/source/front-matter.html.erb
 - fixtures/test-app/source/images/Child folder/regular_file(example).txt
+- fixtures/test-app/source/images/Chrome_Logo.svg
 - fixtures/test-app/source/images/Read me (example).txt
 - fixtures/test-app/source/images/blank.gif
+- fixtures/test-app/source/images/cfb_tomb-perennial-energy.svgz
 - fixtures/test-app/source/img/blank.gif
 - fixtures/test-app/source/index.html.haml
 - fixtures/test-app/source/inline-coffeescript.html.haml
@@ -574,6 +506,7 @@ files:
 - 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/content_for.erb
 - fixtures/test-app/source/layouts/custom.haml
 - fixtures/test-app/source/liquid_master.html.liquid
 - fixtures/test-app/source/markdown.html.markdown
@@ -608,35 +541,44 @@ files:
 - lib/middleman.rb
 - lib/middleman/base.rb
 - lib/middleman/builder.rb
+- lib/middleman/cache.rb
 - lib/middleman/cli.rb
 - lib/middleman/core_extensions/assets.rb
 - lib/middleman/core_extensions/builder.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/extensions.rb
 - lib/middleman/core_extensions/file_watcher.rb
 - lib/middleman/core_extensions/front_matter.rb
 - lib/middleman/core_extensions/rendering.rb
 - lib/middleman/core_extensions/routing.rb
 - lib/middleman/core_extensions/sitemap.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/cache_buster.rb
-- lib/middleman/features/directory_indexes.rb
-- lib/middleman/features/lorem.rb
-- lib/middleman/features/minify_css.rb
-- lib/middleman/features/minify_css/cssmin.rb
-- lib/middleman/features/minify_javascript.rb
-- lib/middleman/features/relative_assets.rb
-- lib/middleman/features/sitemap_tree.rb
+- lib/middleman/extensions/asset_host.rb
+- lib/middleman/extensions/automatic_image_sizes.rb
+- lib/middleman/extensions/automatic_image_sizes/fastimage.rb
+- lib/middleman/extensions/cache_buster.rb
+- lib/middleman/extensions/directory_indexes.rb
+- lib/middleman/extensions/lorem.rb
+- lib/middleman/extensions/minify_css.rb
+- lib/middleman/extensions/minify_css/cssmin.rb
+- lib/middleman/extensions/minify_javascript.rb
+- lib/middleman/extensions/relative_assets.rb
+- lib/middleman/extensions/sitemap_tree.rb
 - lib/middleman/guard.rb
 - lib/middleman/renderers/erb.rb
+- lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/liquid.rb
 - lib/middleman/renderers/markdown.rb
 - lib/middleman/renderers/sass.rb
+- lib/middleman/sitemap/page.rb
+- lib/middleman/sitemap/store.rb
+- lib/middleman/sitemap/template.rb
+- lib/middleman/step_definitions.rb
+- lib/middleman/step_definitions/builder_steps.rb
+- lib/middleman/step_definitions/generator_steps.rb
+- lib/middleman/step_definitions/server_steps.rb
 - lib/middleman/templates.rb
 - lib/middleman/templates/default.rb
 - lib/middleman/templates/default/source/index.html.erb
@@ -930,49 +872,44 @@ files:
 - lib/middleman/version.rb
 - middleman-x86-mingw32.gemspec
 - middleman.gemspec
-has_rdoc: true
 homepage: http://middlemanapp.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -905616201432248626
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
-test_files: 
+test_files:
 - features/asset_host.feature
+- features/auto_layout.feature
 - features/automatic_image_sizes.feature
 - features/builder.feature
 - features/cache_buster.feature
+- features/chained_templates.feature
 - features/clean_build.feature
 - features/coffee-script.feature
+- features/content_for.feature
 - features/custom_layout_engines.feature
 - features/data.feature
 - features/directory_index.feature
@@ -989,18 +926,18 @@ test_files:
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/page_alias_and_layouts.feature
+- features/partials.feature
 - features/relative_assets.feature
 - features/scss-support.feature
 - features/slim.feature
 - features/sprockets.feature
 - features/sprockets_gems.feature
 - features/step_definitions/asset_host_steps.rb
-- features/step_definitions/builder_steps.rb
-- features/step_definitions/generator_steps.rb
-- features/step_definitions/middleman_steps.rb
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
-- features/tiny_src.feature
+- fixtures/chained-app/config.rb
+- fixtures/chained-app/data/article.yml
+- fixtures/chained-app/source/index.html.markdown.erb
 - fixtures/clean-app/config-complications.rb
 - fixtures/clean-app/config-empty.rb
 - fixtures/clean-app/config.rb
@@ -1020,6 +957,12 @@ test_files:
 - fixtures/data-app/data/pages.yml
 - fixtures/data-app/source/index.html.haml
 - fixtures/data-app/source/layout.haml
+- fixtures/different-engine-layout/config.rb
+- fixtures/different-engine-layout/source/index.html.haml
+- fixtures/different-engine-layout/source/layout.erb
+- fixtures/engine-matching-layout/config.rb
+- fixtures/engine-matching-layout/source/index.html.erb
+- fixtures/engine-matching-layout/source/layout.erb
 - fixtures/fonts-app/config.rb
 - fixtures/fonts-app/source/fonts/StMarie-Thin.otf
 - fixtures/fonts-app/source/stylesheets/fonts.css.sass
@@ -1030,10 +973,37 @@ test_files:
 - fixtures/ignore-app/source/articles/template.html.erb
 - fixtures/ignore-app/source/template.html.erb
 - fixtures/indexable-app/config.rb
+- fixtures/indexable-app/source/.htaccess
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
+- fixtures/manual-layout-missing/config.rb
+- fixtures/manual-layout-missing/source/index.html.erb
+- fixtures/manual-layout-override/config.rb
+- fixtures/manual-layout-override/source/index.html.erb
+- fixtures/manual-layout-override/source/layouts/another.erb
+- fixtures/manual-layout-override/source/layouts/custom.erb
+- fixtures/manual-layout/config.rb
+- fixtures/manual-layout/source/index.html.erb
+- fixtures/manual-layout/source/layouts/custom.erb
+- fixtures/multiple-layouts/config.rb
+- fixtures/multiple-layouts/source/index.html.erb
+- fixtures/multiple-layouts/source/layout.erb
+- fixtures/multiple-layouts/source/layout.haml
+- fixtures/no-layout/config.rb
+- fixtures/no-layout/source/index.html.erb
+- fixtures/partials-app/config.rb
+- fixtures/partials-app/source/_locals.erb
+- fixtures/partials-app/source/_main.erb
+- fixtures/partials-app/source/_main.haml
+- fixtures/partials-app/source/index.html.erb
+- fixtures/partials-app/source/locals.html.erb
+- fixtures/partials-app/source/second.html.haml
+- fixtures/partials-app/source/shared/_footer.erb
+- fixtures/partials-app/source/shared/_header.erb
+- fixtures/partials-app/source/sub/_local.erb
+- fixtures/partials-app/source/sub/index.html.erb
 - fixtures/relative-app/config.rb
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
@@ -1050,6 +1020,7 @@ test_files:
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/data/test2.json
+- fixtures/test-app/source/.htaccess
 - fixtures/test-app/source/_liquid_partial.liquid
 - fixtures/test-app/source/_partial.haml
 - fixtures/test-app/source/a_folder/needs_index.html
@@ -1064,6 +1035,9 @@ test_files:
 - fixtures/test-app/source/auto-js/index.html.haml
 - fixtures/test-app/source/auto-js/sub/auto-js.html.haml
 - fixtures/test-app/source/cache-buster.html.haml
+- fixtures/test-app/source/content_for_erb.html.erb
+- fixtures/test-app/source/content_for_haml.html.haml
+- fixtures/test-app/source/content_for_slim.html.slim
 - fixtures/test-app/source/custom-layout-dir/index.html.haml
 - fixtures/test-app/source/custom-layout.html.haml
 - fixtures/test-app/source/data.html.erb
@@ -1072,8 +1046,10 @@ test_files:
 - fixtures/test-app/source/former_padrino_test.html.haml
 - fixtures/test-app/source/front-matter.html.erb
 - fixtures/test-app/source/images/Child folder/regular_file(example).txt
+- fixtures/test-app/source/images/Chrome_Logo.svg
 - fixtures/test-app/source/images/Read me (example).txt
 - fixtures/test-app/source/images/blank.gif
+- fixtures/test-app/source/images/cfb_tomb-perennial-energy.svgz
 - fixtures/test-app/source/img/blank.gif
 - fixtures/test-app/source/index.html.haml
 - fixtures/test-app/source/inline-coffeescript.html.haml
@@ -1091,6 +1067,7 @@ test_files:
 - 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/content_for.erb
 - fixtures/test-app/source/layouts/custom.haml
 - fixtures/test-app/source/liquid_master.html.liquid
 - fixtures/test-app/source/markdown.html.markdown
@@ -1122,3 +1099,4 @@ test_files:
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
 - fixtures/test-app/source/tiny_src.html.haml
+has_rdoc: