middleman 3.0.0.alpha.3 → 3.0.0.alpha.4

data/lib/middleman/sitemap/store.rb

@@ -115,7 +115,9 @@ module Middleman::Sitemap
       # @app.logger.debug :sitemap_update, Time.now, path if @app.logging?
       
       # Add generic path
-      page(path).source_file = File.expand_path(file, @app.root)
+      p = page(path)
+      p.source_file = File.expand_path(file, @app.root)
+      p.touch
       
       true
     end

data/lib/middleman/sitemap/template.rb

@@ -29,17 +29,31 @@ module Middleman::Sitemap
     def ext
       page.ext
     end
-
+    
+    def touch
+      app.cache.remove(:metadata, source_file)
+    end
+    
     def metadata
-      app.cache.fetch(:metadata, source_file) do
-        metadata = { :options => {}, :locals => {} }
+      metadata = app.cache.fetch(:metadata, source_file) do
+        data = { :options => {}, :locals => {} }
+        
         app.provides_metadata.each do |callback, matcher|
           next if !matcher.nil? && !source_file.match(matcher)
           result = app.instance_exec(source_file, &callback)
-          metadata = metadata.deep_merge(result)
+          data = data.deep_merge(result)
         end
-        metadata
+        
+        data
       end
+      
+      app.provides_metadata_for_path.each do |callback, matcher|
+        next if !matcher.nil? && !path.match(matcher)
+        result = app.instance_exec(path, &callback)
+        metadata = metadata.deep_merge(result)
+      end
+      
+      metadata
     end
 
     def render(opts={}, locs={}, &block)

data/lib/middleman/step_definitions.rb

@@ -1,6 +1,7 @@
 MIDDLEMAN_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 MIDDLEMAN_BIN_PATH  = File.join(MIDDLEMAN_ROOT_PATH, "bin")
 
+require "middleman/step_definitions/middleman_steps"
 require "middleman/step_definitions/builder_steps"
 require "middleman/step_definitions/generator_steps"
 require "middleman/step_definitions/server_steps"

data/lib/middleman/step_definitions/builder_steps.rb

@@ -42,4 +42,9 @@ end
 Then /^"([^\"]*)" should not exist at "([^\"]*)"$/ do |target_file, path|
   target = File.join(PROJECT_ROOT_PATH, "fixtures", path, "build", target_file)
   File.exists?(target).should be_false
-end
+end
+
+Then /^the last exit code should be "([^\"]*)"$/ do |exit_code|
+  exit_code = exit_code.to_i
+  $?.exitstatus.should == exit_code
+end

data/lib/middleman/step_definitions/generator_steps.rb

@@ -1,30 +1,26 @@
 require 'fileutils'
 
-Given /^generated directory at "([^\"]*)"$/ do |dirname|
-  target   = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
+Given /^the project has been initialized$/ do
+  step %Q{the project should be cleaned up}
   init_cmd = File.join(MIDDLEMAN_BIN_PATH, "middleman init")
-  `cd #{File.dirname(target)} && #{init_cmd} #{File.basename(target)}`
+  `cd #{File.dirname(@target)} && #{init_cmd} #{File.basename(@target)}`
 end
 
-Then /^template files should exist at "([^\"]*)"$/ do |dirname|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
+Then /^template files should exist$/ do
   template_glob = File.join(MIDDLEMAN_ROOT_PATH, "lib", "middleman", "templates", "default", "*/**/*")
   
   Dir[template_glob].each do |f|
     next if File.directory?(f)
-    File.exists?("#{target}/#{f.split('template/')[1]}").should be_true
+    File.exists?("#{@target}/#{f.split('template/')[1]}").should be_true
   end
 end
 
-Then /^empty directories should exist at "([^\"]*)"$/ do |dirname|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
-  
+Then /^empty directories should exist$/ do
   %w(source/stylesheets source/javascripts source/images).each do |d|
-    File.exists?("#{target}/#{d}").should be_true
+    File.exists?("#{@target}/#{d}").should be_true
   end
 end
 
-Then /^cleanup at "([^\"]*)"$/ do |dirname|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
-  FileUtils.rm_rf(target)
+Then /^the project should be cleaned up$/ do
+  FileUtils.rm_rf(@target)
 end

data/lib/middleman/step_definitions/middleman_steps.rb

@@ -0,0 +1,13 @@
+Given /^a project at "([^\"]*)"$/ do |dirname|
+  @target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
+end
+
+Then /^the file "([^\"]*)" has the contents$/ do |path, contents|
+  file_path = File.expand_path(path, @target)
+  File.open(file_path, 'w') { |f| f.write(contents) }
+  step %Q{the file "#{path}" did change}
+end
+
+Then /^the file "([^\"]*)" did change$/ do |path|
+  @server_inst.file_did_change(path)
+end

data/lib/middleman/step_definitions/server_steps.rb

@@ -22,10 +22,13 @@ Given /^current environment is "([^\"]*)"$/ do |env|
 end
 
 Given /^the Server is running at "([^\"]*)"$/ do |app_path|
+  step %Q{a project at "#{app_path}"}
+  
   initialize_commands = @initialize_commands || []
   initialize_commands.unshift lambda { 
     set :root, File.join(PROJECT_ROOT_PATH, "fixtures", app_path)
     set :environment, @current_env || :development
+    set :show_exceptions, false
   }
   
   @server_inst = Middleman.server.inst do
@@ -42,6 +45,10 @@ When /^I go to "([^\"]*)"$/ do |url|
   @browser.get(url)
 end
 
+Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
+  lambda { @browser.get(url) }.should_not raise_exception
+end
+
 Then /^I should see "([^\"]*)"$/ do |expected|
   @browser.last_response.body.should include(expected)
 end

data/lib/middleman/templates.rb

@@ -1,44 +1,62 @@
+# Use thor for template generation
 require "thor"
 require "thor/group"
 
+# Templates namespace
 module Middleman::Templates
-  @@template_mappings = {}
-  def self.register(name, klass)
-    @@template_mappings[name] = klass
-  end
-  
-  def self.registered_names
-    @@template_mappings.keys
-  end
   
-  def self.registered_templates
-    @@template_mappings
+  # Static methods
+  class << self
+    
+    # Get list of registered templates and add new ones
+    #
+    # @param [Symbol] name The name of the template
+    # @param [Class] klass The class to be executed for this template
+    # @return [Hash] List of registered templates
+    def registered(*args)
+      @_template_mappings ||= {}
+      @_template_mappings[args[0]] = args[1] if args.length == 2
+      @_template_mappings
+    end
+    
+    # Middleman::Templates.register(name, klass)
+    alias :register :registered
   end
   
+  # Base Template class. Handles basic options and paths.
   class Base < ::Thor::Group
     include Thor::Actions
     
+    # Required path for the new project to be generated
     argument :location, :type => :string
+    
+    # Name of the template being used to generate the project.
     class_option :template, :default => "default"
+    
+    # What to call the directory which CSS will be searched for.
     class_option :css_dir, :default => "stylesheets"
+    
+    # What to call the directory which JS will be searched for.
     class_option :js_dir, :default => "javascripts"
+    
+    # What to call the directory which images will be searched for.
     class_option :images_dir, :default => "images"
-    class_option :rack, :type => :boolean, :default => false
-    class_option :bundler, :type => :boolean, :default => false
     
+    # Output a config.ru file for Rack if --rack is passed
+    class_option :rack, :type => :boolean, :default => false
     def generate_rack
-      if options[:rack]
-        template "shared/config.ru", File.join(location, "config.ru")
-      end
+      return unless options[:rack]
+      template "shared/config.ru", File.join(location, "config.ru")
     end
     
+    # Output a Gemfile file for Bundler if --bundler is passed
+    class_option :bundler, :type => :boolean, :default => false
     def generate_bundler
-      if options[:bundler]
-        template "shared/Gemfile.tt", File.join(location, "Gemfile")
-        
-        say_status :run, "bundle install"
-        print `cd #{location} && "#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" install`
-      end
+      return unless options[:bundler]
+      template "shared/Gemfile.tt", File.join(location, "Gemfile")
+      
+      say_status :run, "bundle install"
+      print `cd #{location} && "#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" install`
     end
   end
 end
@@ -49,5 +67,8 @@ require "middleman/templates/default"
 # HTML5 template
 require "middleman/templates/html5"
 
+# HTML5 Mobile template
+require "middleman/templates/mobile"
+
 # Local templates
 require "middleman/templates/local"

data/lib/middleman/templates/default.rb

@@ -1,8 +1,12 @@
+# Default Middleman template
 class Middleman::Templates::Default < Middleman::Templates::Base
+  
+  # Template files are relative to this file
   def self.source_root
     File.dirname(__FILE__)
   end
   
+  # Actually output the files
   def build_scaffold
     template "shared/config.tt", File.join(location, "config.rb")
     copy_file "default/source/index.html.erb", File.join(location, "source/index.html.erb")
@@ -14,4 +18,5 @@ class Middleman::Templates::Default < Middleman::Templates::Base
   end  
 end
 
+# Register this template
 Middleman::Templates.register(:default, Middleman::Templates::Default)

data/lib/middleman/templates/html5.rb

@@ -1,12 +1,17 @@
+# HTML5 Boilerplate template
 class Middleman::Templates::Html5 < Middleman::Templates::Base
+  
+  # Has different default paths
   class_option :css_dir, :default => "css"
   class_option :js_dir, :default => "js"
   class_option :images_dir, :default => "img"
 
+  # Templates are relative to this file
   def self.source_root
     File.dirname(__FILE__)
   end
   
+  # Output the files
   def build_scaffold
     template "shared/config.tt", File.join(location, "config.rb")
     directory "html5/source", File.join(location, "source")
@@ -14,4 +19,5 @@ class Middleman::Templates::Html5 < Middleman::Templates::Base
   end
 end
 
+# Register the template
 Middleman::Templates.register(:html5, Middleman::Templates::Html5)

data/lib/middleman/templates/local.rb

@@ -1,19 +1,18 @@
-module Middleman
-  def self.templates_path
-    File.join(File.expand_path("~/"), ".middleman")
-  end
-end
-
+# Local templates
 class Middleman::Templates::Local < Middleman::Templates::Base
+  
+  # Look for templates in ~/.middleman
   def self.source_root
     Middleman.templates_path
   end
 
+  # Just copy from the template path
   def build_scaffold
     directory options[:template].to_s, location
   end  
 end
 
+# Iterate over the directories in the templates path and register each one.
 Dir[File.join(Middleman.templates_path, "*")].each do |dir|
   next unless File.directory?(dir)
   Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local)

data/lib/middleman/templates/mobile.rb

@@ -1,12 +1,17 @@
+# Mobile HTML5 Boilerplate
 class Middleman::Templates::Mobile < Middleman::Templates::Base
+  
+  # Slightly different paths
   class_option :css_dir, :default => "css"
   class_option :js_dir, :default => "js"
   class_option :images_dir, :default => "img"
 
+  # Template files are relative to this file
   def self.source_root
     File.dirname(__FILE__)
   end
   
+  # Output the files
   def build_scaffold
     template "shared/config.tt", File.join(location, "config.rb")
     directory "mobile/source", File.join(location, "source")
@@ -14,4 +19,5 @@ class Middleman::Templates::Mobile < Middleman::Templates::Base
   end
 end
 
+# Register the template
 Middleman::Templates.register(:mobile, Middleman::Templates::Mobile)

data/lib/middleman/version.rb

@@ -2,7 +2,7 @@
 require "rubygems"
 
 module Middleman
-  VERSION = "3.0.0.alpha.3"
+  VERSION = "3.0.0.alpha.4"
   
   # @private
   GEM_VERSION = ::Gem::Version.create(VERSION)

data/middleman-x86-mingw32.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("rack", ["~> 1.3.5"])
-  s.add_dependency("thin", ["~> 1.2.11"])
+  s.add_dependency("thin", ["~> 1.3.1"])
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("i18n", ["~> 0.6.0"])

data/middleman.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("rack", ["~> 1.3.5"])
-  s.add_dependency("thin", ["~> 1.2.11"])
+  s.add_dependency("thin", ["~> 1.3.1"])
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("i18n", ["~> 0.6.0"])
@@ -36,13 +36,14 @@ Gem::Specification.new do |s|
   s.add_dependency("sprockets", ["~> 2.1.2"])
   s.add_dependency("sprockets-sass", ["~> 0.5.0"])
   s.add_dependency("guard", ["~> 0.8.8"])
+  s.add_dependency("redcarpet", ["~> 2.0.0"])
   
   # OSX
   s.add_dependency("rb-fsevent")
   
   # Development and test
   s.add_development_dependency("slim")
-  s.add_development_dependency("maruku")
+  s.add_development_dependency("sinatra")
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("liquid", ["~> 2.2.0"])
   s.add_development_dependency("cucumber", ["~> 1.1.0"])

metadata

@@ -1,340 +1,494 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: middleman
-version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.3
+version: !ruby/object:Gem::Version 
+  hash: -3702664396
   prerelease: 6
+  segments: 
+  - 3
+  - 0
+  - 0
+  - alpha
+  - 4
+  version: 3.0.0.alpha.4
 platform: ruby
-authors:
+authors: 
 - Thomas Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &70122866510240 !ruby/object:Gem::Requirement
+
+date: 2011-12-14 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 3
+        - 5
         version: 1.3.5
-  type: :runtime
+  name: rack
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866510240
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &70122866509540 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.11
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  name: thin
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866509540
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70122866508800 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 14
+        - 0
         version: 0.14.0
-  type: :runtime
+  name: thor
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866508800
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: &70122866508220 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-  type: :runtime
+  name: tilt
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866508220
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70122866507720 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-  type: :runtime
+  name: i18n
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866507720
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70122866507100 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
-  type: :runtime
+  name: rack-test
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866507100
-- !ruby/object:Gem::Dependency
-  name: uglifier
-  requirement: &70122866506520 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-  type: :runtime
+  name: uglifier
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866506520
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70122866505860 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
-  type: :runtime
+  name: haml
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866505860
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &70122866489660 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 1
+        - 7
         version: 3.1.7
-  type: :runtime
+  name: sass
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866489660
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70122866489060 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
-  type: :runtime
+  name: activesupport
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866489060
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: &70122866488460 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 0
+        - 11
+        - 3
         version: 0.11.3
-  type: :runtime
+  name: compass
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866488460
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: &70122866487840 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-  type: :runtime
+  name: coffee-script
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866487840
-- !ruby/object:Gem::Dependency
-  name: execjs
-  requirement: &70122866487220 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 2
+        - 7
         version: 1.2.7
-  type: :runtime
+  name: execjs
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866487220
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: &70122866486620 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-  type: :runtime
+  name: sprockets
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866486620
-- !ruby/object:Gem::Dependency
-  name: sprockets-sass
-  requirement: &70122866486080 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
-  type: :runtime
+  name: sprockets-sass
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866486080
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &70122866485560 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 8
+        - 8
         version: 0.8.8
-  type: :runtime
+  name: guard
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866485560
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70122866485120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  name: redcarpet
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866485120
-- !ruby/object:Gem::Dependency
-  name: slim
-  requirement: &70122866484200 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rb-fsevent
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866484200
-- !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &70122866482840 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: slim
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: sinatra
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866482840
-- !ruby/object:Gem::Dependency
-  name: coffee-filter
-  requirement: &70122866323340 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-  type: :development
+  name: coffee-filter
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866323340
-- !ruby/object:Gem::Dependency
-  name: liquid
-  requirement: &70122866322580 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-  type: :development
+  name: liquid
+  version_requirements: *id022
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866322580
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &70122866321980 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
-  type: :development
+  name: cucumber
+  version_requirements: *id023
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866321980
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70122866321460 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-  type: :development
+  name: rake
+  version_requirements: *id024
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866321460
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70122866320940 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
         version: 2.7.0
-  type: :development
+  name: rspec
+  version_requirements: *id025
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866320940
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70122866320420 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 3
+        - 9
+        - 4
         version: 3.9.4
-  type: :development
+  name: rdoc
+  version_requirements: *id026
+- !ruby/object:Gem::Dependency 
   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
-  prerelease: false
-  version_requirements: *70122866319960
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: &70122866319420 !ruby/object:Gem::Requirement
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: yard
+  version_requirements: *id027
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+  requirement: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jquery-rails
+  version_requirements: *id028
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70122866319420
-- !ruby/object:Gem::Dependency
-  name: bootstrap-rails
-  requirement: &70122866318800 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id029 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
         version: 0.0.5
-  type: :development
-  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:
+  name: bootstrap-rails
+  version_requirements: *id029
+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
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gemtest
 - .gitignore
 - .travis.yml
 - .yardopts
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -349,6 +503,7 @@ files:
 - features/clean_build.feature
 - features/coffee-script.feature
 - features/content_for.feature
+- features/current_page_request_path_backwards.feature
 - features/custom_layout_engines.feature
 - features/data.feature
 - features/directory_index.feature
@@ -359,13 +514,18 @@ files:
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
+- features/helpers_external.feature
+- features/helpers_lorem.feature
 - features/helpers_page_classes.feature
+- features/instance_vars.feature
 - features/liquid.feature
 - features/markdown.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
+- features/mount_rack.feature
 - features/page_alias_and_layouts.feature
 - features/partials.feature
+- features/preview_changes.feature
 - features/relative_assets.feature
 - features/scss-support.feature
 - features/slim.feature
@@ -374,6 +534,9 @@ files:
 - features/step_definitions/asset_host_steps.rb
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
+- features/wildcard_page_helper.feature
+- fixtures/build-with-errors-app/config.rb
+- fixtures/build-with-errors-app/source/index.html.erb
 - fixtures/chained-app/config.rb
 - fixtures/chained-app/data/article.yml
 - fixtures/chained-app/source/index.html.markdown.erb
@@ -389,6 +552,8 @@ files:
 - fixtures/clean-app/source/should_be_ignored2.html
 - fixtures/clean-app/source/should_be_ignored3.html
 - fixtures/clean-app/source/static.html
+- fixtures/clean-dir-app/config.rb
+- fixtures/clean-dir-app/source/about.html
 - fixtures/custom-layout-app/config.rb
 - fixtures/custom-layout-app/source/index.html.erb
 - fixtures/custom-layout-app/source/layout.haml
@@ -399,9 +564,17 @@ files:
 - fixtures/different-engine-layout/config.rb
 - fixtures/different-engine-layout/source/index.html.haml
 - fixtures/different-engine-layout/source/layout.erb
+- fixtures/different-engine-partial/config.rb
+- fixtures/different-engine-partial/source/index.html.erb
+- fixtures/different-engine-partial/source/layouts/layout.erb
+- fixtures/different-engine-partial/source/shared/_footer.slim
+- fixtures/different-engine-partial/source/shared/_header.erb
 - fixtures/engine-matching-layout/config.rb
 - fixtures/engine-matching-layout/source/index.html.erb
 - fixtures/engine-matching-layout/source/layout.erb
+- fixtures/external-helpers/config.rb
+- fixtures/external-helpers/lib/hello_helper.rb
+- fixtures/external-helpers/source/index.html.erb
 - fixtures/fonts-app/config.rb
 - fixtures/fonts-app/source/fonts/StMarie-Thin.otf
 - fixtures/fonts-app/source/stylesheets/fonts.css.sass
@@ -417,6 +590,11 @@ files:
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
+- fixtures/instance-vars-app/config.rb
+- fixtures/instance-vars-app/source/_vartial.erb
+- fixtures/instance-vars-app/source/instance-var-set.html.erb
+- fixtures/instance-vars-app/source/layout.erb
+- fixtures/instance-vars-app/source/no-instance-var.html.erb
 - fixtures/manual-layout-missing/config.rb
 - fixtures/manual-layout-missing/source/index.html.erb
 - fixtures/manual-layout-override/config.rb
@@ -426,6 +604,16 @@ files:
 - fixtures/manual-layout/config.rb
 - fixtures/manual-layout/source/index.html.erb
 - fixtures/manual-layout/source/layouts/custom.erb
+- fixtures/markdown-app/config.rb
+- fixtures/markdown-app/source/autolink.html.markdown
+- fixtures/markdown-app/source/fenced_code_blocks.html.markdown
+- fixtures/markdown-app/source/index.html.markdown
+- fixtures/markdown-app/source/no_intra_emphasis.html.markdown
+- fixtures/markdown-app/source/smarty_pants.html.markdown
+- fixtures/markdown-app/source/space_after_headers.html.markdown
+- fixtures/markdown-app/source/strikethrough.html.markdown
+- fixtures/markdown-app/source/superscript.html.markdown
+- fixtures/markdown-app/source/tables.html.markdown
 - fixtures/multiple-layouts/config.rb
 - fixtures/multiple-layouts/source/index.html.erb
 - fixtures/multiple-layouts/source/layout.erb
@@ -443,9 +631,22 @@ files:
 - fixtures/partials-app/source/shared/_header.erb
 - fixtures/partials-app/source/sub/_local.erb
 - fixtures/partials-app/source/sub/index.html.erb
+- fixtures/passthrough-app/config.rb
+- fixtures/passthrough-app/source/.htaccess
+- fixtures/passthrough-app/source/inline-coffeescript.html.haml
+- fixtures/passthrough-app/source/inline-css.html.haml
+- fixtures/passthrough-app/source/inline-js.html.haml
+- fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee
+- fixtures/passthrough-app/source/javascripts/js_test.js
+- fixtures/passthrough-app/source/stylesheets/site.css.sass
+- fixtures/preview-app/config.rb
+- fixtures/preview-app/source/content.html.erb
+- fixtures/preview-app/source/layout.erb
 - fixtures/relative-app/config.rb
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
+- fixtures/sinatra-app/config.rb
+- fixtures/sinatra-app/source/index.html.erb
 - fixtures/sprockets-app/config.rb
 - fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
 - fixtures/sprockets-app/source/library/css/plain.css
@@ -483,6 +684,8 @@ files:
 - fixtures/test-app/source/data2.html.liquid
 - fixtures/test-app/source/data3.html.erb
 - fixtures/test-app/source/former_padrino_test.html.haml
+- fixtures/test-app/source/front-matter-2.php.erb
+- fixtures/test-app/source/front-matter-change.html.erb
 - 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
@@ -490,7 +693,7 @@ files:
 - 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/index.html.slim
 - fixtures/test-app/source/inline-coffeescript.html.haml
 - fixtures/test-app/source/inline-css.html.haml
 - fixtures/test-app/source/inline-js.html.haml
@@ -502,6 +705,7 @@ files:
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
 - fixtures/test-app/source/javascripts/jquery_base.js
+- fixtures/test-app/source/javascripts/js_test.js
 - fixtures/test-app/source/javascripts/multiple_engines.js.coffee.erb
 - fixtures/test-app/source/javascripts/sprockets_base.js
 - fixtures/test-app/source/javascripts/sprockets_sub.js
@@ -509,12 +713,13 @@ files:
 - 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
+- fixtures/test-app/source/lorem.html.erb
 - fixtures/test-app/source/needs_index.html
 - fixtures/test-app/source/page-classes.html.haml
 - fixtures/test-app/source/real.html
 - fixtures/test-app/source/real/index.html.erb
 - fixtures/test-app/source/relative_image.html.erb
+- fixtures/test-app/source/request-path.html.erb
 - fixtures/test-app/source/services/index.html.haml
 - fixtures/test-app/source/should_be_ignored.html
 - fixtures/test-app/source/should_be_ignored2.html
@@ -538,6 +743,18 @@ 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
+- fixtures/wildcard-app/config.rb
+- fixtures/wildcard-app/source/admin/index.html.erb
+- fixtures/wildcard-app/source/admin/page.html.erb
+- fixtures/wildcard-app/source/index.html.erb
+- fixtures/wildcard-app/source/layouts/admin.erb
+- fixtures/wildcard-app/source/layouts/layout.erb
+- fixtures/wildcard-directory-index-app/config.rb
+- fixtures/wildcard-directory-index-app/source/admin/index.html.erb
+- fixtures/wildcard-directory-index-app/source/admin/page.html.erb
+- fixtures/wildcard-directory-index-app/source/index.html.erb
+- fixtures/wildcard-directory-index-app/source/layouts/admin.erb
+- fixtures/wildcard-directory-index-app/source/layouts/layout.erb
 - lib/middleman.rb
 - lib/middleman/base.rb
 - lib/middleman/builder.rb
@@ -553,6 +770,7 @@ files:
 - lib/middleman/core_extensions/front_matter.rb
 - lib/middleman/core_extensions/rendering.rb
 - lib/middleman/core_extensions/routing.rb
+- lib/middleman/core_extensions/show_exceptions.rb
 - lib/middleman/core_extensions/sitemap.rb
 - lib/middleman/core_extensions/sprockets.rb
 - lib/middleman/extensions/asset_host.rb
@@ -578,6 +796,7 @@ files:
 - lib/middleman/step_definitions.rb
 - lib/middleman/step_definitions/builder_steps.rb
 - lib/middleman/step_definitions/generator_steps.rb
+- lib/middleman/step_definitions/middleman_steps.rb
 - lib/middleman/step_definitions/server_steps.rb
 - lib/middleman/templates.rb
 - lib/middleman/templates/default.rb
@@ -872,35 +1091,43 @@ 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -905616201432248626
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 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
@@ -910,6 +1137,7 @@ test_files:
 - features/clean_build.feature
 - features/coffee-script.feature
 - features/content_for.feature
+- features/current_page_request_path_backwards.feature
 - features/custom_layout_engines.feature
 - features/data.feature
 - features/directory_index.feature
@@ -920,13 +1148,18 @@ test_files:
 - features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
+- features/helpers_external.feature
+- features/helpers_lorem.feature
 - features/helpers_page_classes.feature
+- features/instance_vars.feature
 - features/liquid.feature
 - features/markdown.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
+- features/mount_rack.feature
 - features/page_alias_and_layouts.feature
 - features/partials.feature
+- features/preview_changes.feature
 - features/relative_assets.feature
 - features/scss-support.feature
 - features/slim.feature
@@ -935,6 +1168,9 @@ test_files:
 - features/step_definitions/asset_host_steps.rb
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
+- features/wildcard_page_helper.feature
+- fixtures/build-with-errors-app/config.rb
+- fixtures/build-with-errors-app/source/index.html.erb
 - fixtures/chained-app/config.rb
 - fixtures/chained-app/data/article.yml
 - fixtures/chained-app/source/index.html.markdown.erb
@@ -950,6 +1186,8 @@ test_files:
 - fixtures/clean-app/source/should_be_ignored2.html
 - fixtures/clean-app/source/should_be_ignored3.html
 - fixtures/clean-app/source/static.html
+- fixtures/clean-dir-app/config.rb
+- fixtures/clean-dir-app/source/about.html
 - fixtures/custom-layout-app/config.rb
 - fixtures/custom-layout-app/source/index.html.erb
 - fixtures/custom-layout-app/source/layout.haml
@@ -960,9 +1198,17 @@ test_files:
 - fixtures/different-engine-layout/config.rb
 - fixtures/different-engine-layout/source/index.html.haml
 - fixtures/different-engine-layout/source/layout.erb
+- fixtures/different-engine-partial/config.rb
+- fixtures/different-engine-partial/source/index.html.erb
+- fixtures/different-engine-partial/source/layouts/layout.erb
+- fixtures/different-engine-partial/source/shared/_footer.slim
+- fixtures/different-engine-partial/source/shared/_header.erb
 - fixtures/engine-matching-layout/config.rb
 - fixtures/engine-matching-layout/source/index.html.erb
 - fixtures/engine-matching-layout/source/layout.erb
+- fixtures/external-helpers/config.rb
+- fixtures/external-helpers/lib/hello_helper.rb
+- fixtures/external-helpers/source/index.html.erb
 - fixtures/fonts-app/config.rb
 - fixtures/fonts-app/source/fonts/StMarie-Thin.otf
 - fixtures/fonts-app/source/stylesheets/fonts.css.sass
@@ -978,6 +1224,11 @@ test_files:
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
+- fixtures/instance-vars-app/config.rb
+- fixtures/instance-vars-app/source/_vartial.erb
+- fixtures/instance-vars-app/source/instance-var-set.html.erb
+- fixtures/instance-vars-app/source/layout.erb
+- fixtures/instance-vars-app/source/no-instance-var.html.erb
 - fixtures/manual-layout-missing/config.rb
 - fixtures/manual-layout-missing/source/index.html.erb
 - fixtures/manual-layout-override/config.rb
@@ -987,6 +1238,16 @@ test_files:
 - fixtures/manual-layout/config.rb
 - fixtures/manual-layout/source/index.html.erb
 - fixtures/manual-layout/source/layouts/custom.erb
+- fixtures/markdown-app/config.rb
+- fixtures/markdown-app/source/autolink.html.markdown
+- fixtures/markdown-app/source/fenced_code_blocks.html.markdown
+- fixtures/markdown-app/source/index.html.markdown
+- fixtures/markdown-app/source/no_intra_emphasis.html.markdown
+- fixtures/markdown-app/source/smarty_pants.html.markdown
+- fixtures/markdown-app/source/space_after_headers.html.markdown
+- fixtures/markdown-app/source/strikethrough.html.markdown
+- fixtures/markdown-app/source/superscript.html.markdown
+- fixtures/markdown-app/source/tables.html.markdown
 - fixtures/multiple-layouts/config.rb
 - fixtures/multiple-layouts/source/index.html.erb
 - fixtures/multiple-layouts/source/layout.erb
@@ -1004,9 +1265,22 @@ test_files:
 - fixtures/partials-app/source/shared/_header.erb
 - fixtures/partials-app/source/sub/_local.erb
 - fixtures/partials-app/source/sub/index.html.erb
+- fixtures/passthrough-app/config.rb
+- fixtures/passthrough-app/source/.htaccess
+- fixtures/passthrough-app/source/inline-coffeescript.html.haml
+- fixtures/passthrough-app/source/inline-css.html.haml
+- fixtures/passthrough-app/source/inline-js.html.haml
+- fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee
+- fixtures/passthrough-app/source/javascripts/js_test.js
+- fixtures/passthrough-app/source/stylesheets/site.css.sass
+- fixtures/preview-app/config.rb
+- fixtures/preview-app/source/content.html.erb
+- fixtures/preview-app/source/layout.erb
 - fixtures/relative-app/config.rb
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
+- fixtures/sinatra-app/config.rb
+- fixtures/sinatra-app/source/index.html.erb
 - fixtures/sprockets-app/config.rb
 - fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss
 - fixtures/sprockets-app/source/library/css/plain.css
@@ -1044,6 +1318,8 @@ test_files:
 - fixtures/test-app/source/data2.html.liquid
 - fixtures/test-app/source/data3.html.erb
 - fixtures/test-app/source/former_padrino_test.html.haml
+- fixtures/test-app/source/front-matter-2.php.erb
+- fixtures/test-app/source/front-matter-change.html.erb
 - 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
@@ -1051,7 +1327,7 @@ test_files:
 - 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/index.html.slim
 - fixtures/test-app/source/inline-coffeescript.html.haml
 - fixtures/test-app/source/inline-css.html.haml
 - fixtures/test-app/source/inline-js.html.haml
@@ -1063,6 +1339,7 @@ test_files:
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
 - fixtures/test-app/source/javascripts/jquery_base.js
+- fixtures/test-app/source/javascripts/js_test.js
 - fixtures/test-app/source/javascripts/multiple_engines.js.coffee.erb
 - fixtures/test-app/source/javascripts/sprockets_base.js
 - fixtures/test-app/source/javascripts/sprockets_sub.js
@@ -1070,12 +1347,13 @@ test_files:
 - 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
+- fixtures/test-app/source/lorem.html.erb
 - fixtures/test-app/source/needs_index.html
 - fixtures/test-app/source/page-classes.html.haml
 - fixtures/test-app/source/real.html
 - fixtures/test-app/source/real/index.html.erb
 - fixtures/test-app/source/relative_image.html.erb
+- fixtures/test-app/source/request-path.html.erb
 - fixtures/test-app/source/services/index.html.haml
 - fixtures/test-app/source/should_be_ignored.html
 - fixtures/test-app/source/should_be_ignored2.html
@@ -1099,4 +1377,15 @@ 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: 
+- fixtures/wildcard-app/config.rb
+- fixtures/wildcard-app/source/admin/index.html.erb
+- fixtures/wildcard-app/source/admin/page.html.erb
+- fixtures/wildcard-app/source/index.html.erb
+- fixtures/wildcard-app/source/layouts/admin.erb
+- fixtures/wildcard-app/source/layouts/layout.erb
+- fixtures/wildcard-directory-index-app/config.rb
+- fixtures/wildcard-directory-index-app/source/admin/index.html.erb
+- fixtures/wildcard-directory-index-app/source/admin/page.html.erb
+- fixtures/wildcard-directory-index-app/source/index.html.erb
+- fixtures/wildcard-directory-index-app/source/layouts/admin.erb
+- fixtures/wildcard-directory-index-app/source/layouts/layout.erb