From 7efa5e9dd9bae62ac5f0e2a96af9fc07f2dd844d Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 20 Jan 2016 15:57:20 -0800
Subject: [PATCH 001/122] Another domain checker

---
 middleman-core/lib/middleman-core/util.rb | 3 ++-
 middleman-core/middleman-core.gemspec     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index db1238b2..b5a5174c 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -18,6 +18,7 @@ require 'middleman-core/sitemap/resource'
 require 'hashie'
 
 # For URI templating
+require 'public_suffix'
 require 'addressable/uri'
 require 'addressable/template'
 require 'active_support/inflector'
@@ -357,7 +358,7 @@ module Middleman
         begin
           uri = ::Addressable::URI.parse(asset_path)
 
-          if uri.relative? && uri.host.nil? && !asset_path.match(/^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
+          if uri.relative? && uri.host.nil? && !::PublicSuffix.valid?(asset_path) && (result = yield(asset_path))
             "#{opening_character}#{result}"
           else
             match
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 894bf470..2e34e6fd 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('tilt', ['~> 1.4.1'])
   s.add_dependency('erubis')
   s.add_dependency('fast_blank')
+  s.add_dependency('public_suffix')
 
   # Helpers
   s.add_dependency('activesupport', ['~> 4.2'])

From 68127003b90003993ada0e49106c844e6f2594c8 Mon Sep 17 00:00:00 2001
From: Jim Dalton <jim.dalton@gmail.com>
Date: Wed, 20 Jan 2016 21:11:03 -0800
Subject: [PATCH 002/122] Add option for MM_DATA_DIR env var to define
 :data_dir default value

---
 middleman-core/lib/middleman-core/core_extensions/data.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
index 22fdd4a2..5f2a789f 100644
--- a/middleman-core/lib/middleman-core/core_extensions/data.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/data.rb
@@ -8,7 +8,7 @@ module Middleman
     class Data < Extension
       attr_reader :data_store
 
-      define_setting :data_dir, 'data', 'The directory data files are stored in'
+      define_setting :data_dir, ENV['MM_DATA_DIR'] || 'data', 'The directory data files are stored in'
 
       # Make the internal `data_store` method available as `app.data`
       expose_to_application data: :data_store

From 92d96f6604249a662b5cd685bb8c48c567bf6790 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 21 Jan 2016 10:19:52 -0800
Subject: [PATCH 003/122] typo

---
 middleman-core/lib/middleman-core/sources/source_watcher.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index 328afb9e..0c7356c2 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -281,7 +281,7 @@ module Middleman
     def path_to_source_file(path, directory, type, destination_dir)
       types = Set.new([type])
       types << :no_frontmatter unless @frontmatter
-      types << :@binary if @binary
+      types << :binary if @binary
 
       relative_path = path.relative_path_from(directory)
       relative_path = File.join(destination_dir, relative_path) if destination_dir

From 4e8273295bc4fb9d5f22958ce270c75c0167578c Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 21 Jan 2016 10:50:44 -0800
Subject: [PATCH 004/122] tweak some checksums, something slightly changed file
 output upstream

---
 .rubocop.yml                                  |  2 +
 middleman-core/features/asset_hash.feature    | 62 +++++++++----------
 .../lib/middleman-core/renderers/sass.rb      |  5 ++
 middleman-core/lib/middleman-core/util.rb     |  6 +-
 4 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 63819945..0145ceef 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -67,3 +67,5 @@ Style/BlockDelimiters:
   Enabled: false
 Style/MultilineBlockChain:
   Enabled: false
+Style/SpecialGlobalVars:
+  Enabled: false
diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature
index 7d23ae6b..3098e73c 100644
--- a/middleman-core/features/asset_hash.feature
+++ b/middleman-core/features/asset_hash.feature
@@ -63,8 +63,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Given the Server is running at "asset-hash-app"
     When I go to "/"
     Then I should see 'href="apple-touch-icon.png"'
-    And I should see 'href="stylesheets/site-d2959d87.css"'
-    And I should see 'href="stylesheets/fragment-a06f0dfc.css"'
+    And I should see 'href="stylesheets/site-d1a750ca.css"'
+    And I should see 'href="stylesheets/fragment-99b76247.css"'
     And I should see 'src="javascripts/application-1d8d5276.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
@@ -72,11 +72,11 @@ Feature: Assets get file hashes appended to them and references to them are upda
     And I should see 'src="images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-d2959d87.css"'
+    Then I should see 'href="../stylesheets/site-d1a750ca.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="../stylesheets/site-d2959d87.css"'
+    Then I should see 'href="../stylesheets/site-d1a750ca.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     And I should see 'src="../images/100px-5fd6fb90.jpg?test"'
@@ -84,8 +84,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
     And I should see 'src="../images/100px-5fd6fb90.jpg#test"'
     When I go to "/javascripts/application-1d8d5276.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-d2959d87.css"
-    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
+    When I go to "/stylesheets/site-d1a750ca.css"
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg");'
     When I go to "/api.json"
     Then I should see 'images/100px-5fd6fb90.gif'
     And I should see 'images/100px-5fd6fb90.jpg'
@@ -94,11 +94,11 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Then I should see 'images/100px-5fd6fb90.gif'
     And I should see 'images/100px-5fd6fb90.jpg'
     And I should see 'images/100px-1242c368.png'
-    When I go to "/stylesheets/fragment-a06f0dfc.css"
-    And I should see 'url("../images/100px-5fd6fb90.jpg")'
-    And I should see 'url("../images/100px-5fd6fb90.jpg?test")'
-    And I should see 'url("../images/100px-5fd6fb90.jpg?#test")'
-    And I should see 'url("../images/100px-5fd6fb90.jpg#test")'
+    When I go to "/stylesheets/fragment-99b76247.css"
+    And I should see 'url("../images/100px-5fd6fb90.jpg");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg?test");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg?#test");'
+    And I should see 'url("../images/100px-5fd6fb90.jpg#test");'
 
   Scenario: Hashed assets work with Slim
     Given the Server is running at "asset-hash-app"
@@ -117,26 +117,26 @@ Feature: Assets get file hashes appended to them and references to them are upda
       """
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-a772891f.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7000b132.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-a772891f.css"
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test")'
+    When I go to "/stylesheets/fragment-7000b132.css"
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test");'
+    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test");'
 
   Scenario: Enabling an asset host still produces hashed files and references (host first)
     Given a fixture app "asset-hash-host-app"
@@ -148,22 +148,22 @@ Feature: Assets get file hashes appended to them and references to them are upda
       """
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-a772891f.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7000b132.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-4b64a653.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-a772891f.css"
+    When I go to "/stylesheets/fragment-7000b132.css"
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
@@ -177,14 +177,14 @@ Feature: Assets get file hashes appended to them and references to them are upda
         font-size: 14px
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-44fb2764.css'
+    Then I should see 'href="../stylesheets/uses_partials-4d4e34e6.css'
     And the file "source/stylesheets/_partial.sass" has the contents
       """
       body
         font-size: 18px !important
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-10d8ae33.css'
+    Then I should see 'href="../stylesheets/uses_partials-ec347271.css'
 
   Scenario: The asset hash should change when a Rack-based filter changes
     Given a fixture app "asset-hash-app"
@@ -198,12 +198,10 @@ Feature: Assets get file hashes appended to them and references to them are upda
       """
     Given the Server is running at "asset-hash-app"
     When I go to "/"
-    Then I should see 'href="stylesheets/site-30784643.css'
-    When I go to "stylesheets/site-30784643.css"
-    Then I should see 'background-image'
+    Then I should see 'href="stylesheets/site-5ad7def0.css'
+    When I go to "stylesheets/site-5ad7def0.css"
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
     Then I should see 'Added by Rack filter'
-    When I go to "stylesheets/site-7474cadd.css"
-    Then I should see 'Not Found'
 
   Scenario: Hashed-asset files are not produced for ignored paths
     Given a fixture app "asset-hash-app"
diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb
index b17acaf8..abd44502 100644
--- a/middleman-core/lib/middleman-core/renderers/sass.rb
+++ b/middleman-core/lib/middleman-core/renderers/sass.rb
@@ -1,5 +1,10 @@
 require 'sass'
 
+begin
+  require 'sassc'
+rescue LoadError
+end
+
 module Middleman
   module Renderers
     # Sass renderer
diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index db1238b2..ae15e3ec 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -35,11 +35,11 @@ module Middleman
     # @return [Boolean]
     Contract Or[String, Pathname] => Bool
     def binary?(filename)
-      @@binary_cache ||= {}
+      @binary_cache ||= {}
 
-      return @@binary_cache[filename] if @@binary_cache.key?(filename)
+      return @binary_cache[filename] if @binary_cache.key?(filename)
 
-      @@binary_cache[filename] = begin
+      @binary_cache[filename] = begin
         path = Pathname(filename)
         ext = path.extname
 

From e0818e2118d286270c1244470526d12c3235499f Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 21 Jan 2016 14:47:45 -0800
Subject: [PATCH 005/122] remove debug code

---
 .../lib/middleman-core/core_extensions/front_matter.rb       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
index a59f7bb1..49f4195f 100644
--- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
@@ -75,11 +75,6 @@ module Middleman::CoreExtensions
 
       return @cache[file[:full_path]] if @cache.key?(file[:full_path])
 
-      if file[:types].include?(:no_frontmatter)
-        $stderr.puts file[:relative_path].to_s
-        require 'pry'
-      end
-
       @cache[file[:full_path]] = ::Middleman::Util::Data.parse(
         file,
         app.config[:frontmatter_delims]

From b8c0fd34e70d9fab4fb4844798d403c8be614eb7 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 22 Jan 2016 14:25:02 -0800
Subject: [PATCH 006/122] additional perf work

---
 middleman-cli/lib/middleman-cli/build.rb      |  4 +-
 middleman-core/lib/middleman-core/builder.rb  | 87 ++++++++++++-------
 .../middleman-core/core_extensions/data.rb    | 11 ++-
 .../lib/middleman-core/file_renderer.rb       |  7 +-
 middleman-core/lib/middleman-core/logger.rb   |  1 +
 .../lib/middleman-core/sitemap/resource.rb    |  7 +-
 .../middleman-core/sources/source_watcher.rb  | 12 +--
 .../lib/middleman-core/template_renderer.rb   | 17 +++-
 middleman-core/lib/middleman-core/util.rb     |  6 +-
 9 files changed, 99 insertions(+), 53 deletions(-)

diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index e3d098e7..df68c9e4 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -52,7 +52,7 @@ module Middleman::Cli
 
       ::Middleman::Logger.singleton(verbose, instrument)
 
-      ::Middleman::Util.instrument 'builder_setup' do
+      ::Middleman::Util.instrument 'builder.setup' do
         @app = ::Middleman::Application.new do
           config[:mode] = :build
           config[:environment] = env
@@ -67,7 +67,7 @@ module Middleman::Cli
         builder.on_build_event(&method(:on_event))
       end
 
-      ::Middleman::Util.instrument 'builder_run' do
+      ::Middleman::Util.instrument 'builder.run' do
         if builder.run!
           clean_directories! if options['clean']
           shell.say 'Project built successfully.'
diff --git a/middleman-core/lib/middleman-core/builder.rb b/middleman-core/lib/middleman-core/builder.rb
index ef289d42..4562dc6c 100644
--- a/middleman-core/lib/middleman-core/builder.rb
+++ b/middleman-core/lib/middleman-core/builder.rb
@@ -51,18 +51,31 @@ module Middleman
       @has_error = false
       @events = {}
 
-      @app.execute_callbacks(:before_build, [self])
+      ::Middleman::Util.instrument 'builder.before' do
+        @app.execute_callbacks(:before_build, [self])
+      end
 
-      queue_current_paths if @cleaning
+      ::Middleman::Util.instrument 'builder.queue' do
+        queue_current_paths if @cleaning
+      end
 
-      prerender_css
-      output_files
+      ::Middleman::Util.instrument 'builder.prerender' do
+        prerender_css
+      end
 
-      clean! if @cleaning
+      ::Middleman::Util.instrument 'builder.output' do
+        output_files
+      end
+
+      ::Middleman::Util.instrument 'builder.clean' do
+        clean! if @cleaning
+      end
 
       ::Middleman::Profiling.report('build')
 
-      @app.execute_callbacks(:after_build, [self])
+      ::Middleman::Util.instrument 'builder.after' do
+        @app.execute_callbacks(:after_build, [self])
+      end
 
       !@has_error
     end
@@ -73,14 +86,18 @@ module Middleman
     def prerender_css
       logger.debug '== Prerendering CSS'
 
-      css_files = @app.sitemap.resources
-                      .select { |resource| resource.ext == '.css' }
-                      .each(&method(:output_resource))
+      css_files = ::Middleman::Util.instrument 'builder.prerender.output' do
+        @app.sitemap.resources
+                        .select { |resource| resource.ext == '.css' }
+                        .each(&method(:output_resource))
+      end
 
-      # Double-check for compass sprites
-      if @app.files.find_new_files!.length > 0
-        logger.debug '== Checking for Compass sprites'
-        @app.sitemap.ensure_resource_list_updated!
+      ::Middleman::Util.instrument 'builder.prerender.check-files' do
+        # Double-check for compass sprites
+        if @app.files.find_new_files!.length > 0
+          logger.debug '== Checking for Compass sprites'
+          @app.sitemap.ensure_resource_list_updated!
+        end
       end
 
       css_files
@@ -92,11 +109,15 @@ module Middleman
     def output_files
       logger.debug '== Building files'
 
-      @app.sitemap.resources
-          .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
+      resources = @app.sitemap.resources
           .reject { |resource| resource.ext == '.css' }
-          .select { |resource| !@glob || File.fnmatch(@glob, resource.destination_path) }
-          .each(&method(:output_resource))
+          .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
+
+      if @glob
+        resources = resources.select { |resource| File.fnmatch(@glob, resource.destination_path) }
+      end
+
+      resources.each(&method(:output_resource))
     end
 
     # Figure out the correct event mode.
@@ -162,25 +183,29 @@ module Middleman
     # @return [void]
     Contract IsA['Middleman::Sitemap::Resource'] => Any
     def output_resource(resource)
-      output_file = @build_dir + resource.destination_path.gsub('%20', ' ')
+      output_file = nil
 
-      begin
-        if resource.binary?
-          export_file!(output_file, resource.file_descriptor[:full_path])
-        else
-          response = @rack.get(::URI.escape(resource.request_path))
+      ::Middleman::Util.instrument "builder.output.resource", path: File.basename(resource.destination_path) do
+        output_file = @build_dir + resource.destination_path.gsub('%20', ' ')
 
-          # If we get a response, save it to a tempfile.
-          if response.status == 200
-            export_file!(output_file, binary_encode(response.body))
+        begin
+          if resource.binary?
+            export_file!(output_file, resource.file_descriptor[:full_path])
           else
-            @has_error = true
-            trigger(:error, output_file, response.body)
+            response = @rack.get(::URI.escape(resource.request_path))
+
+            # If we get a response, save it to a tempfile.
+            if response.status == 200
+              export_file!(output_file, binary_encode(response.body))
+            else
+              @has_error = true
+              trigger(:error, output_file, response.body)
+            end
           end
+        rescue => e
+          @has_error = true
+          trigger(:error, output_file, "#{e}\n#{e.backtrace.join("\n")}")
         end
-      rescue => e
-        @has_error = true
-        trigger(:error, output_file, "#{e}\n#{e.backtrace.join("\n")}")
       end
 
       return unless @cleaning
diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
index 5f2a789f..cce997c6 100644
--- a/middleman-core/lib/middleman-core/core_extensions/data.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/data.rb
@@ -57,6 +57,7 @@ module Middleman
           @app = app
           @data_file_matcher = data_file_matcher
           @local_data = {}
+          @local_data_enhanced = nil
           @local_sources = {}
           @callback_sources = {}
         end
@@ -117,6 +118,8 @@ module Middleman
           end
 
           data_branch[basename] = data
+
+          @local_data_enhanced = nil
         end
 
         # Remove a given file from the internal cache
@@ -137,6 +140,8 @@ module Middleman
           end
 
           data_branch.delete(basename) if data_branch.key?(basename)
+
+          @local_data_enhanced = nil
         end
 
         # Get a hash from either internal static data or a callback
@@ -151,8 +156,7 @@ module Middleman
             callbacks[path.to_s].call
           end
 
-          response = ::Middleman::Util.recursively_enhance(response)
-          response
+          ::Middleman::Util.recursively_enhance(response)
         end
 
         # "Magically" find namespaces of data if they exist
@@ -162,7 +166,8 @@ module Middleman
         def method_missing(path)
           if @local_data.key?(path.to_s)
             # Any way to cache this?
-            return ::Middleman::Util.recursively_enhance(@local_data[path.to_s])
+            @local_data_enhanced ||= ::Middleman::Util.recursively_enhance(@local_data)
+            return @local_data_enhanced[path.to_s]
           else
             result = data_for_path(path)
             return result if result
diff --git a/middleman-core/lib/middleman-core/file_renderer.rb b/middleman-core/lib/middleman-core/file_renderer.rb
index 67f9411f..64519be0 100644
--- a/middleman-core/lib/middleman-core/file_renderer.rb
+++ b/middleman-core/lib/middleman-core/file_renderer.rb
@@ -73,9 +73,10 @@ module Middleman
       # end
 
       # Render using Tilt
-      content = ::Middleman::Util.instrument 'render.tilt', path: path do
-        template.render(context, locs, &block)
-      end
+      # content = ::Middleman::Util.instrument 'render.tilt', path: path do
+      #   template.render(context, locs, &block)
+      # end
+      content = template.render(context, locs, &block)
 
       # Allow hooks to manipulate the result after render
       content = @app.callbacks_for(:after_render).reduce(content) do |sum, callback|
diff --git a/middleman-core/lib/middleman-core/logger.rb b/middleman-core/lib/middleman-core/logger.rb
index d1a1c402..30e28307 100644
--- a/middleman-core/lib/middleman-core/logger.rb
+++ b/middleman-core/lib/middleman-core/logger.rb
@@ -40,6 +40,7 @@ module Middleman
       return if @instrumenting.is_a?(String) && @instrumenting != 'instrument' && !message.include?(@instrumenting)
 
       evt = ::ActiveSupport::Notifications::Event.new(message, *args)
+      return unless evt.duration > 30
       info "== Instrument (#{evt.name.sub(/.middleman$/, '')}): #{evt.duration}ms\n#{args.last}"
     end
   end
diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index b1f614e4..5d7b9969 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -66,6 +66,8 @@ module Middleman
         # Page are data that is exposed through this resource's data member.
         # Note: It is named 'page' for backwards compatibility with older MM.
         @metadata = { options: {}, locals: {}, page: {} }
+
+        @page_data = nil
       end
 
       # Whether this resource has a template file
@@ -91,6 +93,7 @@ module Middleman
       #   Note: It is named 'page' for backwards compatibility with older MM.
       Contract METADATA_HASH => METADATA_HASH
       def add_metadata(meta={})
+        @page_data = nil
         @metadata.deep_merge!(meta)
       end
 
@@ -98,7 +101,7 @@ module Middleman
       # @return [Hash]
       Contract RespondTo[:indifferent_access?]
       def data
-        ::Middleman::Util.recursively_enhance(metadata[:page])
+        @page_data ||= ::Middleman::Util.recursively_enhance(metadata[:page])
       end
 
       # Options about how this resource is rendered, such as its :layout,
@@ -129,7 +132,6 @@ module Middleman
       def render(opts={}, locs={})
         return ::Middleman::FileRenderer.new(@app, file_descriptor[:full_path].to_s).template_data_for_file unless template?
 
-        # ::Middleman::Util.instrument 'render.resource', path: file_descriptor[:full_path].to_s, destination_path: destination_path do
         md   = metadata
         opts = md[:options].deep_merge(opts)
         locs = md[:locals].deep_merge(locs)
@@ -140,7 +142,6 @@ module Middleman
 
         renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s)
         renderer.render(locs, opts)
-        # end
       end
 
       # A path without the directory index - so foo/index.html becomes
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index 0c7356c2..e6ad077c 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -185,9 +185,7 @@ module Middleman
       new_files = ::Middleman::Util.all_files_under(@directory.to_s)
                                    .reject { |p| @files.key?(p) }
 
-      update(new_files, [])
-
-      new_files
+      update(new_files, []).flatten.map { |s| s[:full_path] }
     end
 
     # Manually trigger update events.
@@ -198,14 +196,14 @@ module Middleman
       updated = ::Middleman::Util.all_files_under(@directory.to_s)
       removed = @files.keys.reject { |p| updated.include?(p) }
 
-      update(updated, removed)
+      result = update(updated, removed)
 
       if @waiting_for_existence && @directory.exist?
         @waiting_for_existence = false
         listen!
       end
 
-      updated + removed
+      result.flatten.map { |s| s[:full_path] }
     end
 
     # Work around this bug: http://bugs.ruby-lang.org/issues/4521
@@ -238,7 +236,7 @@ module Middleman
     #
     # @param [String, Pathname] path The updated file path.
     # @return [void]
-    Contract ArrayOf[Pathname], ArrayOf[Pathname] => Any
+    Contract ArrayOf[Pathname], ArrayOf[Pathname] => ArrayOf[ArrayOf[IsA['Middleman::SourceFile']]]
     def update(updated_paths, removed_paths)
       valid_updates = updated_paths
                       .map { |p| @files[p] || path_to_source_file(p, @directory, @type, @options[:destination_dir]) }
@@ -271,6 +269,8 @@ module Middleman
                           valid_removes,
                           self
                         ]) unless valid_updates.empty? && valid_removes.empty?
+
+      [valid_updates, valid_removes]
     end
 
     # Convert a path to a file resprentation.
diff --git a/middleman-core/lib/middleman-core/template_renderer.rb b/middleman-core/lib/middleman-core/template_renderer.rb
index 4af4ce14..1930d434 100644
--- a/middleman-core/lib/middleman-core/template_renderer.rb
+++ b/middleman-core/lib/middleman-core/template_renderer.rb
@@ -133,12 +133,21 @@ module Middleman
       # Add extension helpers to context.
       @app.extensions.add_exposed_to_context(context)
 
-      content = _render_with_all_renderers(path, locs, context, opts, &block)
+      content = ::Middleman::Util.instrument 'builder.output.resource.render-template', path: File.basename(path) do
+        _render_with_all_renderers(path, locs, context, opts, &block)
+      end
 
       # If we need a layout and have a layout, use it
-      if layout_file = fetch_layout(engine, options)
-        layout_renderer = ::Middleman::FileRenderer.new(@app, layout_file[:relative_path].to_s)
-        content = layout_renderer.render(locals, options, context) { content }
+      layout_file = fetch_layout(engine, options)
+      if layout_file
+        content = ::Middleman::Util.instrument 'builder.output.resource.render-layout', path: File.basename(layout_file[:relative_path].to_s) do
+          if layout_file = fetch_layout(engine, options)
+            layout_renderer = ::Middleman::FileRenderer.new(@app, layout_file[:relative_path].to_s)
+            layout_renderer.render(locals, options, context) { content }
+          else
+            content
+          end
+        end
       end
 
       # Return result
diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index ae15e3ec..a2cd1eef 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -98,7 +98,7 @@ module Middleman
     # @private
     # @param [Hash] data Normal hash
     # @return [Hash]
-    Contract Maybe[Hash] => Maybe[Or[Array, EnhancedHash]]
+    Contract Any => Maybe[Or[Array, EnhancedHash]]
     def recursively_enhance(obj)
       if obj.is_a? ::Array
         obj.map { |e| recursively_enhance(e) }
@@ -480,6 +480,8 @@ module Middleman
     # @return [String]
     Contract String => ArrayOf[String]
     def collect_extensions(path)
+      return [] if File.basename(path).start_with?('.')
+
       result = []
 
       step_through_extensions(path) { |e| result << e }
@@ -495,6 +497,8 @@ module Middleman
     # @return [Middleman::SourceFile] All related file paths, not including the source file paths.
     Contract ::Middleman::Application, ArrayOf[Pathname] => ArrayOf[::Middleman::SourceFile]
     def find_related_files(app, files)
+      return [] if files.empty?
+
       all_extensions = files.flat_map { |f| collect_extensions(f.to_s) }
 
       sass_type_aliasing = ['.scss', '.sass']

From c7a46181664bf47e5dd149932d2f0302e212030a Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 22 Jan 2016 15:57:07 -0800
Subject: [PATCH 007/122] Perf work and Parallel builds

---
 CHANGELOG.md                                  |  1 +
 middleman-cli/bin/middleman                   |  2 +-
 middleman-cli/lib/middleman-cli/build.rb      |  4 +++
 .../lib/middleman-core/application.rb         |  4 +--
 middleman-core/lib/middleman-core/builder.rb  | 32 ++++++++++++++-----
 .../middleman-core/core_extensions/data.rb    |  4 +--
 .../core_extensions/default_helpers.rb        | 12 +++----
 .../middleman-core/core_extensions/i18n.rb    |  2 +-
 .../core_extensions/inline_url_rewriter.rb    |  4 +--
 .../lib/middleman-core/extension.rb           |  2 +-
 .../lib/middleman-core/extensions.rb          |  2 +-
 .../extensions/automatic_image_sizes.rb       |  2 +-
 .../middleman-core/extensions/minify_css.rb   |  2 +-
 .../lib/middleman-core/file_renderer.rb       |  2 +-
 .../lib/middleman-core/renderers/haml.rb      |  2 +-
 .../lib/middleman-core/renderers/less.rb      |  2 +-
 .../lib/middleman-core/renderers/sass.rb      |  4 +--
 middleman-core/lib/middleman-core/sources.rb  | 11 +++----
 .../middleman-core/sources/source_watcher.rb  |  2 +-
 middleman-core/lib/middleman-core/util.rb     |  9 +++---
 middleman-core/middleman-core.gemspec         |  1 +
 21 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e9ce31c..1ce7548e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ master
 * Fix asset_host in combination with Google Analytics snippet. #1751
 * Show an error message when git CLI is not available. #1765
 * Correctly show file names of GZIP'ed assets. #1364
+* Build file output is not parallel-ized! Use `middleman build --no-parallel` to disable.
 
 # 4.0.0
 
diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman
index 165b7bc9..43297984 100755
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -4,7 +4,7 @@ require 'middleman-core/profiling'
 if ARGV.include? '--profile'
   Middleman::Profiling.profiler = Middleman::Profiling::RubyProfProfiler.new
 end
-Middleman::Profiling.start
+# Middleman::Profiling.start
 
 require "middleman-core/load_paths"
 Middleman.setup_load_paths
diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index df68c9e4..c00acd2f 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -14,6 +14,10 @@ module Middleman::Cli
                  type: :boolean,
                  default: true,
                  desc: 'Remove orphaned files from build (--no-clean to disable)'
+    class_option :parallel,
+                 type: :boolean,
+                 default: true,
+                 desc: 'Output files in parallel (--no-parallel to disable)'
     class_option :glob,
                  type: :string,
                  aliases: '-g',
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 38c2baf4..9000db79 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -184,7 +184,7 @@ module Middleman
       end
     }, 'Callbacks that can exclude paths from the sitemap'
 
-    define_setting :skip_build_clean, proc { |p| [/\.git/].any? { |r| r.match(p) } }, 'Whether some paths should not be removed during a clean build.'
+    define_setting :skip_build_clean, proc { |p| [/\.git/].any? { |r| p =~ r } }, 'Whether some paths should not be removed during a clean build.'
 
     define_setting :watcher_disable, false, 'If the Listen watcher should not run'
     define_setting :watcher_force_polling, false, 'If the Listen watcher should run in polling mode'
@@ -314,7 +314,7 @@ module Middleman
 
     # Clean up missing Tilt exts
     def prune_tilt_templates!
-      ::Tilt.mappings.each do |key, _|
+      ::Tilt.mappings.each_key do |key|
         begin
           ::Tilt[".#{key}"]
         rescue LoadError, NameError
diff --git a/middleman-core/lib/middleman-core/builder.rb b/middleman-core/lib/middleman-core/builder.rb
index 4562dc6c..5bdedfe8 100644
--- a/middleman-core/lib/middleman-core/builder.rb
+++ b/middleman-core/lib/middleman-core/builder.rb
@@ -1,6 +1,7 @@
 require 'pathname'
 require 'fileutils'
 require 'tempfile'
+require 'parallel'
 require 'middleman-core/rack'
 require 'middleman-core/callback_manager'
 require 'middleman-core/contracts'
@@ -36,6 +37,7 @@ module Middleman
 
       @glob = opts.fetch(:glob)
       @cleaning = opts.fetch(:clean)
+      @parallel = opts.fetch(:parallel, true)
 
       rack_app = ::Middleman::Rack.new(@app).to_app
       @rack = ::Rack::MockRequest.new(rack_app)
@@ -63,16 +65,18 @@ module Middleman
         prerender_css
       end
 
+      ::Middleman::Profiling.start
+
       ::Middleman::Util.instrument 'builder.output' do
         output_files
       end
 
+      ::Middleman::Profiling.report('build')
+
       ::Middleman::Util.instrument 'builder.clean' do
         clean! if @cleaning
       end
 
-      ::Middleman::Profiling.report('build')
-
       ::Middleman::Util.instrument 'builder.after' do
         @app.execute_callbacks(:after_build, [self])
       end
@@ -87,9 +91,8 @@ module Middleman
       logger.debug '== Prerendering CSS'
 
       css_files = ::Middleman::Util.instrument 'builder.prerender.output' do
-        @app.sitemap.resources
-                        .select { |resource| resource.ext == '.css' }
-                        .each(&method(:output_resource))
+        resources = @app.sitemap.resources.select { |resource| resource.ext == '.css' }
+        output_resources(resources)
       end
 
       ::Middleman::Util.instrument 'builder.prerender.check-files' do
@@ -117,7 +120,20 @@ module Middleman
         resources = resources.select { |resource| File.fnmatch(@glob, resource.destination_path) }
       end
 
-      resources.each(&method(:output_resource))
+      output_resources(resources)
+    end
+
+    Contract ResourceList => ResourceList
+    def output_resources(resources)
+      cleaned_paths = if @parallel
+        ::Parallel.map(resources, &method(:output_resource))
+      else
+        resources.map(&method(:output_resource))
+      end
+
+      cleaned_paths.each { |p| @to_clean.delete(p) } if @cleaning
+
+      resources
     end
 
     # Figure out the correct event mode.
@@ -181,7 +197,7 @@ module Middleman
     # Try to output a resource and capture errors.
     # @param [Middleman::Sitemap::Resource] resource The resource.
     # @return [void]
-    Contract IsA['Middleman::Sitemap::Resource'] => Any
+    Contract IsA['Middleman::Sitemap::Resource'] => Maybe[Pathname]
     def output_resource(resource)
       output_file = nil
 
@@ -218,7 +234,7 @@ module Middleman
         output_file
       end
 
-      @to_clean.delete(Pathname(cleaned_name))
+      Pathname(cleaned_name)
     end
 
     # Get a list of all the paths in the destination folder and save them
diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
index cce997c6..7ff60f41 100644
--- a/middleman-core/lib/middleman-core/core_extensions/data.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/data.rb
@@ -203,11 +203,11 @@ module Middleman
         def to_h
           data = {}
 
-          store.each do |k, _|
+          store.each_key do |k|
             data[k] = data_for_path(k)
           end
 
-          callbacks.each do |k, _|
+          callbacks.each_key do |k|
             data[k] = data_for_path(k)
           end
 
diff --git a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
index 745ca71c..8a7c90f6 100644
--- a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
@@ -113,7 +113,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       path_options = {}
       path_options[:relative] = options.delete(:relative) if options.key?(:relative)
 
-      sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all, source|
+      sources.flatten.reduce(::ActiveSupport::SafeBuffer.new) do |all, source|
         all << tag(:link, {
           href: asset_path(:css, source, path_options)
         }.update(options))
@@ -127,7 +127,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       path_options = {}
       path_options[:relative] = options.delete(:relative) if options.key?(:relative)
 
-      sources.flatten.inject(::ActiveSupport::SafeBuffer.new) do |all, source|
+      sources.flatten.reduce(::ActiveSupport::SafeBuffer.new) do |all, source|
         all << content_tag(:script, nil, {
           src: asset_path(:js, source, path_options)
         }.update(options))
@@ -152,7 +152,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       # If the basename of the request as no extension, assume we are serving a
       # directory and join index_file to the path.
       path = File.join(asset_dir, current_resource.path)
-      path = path.sub(/#{Regexp.escape(File.extname(path))}$/, ".#{asset_ext}")
+      path = path[0..-(File.extname(path).length + 1)] + ".#{asset_ext}"
 
       yield path if sitemap.find_resource_by_path(path)
     end
@@ -191,7 +191,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [Hash] options Data to pass through.
     # @return [String]
     def asset_path(kind, source, options={})
-      options_with_resource = options.merge(current_resource: current_resource)
+      options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.asset_path(app, kind, source, options_with_resource)
     end
 
@@ -202,7 +202,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # @param [Hash] options Additional options.
     # @return [String] The fully qualified asset url
     def asset_url(path, prefix='', options={})
-      options_with_resource = options.merge(current_resource: current_resource)
+      options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.asset_url(app, path, prefix, options_with_resource)
     end
 
@@ -210,7 +210,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     # or a Resource, this will produce the nice URL configured for that
     # path, respecting :relative_links, directory indexes, etc.
     def url_for(path_or_resource, options={})
-      options_with_resource = options.merge(current_resource: current_resource)
+      options_with_resource = {}.merge!(options).merge!(current_resource: current_resource)
       ::Middleman::Util.url_for(app, path_or_resource, options_with_resource)
     end
 
diff --git a/middleman-core/lib/middleman-core/core_extensions/i18n.rb b/middleman-core/lib/middleman-core/core_extensions/i18n.rb
index 4b2f35b4..9f7503b8 100644
--- a/middleman-core/lib/middleman-core/core_extensions/i18n.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/i18n.rb
@@ -203,7 +203,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     if (options[:mount_at_root] == locale) || (options[:mount_at_root].nil? && locales[0] == locale)
       '/'
     else
-      replacement = options[:locale_map].fetch(locale, locale)
+      replacement = options[:locale_map][locale] || locale
       options[:path].sub(':locale', replacement.to_s).sub(':lang', replacement.to_s) # Backward compat
     end
   end
diff --git a/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb b/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
index 7d42b667..280c8db0 100644
--- a/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
@@ -108,7 +108,7 @@ module Middleman
                 ignore = rewriter.fetch(:ignore)
                 next if ignore.any? { |r| should_ignore?(r, full_asset_path) }
 
-                rewrite_ignore = Array(rewriter.fetch(:rewrite_ignore, []))
+                rewrite_ignore = Array(rewriter[:rewrite_ignore] || [])
                 next if rewrite_ignore.any? { |i| ::Middleman::Util.path_match(i, path) }
 
                 proc = rewriter.fetch(:proc)
@@ -132,7 +132,7 @@ module Middleman
         def should_ignore?(validator, value)
           if validator.is_a? Regexp
             # Treat as Regexp
-            !value.match(validator).nil?
+            !!(value =~ validator)
           elsif validator.respond_to? :call
             # Treat as proc
             validator.call(value)
diff --git a/middleman-core/lib/middleman-core/extension.rb b/middleman-core/lib/middleman-core/extension.rb
index 1a8b8fa4..e8e36af0 100644
--- a/middleman-core/lib/middleman-core/extension.rb
+++ b/middleman-core/lib/middleman-core/extension.rb
@@ -432,7 +432,7 @@ module Middleman
           {}
         end
 
-        sum.merge(resource_definitions)
+        sum.merge!(resource_definitions)
       end
 
       resources + generator_defs.map do |path, g|
diff --git a/middleman-core/lib/middleman-core/extensions.rb b/middleman-core/lib/middleman-core/extensions.rb
index c295efe3..fba0e488 100644
--- a/middleman-core/lib/middleman-core/extensions.rb
+++ b/middleman-core/lib/middleman-core/extensions.rb
@@ -106,7 +106,7 @@ module Middleman
       # A flattened list of all extensions which are automatically activated
       # @return [Array<Symbol>] A list of extension names which are automatically activated.
       def auto_activated
-        @auto_activate.values.map(&:to_a).flatten.map(&:name)
+        @auto_activate.values.map(&:to_a).flat_map(&:name)
       end
 
       # @api private
diff --git a/middleman-core/lib/middleman-core/extensions/automatic_image_sizes.rb b/middleman-core/lib/middleman-core/extensions/automatic_image_sizes.rb
index 5bd0f14d..5d12501f 100644
--- a/middleman-core/lib/middleman-core/extensions/automatic_image_sizes.rb
+++ b/middleman-core/lib/middleman-core/extensions/automatic_image_sizes.rb
@@ -19,7 +19,7 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension
         real_path = path.dup
         real_path = File.join(config[:images_dir], real_path) unless real_path.start_with?('/')
 
-        file = app.files.find(:source, real_path) || app.files.find(:source, real_path.gsub(/^\//, ''))
+        file = app.files.find(:source, real_path) || app.files.find(:source, real_path.sub(/^\//, ''))
 
         if file && file[:full_path].exist?
           begin
diff --git a/middleman-core/lib/middleman-core/extensions/minify_css.rb b/middleman-core/lib/middleman-core/extensions/minify_css.rb
index caf54262..cc513b6c 100644
--- a/middleman-core/lib/middleman-core/extensions/minify_css.rb
+++ b/middleman-core/lib/middleman-core/extensions/minify_css.rb
@@ -23,7 +23,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
   class SassCompressor
     def self.compress(style, options={})
       root_node = ::Sass::SCSS::CssParser.new(style, 'middleman-css-input', 1).parse
-      root_node.options = options.merge(style: :compressed)
+      root_node.options = {}.merge!(options).merge!(style: :compressed)
       root_node.render.strip
     end
   end
diff --git a/middleman-core/lib/middleman-core/file_renderer.rb b/middleman-core/lib/middleman-core/file_renderer.rb
index 64519be0..ae1212b4 100644
--- a/middleman-core/lib/middleman-core/file_renderer.rb
+++ b/middleman-core/lib/middleman-core/file_renderer.rb
@@ -51,7 +51,7 @@ module Middleman
 
       # Merge per-extension options from config
       extension = File.extname(path)
-      options = opts.merge(options_for_ext(extension))
+      options = {}.merge!(opts).merge!(options_for_ext(extension))
       options[:outvar] ||= '@_out_buf'
       options[:context] = context
       options.delete(:layout)
diff --git a/middleman-core/lib/middleman-core/renderers/haml.rb b/middleman-core/lib/middleman-core/renderers/haml.rb
index 24cdced4..c5bf4699 100644
--- a/middleman-core/lib/middleman-core/renderers/haml.rb
+++ b/middleman-core/lib/middleman-core/renderers/haml.rb
@@ -30,7 +30,7 @@ module Middleman
       end
 
       def evaluate(scope, locals, &block)
-        options = @options.merge(filename: eval_file, line: line, context: @context || scope)
+        options = {}.merge!(@options).merge!(filename: eval_file, line: line, context: @context || scope)
         @engine = ::Haml::Engine.new(data, options)
         output = @engine.render(scope, locals, &block)
 
diff --git a/middleman-core/lib/middleman-core/renderers/less.rb b/middleman-core/lib/middleman-core/renderers/less.rb
index 7830b137..c47d84d3 100644
--- a/middleman-core/lib/middleman-core/renderers/less.rb
+++ b/middleman-core/lib/middleman-core/renderers/less.rb
@@ -26,7 +26,7 @@ module Middleman
           if ::Less.const_defined? :Engine
             @engine = ::Less::Engine.new(data)
           else
-            parser  = ::Less::Parser.new(options.merge(filename: eval_file, line: line, paths: ['.', File.dirname(eval_file)]))
+            parser = ::Less::Parser.new({}.merge!(options).merge!(filename: eval_file, line: line, paths: ['.', File.dirname(eval_file)]))
             @engine = parser.parse(data)
           end
         end
diff --git a/middleman-core/lib/middleman-core/renderers/sass.rb b/middleman-core/lib/middleman-core/renderers/sass.rb
index abd44502..ef040f74 100644
--- a/middleman-core/lib/middleman-core/renderers/sass.rb
+++ b/middleman-core/lib/middleman-core/renderers/sass.rb
@@ -81,7 +81,7 @@ module Middleman
             filename: eval_file,
             line: line,
             syntax: syntax,
-            custom: (options[:custom] || {}).merge(
+            custom: {}.merge!(options[:custom] || {}).merge!(
               middleman_context: ctx.app,
               current_resource: ctx.current_resource
             )
@@ -97,7 +97,7 @@ module Middleman
             more_opts[:css_filename] = file.sub(/\.s[ac]ss$/, '')
           end
 
-          options.merge(more_opts)
+          {}.merge!(options).merge!(more_opts)
         end
       end
 
diff --git a/middleman-core/lib/middleman-core/sources.rb b/middleman-core/lib/middleman-core/sources.rb
index 7114d9f0..54702570 100644
--- a/middleman-core/lib/middleman-core/sources.rb
+++ b/middleman-core/lib/middleman-core/sources.rb
@@ -189,6 +189,7 @@ module Middleman
       array_of_types = Array(types)
 
       watchers
+        .lazy
         .select { |d| array_of_types.include?(d.type) }
         .map { |d| d.find(path, glob) }
         .reject(&:nil?)
@@ -202,9 +203,7 @@ module Middleman
     # @return [Boolean]
     Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], String => Bool
     def exists?(types, path)
-      watchers
-        .select { |d| Array(types).include?(d.type) }
-        .any? { |d| d.exists?(path) }
+      watchers.any? { |d| Array(types).include?(d.type) && d.exists?(path) }
     end
 
     # Check if a file for a given type exists.
@@ -214,9 +213,7 @@ module Middleman
     # @return [Boolean]
     Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], String => Maybe[HANDLER]
     def watcher_for_path(types, path)
-      watchers
-        .select { |d| Array(types).include?(d.type) }
-        .find { |d| d.exists?(path) }
+      watchers.detect { |d| Array(types).include?(d.type) && d.exists?(path) }
     end
 
     # Manually check for new files
@@ -317,7 +314,7 @@ module Middleman
     def matches?(validator, file)
       path = file[:relative_path]
       if validator.is_a? Regexp
-        !!validator.match(path.to_s)
+        !!(path.to_s =~ validator)
       else
         !!validator.call(path, @app)
       end
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index e6ad077c..e1a3fdd4 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -322,7 +322,7 @@ module Middleman
       if @only.empty?
         !@ignored.call(file)
       else
-        @only.any? { |reg| reg.match(file[:relative_path].to_s) }
+        @only.any? { |reg| file[:relative_path].to_s =~ reg }
       end
     end
   end
diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index a2cd1eef..f492a54d 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -79,7 +79,7 @@ module Middleman
           path == matcher
         end
       when matcher.respond_to?(:match)
-        !matcher.match(path).nil?
+        !!(path =~ matcher)
       when matcher.respond_to?(:call)
         matcher.call(path)
       else
@@ -357,7 +357,7 @@ module Middleman
         begin
           uri = ::Addressable::URI.parse(asset_path)
 
-          if uri.relative? && uri.host.nil? && !asset_path.match(/^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
+          if uri.relative? && uri.host.nil? && !(asset_path =~ /^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
             "#{opening_character}#{result}"
           else
             match
@@ -456,10 +456,11 @@ module Middleman
     Contract String => String
     def step_through_extensions(path)
       while ::Tilt[path]
-        yield File.extname(path) if block_given?
+        ext = File.extname(path)
+        yield ext if block_given?
 
         # Strip templating extensions as long as Tilt knows them
-        path = path.sub(/#{::Regexp.escape(File.extname(path))}$/, '')
+        path = path[0..-(ext.length + 1)]
       end
 
       yield File.extname(path) if block_given?
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 894bf470..f9bb6235 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('tilt', ['~> 1.4.1'])
   s.add_dependency('erubis')
   s.add_dependency('fast_blank')
+  s.add_dependency('parallel')
 
   # Helpers
   s.add_dependency('activesupport', ['~> 4.2'])

From 4deaa65a6d5dc594abb9362cd77b25886d2219fc Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 23 Jan 2016 17:14:35 -0800
Subject: [PATCH 008/122] update donate link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b7203403..1efe8b5d 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ The best way to get quick responses to your issues and swift fixes to your bugs
 
 ## Donate
 
-[Click here to lend your support to Middleman](https://spacebox.io/s/4dXbHBorC3)
+[Click here to lend your support to Middleman](https://plasso.co/s/4dXbHBorC3)
 
 ## Versioning
 

From deae5d2216f5105e0de68d8eb51f3bc3cc10c8b2 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 24 Jan 2016 12:30:53 -0800
Subject: [PATCH 009/122] Fix #1778

---
 middleman-core/lib/middleman-core/sources.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/sources.rb b/middleman-core/lib/middleman-core/sources.rb
index 54702570..d30f0124 100644
--- a/middleman-core/lib/middleman-core/sources.rb
+++ b/middleman-core/lib/middleman-core/sources.rb
@@ -184,7 +184,7 @@ module Middleman
     # @param [String] path The file path.
     # @param [Boolean] glob If the path contains wildcard or glob characters.
     # @return [Middleman::SourceFile, nil]
-    Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], String, Maybe[Bool] => Maybe[SourceFile]
+    Contract Or[Symbol, ArrayOf[Symbol], SetOf[Symbol]], Or[Pathname, String], Maybe[Bool] => Maybe[SourceFile]
     def find(types, path, glob=false)
       array_of_types = Array(types)
 

From e7d9c8ad0e0dd45b3df3b1239cbd9e0c5783b2dc Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 24 Jan 2016 13:02:39 -0800
Subject: [PATCH 010/122] Fix a threading issue caused by parallel

---
 middleman-core/lib/middleman-core/builder.rb | 37 +++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/middleman-core/lib/middleman-core/builder.rb b/middleman-core/lib/middleman-core/builder.rb
index 5bdedfe8..3549fc34 100644
--- a/middleman-core/lib/middleman-core/builder.rb
+++ b/middleman-core/lib/middleman-core/builder.rb
@@ -125,13 +125,28 @@ module Middleman
 
     Contract ResourceList => ResourceList
     def output_resources(resources)
-      cleaned_paths = if @parallel
+      results = if @parallel
         ::Parallel.map(resources, &method(:output_resource))
       else
         resources.map(&method(:output_resource))
       end
 
-      cleaned_paths.each { |p| @to_clean.delete(p) } if @cleaning
+      @has_error = true if results.any? { |r| r == false }
+
+      if @cleaning && !@has_error
+        results.each do |p|
+          next unless p.exist?
+
+          # handle UTF-8-MAC filename on MacOS
+          cleaned_name = if RUBY_PLATFORM =~ /darwin/
+            p.to_s.encode('UTF-8', 'UTF-8-MAC')
+          else
+            p
+          end
+
+          @to_clean.delete(Pathname(cleaned_name))
+        end
+      end
 
       resources
     end
@@ -197,10 +212,8 @@ module Middleman
     # Try to output a resource and capture errors.
     # @param [Middleman::Sitemap::Resource] resource The resource.
     # @return [void]
-    Contract IsA['Middleman::Sitemap::Resource'] => Maybe[Pathname]
+    Contract IsA['Middleman::Sitemap::Resource'] => Or[Pathname, Bool]
     def output_resource(resource)
-      output_file = nil
-
       ::Middleman::Util.instrument "builder.output.resource", path: File.basename(resource.destination_path) do
         output_file = @build_dir + resource.destination_path.gsub('%20', ' ')
 
@@ -214,27 +227,17 @@ module Middleman
             if response.status == 200
               export_file!(output_file, binary_encode(response.body))
             else
-              @has_error = true
               trigger(:error, output_file, response.body)
+              return false
             end
           end
         rescue => e
-          @has_error = true
           trigger(:error, output_file, "#{e}\n#{e.backtrace.join("\n")}")
+          return false
         end
-      end
 
-      return unless @cleaning
-      return unless output_file.exist?
-
-      # handle UTF-8-MAC filename on MacOS
-      cleaned_name = if RUBY_PLATFORM =~ /darwin/
-        output_file.to_s.encode('UTF-8', 'UTF-8-MAC')
-      else
         output_file
       end
-
-      Pathname(cleaned_name)
     end
 
     # Get a list of all the paths in the destination folder and save them

From 8881389b42f22b5e2406e999997303fffd8ff1e6 Mon Sep 17 00:00:00 2001
From: Ben Hollis <ben@benhollis.net>
Date: Sun, 24 Jan 2016 22:55:48 -0800
Subject: [PATCH 011/122] Minify inline JS when there are other attributes.

---
 .../lib/middleman-core/extensions/minify_javascript.rb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
index 7472e561..acd71224 100644
--- a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
+++ b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
@@ -112,7 +112,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
 
         # Only compress script tags that contain JavaScript (as opposed to
         # something like jQuery templates, identified with a "text/html" type).
-        if first.include?('<script>') || first.include?('text/javascript')
+        if !first.include?('type=') || first.include?('text/javascript')
           first + minify(inline_content) + last
         else
           match

From 95537967316577520ad4a665835edf5d4cd64f48 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 26 Jan 2016 11:01:12 -0800
Subject: [PATCH 012/122] Fix passing template locals down to partials. Helps
 #1753

---
 .../middleman-core/core_extensions/default_helpers.rb    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
index 8a7c90f6..33b411e1 100644
--- a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
@@ -276,5 +276,14 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
       super(path, params)
     end
+
+    def partial(template, options={}, &block)
+      including_parent_locals = {}
+      including_parent_locals.merge!(@locs || {})
+      including_parent_locals.merge!(options[:locals] || {})
+
+      options[:locals] = including_parent_locals
+      super(template, options, &block)
+    end
   end
 end

From 0c29fd4abf36cda84a12c3a644d51db060feb714 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 26 Jan 2016 13:21:39 -0800
Subject: [PATCH 013/122] Make templates extensions with layouts configurable

---
 CHANGELOG.md                                          | 1 +
 middleman-core/lib/middleman-core/application.rb      | 6 +++++-
 middleman-core/lib/middleman-core/sitemap/resource.rb | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ce7548e..6e0e55c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ master
 * Show an error message when git CLI is not available. #1765
 * Correctly show file names of GZIP'ed assets. #1364
 * Build file output is not parallel-ized! Use `middleman build --no-parallel` to disable.
+* Make template file extensions that get layouts by default configurable via `config[:extensions_with_layout]`
 
 # 4.0.0
 
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 9000db79..b0dbdb48 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -149,9 +149,13 @@ module Middleman
     define_setting :http_prefix, '/', 'Default prefix for building paths'
 
     # Default layout name
-    # @return [String, Symbold]
+    # @return [String]
     define_setting :layout, :_auto_layout, 'Default layout name'
 
+    # Which file extensions have a layout by default.
+    # @return [Array.<String>]
+    define_setting :extensions_with_layout, %w(.html .xhtml .php), 'Which file extensions have a layout by default.'
+
     # Default string encoding for templates and output.
     # @return [String]
     define_setting :encoding, 'utf-8', 'Default string encoding for templates and output'
diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index 5d7b9969..b7b0e063 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -138,7 +138,7 @@ module Middleman
         locs[:current_path] ||= destination_path
 
         # Certain output file types don't use layouts
-        opts[:layout] = false if !opts.key?(:layout) && ext != '.html'
+        opts[:layout] = false if !opts.key?(:layout) && !@app.config.extensions_with_layout.include?(ext)
 
         renderer = ::Middleman::TemplateRenderer.new(@app, file_descriptor[:full_path].to_s)
         renderer.render(locs, opts)

From 2bba7888b0dbd8c848ed37a46815b1c621be3c04 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 26 Jan 2016 13:47:27 -0800
Subject: [PATCH 014/122] Fixes #1780

---
 CHANGELOG.md                               | 1 +
 middleman-core/features/asset_host.feature | 2 ++
 middleman-core/lib/middleman-core/util.rb  | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e0e55c6..f562aa0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ master
 * Correctly show file names of GZIP'ed assets. #1364
 * Build file output is not parallel-ized! Use `middleman build --no-parallel` to disable.
 * Make template file extensions that get layouts by default configurable via `config[:extensions_with_layout]`
+* Remove `=` from inline url matcher. This means paths in HTML attributes MUST be quoted. Fixes #1780
 
 # 4.0.0
 
diff --git a/middleman-core/features/asset_host.feature b/middleman-core/features/asset_host.feature
index 4cd733aa..646f1154 100644
--- a/middleman-core/features/asset_host.feature
+++ b/middleman-core/features/asset_host.feature
@@ -17,6 +17,8 @@ Feature: Alternate between multiple asset hosts
     When I go to "/stylesheets/asset_host.css"
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}
+    When I go to "/javascripts/asset_host.js"
+    Then I should not see content matching %r{http://assets1.example.com/}
 
   Scenario: Set proc host with inline-option
     Given a fixture app "asset-host-app"
diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index f492a54d..cfbcb9ee 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -341,7 +341,7 @@ module Middleman
 
     Contract String, String, ArrayOf[String], Proc => String
     def rewrite_paths(body, _path, exts, &_block)
-      matcher = /([=\'\"\(,]\s*)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/
+      matcher = /([\'\"\(,]\s*)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/
 
       url_fn_prefix = 'url('
 

From 475fa41de0e2743b4f5dfa555087d03aa96ff5a5 Mon Sep 17 00:00:00 2001
From: FearGoidte <FearGoidte@users.noreply.github.com>
Date: Wed, 27 Jan 2016 09:48:36 +0000
Subject: [PATCH 015/122] Support for .xhtml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’ve attempted to make support for .htm and .xhtml consistent.
Extensions are in alphabetical order to make it easier to compare them.
---
 middleman-core/features/gzip.feature                          | 2 +-
 middleman-core/lib/middleman-core/application.rb              | 2 +-
 middleman-core/lib/middleman-core/extensions/asset_hash.rb    | 2 +-
 middleman-core/lib/middleman-core/extensions/asset_host.rb    | 2 +-
 middleman-core/lib/middleman-core/extensions/cache_buster.rb  | 2 +-
 middleman-core/lib/middleman-core/extensions/gzip.rb          | 4 ++--
 .../lib/middleman-core/extensions/relative_assets.rb          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/middleman-core/features/gzip.feature b/middleman-core/features/gzip.feature
index 2f74cc9a..107b696d 100644
--- a/middleman-core/features/gzip.feature
+++ b/middleman-core/features/gzip.feature
@@ -22,7 +22,7 @@ Feature: GZIP assets during build
     Given a fixture app "gzip-app"
     And a file named "config.rb" with:
       """
-      activate :gzip, exts: %w(.js .html .htm)
+      activate :gzip, exts: %w(.htm .html .js .xhtml .xml)
       """
     And a successfully built app at "gzip-app"
     Then the following files should exist:
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index b0dbdb48..a7963f4f 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -154,7 +154,7 @@ module Middleman
 
     # Which file extensions have a layout by default.
     # @return [Array.<String>]
-    define_setting :extensions_with_layout, %w(.html .xhtml .php), 'Which file extensions have a layout by default.'
+    define_setting :extensions_with_layout, %w(.htm .html .xhtml .php), 'Which file extensions have a layout by default.'
 
     # Default string encoding for templates and output.
     # @return [String]
diff --git a/middleman-core/lib/middleman-core/extensions/asset_hash.rb b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
index ac464b69..c90d0223 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_hash.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
@@ -2,7 +2,7 @@ require 'middleman-core/util'
 require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
-  option :sources, %w(.htm .html .php .css .js), 'List of extensions that are searched for hashable assets.'
+  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for hashable assets.'
   option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz), 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
diff --git a/middleman-core/lib/middleman-core/extensions/asset_host.rb b/middleman-core/lib/middleman-core/extensions/asset_host.rb
index 00d463fa..aa424e2f 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_host.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_host.rb
@@ -3,7 +3,7 @@ require 'addressable/uri'
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :host, nil, 'The asset host to use or a Proc to determine asset host', required: true
   option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif), 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w(.htm .html .php .css .js), 'List of extensions that are searched for bustable assets.'
+  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for host rewrites'
 
diff --git a/middleman-core/lib/middleman-core/extensions/cache_buster.rb b/middleman-core/lib/middleman-core/extensions/cache_buster.rb
index 44eda9bc..958bd203 100644
--- a/middleman-core/lib/middleman-core/extensions/cache_buster.rb
+++ b/middleman-core/lib/middleman-core/extensions/cache_buster.rb
@@ -1,7 +1,7 @@
 # The Cache Buster extension
 class Middleman::Extensions::CacheBuster < ::Middleman::Extension
   option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif), 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w(.htm .html .php .css .js), 'List of extensions that are searched for bustable assets.'
+  option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
 
diff --git a/middleman-core/lib/middleman-core/extensions/gzip.rb b/middleman-core/lib/middleman-core/extensions/gzip.rb
index 12079ab5..9ca9da0e 100644
--- a/middleman-core/lib/middleman-core/extensions/gzip.rb
+++ b/middleman-core/lib/middleman-core/extensions/gzip.rb
@@ -7,10 +7,10 @@
 # to serve your Gzipped files whenever the normal (non-.gz) filename is requested.
 #
 # Pass the :exts options to customize which file extensions get zipped (defaults
-# to .html, .htm, .js and .css.
+# to .css, .htm, .html, .js, and .xhtml
 #
 class Middleman::Extensions::Gzip < ::Middleman::Extension
-  option :exts, %w(.js .css .html .htm .svg), 'File extensions to Gzip when building.'
+  option :exts, %w(.css .htm .html .js .svg .xhtml .xml), 'File extensions to Gzip when building.'
   option :ignore, [], 'Patterns to avoid gzipping'
   option :overwrite, false, 'Overwrite original files instead of adding .gz extension.'
 
diff --git a/middleman-core/lib/middleman-core/extensions/relative_assets.rb b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
index a6d1f074..7fcb80d2 100644
--- a/middleman-core/lib/middleman-core/extensions/relative_assets.rb
+++ b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
@@ -3,7 +3,7 @@ require 'addressable/uri'
 # Relative Assets extension
 class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
   option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif .ttf .otf .woff .woff2 .eot), 'List of extensions that get cache busters strings appended to them.'
-  option :sources, %w(.htm .html .css), 'List of extensions that are searched for relative assets.'
+  option :sources, %w(.css .htm .html .xhtml), 'List of extensions that are searched for relative assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
 

From cc36267de51f5ef2e39ef9b8d4ad7b6926c63f64 Mon Sep 17 00:00:00 2001
From: Jim Dalton <jim.dalton@gmail.com>
Date: Wed, 27 Jan 2016 20:56:17 -0800
Subject: [PATCH 016/122] Disable file watching completely when watcher_disable
 is true

---
 .../lib/middleman-core/preview_server.rb      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index acdb367d..d901bbca 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -151,19 +151,19 @@ module Middleman
           config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key]
 
           ready do
-            match_against = [
-              %r{^config\.rb$},
-              %r{^environments/[^\.](.*)\.rb$},
-              %r{^lib/[^\.](.*)\.rb$},
-              %r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
-            ]
-
-            # config.rb
-            watcher = files.watch :reload,
-                                  path: root,
-                                  only: match_against
-
             unless config[:watcher_disable]
+              match_against = [
+                %r{^config\.rb$},
+                %r{^environments/[^\.](.*)\.rb$},
+                %r{^lib/[^\.](.*)\.rb$},
+                %r{^#{config[:helpers_dir]}/[^\.](.*)\.rb$}
+              ]
+
+              # config.rb
+              watcher = files.watch :reload,
+                                    path: root,
+                                    only: match_against
+
               # Hack around node_modules in root.
               watcher.listener.ignore(/^node_modules/)
 

From 007c626d585e970d70c5de63a40a08b6985c4ac3 Mon Sep 17 00:00:00 2001
From: FearGoidte <FearGoidte@users.noreply.github.com>
Date: Thu, 28 Jan 2016 08:16:23 +0000
Subject: [PATCH 017/122] .xml removed from Gzip defaults

---
 middleman-core/features/gzip.feature                 | 2 +-
 middleman-core/lib/middleman-core/extensions/gzip.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/middleman-core/features/gzip.feature b/middleman-core/features/gzip.feature
index 107b696d..643972bc 100644
--- a/middleman-core/features/gzip.feature
+++ b/middleman-core/features/gzip.feature
@@ -22,7 +22,7 @@ Feature: GZIP assets during build
     Given a fixture app "gzip-app"
     And a file named "config.rb" with:
       """
-      activate :gzip, exts: %w(.htm .html .js .xhtml .xml)
+      activate :gzip, exts: %w(.htm .html .js .xhtml)
       """
     And a successfully built app at "gzip-app"
     Then the following files should exist:
diff --git a/middleman-core/lib/middleman-core/extensions/gzip.rb b/middleman-core/lib/middleman-core/extensions/gzip.rb
index 9ca9da0e..0483fe32 100644
--- a/middleman-core/lib/middleman-core/extensions/gzip.rb
+++ b/middleman-core/lib/middleman-core/extensions/gzip.rb
@@ -10,7 +10,7 @@
 # to .css, .htm, .html, .js, and .xhtml
 #
 class Middleman::Extensions::Gzip < ::Middleman::Extension
-  option :exts, %w(.css .htm .html .js .svg .xhtml .xml), 'File extensions to Gzip when building.'
+  option :exts, %w(.css .htm .html .js .svg .xhtml), 'File extensions to Gzip when building.'
   option :ignore, [], 'Patterns to avoid gzipping'
   option :overwrite, false, 'Overwrite original files instead of adding .gz extension.'
 

From 598d72480f486058132632368f7b271feb388a19 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 28 Jan 2016 16:45:54 -0800
Subject: [PATCH 018/122] Fix slow server boot. It was recursing through
 node_modules and .git on initial boot

---
 .../asset-host-app/source/javascripts/asset_host.js   |  2 ++
 .../lib/middleman-core/sources/source_watcher.rb      | 11 +++++++++--
 middleman-core/lib/middleman-core/util.rb             | 10 ++++------
 3 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 middleman-core/fixtures/asset-host-app/source/javascripts/asset_host.js

diff --git a/middleman-core/fixtures/asset-host-app/source/javascripts/asset_host.js b/middleman-core/fixtures/asset-host-app/source/javascripts/asset_host.js
new file mode 100644
index 00000000..251ce693
--- /dev/null
+++ b/middleman-core/fixtures/asset-host-app/source/javascripts/asset_host.js
@@ -0,0 +1,2 @@
+var a = jQuery.css("h1", "font-size");
+console.log(a);
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index e1a3fdd4..cb163abd 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -49,6 +49,8 @@ module Middleman
     # Reference to lower level listener
     attr_reader :listener
 
+    IGNORED_DIRECTORIES = %w(.git node_modules .sass-cache)
+
     # Construct a new SourceWatcher
     #
     # @param [Middleman::Sources] parent The parent collection.
@@ -182,7 +184,7 @@ module Middleman
 
     Contract ArrayOf[Pathname]
     def find_new_files!
-      new_files = ::Middleman::Util.all_files_under(@directory.to_s)
+      new_files = ::Middleman::Util.all_files_under(@directory.to_s, &method(:should_not_recurse?))
                                    .reject { |p| @files.key?(p) }
 
       update(new_files, []).flatten.map { |s| s[:full_path] }
@@ -193,7 +195,7 @@ module Middleman
     # @return [void]
     Contract ArrayOf[Pathname]
     def poll_once!
-      updated = ::Middleman::Util.all_files_under(@directory.to_s)
+      updated = ::Middleman::Util.all_files_under(@directory.to_s, &method(:should_not_recurse?))
       removed = @files.keys.reject { |p| updated.include?(p) }
 
       result = update(updated, removed)
@@ -217,6 +219,11 @@ module Middleman
 
     protected
 
+    Contract Pathname => Bool
+    def should_not_recurse?(p)
+      IGNORED_DIRECTORIES.include?(p.basename.to_s)
+    end
+
     # The `listen` gem callback.
     #
     # @param [Array] modified List of modified files.
diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index cfbcb9ee..f0ca99cd 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -156,16 +156,14 @@ module Middleman
     def all_files_under(path, &ignore)
       path = Pathname(path)
 
-      if path.directory?
+      if ignore && ignore.call(path)
+        []
+      elsif path.directory?
         path.children.flat_map do |child|
           all_files_under(child, &ignore)
         end.compact
       elsif path.file?
-        if block_given? && yield(path)
-          []
-        else
-          [path]
-        end
+        [path]
       else
         []
       end

From c5aabbbe4f67772006a1b92377bc1d8969781426 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 29 Jan 2016 10:30:08 -0800
Subject: [PATCH 019/122] Confirm nested frontmatter doesn't work

---
 .../features/nested_layouts.feature           | 37 ++++++++++---------
 .../source/layouts/inner.erb                  |  7 +++-
 .../source/layouts/inner_haml.haml            |  8 +++-
 .../source/layouts/inner_slim.slim            |  8 +++-
 .../source/layouts/master.erb                 |  8 +++-
 .../source/layouts/master_haml.haml           |  6 ++-
 .../source/layouts/master_slim.slim           |  6 ++-
 .../source/layouts/outer.erb                  |  8 +++-
 .../source/layouts/outer_haml.haml            |  6 ++-
 .../source/layouts/outer_slim.slim            |  6 ++-
 10 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/middleman-core/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature
index d70a7e23..f51831fb 100644
--- a/middleman-core/features/nested_layouts.feature
+++ b/middleman-core/features/nested_layouts.feature
@@ -5,37 +5,37 @@ Feature: Allow nesting of layouts
     When I go to "/index.html"
     Then I should see:
     """
-    Master
+    Master Erb
     <h1>Index Title</h1>
-      Outer
-        Inner
+      I am Outer
+        I am Inner
       Template
-    
+
     """
     When I go to "/another.html"
     Then I should see:
     """
-    Master
+    Master Erb
     <h1>New Article Title</h1>
-      Outer
-        Inner
+      I am Outer
+        I am Inner
       <p>The Article Content</p>
     """
-    
+
   Scenario: A page uses an inner layout when uses an outer layout (slim)
     Given the Server is running at "nested-layout-app"
     When I go to "/slim-test.html"
-    Then I should see "<h1>Master</h1><p>New Article Title</p><div><h2>Outer</h2><h3>Inner</h3><p>The Article Content</p>"
-    
+    Then I should see "<h1>Master Slim</h1><p>New Article Title</p><div><h2>I am Outer</h2><h3>I am Inner</h3><p>The Article Content</p>"
+
   Scenario: A page uses an inner layout when uses an outer layout (haml)
     Given the Server is running at "nested-layout-app"
     When I go to "/haml-test.html"
     Then I should see:
     """
-    Master
+    Master Haml
     <h1>New Article Title</h1>
-    Outer
-    Inner
+    I am Outer
+    I am Inner
     <p>The Article Content</p>
     """
 
@@ -43,13 +43,16 @@ Feature: Allow nesting of layouts
     Given the Server is running at "nested-layout-app"
     When I go to "/data-one.html"
     Then I should see "Page Number One"
-    And I should see "Inner"
+    And I should see "Page #1"
+    And I should see "I am Inner"
+    And I should see "I am Outer"
+    And I should see "Master Erb"
     When I go to "/data-two.html"
     Then I should see "Page Number Two"
-    And I should not see "Inner"
+    And I should not see "I am Inner"
     When I go to "/data-one.html"
     Then I should see "Page Number One"
-    And I should see "Inner"
+    And I should see "I am Inner"
     When I go to "/data-two.html"
     Then I should see "Page Number Two"
-    And I should not see "Inner"
+    And I should not see "I am Inner"
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb
index 62dfc12b..3e29f567 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb
@@ -1,4 +1,7 @@
+---
+inner: true
+---
 <% wrap_layout :outer do %>
-  Inner
+  I am Inner
   <%= yield %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/inner_haml.haml b/middleman-core/fixtures/nested-layout-app/source/layouts/inner_haml.haml
index a8c1938d..5f99da1e 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/inner_haml.haml
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/inner_haml.haml
@@ -1,3 +1,7 @@
+---
+inner_haml: true
+---
+
 = wrap_layout :outer_haml do
-  Inner
-  = yield
\ No newline at end of file
+  I am Inner
+  = yield
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/inner_slim.slim b/middleman-core/fixtures/nested-layout-app/source/layouts/inner_slim.slim
index 49f1ab6f..f7d9c924 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/inner_slim.slim
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/inner_slim.slim
@@ -1,3 +1,7 @@
+---
+inner_slim: true
+---
+
 = wrap_layout :outer_slim do
-  h3 Inner
-  == yield
\ No newline at end of file
+  h3 I am Inner
+  == yield
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/master.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/master.erb
index 7bd170af..fc862aa4 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/master.erb
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/master.erb
@@ -1,3 +1,9 @@
-Master
+---
+master: true
+---
+
+Master Erb
 <h1><%= current_page.data.title %></h1>
 <%= yield %>
+
+Using Inner: <%= current_page.data.inner ? 'true' : 'false' %>
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/master_haml.haml b/middleman-core/fixtures/nested-layout-app/source/layouts/master_haml.haml
index 273f21e7..3c949d5c 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/master_haml.haml
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/master_haml.haml
@@ -1,3 +1,7 @@
-Master
+---
+master_haml: true
+---
+
+Master Haml
 %h1= current_page.data.title
 = yield
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/master_slim.slim b/middleman-core/fixtures/nested-layout-app/source/layouts/master_slim.slim
index 4ade5748..cd5eac1d 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/master_slim.slim
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/master_slim.slim
@@ -1,3 +1,7 @@
-h1 Master
+---
+master_slim: true
+---
+
+h1 Master Slim
 p== current_page.data.title
 div== yield
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb
index 643d8efc..adc4f9e2 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb
@@ -1,4 +1,8 @@
+---
+outer: true
+---
+
 <% wrap_layout :master do %>
-  Outer
+  I am Outer
   <%= yield %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/outer_haml.haml b/middleman-core/fixtures/nested-layout-app/source/layouts/outer_haml.haml
index eaf1671f..d6d4b05b 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/outer_haml.haml
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/outer_haml.haml
@@ -1,3 +1,7 @@
+---
+outer_haml: true
+---
+
 = wrap_layout :master_haml do
-  Outer
+  I am Outer
   = yield
diff --git a/middleman-core/fixtures/nested-layout-app/source/layouts/outer_slim.slim b/middleman-core/fixtures/nested-layout-app/source/layouts/outer_slim.slim
index 0c17185b..65eb3277 100644
--- a/middleman-core/fixtures/nested-layout-app/source/layouts/outer_slim.slim
+++ b/middleman-core/fixtures/nested-layout-app/source/layouts/outer_slim.slim
@@ -1,3 +1,7 @@
+---
+outer_slim: true
+---
+
 = wrap_layout :master_slim do
-  h2 Outer
+  h2 I am Outer
   == yield

From 3f18efeed92bf79367540cf73188086375d52b80 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 31 Jan 2016 14:13:52 -0800
Subject: [PATCH 020/122] split up util module, fix some rubocop complaints

---
 .rubocop.yml                                  |   4 +-
 middleman-core/lib/middleman-core.rb          |   3 -
 middleman-core/lib/middleman-core/builder.rb  |   6 +-
 .../middleman-core/core_extensions/data.rb    |   4 +-
 .../lib/middleman-core/renderers/haml.rb      |   2 +
 .../middleman-core/sources/source_watcher.rb  |   2 +-
 middleman-core/lib/middleman-core/util.rb     | 609 +-----------------
 .../lib/middleman-core/util/binary.rb         |  79 +++
 .../lib/middleman-core/util/data.rb           |  36 +-
 .../lib/middleman-core/util/files.rb          | 134 ++++
 .../lib/middleman-core/util/paths.rb          | 251 ++++++++
 .../lib/middleman-core/util/rack.rb           |  52 ++
 .../lib/middleman-core/util/uri_templates.rb  |  97 +++
 13 files changed, 660 insertions(+), 619 deletions(-)
 create mode 100644 middleman-core/lib/middleman-core/util/binary.rb
 create mode 100644 middleman-core/lib/middleman-core/util/files.rb
 create mode 100644 middleman-core/lib/middleman-core/util/paths.rb
 create mode 100644 middleman-core/lib/middleman-core/util/rack.rb
 create mode 100644 middleman-core/lib/middleman-core/util/uri_templates.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 0145ceef..dbd74993 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -39,8 +39,6 @@ AssignmentInCondition:
   Enabled: false
 CyclomaticComplexity:
   Enabled: false
-AbcSize:
-  Enabled: false
 HandleExceptions:
   Enabled: false
 EndAlignment:
@@ -54,7 +52,7 @@ FormatString:
 CaseIndentation:
   IndentWhenRelativeTo: end
 TrivialAccessors:
-  ExactNameMatch: true
+  Enabled: false
 SingleLineBlockParams:
   Enabled: false
 Metrics/AbcSize:
diff --git a/middleman-core/lib/middleman-core.rb b/middleman-core/lib/middleman-core.rb
index 8170fefb..687a53e5 100644
--- a/middleman-core/lib/middleman-core.rb
+++ b/middleman-core/lib/middleman-core.rb
@@ -6,9 +6,6 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 # Top-level Middleman namespace
 module Middleman
-  # Backwards compatibility namespace
-  module Features; end
-
   autoload :Application, 'middleman-core/application'
 end
 
diff --git a/middleman-core/lib/middleman-core/builder.rb b/middleman-core/lib/middleman-core/builder.rb
index 3549fc34..9bb3c031 100644
--- a/middleman-core/lib/middleman-core/builder.rb
+++ b/middleman-core/lib/middleman-core/builder.rb
@@ -113,8 +113,8 @@ module Middleman
       logger.debug '== Building files'
 
       resources = @app.sitemap.resources
-          .reject { |resource| resource.ext == '.css' }
-          .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
+                      .reject { |resource| resource.ext == '.css' }
+                      .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
 
       if @glob
         resources = resources.select { |resource| File.fnmatch(@glob, resource.destination_path) }
@@ -214,7 +214,7 @@ module Middleman
     # @return [void]
     Contract IsA['Middleman::Sitemap::Resource'] => Or[Pathname, Bool]
     def output_resource(resource)
-      ::Middleman::Util.instrument "builder.output.resource", path: File.basename(resource.destination_path) do
+      ::Middleman::Util.instrument 'builder.output.resource', path: File.basename(resource.destination_path) do
         output_file = @build_dir + resource.destination_path.gsub('%20', ' ')
 
         begin
diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
index 7ff60f41..2f2f4280 100644
--- a/middleman-core/lib/middleman-core/core_extensions/data.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/data.rb
@@ -100,13 +100,13 @@ module Middleman
           extension = File.extname(data_path)
           basename  = File.basename(data_path, extension)
 
+          return unless %w(.yaml .yml .json).include?(extension)
+
           if %w(.yaml .yml).include?(extension)
             data, postscript = ::Middleman::Util::Data.parse(file, @app.config[:frontmatter_delims], :yaml)
             data[:postscript] = postscript if !postscript.nil? && data.is_a?(Hash)
           elsif extension == '.json'
             data, _postscript = ::Middleman::Util::Data.parse(file, @app.config[:frontmatter_delims], :json)
-          else
-            return
           end
 
           data_branch = @local_data
diff --git a/middleman-core/lib/middleman-core/renderers/haml.rb b/middleman-core/lib/middleman-core/renderers/haml.rb
index c5bf4699..8d3f40bb 100644
--- a/middleman-core/lib/middleman-core/renderers/haml.rb
+++ b/middleman-core/lib/middleman-core/renderers/haml.rb
@@ -46,6 +46,7 @@ module Middleman
         ::Haml::Options.defaults[:context] = nil
         ::Haml::Options.send :attr_accessor, :context
 
+        # rubocop:disable NestedMethodDefinition
         [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f|
           f.class_exec do
             def self.render_with_options(text, compiler_options)
@@ -57,6 +58,7 @@ module Middleman
             end
           end
         end
+        # rubocop:enable NestedMethodDefinition
 
         ::Tilt.prefer(::Middleman::Renderers::HamlTemplate, :haml)
 
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index cb163abd..cbcf1fae 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -49,7 +49,7 @@ module Middleman
     # Reference to lower level listener
     attr_reader :listener
 
-    IGNORED_DIRECTORIES = %w(.git node_modules .sass-cache)
+    IGNORED_DIRECTORIES = %w(.git node_modules .sass-cache).freeze
 
     # Construct a new SourceWatcher
     #
diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb
index f0ca99cd..a0d3fc78 100644
--- a/middleman-core/lib/middleman-core/util.rb
+++ b/middleman-core/lib/middleman-core/util.rb
@@ -1,621 +1,24 @@
 # For instrumenting
 require 'active_support/notifications'
 
-# Core Pathname library used for traversal
-require 'pathname'
-
-# Template and Mime detection
-require 'tilt'
-require 'rack/mime'
-
-# DbC
-require 'middleman-core/contracts'
 require 'middleman-core/application'
 require 'middleman-core/sources'
 require 'middleman-core/sitemap/resource'
-
-# Indifferent Access
-require 'hashie'
-
-# For URI templating
-require 'addressable/uri'
-require 'addressable/template'
-require 'active_support/inflector'
-require 'active_support/inflector/transliterate'
+require 'middleman-core/util/binary'
+require 'middleman-core/util/data'
+require 'middleman-core/util/files'
+require 'middleman-core/util/paths'
+require 'middleman-core/util/rack'
+require 'middleman-core/util/uri_templates'
 
 module Middleman
   module Util
-    include Contracts
-
     module_function
 
-    # Whether the source file is binary.
-    #
-    # @param [String] filename The file to check.
-    # @return [Boolean]
-    Contract Or[String, Pathname] => Bool
-    def binary?(filename)
-      @binary_cache ||= {}
-
-      return @binary_cache[filename] if @binary_cache.key?(filename)
-
-      @binary_cache[filename] = begin
-        path = Pathname(filename)
-        ext = path.extname
-
-        # We hardcode detecting of gzipped SVG files
-        if ext == '.svgz'
-          true
-        elsif Tilt.registered?(ext.sub('.', ''))
-          false
-        else
-          dot_ext = (ext.to_s[0] == '.') ? ext.dup : ".#{ext}"
-
-          if mime = ::Rack::Mime.mime_type(dot_ext, nil)
-            !nonbinary_mime?(mime)
-          else
-            file_contents_include_binary_bytes?(path.to_s)
-          end
-        end
-      end
-    end
-
-    # Takes a matcher, which can be a literal string
-    # or a string containing glob expressions, or a
-    # regexp, or a proc, or anything else that responds
-    # to #match or #call, and returns whether or not the
-    # given path matches that matcher.
-    #
-    # @param [String, #match, #call] matcher A matcher String, RegExp, Proc, etc.
-    # @param [String] path A path as a string
-    # @return [Boolean] Whether the path matches the matcher
-    Contract PATH_MATCHER, String => Bool
-    def path_match(matcher, path)
-      case
-      when matcher.is_a?(String)
-        if matcher.include? '*'
-          File.fnmatch(matcher, path)
-        else
-          path == matcher
-        end
-      when matcher.respond_to?(:match)
-        !!(path =~ matcher)
-      when matcher.respond_to?(:call)
-        matcher.call(path)
-      else
-        File.fnmatch(matcher.to_s, path)
-      end
-    end
-
-    class EnhancedHash < ::Hashie::Mash
-      # include ::Hashie::Extensions::MergeInitializer
-      # include ::Hashie::Extensions::MethodReader
-      # include ::Hashie::Extensions::IndifferentAccess
-    end
-
-    # Recursively convert a normal Hash into a EnhancedHash
-    #
-    # @private
-    # @param [Hash] data Normal hash
-    # @return [Hash]
-    Contract Any => Maybe[Or[Array, EnhancedHash]]
-    def recursively_enhance(obj)
-      if obj.is_a? ::Array
-        obj.map { |e| recursively_enhance(e) }
-      elsif obj.is_a? ::Hash
-        ::Hashie::Mash.new(obj)
-      else
-        obj
-      end
-    end
-
-    # Normalize a path to not include a leading slash
-    # @param [String] path
-    # @return [String]
-    Contract String => String
-    def normalize_path(path)
-      # The tr call works around a bug in Ruby's Unicode handling
-      ::URI.decode(path).sub(%r{^/}, '').tr('', '')
-    end
-
-    # This is a separate method from normalize_path in case we
-    # change how we normalize paths
-    Contract String => String
-    def strip_leading_slash(path)
-      path.sub(%r{^/}, '')
-    end
-
     # Facade for ActiveSupport/Notification
     def instrument(name, payload={}, &block)
       suffixed_name = (name =~ /\.middleman$/) ? name.dup : "#{name}.middleman"
       ::ActiveSupport::Notifications.instrument(suffixed_name, payload, &block)
     end
-
-    # Extract the text of a Rack response as a string.
-    # Useful for extensions implemented as Rack middleware.
-    # @param response The response from #call
-    # @return [String] The whole response as a string.
-    Contract RespondTo[:each] => String
-    def extract_response_text(response)
-      # The rack spec states all response bodies must respond to each
-      result = ''
-      response.each do |part, _|
-        result << part
-      end
-      result
-    end
-
-    # Get a recusive list of files inside a path.
-    # Works with symlinks.
-    #
-    # @param path Some path string or Pathname
-    # @param ignore A proc/block that returns true if a given path should be ignored - if a path
-    #               is ignored, nothing below it will be searched either.
-    # @return [Array<Pathname>] An array of Pathnames for each file (no directories)
-    Contract Or[String, Pathname], Proc => ArrayOf[Pathname]
-    def all_files_under(path, &ignore)
-      path = Pathname(path)
-
-      if ignore && ignore.call(path)
-        []
-      elsif path.directory?
-        path.children.flat_map do |child|
-          all_files_under(child, &ignore)
-        end.compact
-      elsif path.file?
-        [path]
-      else
-        []
-      end
-    end
-
-    # Get the path of a file of a given type
-    #
-    # @param [Middleman::Application] app The app.
-    # @param [Symbol] kind The type of file
-    # @param [String, Symbol] source The path to the file
-    # @param [Hash] options Data to pass through.
-    # @return [String]
-    Contract ::Middleman::Application, Symbol, Or[String, Symbol], Hash => String
-    def asset_path(app, kind, source, options={})
-      return source if source.to_s.include?('//') || source.to_s.start_with?('data:')
-
-      asset_folder = case kind
-      when :css
-        app.config[:css_dir]
-      when :js
-        app.config[:js_dir]
-      when :images
-        app.config[:images_dir]
-      when :fonts
-        app.config[:fonts_dir]
-      else
-        kind.to_s
-      end
-
-      source = source.to_s.tr(' ', '')
-      ignore_extension = (kind == :images || kind == :fonts) # don't append extension
-      source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}")
-      asset_folder = '' if source.start_with?('/') # absolute path
-
-      asset_url(app, source, asset_folder, options)
-    end
-
-    # Get the URL of an asset given a type/prefix
-    #
-    # @param [String] path The path (such as "photo.jpg")
-    # @param [String] prefix The type prefix (such as "images")
-    # @param [Hash] options Data to pass through.
-    # @return [String] The fully qualified asset url
-    Contract ::Middleman::Application, String, String, Hash => String
-    def asset_url(app, path, prefix='', options={})
-      # Don't touch assets which already have a full path
-      return path if path.include?('//') || path.start_with?('data:')
-
-      if options[:relative] && !options[:current_resource]
-        raise ArgumentError, '#asset_url must be run in a context with current_resource if relative: true'
-      end
-
-      uri = URI(path)
-      path = uri.path
-
-      result = if resource = app.sitemap.find_resource_by_destination_path(url_for(app, path, options))
-        resource.url
-      else
-        path = File.join(prefix, path)
-        if resource = app.sitemap.find_resource_by_path(path)
-          resource.url
-        else
-          File.join(app.config[:http_prefix], path)
-        end
-      end
-
-      final_result = ::URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative]))
-
-      result_uri = URI(final_result)
-      result_uri.query = uri.query
-      result_uri.fragment = uri.fragment
-      result_uri.to_s
-    end
-
-    # Given a source path (referenced either absolutely or relatively)
-    # or a Resource, this will produce the nice URL configured for that
-    # path, respecting :relative_links, directory indexes, etc.
-    Contract ::Middleman::Application, Or[String, ::Middleman::Sitemap::Resource], Hash => String
-    def url_for(app, path_or_resource, options={})
-      # Handle Resources and other things which define their own url method
-      url = if path_or_resource.respond_to?(:url)
-        path_or_resource.url
-      else
-        path_or_resource.dup
-      end
-
-      # Try to parse URL
-      begin
-        uri = URI(url)
-      rescue ::URI::InvalidURIError
-        # Nothing we can do with it, it's not really a URI
-        return url
-      end
-
-      relative = options[:relative]
-      raise "Can't use the relative option with an external URL" if relative && uri.host
-
-      # Allow people to turn on relative paths for all links with
-      # set :relative_links, true
-      # but still override on a case by case basis with the :relative parameter.
-      effective_relative = relative || false
-      effective_relative = true if relative.nil? && app.config[:relative_links]
-
-      # Try to find a sitemap resource corresponding to the desired path
-      this_resource = options[:current_resource]
-
-      if path_or_resource.is_a?(::Middleman::Sitemap::Resource)
-        resource = path_or_resource
-        resource_url = url
-      elsif this_resource && uri.path && !uri.host
-        # Handle relative urls
-        url_path = Pathname(uri.path)
-        current_source_dir = Pathname('/' + this_resource.path).dirname
-        url_path = current_source_dir.join(url_path) if url_path.relative?
-        resource = app.sitemap.find_resource_by_path(url_path.to_s)
-        if resource
-          resource_url = resource.url
-        else
-          # Try to find a resource relative to destination paths
-          url_path = Pathname(uri.path)
-          current_source_dir = Pathname('/' + this_resource.destination_path).dirname
-          url_path = current_source_dir.join(url_path) if url_path.relative?
-          resource = app.sitemap.find_resource_by_destination_path(url_path.to_s)
-          resource_url = resource.url if resource
-        end
-      elsif options[:find_resource] && uri.path && !uri.host
-        resource = app.sitemap.find_resource_by_path(uri.path)
-        resource_url = resource.url if resource
-      end
-
-      if resource
-        uri.path = if this_resource
-          ::URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
-        else
-          resource_url
-        end
-      end
-
-      # Support a :query option that can be a string or hash
-      if query = options[:query]
-        uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
-      end
-
-      # Support a :fragment or :anchor option just like Padrino
-      fragment = options[:anchor] || options[:fragment]
-      uri.fragment = fragment.to_s if fragment
-
-      # Finally make the URL back into a string
-      uri.to_s
-    end
-
-    # Expand a path to include the index file if it's a directory
-    #
-    # @param [String] path Request path/
-    # @param [Middleman::Application] app The requesting app.
-    # @return [String] Path with index file if necessary.
-    Contract String, ::Middleman::Application => String
-    def full_path(path, app)
-      resource = app.sitemap.find_resource_by_destination_path(path)
-
-      unless resource
-        # Try it with /index.html at the end
-        indexed_path = File.join(path.sub(%r{/$}, ''), app.config[:index_file])
-        resource = app.sitemap.find_resource_by_destination_path(indexed_path)
-      end
-
-      if resource
-        '/' + resource.destination_path
-      else
-        '/' + normalize_path(path)
-      end
-    end
-
-    Contract String, String, ArrayOf[String], Proc => String
-    def rewrite_paths(body, _path, exts, &_block)
-      matcher = /([\'\"\(,]\s*)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/
-
-      url_fn_prefix = 'url('
-
-      body.dup.gsub(matcher) do |match|
-        opening_character = $1
-        asset_path = $2
-
-        if asset_path.start_with?(url_fn_prefix)
-          opening_character << url_fn_prefix
-          asset_path = asset_path[url_fn_prefix.length..-1]
-        end
-
-        begin
-          uri = ::Addressable::URI.parse(asset_path)
-
-          if uri.relative? && uri.host.nil? && !(asset_path =~ /^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
-            "#{opening_character}#{result}"
-          else
-            match
-          end
-        rescue ::Addressable::URI::InvalidURIError
-          match
-        end
-      end
-    end
-
-    # Is mime type known to be non-binary?
-    #
-    # @param [String] mime The mimetype to check.
-    # @return [Boolean]
-    Contract String => Bool
-    def nonbinary_mime?(mime)
-      case
-      when mime.start_with?('text/')
-        true
-      when mime.include?('xml') && !mime.include?('officedocument')
-        true
-      when mime.include?('json')
-        true
-      when mime.include?('javascript')
-        true
-      else
-        false
-      end
-    end
-
-    # Read a few bytes from the file and see if they are binary.
-    #
-    # @param [String] filename The file to check.
-    # @return [Boolean]
-    Contract String => Bool
-    def file_contents_include_binary_bytes?(filename)
-      binary_bytes = [0, 1, 2, 3, 4, 5, 6, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 28, 29, 30, 31]
-      s = File.read(filename, 4096) || ''
-      s.each_byte do |c|
-        return true if binary_bytes.include?(c)
-      end
-
-      false
-    end
-
-    # Glob a directory and try to keep path encoding consistent.
-    #
-    # @param [String] path The glob path.
-    # @return [Array<String>]
-    def glob_directory(path)
-      results = ::Dir[path]
-
-      return results unless RUBY_PLATFORM =~ /darwin/
-
-      results.map { |r| r.encode('UTF-8', 'UTF-8-MAC') }
-    end
-
-    # Get the PWD and try to keep path encoding consistent.
-    #
-    # @param [String] path The glob path.
-    # @return [Array<String>]
-    def current_directory
-      result = ::Dir.pwd
-
-      return result unless RUBY_PLATFORM =~ /darwin/
-
-      result.encode('UTF-8', 'UTF-8-MAC')
-    end
-
-    # Get a relative path to a resource.
-    #
-    # @param [Middleman::Sitemap::Resource] curr_resource The resource.
-    # @param [String] resource_url The target url.
-    # @param [Boolean] relative If the path should be relative.
-    # @return [String]
-    Contract ::Middleman::Sitemap::Resource, String, Bool => String
-    def relative_path_from_resource(curr_resource, resource_url, relative)
-      # Switch to the relative path between resource and the given resource
-      # if we've been asked to.
-      if relative
-        # Output urls relative to the destination path, not the source path
-        current_dir = Pathname('/' + curr_resource.destination_path).dirname
-        relative_path = Pathname(resource_url).relative_path_from(current_dir).to_s
-
-        # Put back the trailing slash to avoid unnecessary Apache redirects
-        if resource_url.end_with?('/') && !relative_path.end_with?('/')
-          relative_path << '/'
-        end
-
-        relative_path
-      else
-        resource_url
-      end
-    end
-
-    Contract String => String
-    def step_through_extensions(path)
-      while ::Tilt[path]
-        ext = File.extname(path)
-        yield ext if block_given?
-
-        # Strip templating extensions as long as Tilt knows them
-        path = path[0..-(ext.length + 1)]
-      end
-
-      yield File.extname(path) if block_given?
-
-      path
-    end
-
-    # Removes the templating extensions, while keeping the others
-    # @param [String] path
-    # @return [String]
-    Contract String => String
-    def remove_templating_extensions(path)
-      step_through_extensions(path)
-    end
-
-    # Removes the templating extensions, while keeping the others
-    # @param [String] path
-    # @return [String]
-    Contract String => ArrayOf[String]
-    def collect_extensions(path)
-      return [] if File.basename(path).start_with?('.')
-
-      result = []
-
-      step_through_extensions(path) { |e| result << e }
-
-      result
-    end
-
-    # Finds files which should also be considered to be dirty when
-    # the given file(s) are touched.
-    #
-    # @param [Middleman::Application] app The app.
-    # @param [Pathname] files The original touched file paths.
-    # @return [Middleman::SourceFile] All related file paths, not including the source file paths.
-    Contract ::Middleman::Application, ArrayOf[Pathname] => ArrayOf[::Middleman::SourceFile]
-    def find_related_files(app, files)
-      return [] if files.empty?
-
-      all_extensions = files.flat_map { |f| collect_extensions(f.to_s) }
-
-      sass_type_aliasing = ['.scss', '.sass']
-      erb_type_aliasing = ['.erb', '.haml', '.slim']
-
-      if (all_extensions & sass_type_aliasing).length > 0
-        all_extensions |= sass_type_aliasing
-      end
-
-      if (all_extensions & erb_type_aliasing).length > 0
-        all_extensions |= erb_type_aliasing
-      end
-
-      all_extensions.uniq!
-
-      app.sitemap.resources.select(&:file_descriptor).select { |r|
-        local_extensions = collect_extensions(r.file_descriptor[:full_path].to_s)
-
-        if (local_extensions & sass_type_aliasing).length > 0
-          local_extensions |= sass_type_aliasing
-        end
-
-        if (local_extensions & erb_type_aliasing).length > 0
-          local_extensions |= erb_type_aliasing
-        end
-
-        local_extensions.uniq!
-
-        ((all_extensions & local_extensions).length > 0) && files.none? { |f| f == r.file_descriptor[:full_path] }
-      }.map(&:file_descriptor)
-    end
-
-    # Handy methods for dealing with URI templates. Mix into whatever class.
-    module UriTemplates
-      module_function
-
-      # Given a URI template string, make an Addressable::Template
-      # This supports the legacy middleman-blog/Sinatra style :colon
-      # URI templates as well as RFC6570 templates.
-      #
-      # @param [String] tmpl_src URI template source
-      # @return [Addressable::Template] a URI template
-      def uri_template(tmpl_src)
-        # Support the RFC6470 templates directly if people use them
-        if tmpl_src.include?(':')
-          tmpl_src = tmpl_src.gsub(/:([A-Za-z0-9]+)/, '{\1}')
-        end
-
-        ::Addressable::Template.new ::Middleman::Util.normalize_path(tmpl_src)
-      end
-
-      # Apply a URI template with the given data, producing a normalized
-      # Middleman path.
-      #
-      # @param [Addressable::Template] template
-      # @param [Hash] data
-      # @return [String] normalized path
-      def apply_uri_template(template, data)
-        ::Middleman::Util.normalize_path ::Addressable::URI.unencode(template.expand(data)).to_s
-      end
-
-      # Use a template to extract parameters from a path, and validate some special (date)
-      # keys. Returns nil if the special keys don't match.
-      #
-      # @param [Addressable::Template] template
-      # @param [String] path
-      def extract_params(template, path)
-        template.extract(path, BlogTemplateProcessor)
-      end
-
-      # Parameterize a string preserving any multibyte characters
-      def safe_parameterize(str)
-        sep = '-'
-
-        # Reimplementation of http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize that preserves un-transliterate-able multibyte chars.
-        parameterized_string = ActiveSupport::Inflector.transliterate(str.to_s).downcase
-        parameterized_string.gsub!(/[^a-z0-9\-_\?]+/, sep)
-
-        parameterized_string.chars.to_a.each_with_index do |char, i|
-          next unless char == '?' && str[i].bytes.count != 1
-          parameterized_string[i] = str[i]
-        end
-
-        re_sep = Regexp.escape(sep)
-        # No more than one of the separator in a row.
-        parameterized_string.gsub!(/#{re_sep}{2,}/, sep)
-        # Remove leading/trailing separator.
-        parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
-
-        parameterized_string
-      end
-
-      # Convert a date into a hash of components to strings
-      # suitable for using in a URL template.
-      # @param [DateTime] date
-      # @return [Hash] parameters
-      def date_to_params(date)
-        {
-          year: date.year.to_s,
-          month: date.month.to_s.rjust(2, '0'),
-          day: date.day.to_s.rjust(2, '0')
-        }
-      end
-    end
-
-    # A special template processor that validates date fields
-    # and has an extra-permissive default regex.
-    #
-    # See https://github.com/sporkmonger/addressable/blob/master/lib/addressable/template.rb#L279
-    class BlogTemplateProcessor
-      def self.match(name)
-        case name
-        when 'year' then '\d{4}'
-        when 'month' then '\d{2}'
-        when 'day' then '\d{2}'
-        else '.*?'
-        end
-      end
-    end
   end
 end
diff --git a/middleman-core/lib/middleman-core/util/binary.rb b/middleman-core/lib/middleman-core/util/binary.rb
new file mode 100644
index 00000000..71e584d1
--- /dev/null
+++ b/middleman-core/lib/middleman-core/util/binary.rb
@@ -0,0 +1,79 @@
+# Template and Mime detection
+require 'tilt'
+require 'rack/mime'
+
+require 'middleman-core/contracts'
+
+module Middleman
+  module Util
+    include Contracts
+
+    module_function
+
+    # Whether the source file is binary.
+    #
+    # @param [String] filename The file to check.
+    # @return [Boolean]
+    Contract Or[String, Pathname] => Bool
+    def binary?(filename)
+      @binary_cache ||= {}
+
+      return @binary_cache[filename] if @binary_cache.key?(filename)
+
+      @binary_cache[filename] = begin
+        path = Pathname(filename)
+        ext = path.extname
+
+        # We hardcode detecting of gzipped SVG files
+        if ext == '.svgz'
+          true
+        elsif ::Tilt.registered?(ext.sub('.', ''))
+          false
+        else
+          dot_ext = (ext.to_s[0] == '.') ? ext.dup : ".#{ext}"
+
+          if mime = ::Rack::Mime.mime_type(dot_ext, nil)
+            !nonbinary_mime?(mime)
+          else
+            file_contents_include_binary_bytes?(path.to_s)
+          end
+        end
+      end
+    end
+
+    # Is mime type known to be non-binary?
+    #
+    # @param [String] mime The mimetype to check.
+    # @return [Boolean]
+    Contract String => Bool
+    def nonbinary_mime?(mime)
+      case
+      when mime.start_with?('text/')
+        true
+      when mime.include?('xml') && !mime.include?('officedocument')
+        true
+      when mime.include?('json')
+        true
+      when mime.include?('javascript')
+        true
+      else
+        false
+      end
+    end
+
+    # Read a few bytes from the file and see if they are binary.
+    #
+    # @param [String] filename The file to check.
+    # @return [Boolean]
+    Contract String => Bool
+    def file_contents_include_binary_bytes?(filename)
+      binary_bytes = [0, 1, 2, 3, 4, 5, 6, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 28, 29, 30, 31]
+      s = ::File.read(filename, 4096) || ''
+      s.each_byte do |c|
+        return true if binary_bytes.include?(c)
+      end
+
+      false
+    end
+  end
+end
diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb
index c18e6975..2bab7fe0 100644
--- a/middleman-core/lib/middleman-core/util/data.rb
+++ b/middleman-core/lib/middleman-core/util/data.rb
@@ -1,12 +1,40 @@
 require 'yaml'
 require 'json'
 require 'pathname'
-require 'middleman-core/util'
-require 'middleman-core/contracts'
 require 'backports/2.1.0/array/to_h'
+require 'hashie'
+
+require 'middleman-core/util/binary'
+require 'middleman-core/contracts'
 
 module Middleman
   module Util
+    include Contracts
+
+    module_function
+
+    class EnhancedHash < ::Hashie::Mash
+      # include ::Hashie::Extensions::MergeInitializer
+      # include ::Hashie::Extensions::MethodReader
+      # include ::Hashie::Extensions::IndifferentAccess
+    end
+
+    # Recursively convert a normal Hash into a EnhancedHash
+    #
+    # @private
+    # @param [Hash] data Normal hash
+    # @return [Hash]
+    Contract Any => Maybe[Or[Array, EnhancedHash]]
+    def recursively_enhance(obj)
+      if obj.is_a? ::Array
+        obj.map { |e| recursively_enhance(e) }
+      elsif obj.is_a? ::Hash
+        ::Hashie::Mash.new(obj)
+      else
+        obj
+      end
+    end
+
     module Data
       include Contracts
 
@@ -23,7 +51,7 @@ module Middleman
         # Avoid weird race condition when a file is renamed
         begin
           content = file.read
-        rescue EOFError, IOError, Errno::ENOENT
+        rescue EOFError, IOError, ::Errno::ENOENT
           return [{}, nil]
         end
 
@@ -31,7 +59,7 @@ module Middleman
                                     .values
                                     .flatten(1)
                                     .transpose
-                                    .map(&Regexp.method(:union))
+                                    .map(&::Regexp.method(:union))
 
         match = /
           \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
diff --git a/middleman-core/lib/middleman-core/util/files.rb b/middleman-core/lib/middleman-core/util/files.rb
new file mode 100644
index 00000000..f8fb1316
--- /dev/null
+++ b/middleman-core/lib/middleman-core/util/files.rb
@@ -0,0 +1,134 @@
+module Middleman
+  module Util
+    include Contracts
+
+    module_function
+
+    # Get a recusive list of files inside a path.
+    # Works with symlinks.
+    #
+    # @param path Some path string or Pathname
+    # @param ignore A proc/block that returns true if a given path should be ignored - if a path
+    #               is ignored, nothing below it will be searched either.
+    # @return [Array<Pathname>] An array of Pathnames for each file (no directories)
+    Contract Or[String, Pathname], Proc => ArrayOf[Pathname]
+    def all_files_under(path, &ignore)
+      path = Pathname(path)
+
+      if ignore && yield(path)
+        []
+      elsif path.directory?
+        path.children.flat_map do |child|
+          all_files_under(child, &ignore)
+        end.compact
+      elsif path.file?
+        [path]
+      else
+        []
+      end
+    end
+
+    # Glob a directory and try to keep path encoding consistent.
+    #
+    # @param [String] path The glob path.
+    # @return [Array<String>]
+    def glob_directory(path)
+      results = ::Dir[path]
+
+      return results unless RUBY_PLATFORM =~ /darwin/
+
+      results.map { |r| r.encode('UTF-8', 'UTF-8-MAC') }
+    end
+
+    # Get the PWD and try to keep path encoding consistent.
+    #
+    # @param [String] path The glob path.
+    # @return [Array<String>]
+    def current_directory
+      result = ::Dir.pwd
+
+      return result unless RUBY_PLATFORM =~ /darwin/
+
+      result.encode('UTF-8', 'UTF-8-MAC')
+    end
+
+    Contract String => String
+    def step_through_extensions(path)
+      while ::Tilt[path]
+        ext = ::File.extname(path)
+        yield ext if block_given?
+
+        # Strip templating extensions as long as Tilt knows them
+        path = path[0..-(ext.length + 1)]
+      end
+
+      yield ::File.extname(path) if block_given?
+
+      path
+    end
+
+    # Removes the templating extensions, while keeping the others
+    # @param [String] path
+    # @return [String]
+    Contract String => String
+    def remove_templating_extensions(path)
+      step_through_extensions(path)
+    end
+
+    # Removes the templating extensions, while keeping the others
+    # @param [String] path
+    # @return [String]
+    Contract String => ArrayOf[String]
+    def collect_extensions(path)
+      return [] if ::File.basename(path).start_with?('.')
+
+      result = []
+
+      step_through_extensions(path) { |e| result << e }
+
+      result
+    end
+
+    # Finds files which should also be considered to be dirty when
+    # the given file(s) are touched.
+    #
+    # @param [Middleman::Application] app The app.
+    # @param [Pathname] files The original touched file paths.
+    # @return [Middleman::SourceFile] All related file paths, not including the source file paths.
+    Contract ::Middleman::Application, ArrayOf[Pathname] => ArrayOf[::Middleman::SourceFile]
+    def find_related_files(app, files)
+      return [] if files.empty?
+
+      all_extensions = files.flat_map { |f| collect_extensions(f.to_s) }
+
+      sass_type_aliasing = ['.scss', '.sass']
+      erb_type_aliasing = ['.erb', '.haml', '.slim']
+
+      if (all_extensions & sass_type_aliasing).length > 0
+        all_extensions |= sass_type_aliasing
+      end
+
+      if (all_extensions & erb_type_aliasing).length > 0
+        all_extensions |= erb_type_aliasing
+      end
+
+      all_extensions.uniq!
+
+      app.sitemap.resources.select(&:file_descriptor).select { |r|
+        local_extensions = collect_extensions(r.file_descriptor[:full_path].to_s)
+
+        if (local_extensions & sass_type_aliasing).length > 0
+          local_extensions |= sass_type_aliasing
+        end
+
+        if (local_extensions & erb_type_aliasing).length > 0
+          local_extensions |= erb_type_aliasing
+        end
+
+        local_extensions.uniq!
+
+        ((all_extensions & local_extensions).length > 0) && files.none? { |f| f == r.file_descriptor[:full_path] }
+      }.map(&:file_descriptor)
+    end
+  end
+end
diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
new file mode 100644
index 00000000..61abec59
--- /dev/null
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -0,0 +1,251 @@
+# Core Pathname library used for traversal
+require 'pathname'
+require 'uri'
+
+require 'middleman-core/contracts'
+
+# rubocop:disable ModuleLength
+module Middleman
+  module Util
+    include Contracts
+
+    module_function
+
+    # Normalize a path to not include a leading slash
+    # @param [String] path
+    # @return [String]
+    Contract String => String
+    def normalize_path(path)
+      # The tr call works around a bug in Ruby's Unicode handling
+      ::URI.decode(path).sub(%r{^/}, '').tr('', '')
+    end
+
+    # This is a separate method from normalize_path in case we
+    # change how we normalize paths
+    Contract String => String
+    def strip_leading_slash(path)
+      path.sub(%r{^/}, '')
+    end
+
+    # Get the path of a file of a given type
+    #
+    # @param [Middleman::Application] app The app.
+    # @param [Symbol] kind The type of file
+    # @param [String, Symbol] source The path to the file
+    # @param [Hash] options Data to pass through.
+    # @return [String]
+    Contract ::Middleman::Application, Symbol, Or[String, Symbol], Hash => String
+    def asset_path(app, kind, source, options={})
+      return source if source.to_s.include?('//') || source.to_s.start_with?('data:')
+
+      asset_folder = case kind
+      when :css
+        app.config[:css_dir]
+      when :js
+        app.config[:js_dir]
+      when :images
+        app.config[:images_dir]
+      when :fonts
+        app.config[:fonts_dir]
+      else
+        kind.to_s
+      end
+
+      source = source.to_s.tr(' ', '')
+      ignore_extension = (kind == :images || kind == :fonts) # don't append extension
+      source << ".#{kind}" unless ignore_extension || source.end_with?(".#{kind}")
+      asset_folder = '' if source.start_with?('/') # absolute path
+
+      asset_url(app, source, asset_folder, options)
+    end
+
+    # Get the URL of an asset given a type/prefix
+    #
+    # @param [String] path The path (such as "photo.jpg")
+    # @param [String] prefix The type prefix (such as "images")
+    # @param [Hash] options Data to pass through.
+    # @return [String] The fully qualified asset url
+    Contract ::Middleman::Application, String, String, Hash => String
+    def asset_url(app, path, prefix='', options={})
+      # Don't touch assets which already have a full path
+      return path if path.include?('//') || path.start_with?('data:')
+
+      if options[:relative] && !options[:current_resource]
+        raise ArgumentError, '#asset_url must be run in a context with current_resource if relative: true'
+      end
+
+      uri = URI(path)
+      path = uri.path
+
+      result = if resource = app.sitemap.find_resource_by_destination_path(url_for(app, path, options))
+        resource.url
+      else
+        path = ::File.join(prefix, path)
+        if resource = app.sitemap.find_resource_by_path(path)
+          resource.url
+        else
+          ::File.join(app.config[:http_prefix], path)
+        end
+      end
+
+      final_result = ::URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative]))
+
+      result_uri = URI(final_result)
+      result_uri.query = uri.query
+      result_uri.fragment = uri.fragment
+      result_uri.to_s
+    end
+
+    # Given a source path (referenced either absolutely or relatively)
+    # or a Resource, this will produce the nice URL configured for that
+    # path, respecting :relative_links, directory indexes, etc.
+    Contract ::Middleman::Application, Or[String, ::Middleman::Sitemap::Resource], Hash => String
+    def url_for(app, path_or_resource, options={})
+      # Handle Resources and other things which define their own url method
+      url = if path_or_resource.respond_to?(:url)
+        path_or_resource.url
+      else
+        path_or_resource.dup
+      end
+
+      # Try to parse URL
+      begin
+        uri = URI(url)
+      rescue ::URI::InvalidURIError
+        # Nothing we can do with it, it's not really a URI
+        return url
+      end
+
+      relative = options[:relative]
+      raise "Can't use the relative option with an external URL" if relative && uri.host
+
+      # Allow people to turn on relative paths for all links with
+      # set :relative_links, true
+      # but still override on a case by case basis with the :relative parameter.
+      effective_relative = relative || false
+      effective_relative = true if relative.nil? && app.config[:relative_links]
+
+      # Try to find a sitemap resource corresponding to the desired path
+      this_resource = options[:current_resource]
+
+      if path_or_resource.is_a?(::Middleman::Sitemap::Resource)
+        resource = path_or_resource
+        resource_url = url
+      elsif this_resource && uri.path && !uri.host
+        # Handle relative urls
+        url_path = Pathname(uri.path)
+        current_source_dir = Pathname('/' + this_resource.path).dirname
+        url_path = current_source_dir.join(url_path) if url_path.relative?
+        resource = app.sitemap.find_resource_by_path(url_path.to_s)
+        if resource
+          resource_url = resource.url
+        else
+          # Try to find a resource relative to destination paths
+          url_path = Pathname(uri.path)
+          current_source_dir = Pathname('/' + this_resource.destination_path).dirname
+          url_path = current_source_dir.join(url_path) if url_path.relative?
+          resource = app.sitemap.find_resource_by_destination_path(url_path.to_s)
+          resource_url = resource.url if resource
+        end
+      elsif options[:find_resource] && uri.path && !uri.host
+        resource = app.sitemap.find_resource_by_path(uri.path)
+        resource_url = resource.url if resource
+      end
+
+      if resource
+        uri.path = if this_resource
+          ::URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
+        else
+          resource_url
+        end
+      end
+
+      # Support a :query option that can be a string or hash
+      if query = options[:query]
+        uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
+      end
+
+      # Support a :fragment or :anchor option just like Padrino
+      fragment = options[:anchor] || options[:fragment]
+      uri.fragment = fragment.to_s if fragment
+
+      # Finally make the URL back into a string
+      uri.to_s
+    end
+
+    # Expand a path to include the index file if it's a directory
+    #
+    # @param [String] path Request path/
+    # @param [Middleman::Application] app The requesting app.
+    # @return [String] Path with index file if necessary.
+    Contract String, ::Middleman::Application => String
+    def full_path(path, app)
+      resource = app.sitemap.find_resource_by_destination_path(path)
+
+      unless resource
+        # Try it with /index.html at the end
+        indexed_path = ::File.join(path.sub(%r{/$}, ''), app.config[:index_file])
+        resource = app.sitemap.find_resource_by_destination_path(indexed_path)
+      end
+
+      if resource
+        '/' + resource.destination_path
+      else
+        '/' + normalize_path(path)
+      end
+    end
+
+    # Get a relative path to a resource.
+    #
+    # @param [Middleman::Sitemap::Resource] curr_resource The resource.
+    # @param [String] resource_url The target url.
+    # @param [Boolean] relative If the path should be relative.
+    # @return [String]
+    Contract ::Middleman::Sitemap::Resource, String, Bool => String
+    def relative_path_from_resource(curr_resource, resource_url, relative)
+      # Switch to the relative path between resource and the given resource
+      # if we've been asked to.
+      if relative
+        # Output urls relative to the destination path, not the source path
+        current_dir = Pathname('/' + curr_resource.destination_path).dirname
+        relative_path = Pathname(resource_url).relative_path_from(current_dir).to_s
+
+        # Put back the trailing slash to avoid unnecessary Apache redirects
+        if resource_url.end_with?('/') && !relative_path.end_with?('/')
+          relative_path << '/'
+        end
+
+        relative_path
+      else
+        resource_url
+      end
+    end
+
+    # Takes a matcher, which can be a literal string
+    # or a string containing glob expressions, or a
+    # regexp, or a proc, or anything else that responds
+    # to #match or #call, and returns whether or not the
+    # given path matches that matcher.
+    #
+    # @param [String, #match, #call] matcher A matcher String, RegExp, Proc, etc.
+    # @param [String] path A path as a string
+    # @return [Boolean] Whether the path matches the matcher
+    Contract PATH_MATCHER, String => Bool
+    def path_match(matcher, path)
+      case
+      when matcher.is_a?(String)
+        if matcher.include? '*'
+          ::File.fnmatch(matcher, path)
+        else
+          path == matcher
+        end
+      when matcher.respond_to?(:match)
+        !!(path =~ matcher)
+      when matcher.respond_to?(:call)
+        matcher.call(path)
+      else
+        ::File.fnmatch(matcher.to_s, path)
+      end
+    end
+  end
+end
diff --git a/middleman-core/lib/middleman-core/util/rack.rb b/middleman-core/lib/middleman-core/util/rack.rb
new file mode 100644
index 00000000..8399b3af
--- /dev/null
+++ b/middleman-core/lib/middleman-core/util/rack.rb
@@ -0,0 +1,52 @@
+require 'middleman-core/contracts'
+
+module Middleman
+  module Util
+    include Contracts
+
+    module_function
+
+    # Extract the text of a Rack response as a string.
+    # Useful for extensions implemented as Rack middleware.
+    # @param response The response from #call
+    # @return [String] The whole response as a string.
+    Contract RespondTo[:each] => String
+    def extract_response_text(response)
+      # The rack spec states all response bodies must respond to each
+      result = ''
+      response.each do |part, _|
+        result << part
+      end
+      result
+    end
+
+    Contract String, String, ArrayOf[String], Proc => String
+    def rewrite_paths(body, _path, exts, &_block)
+      matcher = /([\'\"\(,]\s*)([^\s\'\"\)>]+(#{::Regexp.union(exts)}))/
+
+      url_fn_prefix = 'url('
+
+      body.dup.gsub(matcher) do |match|
+        opening_character = $1
+        asset_path = $2
+
+        if asset_path.start_with?(url_fn_prefix)
+          opening_character << url_fn_prefix
+          asset_path = asset_path[url_fn_prefix.length..-1]
+        end
+
+        begin
+          uri = ::Addressable::URI.parse(asset_path)
+
+          if uri.relative? && uri.host.nil? && !(asset_path =~ /^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
+            "#{opening_character}#{result}"
+          else
+            match
+          end
+        rescue ::Addressable::URI::InvalidURIError
+          match
+        end
+      end
+    end
+  end
+end
diff --git a/middleman-core/lib/middleman-core/util/uri_templates.rb b/middleman-core/lib/middleman-core/util/uri_templates.rb
new file mode 100644
index 00000000..c13d504d
--- /dev/null
+++ b/middleman-core/lib/middleman-core/util/uri_templates.rb
@@ -0,0 +1,97 @@
+# For URI templating
+require 'addressable/uri'
+require 'addressable/template'
+require 'active_support/inflector'
+require 'active_support/inflector/transliterate'
+
+module Middleman
+  module Util
+    # Handy methods for dealing with URI templates. Mix into whatever class.
+    module UriTemplates
+      module_function
+
+      # Given a URI template string, make an Addressable::Template
+      # This supports the legacy middleman-blog/Sinatra style :colon
+      # URI templates as well as RFC6570 templates.
+      #
+      # @param [String] tmpl_src URI template source
+      # @return [Addressable::Template] a URI template
+      def uri_template(tmpl_src)
+        # Support the RFC6470 templates directly if people use them
+        if tmpl_src.include?(':')
+          tmpl_src = tmpl_src.gsub(/:([A-Za-z0-9]+)/, '{\1}')
+        end
+
+        ::Addressable::Template.new(::Middleman::Util.normalize_path(tmpl_src))
+      end
+
+      # Apply a URI template with the given data, producing a normalized
+      # Middleman path.
+      #
+      # @param [Addressable::Template] template
+      # @param [Hash] data
+      # @return [String] normalized path
+      def apply_uri_template(template, data)
+        ::Middleman::Util.normalize_path(::Addressable::URI.unencode(template.expand(data)).to_s)
+      end
+
+      # Use a template to extract parameters from a path, and validate some special (date)
+      # keys. Returns nil if the special keys don't match.
+      #
+      # @param [Addressable::Template] template
+      # @param [String] path
+      def extract_params(template, path)
+        template.extract(path, BlogTemplateProcessor)
+      end
+
+      # Parameterize a string preserving any multibyte characters
+      def safe_parameterize(str)
+        sep = '-'
+
+        # Reimplementation of http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html#method-i-parameterize that preserves un-transliterate-able multibyte chars.
+        parameterized_string = ::ActiveSupport::Inflector.transliterate(str.to_s).downcase
+        parameterized_string.gsub!(/[^a-z0-9\-_\?]+/, sep)
+
+        parameterized_string.chars.to_a.each_with_index do |char, i|
+          next unless char == '?' && str[i].bytes.count != 1
+          parameterized_string[i] = str[i]
+        end
+
+        re_sep = ::Regexp.escape(sep)
+        # No more than one of the separator in a row.
+        parameterized_string.gsub!(/#{re_sep}{2,}/, sep)
+        # Remove leading/trailing separator.
+        parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
+
+        parameterized_string
+      end
+
+      # Convert a date into a hash of components to strings
+      # suitable for using in a URL template.
+      # @param [DateTime] date
+      # @return [Hash] parameters
+      def date_to_params(date)
+        {
+          year: date.year.to_s,
+          month: date.month.to_s.rjust(2, '0'),
+          day: date.day.to_s.rjust(2, '0')
+        }
+      end
+    end
+
+    # A special template processor that validates date fields
+    # and has an extra-permissive default regex.
+    #
+    # See https://github.com/sporkmonger/addressable/blob/master/lib/addressable/template.rb#L279
+    class BlogTemplateProcessor
+      def self.match(name)
+        case name
+        when 'year' then '\d{4}'
+        when 'month' then '\d{2}'
+        when 'day' then '\d{2}'
+        else '.*?'
+        end
+      end
+    end
+  end
+end

From f596d8ebf58f634032aa44745622bbc442b93384 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 2 Feb 2016 13:11:53 -0800
Subject: [PATCH 021/122] bump

---
 middleman-core/lib/middleman-core/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index dbe053e0..346327ff 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.0.rc.2'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.0'.freeze unless const_defined?(:VERSION)
 end

From 6de25dfd0e6a5b612548bddf851f413368f98b9e Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 2 Feb 2016 18:49:14 -0800
Subject: [PATCH 022/122] Fix #1787

---
 middleman-core/lib/middleman-core/extensions.rb | 2 +-
 middleman-core/lib/middleman-core/version.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/middleman-core/lib/middleman-core/extensions.rb b/middleman-core/lib/middleman-core/extensions.rb
index fba0e488..c295efe3 100644
--- a/middleman-core/lib/middleman-core/extensions.rb
+++ b/middleman-core/lib/middleman-core/extensions.rb
@@ -106,7 +106,7 @@ module Middleman
       # A flattened list of all extensions which are automatically activated
       # @return [Array<Symbol>] A list of extension names which are automatically activated.
       def auto_activated
-        @auto_activate.values.map(&:to_a).flat_map(&:name)
+        @auto_activate.values.map(&:to_a).flatten.map(&:name)
       end
 
       # @api private
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 346327ff..73057eae 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.0'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.1'.freeze unless const_defined?(:VERSION)
 end

From a2181a2fd91580fef9eec9629b1ea507c1b04fd0 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 3 Feb 2016 09:57:30 -0800
Subject: [PATCH 023/122] Allow findup to be false

---
 CHANGELOG.md                                    | 6 ++++++
 middleman-core/lib/middleman-core/load_paths.rb | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f562aa0f..89a3371f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 master
 ===
 
+* Allow looking for `Gemfile` when setting up a project to fail gracefully.
+
+# 4.1.1
+
+* Fix bad code that made `/__middleman/` break.
+
 # 4.1.0
 
 * Add rewrite_ignore option to asset_hash, asset_host, cache_buster & relative_assets. This proc let's you opt-out of the extension behavior on a per-path basis.
diff --git a/middleman-core/lib/middleman-core/load_paths.rb b/middleman-core/lib/middleman-core/load_paths.rb
index c0bda7b2..af281886 100644
--- a/middleman-core/lib/middleman-core/load_paths.rb
+++ b/middleman-core/lib/middleman-core/load_paths.rb
@@ -22,7 +22,9 @@ module Middleman
 
     # Set BUNDLE_GEMFILE and run Bundler setup. Raises an exception if there is no Gemfile
     def setup_bundler
-      ENV['BUNDLE_GEMFILE'] ||= File.join(findup('Gemfile', ENV['MM_ROOT']), 'Gemfile')
+      if found_gemfile_root = findup('Gemfile', ENV['MM_ROOT'])
+        ENV['BUNDLE_GEMFILE'] ||= File.join(found_gemfile_root, 'Gemfile')
+      end
 
       unless File.exist?(ENV['BUNDLE_GEMFILE'])
         ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)

From b1778a92cd3797772ed0b10772193897c5b0b8c7 Mon Sep 17 00:00:00 2001
From: Jim Cushing <jcushing@groupcse.com>
Date: Wed, 3 Feb 2016 16:55:11 -0500
Subject: [PATCH 024/122] fix partials used with blocks

---
 middleman-core/features/partials.feature                   | 7 +++++++
 middleman-core/fixtures/partials-app/source/_block.erb     | 3 +++
 middleman-core/fixtures/partials-app/source/block.html.erb | 3 +++
 middleman-core/lib/middleman-core/template_context.rb      | 3 ++-
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 middleman-core/fixtures/partials-app/source/_block.erb
 create mode 100644 middleman-core/fixtures/partials-app/source/block.html.erb

diff --git a/middleman-core/features/partials.feature b/middleman-core/features/partials.feature
index 86509027..30773b46 100644
--- a/middleman-core/features/partials.feature
+++ b/middleman-core/features/partials.feature
@@ -50,3 +50,10 @@ Feature: Provide Sane Defaults for Partial Behavior
     Then I should see "File Not Found"
     When I go to "/_code_snippet.html"
     Then I should see "File Not Found"
+
+Scenario: Works with blocks
+    Given the Server is running at "partials-app"
+    When I go to "/block.html"
+    Then I should see "Start"
+    And I should see "Contents"
+    And I should see "End"
diff --git a/middleman-core/fixtures/partials-app/source/_block.erb b/middleman-core/fixtures/partials-app/source/_block.erb
new file mode 100644
index 00000000..179e0c82
--- /dev/null
+++ b/middleman-core/fixtures/partials-app/source/_block.erb
@@ -0,0 +1,3 @@
+Start
+<%= yield %>
+End
diff --git a/middleman-core/fixtures/partials-app/source/block.html.erb b/middleman-core/fixtures/partials-app/source/block.html.erb
new file mode 100644
index 00000000..613f7ccb
--- /dev/null
+++ b/middleman-core/fixtures/partials-app/source/block.html.erb
@@ -0,0 +1,3 @@
+<% partial "block" do %>
+Contents 
+<% end %>
diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index 8d7fd784..cd0b50e8 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -96,8 +96,9 @@ module Middleman
     #
     # @param [String, Symbol] name The partial to render.
     # @param [Hash] options
+    # @param [Proc] block A block will be evaluated to return internal contents.
     # @return [String]
-    Contract Any, Or[Symbol, String], Hash => String
+    Contract Any, Or[Symbol, String], Hash => String, Maybe[Proc] => String
     def render(_, name, options={}, &block)
       name = name.to_s
 

From 7bd417fad1ceb02e8957ce22c5bd4039a38eec73 Mon Sep 17 00:00:00 2001
From: Jim Cushing <jimothy@mac.com>
Date: Thu, 4 Feb 2016 20:44:39 -0500
Subject: [PATCH 025/122] show version on middleman page

---
 .../lib/middleman-core/meta_pages/templates/index.html.erb    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/meta_pages/templates/index.html.erb b/middleman-core/lib/middleman-core/meta_pages/templates/index.html.erb
index 65041ac7..50c16087 100644
--- a/middleman-core/lib/middleman-core/meta_pages/templates/index.html.erb
+++ b/middleman-core/lib/middleman-core/meta_pages/templates/index.html.erb
@@ -10,7 +10,9 @@
     <div class="container">
       <article id="main">
         <h1>Middleman Information</h1>
-
+        <p>
+          Middleman version <%= Middleman::VERSION %>
+        </p>
         <ul class="nav-list">
           <li>
             <a href="/__middleman/sitemap/">Sitemap</a>

From b7886aa14cd68a6a3a7b02c7777b5922de4280f1 Mon Sep 17 00:00:00 2001
From: Melvin Lammerts <melvinsh@users.noreply.github.com>
Date: Mon, 15 Feb 2016 23:42:05 +0100
Subject: [PATCH 026/122] escape path in 404 (not found) page

This escapes the `path` variable using `escape_html` from `Rack::Utils` to prevent Cross-Site Scripting in 404 (Not Found) pages.
---
 middleman-core/lib/middleman-core/rack.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/middleman-core/lib/middleman-core/rack.rb b/middleman-core/lib/middleman-core/rack.rb
index 390728b4..cf241d9f 100644
--- a/middleman-core/lib/middleman-core/rack.rb
+++ b/middleman-core/lib/middleman-core/rack.rb
@@ -2,6 +2,7 @@ require 'rack'
 require 'rack/file'
 require 'rack/lint'
 require 'rack/head'
+require 'rack/utils'
 
 require 'middleman-core/util'
 require 'middleman-core/logger'
@@ -124,6 +125,7 @@ module Middleman
 
     # Halt request and return 404
     def not_found(res, path)
+      path = ::Rack::Utils::escape_html(path)
       res.status = 404
       res.write "<html><head></head><body><h1>File Not Found</h1><p>#{path}</p></body></html>"
       res.finish

From fc0f5d24d65e06e18d3ecd3cf53f45ade09c6ca9 Mon Sep 17 00:00:00 2001
From: Steven Sloan <stevenosloan@gmail.com>
Date: Wed, 17 Feb 2016 16:58:04 -0500
Subject: [PATCH 027/122] feat(data): allow for setting & getting Arrays
 through #store & #data_for_path

Seeing that in #touch_file that a value in data could be an Array or Hash, loosen contracts to allow for other storage & retrieval methods to set the same types. Array & Hash being allowable is strongly tied to what *could* be returned after passing through Util.recursively_enhance

[close #1803]
---
 .../middleman-core/core_extensions/data.rb    |   4 +-
 .../lib/middleman-core/util/data.rb           |   2 +-
 .../core_extensions/data_spec.rb              | 108 +++++++++++++++++-
 3 files changed, 110 insertions(+), 4 deletions(-)

diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
index 2f2f4280..18057465 100644
--- a/middleman-core/lib/middleman-core/core_extensions/data.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/data.rb
@@ -67,7 +67,7 @@ module Middleman
         # @param [Symbol] name Name of the data, used for namespacing
         # @param [Hash] content The content for this data
         # @return [Hash]
-        Contract Symbol, Hash => Hash
+        Contract Symbol, Or[Hash, Array] => Hash
         def store(name=nil, content=nil)
           @local_sources[name.to_s] = content unless name.nil? || content.nil?
           @local_sources
@@ -148,7 +148,7 @@ module Middleman
         #
         # @param [String, Symbol] path The name of the data namespace
         # @return [Hash, nil]
-        Contract Or[String, Symbol] => Maybe[Hash]
+        Contract Or[String, Symbol] => Maybe[Or[Array, IsA['Middleman::Util::EnhancedHash']]]
         def data_for_path(path)
           response = if store.key?(path.to_s)
             store[path.to_s]
diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb
index 2bab7fe0..1a521b8d 100644
--- a/middleman-core/lib/middleman-core/util/data.rb
+++ b/middleman-core/lib/middleman-core/util/data.rb
@@ -29,7 +29,7 @@ module Middleman
       if obj.is_a? ::Array
         obj.map { |e| recursively_enhance(e) }
       elsif obj.is_a? ::Hash
-        ::Hashie::Mash.new(obj)
+        EnhancedHash.new(obj)
       else
         obj
       end
diff --git a/middleman-core/spec/middleman-core/core_extensions/data_spec.rb b/middleman-core/spec/middleman-core/core_extensions/data_spec.rb
index 7c7ddb46..1f0099c9 100644
--- a/middleman-core/spec/middleman-core/core_extensions/data_spec.rb
+++ b/middleman-core/spec/middleman-core/core_extensions/data_spec.rb
@@ -7,6 +7,112 @@ end
 
 describe Middleman::CoreExtensions::Data::DataStore do
 
+  describe "#store" do
+    before :each do
+      @subject = described_class.new instance_double("Middleman::Application"),
+                                     Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+    end
+
+    context "when given a name and data" do
+      it "adds data at the given name" do
+        @subject.store :foo, { 'bar' => 'baz' }
+        @subject.store :baz, [:wu, :tang]
+
+        expect( @subject.store['foo'] ).to eq({ 'bar' => 'baz' })
+        expect( @subject.store['baz'] ).to match_array [:wu, :tang]
+      end
+
+      it "overwrites previous keys if given the same key" do
+        @subject.store :foo, { 'bar' => 'baz' }
+        @subject.store :foo, [:wu, :tang]
+
+        expect( @subject.store['foo'] ).to match_array [:wu, :tang]
+      end
+    end
+
+    context "when given no args" do
+      it "returns @local_sources instance var" do
+        @subject.instance_variable_set :"@local_sources", { foo: 'bar' }
+        expect( @subject.store ).to eq({ foo: 'bar' })
+      end
+    end
+  end
+
+  describe "#callbacks" do
+    before :each do
+      @subject = described_class.new instance_double("Middleman::Application"),
+                                     Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+    end
+
+    context "when given a name and proc" do
+      it "adds a callback at the given name" do
+        @subject.callbacks :foo, lambda { "bar" }
+        callback = @subject.instance_variable_get(:@callback_sources)['foo']
+
+        expect( callback.call ).to eq "bar"
+      end
+
+      it "overwrites previous keys if given the same key" do
+        @subject.callbacks :foo, lambda { "bar" }
+        @subject.callbacks :foo, lambda { "baz" }
+        callback = @subject.instance_variable_get(:@callback_sources)['foo']
+
+        expect( callback.call ).to eq "baz"
+      end
+    end
+
+    context "when given no args" do
+      it "returns @callback_sources instance var" do
+        @subject.instance_variable_set :"@callback_sources", { foo: 'bar' }
+        expect( @subject.callbacks ).to eq({ foo: 'bar' })
+      end
+    end
+  end
+
+  describe "#data_for_path" do
+    before :each do
+      @subject = described_class.new instance_double("Middleman::Application"),
+                                     Middleman::CoreExtensions::Data::DATA_FILE_MATCHER
+    end
+
+    context "given path matches local data" do
+      it "returns hash for key" do
+        @subject.store :foo, { 'bar' => 'baz' }
+        expect( @subject.data_for_path(:foo) ).to eq({ 'bar' => 'baz' })
+      end
+
+      it "returns array for key" do
+        @subject.store :foo, [:bar, :baz]
+        expect( @subject.data_for_path(:foo) ).to match_array [:bar, :baz]
+      end
+    end
+
+    context "given path matches callback data" do
+      it "returns value of calback lambda" do
+        @subject.callbacks :foo, lambda { { 'bar' => 'baz' } }
+        @subject.callbacks :wu, lambda { [:tang, :clan] }
+
+        expect( @subject.data_for_path(:foo) ).to eq({ 'bar' => 'baz' })
+        expect( @subject.data_for_path(:wu) ).to match_array [:tang, :clan]
+      end
+    end
+
+    context "given path matches both sources" do
+      it "returns match from local data" do
+        @subject.store :foo, { 'local' => 'data' }
+        @subject.callbacks :foo, lambda { { 'callback' => 'data' } }
+
+        expect( @subject.data_for_path(:foo) ).to eq({ 'local' => 'data' })
+      end
+    end
+
+    context "given path matches no sources" do
+      it "returns nil" do
+        expect( @subject.data_for_path(:missing) ).to be_nil
+      end
+    end
+  end
+
   describe "#key?" do
 
     it "returns true if key included in local_data, local_sources, or callback_sources" do
@@ -38,4 +144,4 @@ describe Middleman::CoreExtensions::Data::DataStore do
 
   end
 
-end
\ No newline at end of file
+end

From 351003b4fe4764287f2c21d23021988533d327fe Mon Sep 17 00:00:00 2001
From: Adam Heath <adam@polleverywhere.com>
Date: Thu, 18 Feb 2016 12:41:48 +0800
Subject: [PATCH 028/122] Make build fail when external_pipeline fails

---
 middleman-core/features/builder.feature              | 12 ++++++++----
 .../fixtures/external-pipeline-error/config.rb       |  5 +++++
 .../source/javascripts/file.js                       |  0
 .../middleman-core/extensions/external_pipeline.rb   |  5 +++++
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 middleman-core/fixtures/external-pipeline-error/config.rb
 create mode 100644 middleman-core/fixtures/external-pipeline-error/source/javascripts/file.js

diff --git a/middleman-core/features/builder.feature b/middleman-core/features/builder.feature
index b61f5cdc..d99c165c 100644
--- a/middleman-core/features/builder.feature
+++ b/middleman-core/features/builder.feature
@@ -20,13 +20,13 @@ Feature: Builder
       | layout                                        |
       | layouts/custom                                |
       | layouts/content_for                           |
-      
+
     And the file "index.html" should contain "Comment in layout"
     And the file "index.html" should contain "<h1>Welcome</h1>"
     And the file "static.html" should contain "Static, no code!"
     And the file "services/index.html" should contain "Services"
     And the file "stylesheets/static.css" should contain "body"
-    
+
   Scenario: Build glob
     Given a successfully built app at "glob-app" with flags "--glob '*.css'"
     When I cd to "build"
@@ -34,15 +34,19 @@ Feature: Builder
       | index.html                                    |
     Then the following files should exist:
       | stylesheets/site.css                          |
-  
+
   Scenario: Build with errors
     Given a built app at "build-with-errors-app"
     Then the exit status should be 1
-  
+
   Scenario: Build empty errors
     Given a built app at "empty-app"
     Then the exit status should be 1
 
+  Scenario: Build external_pipeline errors
+    Given a built app at "external-pipeline-error"
+    Then the exit status should be 1
+
   Scenario: Build alias (b)
     Given a fixture app "large-build-app"
     When I run `middleman b`
diff --git a/middleman-core/fixtures/external-pipeline-error/config.rb b/middleman-core/fixtures/external-pipeline-error/config.rb
new file mode 100644
index 00000000..96bb2b94
--- /dev/null
+++ b/middleman-core/fixtures/external-pipeline-error/config.rb
@@ -0,0 +1,5 @@
+activate :external_pipeline,
+  name: :failing,
+  command: "mv does-not-exist tmp/file.js",
+  source: "tmp",
+  latency: 2
diff --git a/middleman-core/fixtures/external-pipeline-error/source/javascripts/file.js b/middleman-core/fixtures/external-pipeline-error/source/javascripts/file.js
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
index 6b51d944..0e09dc17 100644
--- a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
+++ b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
@@ -34,6 +34,11 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
       end
     end
 
+    unless $?.success?
+      logger.error '== External: Command failed with non-zero exit status'
+      exit(1)
+    end
+
     @watcher.poll_once!
   rescue ::Errno::ENOENT => e
     logger.error "== External: Command failed with message: #{e.message}"

From e36fd3f47667ef4e3070a2b2cc012b5815eedc79 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 19 Feb 2016 11:25:40 -0800
Subject: [PATCH 029/122] move contrib file

---
 CONTRIBUTING.md => .github/CONTRIBUTING.md | 0
 .gitignore                                 | 1 +
 2 files changed, 1 insertion(+)
 rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%)

diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.gitignore b/.gitignore
index 591c32b0..88e2e11e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+npm-debug.log
 /.bundle
 .DS_Store
 coverage

From b695f6da1eebae08d4d3b6f2afcdebf2027eed88 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 19 Feb 2016 13:24:16 -0800
Subject: [PATCH 030/122] Fix #1028

---
 middleman-core/lib/middleman-core/application.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index a7963f4f..a805df45 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -183,8 +183,8 @@ module Middleman
         ignored
       end,
 
-      layout: proc do |file, _sitemap_app|
-        file[:relative_path].to_s.start_with?('layout.', 'layouts/')
+      layout: proc do |file, app|
+        file[:relative_path].to_s.start_with?('layout.', app.config[:layouts_dir] + '/')
       end
     }, 'Callbacks that can exclude paths from the sitemap'
 

From edb1a53060abdc3589cbcfb6a60b69796462c999 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Mon, 22 Feb 2016 11:17:21 -0800
Subject: [PATCH 031/122] Add page_id concept

---
 CHANGELOG.md                                  |  1 +
 middleman-core/features/page-id.feature       | 26 +++++++++++++++++++
 middleman-core/fixtures/page-id-app/config.rb |  5 ++++
 .../fixtures/page-id-app/source/fm.html.erb   |  5 ++++
 .../page-id-app/source/index.html.erb         |  6 +++++
 .../source/overwrites/from-default.html.erb   |  1 +
 .../overwrites/from-frontmatter.html.erb      |  5 ++++
 .../middleman-core/core_extensions/routing.rb |  5 +++-
 .../sitemap/extensions/proxies.rb             |  5 +++-
 .../lib/middleman-core/sitemap/resource.rb    |  5 ++++
 .../lib/middleman-core/sitemap/store.rb       | 13 ++++++++++
 .../lib/middleman-core/util/paths.rb          |  7 ++++-
 12 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 middleman-core/features/page-id.feature
 create mode 100644 middleman-core/fixtures/page-id-app/config.rb
 create mode 100644 middleman-core/fixtures/page-id-app/source/fm.html.erb
 create mode 100644 middleman-core/fixtures/page-id-app/source/index.html.erb
 create mode 100644 middleman-core/fixtures/page-id-app/source/overwrites/from-default.html.erb
 create mode 100644 middleman-core/fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89a3371f..b7bec4c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 master
 ===
 
+* Add `page_id` concept. Using the `id` key in frontmatter, proxy or page will set an ID on a resource which can be referenced by `url_for` and `link_to`.
 * Allow looking for `Gemfile` when setting up a project to fail gracefully.
 
 # 4.1.1
diff --git a/middleman-core/features/page-id.feature b/middleman-core/features/page-id.feature
new file mode 100644
index 00000000..63dd6fad
--- /dev/null
+++ b/middleman-core/features/page-id.feature
@@ -0,0 +1,26 @@
+Feature: Page IDs
+
+  Scenario: link_to works with blocks (erb)
+    Given the Server is running at "page-id-app"
+    When I go to "/index.html"
+    Then I should see "I am: index.html"
+    And I should see "URL1: /fm.html"
+    And I should see "URL2: /2.html"
+    And I should see 'URL3: <a href="/3.html">Hi</a>'
+    And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
+
+    When I go to "/fm.html"
+    Then I should see "I am: frontmatter"
+
+    When I go to "/1.html"
+    Then I should see "I am: page1"
+    When I go to "/2.html"
+    Then I should see "I am: page2"
+    When I go to "/3.html"
+    Then I should see "I am: page3"
+
+    When I go to "/overwrites/from-default.html"
+    Then I should see "I am: something-else"
+
+    When I go to "/overwrites/from-frontmatter.html"
+    Then I should see "I am: from_frontmatter"
diff --git a/middleman-core/fixtures/page-id-app/config.rb b/middleman-core/fixtures/page-id-app/config.rb
new file mode 100644
index 00000000..d0475e7a
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/config.rb
@@ -0,0 +1,5 @@
+%w(1 2 3).each do |n|
+  proxy "/#{n}.html", "/index.html", id: "page#{n}"
+end
+
+page "/overwrites/*", id: :"something-else"
diff --git a/middleman-core/fixtures/page-id-app/source/fm.html.erb b/middleman-core/fixtures/page-id-app/source/fm.html.erb
new file mode 100644
index 00000000..4d6d0772
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/source/fm.html.erb
@@ -0,0 +1,5 @@
+---
+id: frontmatter
+---
+
+I am: <%= current_resource.page_id %>
diff --git a/middleman-core/fixtures/page-id-app/source/index.html.erb b/middleman-core/fixtures/page-id-app/source/index.html.erb
new file mode 100644
index 00000000..8f2997b6
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/source/index.html.erb
@@ -0,0 +1,6 @@
+I am: <%= current_resource.page_id %>
+
+URL1: <%= url_for "frontmatter" %>
+URL2: <%= url_for "page2" %>
+URL3: <%= link_to "Hi", "page3" %>
+URL4: <%= link_to "Sym", :"something-else" %>
diff --git a/middleman-core/fixtures/page-id-app/source/overwrites/from-default.html.erb b/middleman-core/fixtures/page-id-app/source/overwrites/from-default.html.erb
new file mode 100644
index 00000000..a27800bd
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/source/overwrites/from-default.html.erb
@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>
diff --git a/middleman-core/fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb b/middleman-core/fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb
new file mode 100644
index 00000000..194cf4c1
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb
@@ -0,0 +1,5 @@
+---
+id: from_frontmatter
+---
+
+I am: <%= current_resource.page_id %>
diff --git a/middleman-core/lib/middleman-core/core_extensions/routing.rb b/middleman-core/lib/middleman-core/core_extensions/routing.rb
index 089b0486..b10fba53 100644
--- a/middleman-core/lib/middleman-core/core_extensions/routing.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/routing.rb
@@ -52,10 +52,13 @@ module Middleman
       def page(path, opts={})
         options = opts.dup
 
+        page_data = options.delete(:data) || {}
+        page_data[:id] = options.delete(:id) if options.key?(:id)
+
         # Default layout
         metadata = {
           locals: options.delete(:locals) || {},
-          page: options.delete(:data) || {},
+          page: page_data,
           options: options
         }
 
diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb
index 33c0f9a5..b11e02eb 100644
--- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb
+++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb
@@ -36,10 +36,13 @@ module Middleman
           md = metadata.dup
           should_ignore = md.delete(:ignore)
 
+          page_data = md.delete(:data) || {}
+          page_data[:id] = md.delete(:id) if md.key?(:id)
+
           r = ProxyResource.new(app.sitemap, path, target)
           r.add_metadata(
             locals: md.delete(:locals) || {},
-            page: md.delete(:data) || {},
+            page: page_data || {},
             options: md
           )
 
diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index b7b0e063..22213c21 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -85,6 +85,11 @@ module Middleman
         file_descriptor && file_descriptor[:full_path].to_s
       end
 
+      Contract Or[Symbol, String]
+      def page_id
+        metadata[:page][:id] || destination_path
+      end
+
       # Merge in new metadata specific to this resource.
       # @param [Hash] meta A metadata block with keys :options, :locals, :page.
       #   Options are generally rendering/sitemap options
diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb
index 41037309..a7ade5fc 100644
--- a/middleman-core/lib/middleman-core/sitemap/store.rb
+++ b/middleman-core/lib/middleman-core/sitemap/store.rb
@@ -149,6 +149,17 @@ module Middleman
         end
       end
 
+      # Find a resource given its page id
+      # @param [String] page_id The page id.
+      # @return [Middleman::Sitemap::Resource]
+      Contract Or[String, Symbol] => Maybe[IsA['Middleman::Sitemap::Resource']]
+      def find_resource_by_page_id(page_id)
+        @lock.synchronize do
+          ensure_resource_list_updated!
+          @_lookup_by_page_id[page_id.to_sym]
+        end
+      end
+
       # Get the array of all resources
       # @param [Boolean] include_ignored Whether to include ignored resources
       # @return [Array<Middleman::Sitemap::Resource>]
@@ -220,6 +231,7 @@ module Middleman
                 @resources.each do |resource|
                   @_lookup_by_path[resource.path] = resource
                   @_lookup_by_destination_path[resource.destination_path] = resource
+                  @_lookup_by_page_id[resource.page_id.to_sym] = resource
                 end
 
                 invalidate_resources_not_ignored_cache!
@@ -239,6 +251,7 @@ module Middleman
         @lock.synchronize do
           @_lookup_by_path = {}
           @_lookup_by_destination_path = {}
+          @_lookup_by_page_id = {}
         end
       end
 
diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index 61abec59..7c6ffc37 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -99,8 +99,13 @@ module Middleman
     # Given a source path (referenced either absolutely or relatively)
     # or a Resource, this will produce the nice URL configured for that
     # path, respecting :relative_links, directory indexes, etc.
-    Contract ::Middleman::Application, Or[String, ::Middleman::Sitemap::Resource], Hash => String
+    Contract ::Middleman::Application, Or[String, Symbol, ::Middleman::Sitemap::Resource], Hash => String
     def url_for(app, path_or_resource, options={})
+      if path_or_resource.is_a?(String) || path_or_resource.is_a?(Symbol)
+        r = app.sitemap.find_resource_by_page_id(path_or_resource)
+        path_or_resource = r if r
+      end
+
       # Handle Resources and other things which define their own url method
       url = if path_or_resource.respond_to?(:url)
         path_or_resource.url

From 4733488e8df4cbd782a57a4a16a6f1dea4aa60df Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 24 Feb 2016 13:14:50 -0800
Subject: [PATCH 032/122] Update deps

---
 middleman-core/middleman-core.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index f9bb6235..d75fdec5 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -51,10 +51,10 @@ Gem::Specification.new do |s|
   s.add_dependency('execjs', ['~> 2.0'])
 
   # Testing
-  s.add_dependency('contracts', ['~> 0.12.0'])
+  s.add_dependency('contracts', ['~> 0.13.0'])
 
   # Hash stuff
   s.add_dependency('hashie', ['~> 3.4'])
-  s.add_dependency('hamster', ['~> 2.0'])
+  s.add_dependency('hamster', ['~> 3.0'])
   s.add_dependency('backports', ['~> 3.6'])
 end

From 0d983231d0ab90e64e6a96da06d9fe62c8f28fab Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 24 Feb 2016 14:20:42 -0800
Subject: [PATCH 033/122] Run  helper after collections. Fixes #1226

---
 .../features/custom_layouts.feature           | 18 +++++++++++++++-
 middleman-core/lib/middleman-core/builder.rb  |  2 +-
 .../lib/middleman-core/configuration.rb       |  2 +-
 .../middleman-core/core_extensions/i18n.rb    |  2 +-
 .../middleman-core/core_extensions/routing.rb |  4 ++--
 .../lib/middleman-core/extension.rb           |  4 ++--
 .../extensions/external_pipeline.rb           |  2 +-
 middleman-core/lib/middleman-core/logger.rb   |  2 +-
 middleman-core/lib/middleman-core/rack.rb     |  2 +-
 .../lib/middleman-core/renderers/redcarpet.rb |  4 ++--
 .../lib/middleman-core/sitemap/resource.rb    | 11 +++++++---
 .../lib/middleman-core/sitemap/store.rb       |  9 +++++++-
 .../lib/middleman-core/util/files.rb          | 21 +++++--------------
 13 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/middleman-core/features/custom_layouts.feature b/middleman-core/features/custom_layouts.feature
index 27f7df08..dfe52344 100644
--- a/middleman-core/features/custom_layouts.feature
+++ b/middleman-core/features/custom_layouts.feature
@@ -11,6 +11,22 @@ Feature: Custom layouts
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
 
+  Scenario: Using custom :layout attribute with proxy
+    Given a fixture app "custom-layout-app2"
+    And a file named "config.rb" with:
+      """
+      page '/test/*', layout: :custom
+      proxy "/test/me.html", "/custom-layout.html"
+      live { %w(you) }.each do |who|
+        proxy "/test/#{who}.html", "/custom-layout.html"
+      end
+      """
+    And the Server is running at "custom-layout-app2"
+    When I go to "/test/me.html"
+    Then I should see "Custom Layout"
+    When I go to "/test/you.html"
+    Then I should see "Custom Layout"
+
   Scenario: Using custom :layout attribute with folders
     Given a fixture app "custom-layout-app2"
     And a file named "config.rb" with:
@@ -65,4 +81,4 @@ Feature: Custom layouts
     When I go to "/path/index.html"
     Then I should see "Alt"
     And I should see "Monde"
-    And I should not see "Hello"
\ No newline at end of file
+    And I should not see "Hello"
diff --git a/middleman-core/lib/middleman-core/builder.rb b/middleman-core/lib/middleman-core/builder.rb
index 9bb3c031..d2235c5f 100644
--- a/middleman-core/lib/middleman-core/builder.rb
+++ b/middleman-core/lib/middleman-core/builder.rb
@@ -97,7 +97,7 @@ module Middleman
 
       ::Middleman::Util.instrument 'builder.prerender.check-files' do
         # Double-check for compass sprites
-        if @app.files.find_new_files!.length > 0
+        unless @app.files.find_new_files!.empty?
           logger.debug '== Checking for Compass sprites'
           @app.sitemap.ensure_resource_list_updated!
         end
diff --git a/middleman-core/lib/middleman-core/configuration.rb b/middleman-core/lib/middleman-core/configuration.rb
index 3f889c00..c916fc90 100644
--- a/middleman-core/lib/middleman-core/configuration.rb
+++ b/middleman-core/lib/middleman-core/configuration.rb
@@ -40,7 +40,7 @@ module Middleman
 
       # Allow configuration settings to be read and written via methods
       def method_missing(method, *args)
-        if defines_setting?(method) && args.size == 0
+        if defines_setting?(method) && args.empty?
           self[method]
         elsif method.to_s =~ /^(\w+)=$/ && args.size == 1
           self[$1.to_sym] = args[0]
diff --git a/middleman-core/lib/middleman-core/core_extensions/i18n.rb b/middleman-core/lib/middleman-core/core_extensions/i18n.rb
index 9f7503b8..ac86d9a0 100644
--- a/middleman-core/lib/middleman-core/core_extensions/i18n.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/i18n.rb
@@ -102,7 +102,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
       locale_suffix = ::I18n.locale
 
       extname = File.extname(partial_name)
-      maybe_static = extname.length > 0
+      maybe_static = !extname.empty?
       suffixed_partial_name = if maybe_static
         partial_name.sub(extname, ".#{locale_suffix}#{extname}")
       else
diff --git a/middleman-core/lib/middleman-core/core_extensions/routing.rb b/middleman-core/lib/middleman-core/core_extensions/routing.rb
index b10fba53..f47ac16b 100644
--- a/middleman-core/lib/middleman-core/core_extensions/routing.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/routing.rb
@@ -4,7 +4,7 @@ module Middleman
     class Routing < ConfigExtension
       # This should always run late, but not as late as :directory_indexes,
       # so it can add metadata to any pages generated by other extensions
-      self.resource_list_manipulator_priority = 10
+      self.resource_list_manipulator_priority = [10, 130]
 
       # Expose the `page` method to config.
       expose_to_config :page
@@ -25,7 +25,7 @@ module Middleman
 
           resources
             .select { |r| ::Middleman::Util.path_match(normalized_path, "/#{r.path}") }
-            .each { |r| r.add_metadata(metadata) }
+            .each { |r| r.add_metadata(metadata, true) }
 
           resources
         end
diff --git a/middleman-core/lib/middleman-core/extension.rb b/middleman-core/lib/middleman-core/extension.rb
index e8e36af0..d9dc01ca 100644
--- a/middleman-core/lib/middleman-core/extension.rb
+++ b/middleman-core/lib/middleman-core/extension.rb
@@ -402,11 +402,11 @@ module Middleman
         ext.after_configuration if ext.respond_to?(:after_configuration)
 
         if ext.respond_to?(:manipulate_resource_list)
-          ext.app.sitemap.register_resource_list_manipulator(ext.class.ext_name, ext, ext.class.resource_list_manipulator_priority)
+          ext.app.sitemap.register_resource_list_manipulators(ext.class.ext_name, ext, ext.class.resource_list_manipulator_priority)
         end
 
         if ext.class.resources_generators && !ext.class.resources_generators.empty?
-          ext.app.sitemap.register_resource_list_manipulator(
+          ext.app.sitemap.register_resource_list_manipulators(
             :"#{ext.class.ext_name}_generator",
             ext,
             ext.class.resource_list_manipulator_priority,
diff --git a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
index 0e09dc17..d4a5aab5 100644
--- a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
+++ b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
@@ -30,7 +30,7 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
     ::IO.popen(options[:command], 'r') do |pipe|
       while buf = pipe.gets
         without_newline = buf.sub(/\n$/, '')
-        logger.info "== External: #{without_newline}" if without_newline.length > 0
+        logger.info "== External: #{without_newline}" unless without_newline.empty?
       end
     end
 
diff --git a/middleman-core/lib/middleman-core/logger.rb b/middleman-core/lib/middleman-core/logger.rb
index 30e28307..1c0170d1 100644
--- a/middleman-core/lib/middleman-core/logger.rb
+++ b/middleman-core/lib/middleman-core/logger.rb
@@ -7,7 +7,7 @@ module Middleman
   # The Middleman Logger
   class Logger < ActiveSupport::Logger
     def self.singleton(*args)
-      if !@_logger || args.length > 0
+      if !@_logger || !args.empty?
         if args.length == 1 && (args.first.is_a?(::String) || args.first.respond_to?(:write))
           args = [0, false, args.first]
         end
diff --git a/middleman-core/lib/middleman-core/rack.rb b/middleman-core/lib/middleman-core/rack.rb
index cf241d9f..293a2e43 100644
--- a/middleman-core/lib/middleman-core/rack.rb
+++ b/middleman-core/lib/middleman-core/rack.rb
@@ -125,7 +125,7 @@ module Middleman
 
     # Halt request and return 404
     def not_found(res, path)
-      path = ::Rack::Utils::escape_html(path)
+      path = ::Rack::Utils.escape_html(path)
       res.status = 404
       res.write "<html><head></head><body><h1>File Not Found</h1><p>#{path}</p></body></html>"
       res.finish
diff --git a/middleman-core/lib/middleman-core/renderers/redcarpet.rb b/middleman-core/lib/middleman-core/renderers/redcarpet.rb
index 122de759..1542489c 100644
--- a/middleman-core/lib/middleman-core/renderers/redcarpet.rb
+++ b/middleman-core/lib/middleman-core/renderers/redcarpet.rb
@@ -76,7 +76,7 @@ module Middleman
           scope.image_tag(link, title: title, alt: alt_text)
         else
           link_string = link.dup
-          link_string << %("#{title}") if title && title.length > 0 && title != alt_text
+          link_string << %("#{title}") if title && !title.empty? && title != alt_text
           "![#{alt_text}](#{link_string})"
         end
       end
@@ -89,7 +89,7 @@ module Middleman
           scope.link_to(content, link, attributes)
         else
           link_string = link.dup
-          link_string << %("#{title}") if title && title.length > 0 && title != alt_text
+          link_string << %("#{title}") if title && !title.empty? && title != alt_text
           "[#{content}](#{link_string})"
         end
       end
diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index 22213c21..fd236f3f 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -96,10 +96,15 @@ module Middleman
       #   Locals are local variables for rendering this resource's template
       #   Page are data that is exposed through this resource's data member.
       #   Note: It is named 'page' for backwards compatibility with older MM.
-      Contract METADATA_HASH => METADATA_HASH
-      def add_metadata(meta={})
+      Contract METADATA_HASH, Maybe[Bool] => METADATA_HASH
+      def add_metadata(meta={}, reverse=false)
         @page_data = nil
-        @metadata.deep_merge!(meta)
+
+        @metadata = if reverse
+          meta.deep_merge(@metadata)
+        else
+          @metadata.deep_merge(meta)
+        end
       end
 
       # Data about this resource, populated from frontmatter or extensions.
diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb
index a7ade5fc..4667936d 100644
--- a/middleman-core/lib/middleman-core/sitemap/store.rb
+++ b/middleman-core/lib/middleman-core/sitemap/store.rb
@@ -87,6 +87,13 @@ module Middleman
         @app.config_context.class.send :def_delegator, :app, :sitemap
       end
 
+      Contract Symbol, RespondTo[:manipulate_resource_list], Maybe[Or[Num, ArrayOf[Num]]], Maybe[Symbol] => Any
+      def register_resource_list_manipulators(name, manipulator, priority=50, custom_name=nil)
+        Array(priority || 50).each do |p|
+          register_resource_list_manipulator(name, manipulator, p, custom_name)
+        end
+      end
+
       # Register an object which can transform the sitemap resource list. Best to register
       # these in a `before_configuration` or `after_configuration` hook.
       #
@@ -221,7 +228,7 @@ module Middleman
 
             @resource_list_manipulators.each do |m|
               ::Middleman::Util.instrument 'sitemap.manipulator', name: m[:name] do
-                @app.logger.debug "== Running manipulator: #{m[:name]}"
+                @app.logger.debug "== Running manipulator: #{m[:name]} (#{m[:priority]})"
                 @resources = m[:manipulator].send(m[:custom_name] || :manipulate_resource_list, @resources)
 
                 # Reset lookup cache
diff --git a/middleman-core/lib/middleman-core/util/files.rb b/middleman-core/lib/middleman-core/util/files.rb
index f8fb1316..4422b3ef 100644
--- a/middleman-core/lib/middleman-core/util/files.rb
+++ b/middleman-core/lib/middleman-core/util/files.rb
@@ -104,30 +104,19 @@ module Middleman
       sass_type_aliasing = ['.scss', '.sass']
       erb_type_aliasing = ['.erb', '.haml', '.slim']
 
-      if (all_extensions & sass_type_aliasing).length > 0
-        all_extensions |= sass_type_aliasing
-      end
-
-      if (all_extensions & erb_type_aliasing).length > 0
-        all_extensions |= erb_type_aliasing
-      end
+      all_extensions |= sass_type_aliasing unless (all_extensions & sass_type_aliasing).empty?
+      all_extensions |= erb_type_aliasing unless (all_extensions & erb_type_aliasing).empty?
 
       all_extensions.uniq!
 
       app.sitemap.resources.select(&:file_descriptor).select { |r|
         local_extensions = collect_extensions(r.file_descriptor[:full_path].to_s)
-
-        if (local_extensions & sass_type_aliasing).length > 0
-          local_extensions |= sass_type_aliasing
-        end
-
-        if (local_extensions & erb_type_aliasing).length > 0
-          local_extensions |= erb_type_aliasing
-        end
+        local_extensions |= sass_type_aliasing unless (local_extensions & sass_type_aliasing).empty?
+        local_extensions |= erb_type_aliasing unless (local_extensions & erb_type_aliasing).empty?
 
         local_extensions.uniq!
 
-        ((all_extensions & local_extensions).length > 0) && files.none? { |f| f == r.file_descriptor[:full_path] }
+        !(all_extensions & local_extensions).empty? && files.none? { |f| f == r.file_descriptor[:full_path] }
       }.map(&:file_descriptor)
     end
   end

From d883152e997a24c81baa1375f786e2fb2fd6db8d Mon Sep 17 00:00:00 2001
From: Adam Heath <adam@polleverywhere.com>
Date: Fri, 26 Feb 2016 08:46:00 +0800
Subject: [PATCH 034/122] Add sourceMap comment to asset_hash and hash .map
 files by default

---
 middleman-core/features/asset_hash.feature      | 14 ++++++++++++++
 .../fixtures/asset-hash-source-map/config.rb    |  6 ++++++
 .../asset-hash-source-map/lib/middleware.rb     | 16 ++++++++++++++++
 .../asset-hash-source-map/source/index.html.erb |  6 ++++++
 .../source/javascripts/application.js           |  2 ++
 .../source/javascripts/application.js.map       |  1 +
 .../asset-hash-source-map/source/layout.erb     | 17 +++++++++++++++++
 .../lib/middleman-core/extensions/asset_hash.rb |  2 +-
 middleman-core/lib/middleman-core/util/rack.rb  |  2 +-
 9 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 middleman-core/fixtures/asset-hash-source-map/config.rb
 create mode 100644 middleman-core/fixtures/asset-hash-source-map/lib/middleware.rb
 create mode 100644 middleman-core/fixtures/asset-hash-source-map/source/index.html.erb
 create mode 100644 middleman-core/fixtures/asset-hash-source-map/source/javascripts/application.js
 create mode 100644 middleman-core/fixtures/asset-hash-source-map/source/javascripts/application.js.map
 create mode 100644 middleman-core/fixtures/asset-hash-source-map/source/layout.erb

diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature
index 3098e73c..dd659336 100644
--- a/middleman-core/features/asset_hash.feature
+++ b/middleman-core/features/asset_hash.feature
@@ -285,3 +285,17 @@ Feature: Assets get file hashes appended to them and references to them are upda
       | javascripts/jquery.min-276c87ff.js |
     And the following files should not exist:
       | javascripts/jquery.min.js |
+
+  Scenario: Source map paths include the hash
+    Given a successfully built app at "asset-hash-source-map"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | javascripts/application-4553338c.js |
+      | javascripts/application.js-22cc2b5f.map |
+      | index.html |
+    And the following files should not exist:
+      | javascripts/application.js |
+      | javascripts/application.js.map |
+
+    And the file "javascripts/application-4553338c.js" should contain "//# sourceMappingURL=application.js-22cc2b5f.map"
diff --git a/middleman-core/fixtures/asset-hash-source-map/config.rb b/middleman-core/fixtures/asset-hash-source-map/config.rb
new file mode 100644
index 00000000..1327d8f0
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-source-map/config.rb
@@ -0,0 +1,6 @@
+
+activate :asset_hash
+
+activate :relative_assets
+
+activate :directory_indexes
diff --git a/middleman-core/fixtures/asset-hash-source-map/lib/middleware.rb b/middleman-core/fixtures/asset-hash-source-map/lib/middleware.rb
new file mode 100644
index 00000000..8ee825fd
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-source-map/lib/middleware.rb
@@ -0,0 +1,16 @@
+class Middleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, response = @app.call(env)
+    body = ''
+    response.each {|part| body += part }
+    if (env["PATH_INFO"] =~ /css$/)
+      body += "\n/* Added by Rack filter */"
+      status, headers, response = Rack::Response.new(body, status, headers).finish
+    end
+    [status, headers, response]
+  end
+end
diff --git a/middleman-core/fixtures/asset-hash-source-map/source/index.html.erb b/middleman-core/fixtures/asset-hash-source-map/source/index.html.erb
new file mode 100644
index 00000000..a88cc13f
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-source-map/source/index.html.erb
@@ -0,0 +1,6 @@
+<% content_for :head do %>
+  <title>The Middleman!</title>
+<% end %>
+
+<h1>Testing the sitemap hashing</h1>
+<br /><br /><br />
diff --git a/middleman-core/fixtures/asset-hash-source-map/source/javascripts/application.js b/middleman-core/fixtures/asset-hash-source-map/source/javascripts/application.js
new file mode 100644
index 00000000..c72f8572
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-source-map/source/javascripts/application.js
@@ -0,0 +1,2 @@
+function foo(){var message="HEY THERE FRIEND!";var para=document.createElement("p");para.innerHTML=message;var body=document.getElementsByTagName("body")[0];body.insertBefore(para,body.firstChild)}window.onload=foo;
+//# sourceMappingURL=application.js.map
diff --git a/middleman-core/fixtures/asset-hash-source-map/source/javascripts/application.js.map b/middleman-core/fixtures/asset-hash-source-map/source/javascripts/application.js.map
new file mode 100644
index 00000000..6a5acd5c
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-source-map/source/javascripts/application.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["source/javascripts/application.js"],"names":["foo","message","para","document","createElement","innerHTML","body","getElementsByTagName","insertBefore","firstChild","window","onload"],"mappings":"AAAA,QAASA,OACP,GAAIC,SAAU,mBACd,IAAIC,MAAOC,SAASC,cAAc,IAClCF,MAAKG,UAAYJ,OACb,IAAIK,MAAOH,SAASI,qBAAqB,QAAQ,EAC/CD,MAAKE,aAAaN,KAAMI,KAAKG,YAGpCC,OAAOC,OAASX"}
\ No newline at end of file
diff --git a/middleman-core/fixtures/asset-hash-source-map/source/layout.erb b/middleman-core/fixtures/asset-hash-source-map/source/layout.erb
new file mode 100644
index 00000000..c8aacecf
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-source-map/source/layout.erb
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+
+    <%= javascript_include_tag "application" %>
+    <%= yield_content :head %>
+  </head>
+
+  <body class="<%= page_classes %>">
+
+    <div id="main" role="main">
+      <%= yield %>
+    </div>
+
+  </body>
+</html>
diff --git a/middleman-core/lib/middleman-core/extensions/asset_hash.rb b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
index c90d0223..247d1160 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_hash.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
@@ -3,7 +3,7 @@ require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for hashable assets.'
-  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz), 'List of extensions that get asset hashes appended to them.'
+  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz .map), 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
 
diff --git a/middleman-core/lib/middleman-core/util/rack.rb b/middleman-core/lib/middleman-core/util/rack.rb
index 8399b3af..17ac7252 100644
--- a/middleman-core/lib/middleman-core/util/rack.rb
+++ b/middleman-core/lib/middleman-core/util/rack.rb
@@ -22,7 +22,7 @@ module Middleman
 
     Contract String, String, ArrayOf[String], Proc => String
     def rewrite_paths(body, _path, exts, &_block)
-      matcher = /([\'\"\(,]\s*)([^\s\'\"\)>]+(#{::Regexp.union(exts)}))/
+      matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)>]+(#{::Regexp.union(exts)}))/
 
       url_fn_prefix = 'url('
 

From e14107ba656f7824dd804d2b0aea1ff2130fe1ed Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 28 Feb 2016 20:17:35 -0800
Subject: [PATCH 035/122] prep v4.1.2

---
 CHANGELOG.md                                 | 4 ++++
 middleman-core/lib/middleman-core/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7bec4c8..9800baae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ master
 
 * Add `page_id` concept. Using the `id` key in frontmatter, proxy or page will set an ID on a resource which can be referenced by `url_for` and `link_to`.
 * Allow looking for `Gemfile` when setting up a project to fail gracefully.
+* Send correct exit code when external_pipeline fails during build.
+* Fix error when customizing `layouts_dir`. #1028
+* Fix collections (commands in loops) not being processed by `page` command. #1226
+* Correctly asset_hash sourcemap references.
 
 # 4.1.1
 
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 73057eae..78e9c308 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.1'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.2'.freeze unless const_defined?(:VERSION)
 end

From c44f7482b1709d33542b0c572a8d04cab5c70ee3 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 1 Mar 2016 09:25:05 -0800
Subject: [PATCH 036/122] Fix #1822

---
 middleman-core/lib/middleman-core/builder.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/builder.rb b/middleman-core/lib/middleman-core/builder.rb
index d2235c5f..1796d4d7 100644
--- a/middleman-core/lib/middleman-core/builder.rb
+++ b/middleman-core/lib/middleman-core/builder.rb
@@ -117,7 +117,13 @@ module Middleman
                       .sort_by { |resource| SORT_ORDER.index(resource.ext) || 100 }
 
       if @glob
-        resources = resources.select { |resource| File.fnmatch(@glob, resource.destination_path) }
+        resources = resources.select do |resource|
+          if defined?(::File::FNM_EXTGLOB)
+            File.fnmatch(@glob, resource.destination_path, ::File::FNM_EXTGLOB)
+          else
+            File.fnmatch(@glob, resource.destination_path)
+          end
+        end
       end
 
       output_resources(resources)

From 7b59f240d52129392f553afef5cf0350947259da Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 2 Mar 2016 12:00:39 -0800
Subject: [PATCH 037/122] Fixes #1821

---
 CHANGELOG.md                                           |  4 ++++
 .../lib/middleman-core/extensions/directory_indexes.rb | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9800baae..e8fe629d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 master
 ===
 
+* Fix directory indexes with `.htm` files. #1821
+
+# 4.1.2
+
 * Add `page_id` concept. Using the `id` key in frontmatter, proxy or page will set an ID on a resource which can be referenced by `url_for` and `link_to`.
 * Allow looking for `Gemfile` when setting up a project to fail gracefully.
 * Send correct exit code when external_pipeline fails during build.
diff --git a/middleman-core/lib/middleman-core/extensions/directory_indexes.rb b/middleman-core/lib/middleman-core/extensions/directory_indexes.rb
index 171b1493..e58682db 100644
--- a/middleman-core/lib/middleman-core/extensions/directory_indexes.rb
+++ b/middleman-core/lib/middleman-core/extensions/directory_indexes.rb
@@ -11,16 +11,22 @@ class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
     index_file = app.config[:index_file]
     new_index_path = "/#{index_file}"
 
+    extensions = %w(.htm .html .php)
+
     resources.each do |resource|
       # Check if it would be pointless to reroute
       next if resource.destination_path == index_file ||
               resource.destination_path.end_with?(new_index_path) ||
-              File.extname(index_file) != resource.ext
+              !extensions.include?(resource.ext)
 
       # Check if file metadata (options set by "page" in config.rb or frontmatter) turns directory_index off
       next if resource.options[:directory_index] == false
 
-      resource.destination_path = resource.destination_path.chomp(File.extname(index_file)) + new_index_path
+      extensions.each do |ext|
+        resource.destination_path = resource.destination_path.chomp(ext)
+      end
+
+      resource.destination_path += new_index_path
     end
   end
 end

From 737e6f5e64d83823a1a197e29b67f2eb14e60d73 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 2 Mar 2016 12:54:14 -0800
Subject: [PATCH 038/122] expand_path on custom source directories. Fixes #1823

---
 middleman-core/lib/middleman-core/sources.rb                | 3 ++-
 middleman-core/lib/middleman-core/sources/source_watcher.rb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/middleman-core/lib/middleman-core/sources.rb b/middleman-core/lib/middleman-core/sources.rb
index d30f0124..f0d3cc91 100644
--- a/middleman-core/lib/middleman-core/sources.rb
+++ b/middleman-core/lib/middleman-core/sources.rb
@@ -116,7 +116,8 @@ module Middleman
     Contract Or[Symbol, HANDLER], Maybe[Hash] => HANDLER
     def watch(type_or_handler, options={})
       handler = if type_or_handler.is_a? Symbol
-        SourceWatcher.new(self, type_or_handler, options.delete(:path), options)
+        path = File.expand_path(options.delete(:path), app.root)
+        SourceWatcher.new(self, type_or_handler, path, options)
       else
         type_or_handler
       end
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index cbcf1fae..21d6d7b2 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -92,7 +92,7 @@ module Middleman
     # @return [void]
     Contract String => Any
     def update_path(directory)
-      @directory = Pathname(directory)
+      @directory = Pathname(File.expand_path(directory, app.root))
 
       stop_listener! if @listener
 
@@ -133,6 +133,7 @@ module Middleman
       return nil if p.absolute? && !p.to_s.start_with?(@directory.to_s)
 
       p = @directory + p if p.relative?
+
       if glob
         @extensionless_files[p]
       else

From fbc572f920e99281092cc791aaff3b6cd6faf170 Mon Sep 17 00:00:00 2001
From: Greg Tarsa <gltarsa@gmail.com>
Date: Thu, 3 Mar 2016 11:20:52 -0500
Subject: [PATCH 039/122] Ensure that misspelled or missing partials generate
 an error

---
 middleman-core/features/partials.feature          | 15 ++++++++++-----
 .../partials-app/source/index_missing.html.erb    |  3 +++
 .../lib/middleman-core/template_context.rb        |  1 -
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100755 middleman-core/fixtures/partials-app/source/index_missing.html.erb

diff --git a/middleman-core/features/partials.feature b/middleman-core/features/partials.feature
index 30773b46..8a0154c2 100644
--- a/middleman-core/features/partials.feature
+++ b/middleman-core/features/partials.feature
@@ -5,25 +5,30 @@ Feature: Provide Sane Defaults for Partial Behavior
     When I go to "/index.html"
     Then I should see "Header"
     And I should see "Footer"
-    
+
   Scenario: Finds shared partials relative to the root (sub)
     Given the Server is running at "partials-app"
     When I go to "/sub/index.html"
     Then I should see "Header"
     And I should see "Footer"
-    
+
+  Scenario: Flags error when partial is not found
+    Given the Server is running at "partials-app"
+    When I go to "/index_missing.html"
+    Then I should see "Error: Could not locate partial"
+
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"
     When I go to "/index.html"
     Then I should see "ERb Main"
-  
+
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"
     When I go to "/second.html"
     Then I should see "Str Main"
     And I should see "Header"
     And I should see "Footer"
-    
+
   Scenario: Finds partial relative to template
     Given the Server is running at "partials-app"
     When I go to "/sub/index.html"
@@ -33,7 +38,7 @@ Feature: Provide Sane Defaults for Partial Behavior
     Given the Server is running at "partials-app"
     When I go to "/locals.html"
     Then I should see "Local var is bar"
-  
+
   Scenario: Partial and Layout use different engines
     Given the Server is running at "different-engine-partial"
     When I go to "/index.html"
diff --git a/middleman-core/fixtures/partials-app/source/index_missing.html.erb b/middleman-core/fixtures/partials-app/source/index_missing.html.erb
new file mode 100755
index 00000000..bcd70b82
--- /dev/null
+++ b/middleman-core/fixtures/partials-app/source/index_missing.html.erb
@@ -0,0 +1,3 @@
+<%= partial "shared/header" %>
+<%= partial "i_do_not_exist" %>
+<%= partial "shared/footer" %>
diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index cd0b50e8..4feca57e 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -104,7 +104,6 @@ module Middleman
 
       partial_file = locate_partial(name, false) || locate_partial(name, true)
 
-      return '' unless partial_file
       raise ::Middleman::TemplateRenderer::TemplateNotFound, "Could not locate partial: #{name}" unless partial_file
 
       source_path = sitemap.file_to_path(partial_file)

From d624dc460137a5c51dbfd6de7f27c9e259949584 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 10 Mar 2016 13:17:34 -0800
Subject: [PATCH 040/122] Refine gemspec

---
 middleman-core/middleman-core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index d75fdec5..16ee5ff1 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_dependency('i18n', ['~> 0.7.0'])
 
   # Automatic Image Sizes
-  s.add_dependency('fastimage', ['~> 1.8'])
+  s.add_dependency('fastimage', ['~> 1.8.0'])
 
   # Minify CSS
   s.add_dependency('sass', ['>= 3.4'])

From 1f3bf47e3c2179f9de2747e52abc75ffde1b450e Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 12 Mar 2016 13:55:25 -0800
Subject: [PATCH 041/122] Expose all config options to CLIs. Helps with #1829

---
 CHANGELOG.md                                  |  1 +
 middleman-cli/bin/middleman                   | 41 ++++++++++++++++
 middleman-cli/lib/middleman-cli.rb            | 11 -----
 middleman-cli/lib/middleman-cli/build.rb      | 19 ++++++--
 middleman-cli/lib/middleman-cli/server.rb     | 47 +++----------------
 .../lib/middleman-core/application.rb         |  2 +-
 .../lib/middleman-core/extensions.rb          |  2 +-
 .../lib/middleman-core/preview_server.rb      | 21 ++++-----
 .../sitemap/extensions/import.rb              |  4 +-
 9 files changed, 78 insertions(+), 70 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8fe629d..e8b3a6b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 master
 ===
 
+* Expose all top-level config options to CLI (flags now match config. latency -> watcher_latency, etc).
 * Fix directory indexes with `.htm` files. #1821
 
 # 4.1.2
diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman
index 43297984..637e5122 100755
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -9,6 +9,31 @@ end
 require "middleman-core/load_paths"
 Middleman.setup_load_paths
 
+require 'middleman-core'
+require 'middleman-core/logger'
+
+module Middleman::Cli
+  class << self
+    attr_accessor :config
+  end
+
+  def self.import_config(base)
+    ::Middleman::Cli.config.all_settings.each do |setting|
+      if setting.default.is_a?(String) || setting.default.is_a?(NilClass)
+        base.class_option setting.key,
+                          type: :string,
+                          default: setting.default,
+                          desc: setting.description
+      elsif setting.default.is_a?(TrueClass) || setting.default.is_a?(FalseClass)
+        base.class_option setting.key,
+                          type: :boolean,
+                          default: setting.default,
+                          desc: setting.description
+      end
+    end
+  end
+end
+
 require "middleman-cli"
 
 # Change directory to the root
@@ -19,5 +44,21 @@ if ARGV[0] != 'help' && (ARGV.length < 1 || ARGV.first.include?('-'))
   ARGV.unshift('server')
 end
 
+::Middleman::Logger.singleton(3)
+::Middleman::Cli.config = ::Middleman::Application.new do
+  config[:exit_before_ready] = true
+end.config
+
+# Require the Middleman version
+require 'middleman-core/version'
+
+# Include the core CLI items
+require 'middleman-cli/init'
+require 'middleman-cli/extension'
+require 'middleman-cli/server'
+require 'middleman-cli/build'
+require 'middleman-cli/console'
+require 'middleman-cli/config'
+
 # Start the CLI
 Middleman::Cli::Base.start(ARGV)
diff --git a/middleman-cli/lib/middleman-cli.rb b/middleman-cli/lib/middleman-cli.rb
index 83b95d30..e17137e7 100644
--- a/middleman-cli/lib/middleman-cli.rb
+++ b/middleman-cli/lib/middleman-cli.rb
@@ -21,14 +21,3 @@ module Middleman::Cli
     end
   end
 end
-
-# Require the Middleman version
-require 'middleman-core/version'
-
-# Include the core CLI items
-require 'middleman-cli/init'
-require 'middleman-cli/extension'
-require 'middleman-cli/server'
-require 'middleman-cli/build'
-require 'middleman-cli/console'
-require 'middleman-cli/config'
diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index c00acd2f..4cddfe26 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -1,3 +1,5 @@
+require 'middleman-core/application'
+
 # CLI Module
 module Middleman::Cli
   # The CLI Build class
@@ -8,8 +10,7 @@ module Middleman::Cli
 
     class_option :environment,
                  aliases: '-e',
-                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'production',
-                 desc: 'The environment Middleman will run under'
+                 default: :production
     class_option :clean,
                  type: :boolean,
                  default: true,
@@ -36,6 +37,8 @@ module Middleman::Cli
                  default: false,
                  desc: 'Generate profiling report for the build'
 
+    Middleman::Cli.import_config(self)
+
     # Core build Thor command
     # @return [void]
     def build
@@ -48,19 +51,27 @@ module Middleman::Cli
       require 'middleman-core/builder'
       require 'fileutils'
 
-      env = options['environment'].to_sym
       verbose = options['verbose'] ? 0 : 1
       instrument = options['instrument']
 
       builder = nil
+      cli_options = options
 
       ::Middleman::Logger.singleton(verbose, instrument)
 
       ::Middleman::Util.instrument 'builder.setup' do
         @app = ::Middleman::Application.new do
           config[:mode] = :build
-          config[:environment] = env
           config[:show_exceptions] = false
+
+          cli_options.each do |k, v|
+            setting = config.setting(k.to_sym)
+            next unless setting
+
+            v = setting.options[:import].call(v) if setting.options[:import]
+
+            config[k.to_sym] = v
+          end
         end
 
         builder = Middleman::Builder.new(@app,
diff --git a/middleman-cli/lib/middleman-cli/server.rb b/middleman-cli/lib/middleman-cli/server.rb
index ab387ee6..479f53bd 100644
--- a/middleman-cli/lib/middleman-cli/server.rb
+++ b/middleman-cli/lib/middleman-cli/server.rb
@@ -5,25 +5,13 @@ module Middleman::Cli
     check_unknown_options!
 
     class_option :environment,
-                 aliases: '-e',
-                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
-                 desc: 'The environment Middleman will run under'
+                 aliases: '-e'
     class_option :port,
-                 aliases: '-p',
-                 desc: 'The port Middleman will listen on'
+                 aliases: '-p'
     class_option :server_name,
-                 aliases: '-s',
-                 desc: 'The server name Middleman will use'
+                 aliases: '-s'
     class_option :bind_address,
-                 aliases: '-b',
-                 desc: 'The bind address Middleman will listen on'
-    class_option :https,
-                 type: :boolean,
-                 desc: 'Serve the preview server over SSL/TLS'
-    class_option :ssl_certificate,
-                 desc: 'Path to an X.509 certificate to use for the preview server'
-    class_option :ssl_private_key,
-                 desc: "Path to an RSA private key for the preview server's certificate"
+                 aliases: '-b'
     class_option :verbose,
                  type: :boolean,
                  default: false,
@@ -32,29 +20,18 @@ module Middleman::Cli
                  type: :string,
                  default: false,
                  desc: 'Print instrument messages'
-    class_option :disable_watcher,
-                 type: :boolean,
-                 default: false,
-                 desc: 'Disable the file change and delete watcher process'
     class_option :profile,
                  type: :boolean,
                  default: false,
                  desc: 'Generate profiling report for server startup'
-    class_option :force_polling,
-                 type: :boolean,
-                 default: false,
-                 desc: 'Force file watcher into polling mode'
-    class_option :latency,
-                 type: :numeric,
-                 aliases: '-l',
-                 default: 0.5,
-                 desc: 'Set file watcher latency, in seconds'
     class_option :daemon,
                  type: :boolean,
                  aliases: '-d',
                  default: false,
                  desc: 'Daemonize preview server'
 
+    Middleman::Cli.import_config(self)
+
     # Start the server
     def server
       require 'middleman-core'
@@ -66,24 +43,14 @@ module Middleman::Cli
       end
 
       params = {
-        port: options['port'],
-        bind_address: options['bind_address'],
-        https: options['https'],
-        server_name: options['server_name'],
-        ssl_certificate: options['ssl_certificate'],
-        ssl_private_key: options['ssl_private_key'],
-        environment: options['environment'],
         debug: options['verbose'],
         instrumenting: options['instrument'],
-        disable_watcher: options['disable_watcher'],
         reload_paths: options['reload_paths'],
-        force_polling: options['force_polling'],
-        latency: options['latency'],
         daemon: options['daemon']
       }
 
       puts '== The Middleman is loading'
-      ::Middleman::PreviewServer.start(params)
+      ::Middleman::PreviewServer.start(params, options)
     end
 
     # Add to CLI
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index a805df45..590f42ab 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -106,7 +106,7 @@ module Middleman
 
     # Middleman environment. Defaults to :development
     # @return [String]
-    define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development'
+    define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development', import: proc { |s| s.to_sym }
 
     # Which file should be used for directory indexes
     # @return [String]
diff --git a/middleman-core/lib/middleman-core/extensions.rb b/middleman-core/lib/middleman-core/extensions.rb
index c295efe3..001b4344 100644
--- a/middleman-core/lib/middleman-core/extensions.rb
+++ b/middleman-core/lib/middleman-core/extensions.rb
@@ -52,7 +52,7 @@ module Middleman
       def register(name, extension_class=nil, options={}, &block)
         raise 'Extension name must be a symbol' unless name.is_a?(Symbol)
         # If we've already got an extension registered under this name, bail out
-        raise "There is already an extension registered with the name '#{name}'" if registered.key?(name)
+        # raise "There is a already an extension registered with the name '#{name}'" if registered.key?(name)
 
         # If the extension is defined with a block, grab options out of the "extension_class" parameter.
         if extension_class && block_given? && options.empty? && extension_class.is_a?(Hash)
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index d901bbca..34b5d9c7 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -18,12 +18,13 @@ module Middleman
 
       # Start an instance of Middleman::Application
       # @return [void]
-      def start(opts={})
+      def start(opts={}, cli_options={})
         # Do not buffer output, otherwise testing of output does not work
         $stdout.sync = true
         $stderr.sync = true
 
         @options = opts
+        @cli_options = cli_options
         @server_information = ServerInformation.new
         @server_information.https = (@options[:https] == true)
 
@@ -131,6 +132,7 @@ module Middleman
 
       def initialize_new_app
         opts = @options.dup
+        cli_options = @cli_options.dup
 
         ::Middleman::Logger.singleton(
           opts[:debug] ? 0 : 1,
@@ -138,17 +140,14 @@ module Middleman
         )
 
         app = ::Middleman::Application.new do
-          config[:environment] = opts[:environment].to_sym if opts[:environment]
-          config[:watcher_disable] = opts[:disable_watcher]
-          config[:watcher_force_polling] = opts[:force_polling]
-          config[:watcher_latency] = opts[:latency]
+          cli_options.each do |k, v|
+            setting = config.setting(k.to_sym)
+            next unless setting
 
-          config[:port] = opts[:port] if opts[:port]
-          config[:bind_address]    = opts[:bind_address]
-          config[:server_name]     = opts[:server_name]
-          config[:https]           = opts[:https] unless opts[:https].nil?
-          config[:ssl_certificate] = opts[:ssl_certificate] if opts[:ssl_certificate]
-          config[:ssl_private_key] = opts[:ssl_private_key] if opts[:ssl_private_key]
+            v = setting.options[:import].call(v) if setting.options[:import]
+
+            config[k.to_sym] = v
+          end
 
           ready do
             unless config[:watcher_disable]
diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/import.rb b/middleman-core/lib/middleman-core/sitemap/extensions/import.rb
index 239aa917..db7e46d0 100644
--- a/middleman-core/lib/middleman-core/sitemap/extensions/import.rb
+++ b/middleman-core/lib/middleman-core/sitemap/extensions/import.rb
@@ -23,8 +23,8 @@ module Middleman
         ImportPathDescriptor = Struct.new(:from, :renameProc) do
           def execute_descriptor(app, resources)
             resources + ::Middleman::Util.glob_directory(File.join(from, '**/*'))
-                        .reject { |path| File.directory?(path) }
-                        .map do |path|
+                                         .reject { |path| File.directory?(path) }
+                                         .map do |path|
                           target_path = Pathname(path).relative_path_from(Pathname(from).parent).to_s
 
                           ::Middleman::Sitemap::Resource.new(

From 0904652c6fc8e018a6dc30c82f5b9a6d576e943e Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 15 Mar 2016 14:10:27 -0700
Subject: [PATCH 042/122] Try to fix #1832

---
 middleman-core/middleman-core.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 16ee5ff1..80e542d7 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   # Helpers
   s.add_dependency('activesupport', ['~> 4.2'])
   s.add_dependency('padrino-helpers', ['~> 0.13.0'])
-  s.add_dependency("addressable", ["~> 2.4.0"])
+  s.add_dependency("addressable", ["~> 2.3"])
 
   # Watcher
   s.add_dependency('listen', ['~> 3.0'])
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_dependency('i18n', ['~> 0.7.0'])
 
   # Automatic Image Sizes
-  s.add_dependency('fastimage', ['~> 1.8.0'])
+  s.add_dependency('fastimage', ['~> 1.7'])
 
   # Minify CSS
   s.add_dependency('sass', ['>= 3.4'])

From 563da9d45bd07fe3fbf63280abe3f2a1122b7dc1 Mon Sep 17 00:00:00 2001
From: Gregory McIntyre <greg@gregorymcintyre.com>
Date: Wed, 16 Mar 2016 12:22:13 +1100
Subject: [PATCH 043/122] Fix bug with store rebuilding and proxy resources.

---
 middleman-core/lib/middleman-core/sitemap/store.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb
index 4667936d..2871eae5 100644
--- a/middleman-core/lib/middleman-core/sitemap/store.rb
+++ b/middleman-core/lib/middleman-core/sitemap/store.rb
@@ -237,7 +237,16 @@ module Middleman
                 # Rebuild cache
                 @resources.each do |resource|
                   @_lookup_by_path[resource.path] = resource
+                end
+
+                @resources.each do |resource|
                   @_lookup_by_destination_path[resource.destination_path] = resource
+                end
+
+                # NB: This needs to be done after the previous two steps,
+                # since some proxy resources are looked up by path in order to
+                # get their metadata and subsequently their page_id.
+                @resources.each do |resource|
                   @_lookup_by_page_id[resource.page_id.to_sym] = resource
                 end
 

From 5337d0640bdd35ad2c22d02ad58319a1ca230c84 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 17 Mar 2016 13:23:36 -0700
Subject: [PATCH 044/122] Allow skipping sitemap. Helps #1837

---
 middleman-cli/bin/middleman                        | 2 ++
 middleman-cli/lib/middleman-cli/config.rb          | 2 ++
 middleman-core/lib/middleman-core/application.rb   | 4 ++++
 middleman-core/lib/middleman-core/sitemap/store.rb | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman
index 637e5122..c635d220 100755
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -47,6 +47,8 @@ end
 ::Middleman::Logger.singleton(3)
 ::Middleman::Cli.config = ::Middleman::Application.new do
   config[:exit_before_ready] = true
+  config[:watcher_disable] = true
+  config[:disable_sitemap] = true
 end.config
 
 # Require the Middleman version
diff --git a/middleman-cli/lib/middleman-cli/config.rb b/middleman-cli/lib/middleman-cli/config.rb
index 902ea216..eaa2c6a6 100644
--- a/middleman-cli/lib/middleman-cli/config.rb
+++ b/middleman-cli/lib/middleman-cli/config.rb
@@ -23,6 +23,8 @@ module Middleman::Cli
       ::Middleman::Logger.singleton(2, false)
 
       app = ::Middleman::Application.new do
+        config[:disable_sitemap] = true
+        config[:watcher_disable] = true
         config[:exit_before_ready] = true
         config[:environment] = opts[:environment].to_sym if opts[:environment]
       end
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 590f42ab..8951449d 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -96,6 +96,10 @@ module Middleman
     # @return [String]
     define_setting :source, 'source', 'Name of the source directory'
 
+    # If we should not run the sitemap.
+    # @return [Boolean]
+    define_setting :disable_sitemap, false, 'If we should not run the sitemap.'
+
     # If we should exit before ready event.
     # @return [Boolean]
     define_setting :exit_before_ready, false, 'If we should exit before ready event.'
diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb
index 2871eae5..47e678ba 100644
--- a/middleman-core/lib/middleman-core/sitemap/store.rb
+++ b/middleman-core/lib/middleman-core/sitemap/store.rb
@@ -216,6 +216,8 @@ module Middleman
       # rebuild_resource_list! since the last time it was run. This is
       # very expensive!
       def ensure_resource_list_updated!
+        return if @app.config[:disable_sitemap]
+
         @lock.synchronize do
           return unless @needs_sitemap_rebuild
 

From dfa389bde42512b464ecab041446f48087af6eac Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 17 Mar 2016 14:47:14 -0700
Subject: [PATCH 045/122] bump

---
 middleman-core/lib/middleman-core/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 78e9c308..0bc748d7 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.2'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.3'.freeze unless const_defined?(:VERSION)
 end

From d22bd914ae4a90a195fafc1f9b1f46b400e58950 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 18 Mar 2016 10:37:02 -0700
Subject: [PATCH 046/122] Add specific test for #1556

---
 middleman-core/features/dynamic_pages.feature | 27 ++++++++++---------
 .../fixtures/dynamic-pages-app/config.rb      |  4 +++
 .../source/should_be_ignored9.html            |  1 +
 3 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored9.html

diff --git a/middleman-core/features/dynamic_pages.feature b/middleman-core/features/dynamic_pages.feature
index 6d1b59ac..fc886ffd 100644
--- a/middleman-core/features/dynamic_pages.feature
+++ b/middleman-core/features/dynamic_pages.feature
@@ -31,7 +31,8 @@ Feature: Dynamic Pages
       | should_be_ignored6.html                       |
       | should_be_ignored7.html                       |
       | should_be_ignored8.html                       |
-    
+      | should_be_ignored9.html                       |
+
   Scenario: Preview basic proxy
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake.html"
@@ -42,46 +43,46 @@ Feature: Dynamic Pages
     Then I should see "I am real"
     When I go to "/fake4.html"
     Then I should see "I am real"
-    
+
   Scenario: Preview proxy with variable one
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am one glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake2/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am two glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake3/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am three glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake4/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am four glob"
     Then I should see "All: I am all glob"
-    
+
   Scenario: Preview proxy with variable two
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am one glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake2/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am two glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake3/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am three glob"
     Then I should see "All: I am all glob"
-    
+
     When I go to "/fake4/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am four glob"
@@ -101,7 +102,7 @@ Feature: Dynamic Pages
     Then the file "fake3/one.html" should contain "I am real: one"
     Then the file "fake3/one.html" should contain "Global: I am three glob"
     Then the file "fake3/one.html" should contain "All: I am all glob"
-    
+
   Scenario: Target ignore
     Given the Server is running at "dynamic-pages-app"
     When I go to "/target_ignore.html"
@@ -112,7 +113,7 @@ Feature: Dynamic Pages
     Then I should see "Ignore me! 7"
     When I go to "/target_ignore4.html"
     Then I should see "Ignore me! 8"
-    
+
   Scenario: Preview ignored paths
     Given the Server is running at "dynamic-pages-app"
     When I go to "/should_be_ignored.html"
@@ -130,4 +131,6 @@ Feature: Dynamic Pages
     When I go to "/should_be_ignored7.html"
     Then I should see "File Not Found"
     When I go to "/should_be_ignored8.html"
-    Then I should see "File Not Found"
\ No newline at end of file
+    Then I should see "File Not Found"
+    When I go to "/should_be_ignored9.html"
+    Then I should see "File Not Found"
diff --git a/middleman-core/fixtures/dynamic-pages-app/config.rb b/middleman-core/fixtures/dynamic-pages-app/config.rb
index 75fab5e0..b195e0f9 100644
--- a/middleman-core/fixtures/dynamic-pages-app/config.rb
+++ b/middleman-core/fixtures/dynamic-pages-app/config.rb
@@ -28,3 +28,7 @@ page "fake/*", locals: { glob_var: "I am one glob" }
 page "fake2/*", locals: { glob_var: "I am two glob" }
 page "fake3/*", locals: { glob_var: "I am three glob" }
 page "fake4/*", locals: { glob_var: "I am four glob" }
+
+["tom", "dick", "harry"].each do |name|
+  proxy "/about/#{name}.html", "/should_be_ignored9.html", locals: { person_name: name }, ignore: true
+end
diff --git a/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored9.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored9.html
new file mode 100644
index 00000000..53571d5e
--- /dev/null
+++ b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored9.html
@@ -0,0 +1 @@
+<h1>Ignore me! 9</h1>

From 0436c211c60d3e78f7d5b79a99472690a37e4396 Mon Sep 17 00:00:00 2001
From: Gregory McIntyre <greg@gregorymcintyre.com>
Date: Sat, 19 Mar 2016 13:37:12 +1100
Subject: [PATCH 047/122] Fix asset_url and relative option bug.

If the relative option is set and the asset is stored in the directory
alongside the resource referencing it, asset_url produces the
wrong path ('../images/image.jpg' rather than just 'image.jpg').
---
 middleman-core/lib/middleman-core/util/paths.rb |  6 +++++-
 middleman-core/spec/middleman-core/util_spec.rb | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index 7c6ffc37..97abf218 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -77,7 +77,11 @@ module Middleman
       uri = URI(path)
       path = uri.path
 
-      result = if resource = app.sitemap.find_resource_by_destination_path(url_for(app, path, options))
+      # Ensure the url we pass into find_resource_by_destination_path is not a
+      # relative path, since it only takes absolute url paths.
+      dest_path = url_for(app, path, options.merge(relative: false))
+
+      result = if resource = app.sitemap.find_resource_by_destination_path(dest_path)
         resource.url
       else
         path = ::File.join(prefix, path)
diff --git a/middleman-core/spec/middleman-core/util_spec.rb b/middleman-core/spec/middleman-core/util_spec.rb
index ce175e35..8385889b 100644
--- a/middleman-core/spec/middleman-core/util_spec.rb
+++ b/middleman-core/spec/middleman-core/util_spec.rb
@@ -120,6 +120,20 @@ describe Middleman::Util do
                                                                        relative: true ) ).to eq '../images/blank.gif'
       end
 
+      context "when the asset is stored in the same directory as current_resource" do
+        before do
+          Given.file 'source/a-path/index.html', ''
+          Given.file 'source/a-path/blank.gif', ''
+          @mm = Middleman::Application.new
+        end
+
+        it "returns path relative to the provided current_resource" do
+          current_resource = @mm.sitemap.find_resource_by_path('a-path/index.html')
+          expect( Middleman::Util.asset_url( @mm, 'blank.gif', 'images', current_resource: current_resource,
+                                                                        relative: true) ).to eq 'blank.gif'
+        end
+      end
+
       it "raises error if not given a current_resource" do
         expect{
           Middleman::Util.asset_url( @mm, 'blank.gif', 'images', relative: true )

From 7e42954258596c2976ff1336ee556995a8cd6e00 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 20 Mar 2016 16:31:15 -0700
Subject: [PATCH 048/122] Define a :config mode, dont run external pipeline on
 config mode. Fixes #1844

---
 middleman-cli/bin/middleman                                     | 1 +
 middleman-cli/lib/middleman-cli/config.rb                       | 1 +
 .../lib/middleman-core/extensions/external_pipeline.rb          | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman
index c635d220..ff61b21c 100755
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -46,6 +46,7 @@ end
 
 ::Middleman::Logger.singleton(3)
 ::Middleman::Cli.config = ::Middleman::Application.new do
+  config[:mode] = :config
   config[:exit_before_ready] = true
   config[:watcher_disable] = true
   config[:disable_sitemap] = true
diff --git a/middleman-cli/lib/middleman-cli/config.rb b/middleman-cli/lib/middleman-cli/config.rb
index eaa2c6a6..add8730a 100644
--- a/middleman-cli/lib/middleman-cli/config.rb
+++ b/middleman-cli/lib/middleman-cli/config.rb
@@ -23,6 +23,7 @@ module Middleman::Cli
       ::Middleman::Logger.singleton(2, false)
 
       app = ::Middleman::Application.new do
+        config[:mode] = :config
         config[:disable_sitemap] = true
         config[:watcher_disable] = true
         config[:exit_before_ready] = true
diff --git a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
index d4a5aab5..35d95138 100644
--- a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
+++ b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
@@ -10,6 +10,8 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
   def initialize(app, config={}, &block)
     super
 
+    return if app.mode?(:config)
+
     require 'thread'
 
     @watcher = app.files.watch :source,

From aab7bac8a6f531cea02572bb0a1614f9de88a932 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 20 Mar 2016 16:44:20 -0700
Subject: [PATCH 049/122] Apply CLI options later in process. Fixes 1843

---
 middleman-cli/bin/middleman                         |  4 ++--
 middleman-cli/lib/middleman-cli/build.rb            | 11 +++--------
 middleman-core/lib/middleman-core/application.rb    | 11 +++++++++++
 middleman-core/lib/middleman-core/preview_server.rb | 10 +++-------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman
index ff61b21c..b5d1921d 100755
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -22,12 +22,12 @@ module Middleman::Cli
       if setting.default.is_a?(String) || setting.default.is_a?(NilClass)
         base.class_option setting.key,
                           type: :string,
-                          default: setting.default,
+                          default: :undefined,
                           desc: setting.description
       elsif setting.default.is_a?(TrueClass) || setting.default.is_a?(FalseClass)
         base.class_option setting.key,
                           type: :boolean,
-                          default: setting.default,
+                          default: :undefined,
                           desc: setting.description
       end
     end
diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index 4cddfe26..d6cf884b 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -63,14 +63,9 @@ module Middleman::Cli
         @app = ::Middleman::Application.new do
           config[:mode] = :build
           config[:show_exceptions] = false
-
-          cli_options.each do |k, v|
-            setting = config.setting(k.to_sym)
-            next unless setting
-
-            v = setting.options[:import].call(v) if setting.options[:import]
-
-            config[k.to_sym] = v
+          config[:cli_options] = cli_options.reduce({}) do |sum, (k, v)|
+            sum[k] = v unless v == :undefined
+            sum
           end
         end
 
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 8951449d..16ddd59b 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -194,6 +194,8 @@ module Middleman
 
     define_setting :skip_build_clean, proc { |p| [/\.git/].any? { |r| p =~ r } }, 'Whether some paths should not be removed during a clean build.'
 
+    define_setting :cli_options, {}, 'Options from the Command Line.'
+
     define_setting :watcher_disable, false, 'If the Listen watcher should not run'
     define_setting :watcher_force_polling, false, 'If the Listen watcher should run in polling mode'
     define_setting :watcher_latency, nil, 'The Listen watcher latency'
@@ -281,6 +283,15 @@ module Middleman
       # Run any `configure` blocks for the current mode.
       execute_callbacks([:configure, config[:mode]])
 
+      config[:cli_options].each do |k, v|
+        setting = config.setting(k.to_sym)
+        next unless setting
+
+        v = setting.options[:import].call(v) if setting.options[:import]
+
+        config[k.to_sym] = v
+      end
+
       # Post parsing, pre-extension callback
       execute_callbacks(:after_configuration_eval)
 
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index 34b5d9c7..f2c571b5 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -140,13 +140,9 @@ module Middleman
         )
 
         app = ::Middleman::Application.new do
-          cli_options.each do |k, v|
-            setting = config.setting(k.to_sym)
-            next unless setting
-
-            v = setting.options[:import].call(v) if setting.options[:import]
-
-            config[k.to_sym] = v
+          cli_options.reduce({}) do |sum, (k, v)|
+            sum[k] = v unless v == :undefined
+            sum
           end
 
           ready do

From 8425692b86b58080d6a76148ad8cc42967f5bc0b Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 20 Mar 2016 17:33:44 -0700
Subject: [PATCH 050/122] Try to fix preview server config

---
 .../lib/middleman-core/application.rb         | 22 ++++++++++------
 .../lib/middleman-core/preview_server.rb      | 25 ++++++++++++++-----
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 16ddd59b..d02a6a9b 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -271,6 +271,8 @@ module Middleman
       # Before config is parsed, before extensions get to it.
       execute_callbacks(:initialized)
 
+      apply_cli_options
+
       # Before config is parsed. Mostly used for extensions.
       execute_callbacks(:before_configuration)
 
@@ -283,14 +285,7 @@ module Middleman
       # Run any `configure` blocks for the current mode.
       execute_callbacks([:configure, config[:mode]])
 
-      config[:cli_options].each do |k, v|
-        setting = config.setting(k.to_sym)
-        next unless setting
-
-        v = setting.options[:import].call(v) if setting.options[:import]
-
-        config[k.to_sym] = v
-      end
+      apply_cli_options
 
       # Post parsing, pre-extension callback
       execute_callbacks(:after_configuration_eval)
@@ -308,6 +303,17 @@ module Middleman
       execute_callbacks(:ready) unless config[:exit_before_ready]
     end
 
+    def apply_cli_options
+      config[:cli_options].each do |k, v|
+        setting = config.setting(k.to_sym)
+        next unless setting
+
+        v = setting.options[:import].call(v) if setting.options[:import]
+
+        config[k.to_sym] = v
+      end
+    end
+
     # Eval config
     def evaluate_configuration!
       # Check for and evaluate local configuration in `config.rb`
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index f2c571b5..bd019e00 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -172,18 +172,23 @@ module Middleman
         end
 
         # store configured port to make a check later on possible
-        configured_port = app.config[:port]
+        configured_port = possible_from_cli(:port, app.config)
 
         # Use configuration values to set `bind_address` etc. in
         # `server_information`
-        server_information.use app.config
+        server_information.use({
+          bind_address: possible_from_cli(:bind_address, app.config),
+          port: possible_from_cli(:port, app.config),
+          server_name: possible_from_cli(:server_name, app.config),
+          https: possible_from_cli(:https, app.config)
+        })
 
-        app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless app.config[:port] == configured_port
+        app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless server_information.port == configured_port
 
-        @environment = app.config[:environment]
+        @environment = possible_from_cli(:environment, app.config)
 
-        @ssl_certificate = app.config[:ssl_certificate]
-        @ssl_private_key = app.config[:ssl_private_key]
+        @ssl_certificate = possible_from_cli(:ssl_certificate, app.config)
+        @ssl_private_key = possible_from_cli(:ssl_private_key, app.config)
 
         app.files.on_change :reload do
           $mm_reload = true
@@ -199,6 +204,14 @@ module Middleman
         app
       end
 
+      def possible_from_cli(key, config)
+        if @cli_options[key] && @cli_options[key] != :undefined
+          @cli_options[key]
+        else
+          config[key]
+        end
+      end
+
       # Trap some interupt signals and shut down smoothly
       # @return [void]
       def register_signal_handlers

From d461473f81b4fdfa9e5fb1ef662a4ca36170c9d3 Mon Sep 17 00:00:00 2001
From: FearGoidte <FearGoidte@users.noreply.github.com>
Date: Mon, 21 Mar 2016 15:19:36 +0000
Subject: [PATCH 051/122] Added .xhtml

Fixes pretty U.R.L.s for xhtml files
---
 .../lib/middleman-core/extensions/directory_indexes.rb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/extensions/directory_indexes.rb b/middleman-core/lib/middleman-core/extensions/directory_indexes.rb
index e58682db..cef88868 100644
--- a/middleman-core/lib/middleman-core/extensions/directory_indexes.rb
+++ b/middleman-core/lib/middleman-core/extensions/directory_indexes.rb
@@ -11,7 +11,7 @@ class Middleman::Extensions::DirectoryIndexes < ::Middleman::Extension
     index_file = app.config[:index_file]
     new_index_path = "/#{index_file}"
 
-    extensions = %w(.htm .html .php)
+    extensions = %w(.htm .html .php .xhtml)
 
     resources.each do |resource|
       # Check if it would be pointless to reroute

From f5a668d3804e16ed968d55aae6f3935a834fbbea Mon Sep 17 00:00:00 2001
From: FearGoidte <FearGoidte@users.noreply.github.com>
Date: Tue, 22 Mar 2016 08:24:21 +0000
Subject: [PATCH 052/122] Typo reversed meaning

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8b3a6b5..751cd5b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ master
 ===
 
 * Expose all top-level config options to CLI (flags now match config. latency -> watcher_latency, etc).
-* Fix directory indexes with `.htm` files. #1821
+* Fix directory indexes with `.htm` and `.xhtml` files. #1821
 
 # 4.1.2
 
@@ -35,7 +35,7 @@ master
 * Fix asset_host in combination with Google Analytics snippet. #1751
 * Show an error message when git CLI is not available. #1765
 * Correctly show file names of GZIP'ed assets. #1364
-* Build file output is not parallel-ized! Use `middleman build --no-parallel` to disable.
+* Build file output is now parallel-ized! Use `middleman build --no-parallel` to disable.
 * Make template file extensions that get layouts by default configurable via `config[:extensions_with_layout]`
 * Remove `=` from inline url matcher. This means paths in HTML attributes MUST be quoted. Fixes #1780
 

From 025e35f6a1b9f6f80533805b89b7ab5962c89636 Mon Sep 17 00:00:00 2001
From: Adam Heath <adam@polleverywhere.com>
Date: Tue, 22 Mar 2016 17:34:36 +0800
Subject: [PATCH 053/122] Fix asset_hash with content rule and uncommented CSS
 url

Fixes middleman/middleman#1852
---
 middleman-core/features/asset_hash.feature        |   7 +++++++
 .../source/images/100px.jpg                       | Bin 0 -> 334 bytes
 .../source/stylesheets/test.css                   |   3 +++
 middleman-core/lib/middleman-core/util/rack.rb    |   2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 middleman-core/fixtures/asset-hash-minified-app/source/images/100px.jpg
 create mode 100644 middleman-core/fixtures/asset-hash-minified-app/source/stylesheets/test.css

diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature
index dd659336..6a353370 100644
--- a/middleman-core/features/asset_hash.feature
+++ b/middleman-core/features/asset_hash.feature
@@ -283,8 +283,15 @@ Feature: Assets get file hashes appended to them and references to them are upda
     When I cd to "build"
     Then the following files should exist:
       | javascripts/jquery.min-276c87ff.js |
+      | stylesheets/test-7de2ad06.css |
     And the following files should not exist:
       | javascripts/jquery.min.js |
+    And the file "stylesheets/test-7de2ad06.css" should contain:
+      """
+      .no-bug{background-image:url(/images/100px-5fd6fb90.jpg)}
+      .bug{content:"";background-image:url(/images/100px-5fd6fb90.jpg)}
+      .no-bug{content:""; background-image:url(/images/100px-5fd6fb90.jpg)}
+      """
 
   Scenario: Source map paths include the hash
     Given a successfully built app at "asset-hash-source-map"
diff --git a/middleman-core/fixtures/asset-hash-minified-app/source/images/100px.jpg b/middleman-core/fixtures/asset-hash-minified-app/source/images/100px.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..557d02781344edfba89f96b50e1315b9da17f061
GIT binary patch
literal 334
zcmZ?wbh9u|Okqf2c+9|X=FFLC)240QxN**$Is5kQ+rEAK(W6IKty;Bs@nQySKnElU
z(#yc|PvC^->b(}P&+h)8pwX9-IWJ??x}4Yh3Utnw<le7X_rB)+{{ssOJanY`Pb?`q
znPWBo!io~FwNdMDtSLMFwrc-_4HZ6mv(LZSQgt?O_x*x33I>WiY;2vf`)6K%U&&D2
z=)uHXBE-zZ&feMGE7{h;(ACp7&5NajjggI&nPJYn1wxE-mzB<*JAdKoC7!dYN;Ynp
z%*M=7vuXF%rpX=~_Z`|R%*x0ra&YgF4XfD7)}CL_z|J^f_r(i~E_fYloI2rw@SJ-`
z=T3jv@4c*}xvD{!k%NI_@|*X&-WC4-^Y`C>24*f9j|~eBHggDT#hlo%@Nm0;vez7s
Zjf;+UOBiR}Ik9o^@qQKsT^9xhYXBQ`m0bV;

literal 0
HcmV?d00001

diff --git a/middleman-core/fixtures/asset-hash-minified-app/source/stylesheets/test.css b/middleman-core/fixtures/asset-hash-minified-app/source/stylesheets/test.css
new file mode 100644
index 00000000..059fce9a
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-minified-app/source/stylesheets/test.css
@@ -0,0 +1,3 @@
+.no-bug{background-image:url(/images/100px.jpg)}
+.bug{content:"";background-image:url(/images/100px.jpg)}
+.no-bug{content:""; background-image:url(/images/100px.jpg)}
diff --git a/middleman-core/lib/middleman-core/util/rack.rb b/middleman-core/lib/middleman-core/util/rack.rb
index 17ac7252..f8003efe 100644
--- a/middleman-core/lib/middleman-core/util/rack.rb
+++ b/middleman-core/lib/middleman-core/util/rack.rb
@@ -22,7 +22,7 @@ module Middleman
 
     Contract String, String, ArrayOf[String], Proc => String
     def rewrite_paths(body, _path, exts, &_block)
-      matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)>]+(#{::Regexp.union(exts)}))/
+      matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)\(>]+(#{::Regexp.union(exts)}))/
 
       url_fn_prefix = 'url('
 

From 179d6c0be459e5078a2b3425054fb39bf51bf3bb Mon Sep 17 00:00:00 2001
From: Brad Gessler <bradgessler@gmail.com>
Date: Tue, 22 Mar 2016 01:59:05 -0700
Subject: [PATCH 054/122] Add extensions to asset_host extension.

---
 middleman-core/lib/middleman-core/extensions/asset_host.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/extensions/asset_host.rb b/middleman-core/lib/middleman-core/extensions/asset_host.rb
index aa424e2f..9793960a 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_host.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_host.rb
@@ -2,7 +2,7 @@ require 'addressable/uri'
 
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :host, nil, 'The asset host to use or a Proc to determine asset host', required: true
-  option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif), 'List of extensions that get cache busters strings appended to them.'
+  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz .map), 'List of extensions that get cache busters strings appended to them.'
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for host rewrites'

From bca8b854ddd7dcacd3c5aab5911a188319b13f2e Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 22 Mar 2016 12:34:03 -0700
Subject: [PATCH 055/122] prep

---
 CHANGELOG.md                                        |  9 +++++++++
 middleman-core/lib/middleman-core/preview_server.rb | 10 ++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 751cd5b2..ef5780ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 master
 ===
 
+# 4.1.4
+
+* Unify default extensions for all URL processing extensions. #1855
+* Fix URL regex for `content: ` context of CSS. #1853
+* Make sure CLI config over-rides `config.rb` order.
+* Fix relative assets in some contexts. #1842
+
+# 4.1.3
+
 * Expose all top-level config options to CLI (flags now match config. latency -> watcher_latency, etc).
 * Fix directory indexes with `.htm` and `.xhtml` files. #1821
 
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index bd019e00..b10076d7 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -176,12 +176,10 @@ module Middleman
 
         # Use configuration values to set `bind_address` etc. in
         # `server_information`
-        server_information.use({
-          bind_address: possible_from_cli(:bind_address, app.config),
-          port: possible_from_cli(:port, app.config),
-          server_name: possible_from_cli(:server_name, app.config),
-          https: possible_from_cli(:https, app.config)
-        })
+        server_information.use(bind_address: possible_from_cli(:bind_address, app.config),
+                               port: possible_from_cli(:port, app.config),
+                               server_name: possible_from_cli(:server_name, app.config),
+                               https: possible_from_cli(:https, app.config))
 
         app.logger.warn format('== The Middleman uses a different port "%s" then the configured one "%s" because some other server is listening on that port.', server_information.port, configured_port) unless server_information.port == configured_port
 

From 5a2f9c8ca655c676fa68aef702130accabe4fd91 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 22 Mar 2016 15:43:48 -0700
Subject: [PATCH 056/122] Create a single default list of asset extensions. Add
 .ico to it. Fixes #1830.

---
 middleman-cli/lib/middleman-cli/build.rb               |  3 +--
 middleman-core/lib/middleman-core/application.rb       |  4 ++++
 .../lib/middleman-core/extensions/asset_hash.rb        | 10 +++++++---
 .../lib/middleman-core/extensions/asset_host.rb        |  4 ++--
 .../lib/middleman-core/extensions/cache_buster.rb      |  4 ++--
 .../lib/middleman-core/extensions/relative_assets.rb   |  4 ++--
 middleman-core/lib/middleman-core/preview_server.rb    |  3 +--
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index d6cf884b..7d5dd3af 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -63,9 +63,8 @@ module Middleman::Cli
         @app = ::Middleman::Application.new do
           config[:mode] = :build
           config[:show_exceptions] = false
-          config[:cli_options] = cli_options.reduce({}) do |sum, (k, v)|
+          config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
             sum[k] = v unless v == :undefined
-            sum
           end
         end
 
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index d02a6a9b..edc28ade 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -160,6 +160,10 @@ module Middleman
     # @return [Array.<String>]
     define_setting :extensions_with_layout, %w(.htm .html .xhtml .php), 'Which file extensions have a layout by default.'
 
+    # Which file extensions are "assets."
+    # @return [Array.<String>]
+    define_setting :asset_extensions, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif .ttf .otf .woff .woff2 .eot .ico .map), 'Which file extensions are treated as assets.'
+
     # Default string encoding for templates and output.
     # @return [String]
     define_setting :encoding, 'utf-8', 'Default string encoding for templates and output'
diff --git a/middleman-core/lib/middleman-core/extensions/asset_hash.rb b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
index 247d1160..b38bab9f 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_hash.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
@@ -3,7 +3,7 @@ require 'middleman-core/rack'
 
 class Middleman::Extensions::AssetHash < ::Middleman::Extension
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for hashable assets.'
-  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz .map), 'List of extensions that get asset hashes appended to them.'
+  option :exts, nil, 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
 
@@ -17,8 +17,12 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
     # Allow specifying regexes to ignore, plus always ignore apple touch icons
     @ignore = Array(options.ignore) + [/^apple-touch-icon/]
 
+    # Exclude .ico from the default list because browsers expect it
+    # to be named "favicon.ico"
+    @exts = options.exts || (app.config[:asset_extensions] - %w(.ico))
+
     app.rewrite_inline_urls id: :asset_hash,
-                            url_extensions: options.exts.sort.reverse,
+                            url_extensions: @exts.sort.reverse,
                             source_extensions: options.sources,
                             ignore: @ignore,
                             rewrite_ignore: options.rewrite_ignore,
@@ -70,7 +74,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
   Contract IsA['Middleman::Sitemap::Resource'] => Maybe[IsA['Middleman::Sitemap::Resource']]
   def manipulate_single_resource(resource)
-    return unless options.exts.include?(resource.ext)
+    return unless @exts.include?(resource.ext)
     return if ignored_resource?(resource)
     return if resource.ignored?
 
diff --git a/middleman-core/lib/middleman-core/extensions/asset_host.rb b/middleman-core/lib/middleman-core/extensions/asset_host.rb
index 9793960a..f7c7e8fc 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_host.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_host.rb
@@ -2,7 +2,7 @@ require 'addressable/uri'
 
 class Middleman::Extensions::AssetHost < ::Middleman::Extension
   option :host, nil, 'The asset host to use or a Proc to determine asset host', required: true
-  option :exts, %w(.jpg .jpeg .png .gif .webp .js .css .otf .woff .woff2 .eot .ttf .svg .svgz .map), 'List of extensions that get cache busters strings appended to them.'
+  option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for host rewrites'
@@ -11,7 +11,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
     super
 
     app.rewrite_inline_urls id: :asset_host,
-                            url_extensions: options.exts,
+                            url_extensions: options.exts || app.config[:asset_extensions],
                             source_extensions: options.sources,
                             ignore: options.ignore,
                             rewrite_ignore: options.rewrite_ignore,
diff --git a/middleman-core/lib/middleman-core/extensions/cache_buster.rb b/middleman-core/lib/middleman-core/extensions/cache_buster.rb
index 958bd203..2de11632 100644
--- a/middleman-core/lib/middleman-core/extensions/cache_buster.rb
+++ b/middleman-core/lib/middleman-core/extensions/cache_buster.rb
@@ -1,6 +1,6 @@
 # The Cache Buster extension
 class Middleman::Extensions::CacheBuster < ::Middleman::Extension
-  option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif), 'List of extensions that get cache busters strings appended to them.'
+  option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
   option :sources, %w(.css .htm .html .js .php .xhtml), 'List of extensions that are searched for bustable assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
@@ -9,7 +9,7 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension
     super
 
     app.rewrite_inline_urls id: :cache_buster,
-                            url_extensions: options.exts,
+                            url_extensions: options.exts || app.config[:asset_extensions],
                             source_extensions: options.sources,
                             ignore: options.ignore,
                             rewrite_ignore: options.rewrite_ignore,
diff --git a/middleman-core/lib/middleman-core/extensions/relative_assets.rb b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
index 7fcb80d2..b319de1b 100644
--- a/middleman-core/lib/middleman-core/extensions/relative_assets.rb
+++ b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
@@ -2,7 +2,7 @@ require 'addressable/uri'
 
 # Relative Assets extension
 class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
-  option :exts, %w(.css .png .jpg .jpeg .webp .svg .svgz .js .gif .ttf .otf .woff .woff2 .eot), 'List of extensions that get cache busters strings appended to them.'
+  option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
   option :sources, %w(.css .htm .html .xhtml), 'List of extensions that are searched for relative assets.'
   option :ignore, [], 'Regexes of filenames to skip adding query strings to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
@@ -11,7 +11,7 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
     super
 
     app.rewrite_inline_urls id: :asset_hash,
-                            url_extensions: options.exts,
+                            url_extensions: options.exts || app.config[:asset_extensions],
                             source_extensions: options.sources,
                             ignore: options.ignore,
                             rewrite_ignore: options.rewrite_ignore,
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index b10076d7..293a334f 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -140,9 +140,8 @@ module Middleman
         )
 
         app = ::Middleman::Application.new do
-          cli_options.reduce({}) do |sum, (k, v)|
+          cli_options.each_with_object({}) do |(k, v), sum|
             sum[k] = v unless v == :undefined
-            sum
           end
 
           ready do

From b950af89ac448368d1d64ed9003b1998cd48d823 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 22 Mar 2016 16:04:00 -0700
Subject: [PATCH 057/122] Really prep

---
 middleman-core/lib/middleman-core/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 0bc748d7..691fae2d 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.3'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.4'.freeze unless const_defined?(:VERSION)
 end

From 9e774b608a00f963bd1c535ed411ad8dff10b513 Mon Sep 17 00:00:00 2001
From: Jim Derry <balthisar@gmail.com>
Date: Fri, 25 Mar 2016 14:00:48 +0800
Subject: [PATCH 058/122] Fix server CLI

---
 middleman-core/lib/middleman-core/preview_server.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index 293a334f..fd91ae1e 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -140,7 +140,7 @@ module Middleman
         )
 
         app = ::Middleman::Application.new do
-          cli_options.each_with_object({}) do |(k, v), sum|
+          config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
             sum[k] = v unless v == :undefined
           end
 

From 55230229f6a15fbb1adebfc7ab18f64274ac3b52 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 25 Mar 2016 10:16:54 -0700
Subject: [PATCH 059/122] Fix #1857

---
 .../lib/middleman-core/extensions/external_pipeline.rb    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
index 35d95138..37b6c9e5 100644
--- a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
+++ b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
@@ -13,9 +13,15 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
     return if app.mode?(:config)
 
     require 'thread'
+    require 'fileutils'
+
+    source_path = File.expand_path(options[:source], app.root)
+
+    # Make sure it exists, or `listen` will explode.
+    ::FileUtils.mkdir_p(source_path)
 
     @watcher = app.files.watch :source,
-                               path: File.expand_path(options[:source], app.root),
+                               path: source_path,
                                latency: options[:latency],
                                frontmatter: false
 

From 3cbd9fdedefb5ce61674ef491d3c492e4e9c9255 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 25 Mar 2016 10:23:00 -0700
Subject: [PATCH 060/122] Add back plain environment helper to context. Helps
 with #1861

---
 middleman-core/lib/middleman-core/template_context.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index 4feca57e..99ec6ee5 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -23,7 +23,7 @@ module Middleman
     attr_accessor :current_engine
 
     # Shorthand references to global values on the app instance.
-    def_delegators :@app, :config, :logger, :sitemap, :server?, :build?, :environment?, :data, :extensions, :root
+    def_delegators :@app, :config, :logger, :sitemap, :server?, :build?, :environment?, :environment, :data, :extensions, :root
 
     # Initialize a context with the current app and predefined locals and options hashes.
     #

From 49da6156a0e4f87f35454c812d3e8da1d3c75075 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 26 Mar 2016 15:17:09 -0700
Subject: [PATCH 061/122] Fixes #1860

---
 .../lib/middleman-core/util/files.rb          | 42 +++++++++++++------
 middleman-core/lib/middleman-core/version.rb  |  2 +-
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/middleman-core/lib/middleman-core/util/files.rb b/middleman-core/lib/middleman-core/util/files.rb
index 4422b3ef..9ba716f3 100644
--- a/middleman-core/lib/middleman-core/util/files.rb
+++ b/middleman-core/lib/middleman-core/util/files.rb
@@ -1,3 +1,5 @@
+require 'set'
+
 module Middleman
   module Util
     include Contracts
@@ -52,9 +54,15 @@ module Middleman
       result.encode('UTF-8', 'UTF-8-MAC')
     end
 
+    Contract String => Bool
+    def tilt_recognizes?(path)
+      @@tilt_lookup_cache ||= {}
+      @@tilt_lookup_cache[path] ||= ::Tilt[path]
+    end
+
     Contract String => String
     def step_through_extensions(path)
-      while ::Tilt[path]
+      while tilt_recognizes?(path)
         ext = ::File.extname(path)
         yield ext if block_given?
 
@@ -80,13 +88,18 @@ module Middleman
     # @return [String]
     Contract String => ArrayOf[String]
     def collect_extensions(path)
-      return [] if ::File.basename(path).start_with?('.')
+      @@extensions_cache ||= {}
 
-      result = []
+      base_name = ::File.basename(path)
+      @@extensions_cache[base_name] ||= begin
+        result = []
 
-      step_through_extensions(path) { |e| result << e }
+        unless base_name.start_with?('.')
+          step_through_extensions(base_name) { |e| result << e }
+        end
 
-      result
+        result
+      end
     end
 
     # Finds files which should also be considered to be dirty when
@@ -99,8 +112,9 @@ module Middleman
     def find_related_files(app, files)
       return [] if files.empty?
 
-      all_extensions = files.flat_map { |f| collect_extensions(f.to_s) }
+      file_set = ::Set.new(files)
 
+      all_extensions = files.flat_map { |f| collect_extensions(f.to_s) }
       sass_type_aliasing = ['.scss', '.sass']
       erb_type_aliasing = ['.erb', '.haml', '.slim']
 
@@ -109,14 +123,18 @@ module Middleman
 
       all_extensions.uniq!
 
-      app.sitemap.resources.select(&:file_descriptor).select { |r|
-        local_extensions = collect_extensions(r.file_descriptor[:full_path].to_s)
-        local_extensions |= sass_type_aliasing unless (local_extensions & sass_type_aliasing).empty?
-        local_extensions |= erb_type_aliasing unless (local_extensions & erb_type_aliasing).empty?
+      app.sitemap.resources.select { |r|
+        if r.file_descriptor
+          local_extensions = collect_extensions(r.file_descriptor[:full_path].to_s)
+          local_extensions |= sass_type_aliasing unless (local_extensions & sass_type_aliasing).empty?
+          local_extensions |= erb_type_aliasing unless (local_extensions & erb_type_aliasing).empty?
 
-        local_extensions.uniq!
+          local_extensions.uniq!
 
-        !(all_extensions & local_extensions).empty? && files.none? { |f| f == r.file_descriptor[:full_path] }
+          !(all_extensions & local_extensions).empty? && !file_set.include?(r.file_descriptor[:full_path])
+        else
+          false
+        end
       }.map(&:file_descriptor)
     end
   end
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 691fae2d..35bcf57b 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.4'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.5'.freeze unless const_defined?(:VERSION)
 end

From 058a63a0de77395361b594cf0be38b2f34306677 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 26 Mar 2016 16:43:47 -0700
Subject: [PATCH 062/122] Make #1831 work

---
 middleman-core/lib/middleman-core/config_context.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/middleman-core/lib/middleman-core/config_context.rb b/middleman-core/lib/middleman-core/config_context.rb
index 1f9f32f6..d140e8ea 100644
--- a/middleman-core/lib/middleman-core/config_context.rb
+++ b/middleman-core/lib/middleman-core/config_context.rb
@@ -22,6 +22,10 @@ module Middleman
       app.subscribe_to_callbacks(&method(:execute_callbacks))
     end
 
+    def include(mod)
+      self.extend(mod)
+    end
+
     def helpers(*helper_modules, &block)
       helper_modules ||= []
 

From 16c82fe57a629ccc10ebe0a2aa18ce04f3cc4e14 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 27 Mar 2016 14:12:32 -0700
Subject: [PATCH 063/122] Really fix #1864

---
 CHANGELOG.md                                         |  4 ++++
 .../lib/middleman-core/sources/source_watcher.rb     | 12 ++++++++----
 middleman-core/lib/middleman-core/version.rb         |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef5780ff..9cb86926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 master
 ===
 
+# 4.1.5-4.1.6
+
+* Fix file recursion when looking for possible asset dependencies. Major preview server performance improvement.
+
 # 4.1.4
 
 * Unify default extensions for all URL processing extensions. #1855
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index 21d6d7b2..2c034570 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -2,6 +2,7 @@
 require 'listen'
 require 'middleman-core/contracts'
 require 'digest'
+require 'set'
 
 # Monkey patch Listen silencer so `only` works on directories too
 module Listen
@@ -49,7 +50,7 @@ module Middleman
     # Reference to lower level listener
     attr_reader :listener
 
-    IGNORED_DIRECTORIES = %w(.git node_modules .sass-cache).freeze
+    IGNORED_DIRECTORIES = Set.new(%w(.git node_modules .sass-cache vendor/bundle .bundle))
 
     # Construct a new SourceWatcher
     #
@@ -167,7 +168,8 @@ module Middleman
       @listener = ::Listen.to(@directory.to_s, config, &method(:on_listener_change))
 
       @listener.ignore(/^\.sass-cache/)
-      # @listener.only(@only) unless @only.empty?
+      @listener.ignore(/^node_modules/)
+      @listener.ignore(/^vendor\/bundle/)
 
       @listener.start
     end
@@ -222,7 +224,8 @@ module Middleman
 
     Contract Pathname => Bool
     def should_not_recurse?(p)
-      IGNORED_DIRECTORIES.include?(p.basename.to_s)
+      relative_path = p.relative_path_from(@directory).to_s
+      IGNORED_DIRECTORIES.include?(relative_path)
     end
 
     # The `listen` gem callback.
@@ -255,7 +258,8 @@ module Middleman
         logger.debug "== Change (#{f[:types].inspect}): #{f[:relative_path]}"
       end
 
-      related_updates = ::Middleman::Util.find_related_files(app, (updated_paths + removed_paths)).select(&method(:valid?))
+      related_sources = valid_updates.map { |u| u[:full_path] } + removed_paths
+      related_updates = ::Middleman::Util.find_related_files(app, related_sources).select(&method(:valid?))
 
       related_updates.each do |f|
         logger.debug "== Possible Change (#{f[:types].inspect}): #{f[:relative_path]}"
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 35bcf57b..364ca123 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.5'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.6'.freeze unless const_defined?(:VERSION)
 end

From 21f4f40e211eb57bdf3b2c689d0151cf36dacfb4 Mon Sep 17 00:00:00 2001
From: Joshua Lusk <luskjh@users.noreply.github.com>
Date: Wed, 6 Apr 2016 12:37:15 -0400
Subject: [PATCH 064/122] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1efe8b5d..55b81cc1 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ The last few years have seen an explosion in the amount and variety of tools dev
 
 * [Sass](http://sass-lang.com/) for DRY stylesheets
 * [CoffeeScript](http://coffeescript.org/) for safer and less verbose javascript
-* Multiple asset management solutions, including [Sprockets](https://github.com/sstephenson/sprockets)
+* Multiple asset management solutions, including [Sprockets](https://github.com/rails/sprockets)
 * [ERb](http://ruby-doc.org/stdlib-2.0.0/libdoc/erb/rdoc/ERB.html) & [Haml](http://haml.info/) for dynamic pages and simplified HTML syntax
 
 **Middleman** gives the stand-alone developer access to all these tools and many, many more. Why would you use a stand-alone framework instead of Ruby on Rails?

From e99649b33e44efa2c442968727e5fe2483162efc Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Mon, 11 Apr 2016 16:02:31 -0700
Subject: [PATCH 065/122] Make global config access work inside steps

---
 .gitignore                                    |  2 +
 .../features/front-matter-neighbor.feature    |  8 +++-
 .../core_extensions/collections.rb            | 45 ++++++++++++-------
 .../collections/step_context.rb               |  8 +++-
 .../middleman-core/core_extensions/data.rb    |  2 +
 .../middleman-core/core_extensions/i18n.rb    |  2 +
 .../lib/middleman-core/extension.rb           | 40 +++++++++++++++--
 7 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 88e2e11e..aabe272b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+.byebug_history
 npm-debug.log
+manifest.yaml
 /.bundle
 .DS_Store
 coverage
diff --git a/middleman-core/features/front-matter-neighbor.feature b/middleman-core/features/front-matter-neighbor.feature
index e2e5cc69..9260ff41 100644
--- a/middleman-core/features/front-matter-neighbor.feature
+++ b/middleman-core/features/front-matter-neighbor.feature
@@ -22,7 +22,7 @@ Feature: Neighboring YAML Front Matter
     Then I should not see "---"
     When I go to "/raw-front-matter.php.frontmatter"
     Then I should see "File Not Found"
-    
+
   Scenario: YAML not on first line, with encoding
     Given the Server is running at "frontmatter-neighbor-app"
     When I go to "/front-matter-encoding.html"
@@ -35,7 +35,7 @@ Feature: Neighboring YAML Front Matter
     Given the Server is running at "frontmatter-neighbor-app"
     And the file "source/front-matter-change.html.erb" has the contents
       """
-      <%= current_page.data.title %>
+      FileA <%= current_page.data.title %>
       """
     And the file "source/front-matter-change.html.erb.frontmatter" has the contents
       """
@@ -43,6 +43,8 @@ Feature: Neighboring YAML Front Matter
       title: Hello World
       layout: false
       ---
+
+      FileB
       """
     When I go to "/front-matter-change.html"
     Then I should see "Hello World"
@@ -52,6 +54,8 @@ Feature: Neighboring YAML Front Matter
       title: Hola Mundo
       layout: false
       ---
+
+      FileC
       """
     When I go to "/front-matter-change.html"
     Then I should see "Hola Mundo"
diff --git a/middleman-core/lib/middleman-core/core_extensions/collections.rb b/middleman-core/lib/middleman-core/core_extensions/collections.rb
index 434455f1..22e6d281 100644
--- a/middleman-core/lib/middleman-core/core_extensions/collections.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/collections.rb
@@ -1,3 +1,4 @@
+require 'monitor'
 require 'middleman-core/core_extensions/collections/pagination'
 require 'middleman-core/core_extensions/collections/step_context'
 require 'middleman-core/core_extensions/collections/lazy_root'
@@ -41,6 +42,8 @@ module Middleman
           @values_by_name = {}
 
           @collector_roots = []
+
+          @lock = Monitor.new
         end
 
         def before_configuration
@@ -81,27 +84,35 @@ module Middleman
 
         Contract ResourceList => ResourceList
         def manipulate_resource_list(resources)
-          @collector_roots.each do |pair|
-            dataset = pair[:block].call(app, resources)
-            pair[:root].realize!(dataset)
-          end
+          @lock.synchronize do
+            @collector_roots.each do |pair|
+              dataset = pair[:block].call(app, resources)
+              pair[:root].realize!(dataset)
+            end
 
-          ctx = StepContext.new
-          leaves = @leaves.dup
+            ctx = StepContext.new
+            StepContext.current = ctx
 
-          @collectors_by_name.each do |k, v|
-            @values_by_name[k] = v.value(ctx)
-            leaves.delete v
-          end
+            leaves = @leaves.dup
 
-          # Execute code paths
-          leaves.each do |v|
-            v.value(ctx)
-          end
+            @collectors_by_name.each do |k, v|
+              @values_by_name[k] = v.value(ctx)
+              leaves.delete v
+            end
 
-          # Inject descriptors
-          ctx.descriptors.reduce(resources) do |sum, d|
-            d.execute_descriptor(app, sum)
+            # Execute code paths
+            leaves.each do |v|
+              v.value(ctx)
+            end
+
+            # Inject descriptors
+            results = ctx.descriptors.reduce(resources) do |sum, d|
+              d.execute_descriptor(app, sum)
+            end
+
+            StepContext.current = nil
+
+            results
           end
         end
       end
diff --git a/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb b/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb
index 2ce90b83..0b17870d 100644
--- a/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb
@@ -2,8 +2,12 @@ module Middleman
   module CoreExtensions
     module Collections
       class StepContext
-        def self.add_to_context(name, &func)
-          send(:define_method, :"_internal_#{name}", &func)
+        class << self
+          attr_accessor :current
+
+          def add_to_context(name, &func)
+            send(:define_method, :"_internal_#{name}", &func)
+          end
         end
 
         attr_reader :descriptors
diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb
index 18057465..d711ef4f 100644
--- a/middleman-core/lib/middleman-core/core_extensions/data.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/data.rb
@@ -88,6 +88,8 @@ module Middleman
         def update_files(updated_files, removed_files)
           updated_files.each(&method(:touch_file))
           removed_files.each(&method(:remove_file))
+
+          @app.sitemap.rebuild_resource_list!(:touched_data_file)
         end
 
         # Update the internal cache for a given file path
diff --git a/middleman-core/lib/middleman-core/core_extensions/i18n.rb b/middleman-core/lib/middleman-core/core_extensions/i18n.rb
index ac86d9a0..156f2694 100644
--- a/middleman-core/lib/middleman-core/core_extensions/i18n.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/i18n.rb
@@ -213,6 +213,8 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   def on_file_changed(_updated_files, _removed_files)
     ::I18n.load_path |= app.files.by_type(:locales).files.map { |p| p[:full_path].to_s }
     ::I18n.reload!
+
+    @app.sitemap.rebuild_resource_list!(:touched_locale_file)
   end
 
   def configure_i18n
diff --git a/middleman-core/lib/middleman-core/extension.rb b/middleman-core/lib/middleman-core/extension.rb
index d9dc01ca..8f342e69 100644
--- a/middleman-core/lib/middleman-core/extension.rb
+++ b/middleman-core/lib/middleman-core/extension.rb
@@ -490,15 +490,14 @@ module Middleman
   class ConfigExtension < Extension
     def initialize(app, config={}, &block)
       @descriptors = {}
-      @wrapped = {}
+      @ready = false
 
       self.class.exposed_to_config.each do |k, v|
         @descriptors[k] = []
 
         define_singleton_method(:"__original_#{v}", &method(v))
         define_singleton_method(v) do |*args, &b|
-          @descriptors[k] << method(:"__original_#{v}").call(*args, &b)
-          @app.sitemap.rebuild_resource_list!(:"first_run_change_#{v}")
+          proxy_method_call(k, v, args, &b)
         end
       end
 
@@ -506,11 +505,24 @@ module Middleman
     end
 
     def after_configuration
+      context = self
+
       self.class.exposed_to_config.each do |k, v|
-        ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(k, &method(:"__original_#{v}"))
+        ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(k) do |*args, &b|
+          r = context.method(:"__original_#{v}").call(*args, &b)
+          self.descriptors << r if r.respond_to?(:execute_descriptor)
+        end
       end
     end
 
+    def ready
+      @ready = true
+
+      # @descriptors.each do |k, v|
+      #   @descriptors[k] = []
+      # end
+    end
+
     # Update the main sitemap resource list
     # @return Array<Middleman::Sitemap::Resource>
     Contract ResourceList => ResourceList
@@ -519,5 +531,25 @@ module Middleman
         c.execute_descriptor(app, sum)
       end
     end
+
+    Contract Symbol, Symbol, ArrayOf[Any], Maybe[Proc] => Any
+    def proxy_method_call(k, v, args, &b)
+      if @ready
+        ctx = ::Middleman::CoreExtensions::Collections::StepContext.current
+        r = method(:"__original_#{v}").call(*args, &b)
+
+        if r.respond_to?(:execute_descriptor)
+          if ctx
+            ctx.descriptors << r
+          else
+            @descriptors[k] << r
+            @app.sitemap.rebuild_resource_list!(:"first_run_change_#{v}")
+          end
+        end
+      else
+        @descriptors[k] << method(:"__original_#{v}").call(*args, &b)
+        @app.sitemap.rebuild_resource_list!(:"first_run_change_#{v}")
+      end
+    end
   end
 end

From ac974ca05f5aa225637a83b5a90a683c3c10b0b8 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 12 Apr 2016 10:00:09 -0700
Subject: [PATCH 066/122] Allow restarting external-pipeline without orphaning
 processes

---
 .../lib/middleman-core/application.rb         |  3 +-
 .../extensions/external_pipeline.rb           | 55 +++++++++++++++----
 .../lib/middleman-core/preview_server.rb      |  2 +
 middleman-core/middleman-core.gemspec         |  1 +
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index edc28ade..379d1e81 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -235,7 +235,8 @@ module Middleman
                                       :before, # Before Rack requests
                                       :before_render,
                                       :after_render,
-                                      :before_server
+                                      :before_server,
+                                      :reload
                                     ])
 
         @middleware = Set.new
diff --git a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
index 37b6c9e5..ae5e4c3c 100644
--- a/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
+++ b/middleman-core/lib/middleman-core/extensions/external_pipeline.rb
@@ -12,6 +12,7 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
 
     return if app.mode?(:config)
 
+    require 'servolux'
     require 'thread'
     require 'fileutils'
 
@@ -25,31 +26,63 @@ class Middleman::Extensions::ExternalPipeline < ::Middleman::Extension
                                latency: options[:latency],
                                frontmatter: false
 
+    @current_thread = nil
+    app.reload(&method(:reload!))
+
     logger.info "== Executing: `#{options[:command]}`"
 
     if app.build? || options[:disable_background_execution]
-      watch_command!
+      watch_command!(false)
+
+      @watcher.poll_once!
     else
-      ::Thread.new { watch_command! }
+      watch_command!(true)
     end
   end
 
-  def watch_command!
-    ::IO.popen(options[:command], 'r') do |pipe|
-      while buf = pipe.gets
+  def reload!
+    if @current_thread
+      logger.info "== Stopping: `#{options[:command]}`"
+
+      @current_thread.stop
+      @current_thread = nil
+    end
+  end
+
+  def watch_command!(async)
+    @current_thread = ::Servolux::Child.new(
+      command: options[:command],
+      suspend: 2
+    )
+
+    @current_thread.start
+
+    watch_thread = Thread.new do
+      while buf = @current_thread.io.gets
         without_newline = buf.sub(/\n$/, '')
         logger.info "== External: #{without_newline}" unless without_newline.empty?
       end
+
+      @current_thread.wait
+
+      if !@current_thread.exitstatus.nil? && @current_thread.exitstatus != 0
+        logger.error '== External: Command failed with non-zero exit status'
+        exit(1)
+      end
     end
 
-    unless $?.success?
-      logger.error '== External: Command failed with non-zero exit status'
-      exit(1)
-    end
-
-    @watcher.poll_once!
+    watch_thread.join unless async
   rescue ::Errno::ENOENT => e
     logger.error "== External: Command failed with message: #{e.message}"
     exit(1)
   end
+
+  private
+
+  def print_command(stdout)
+    while buf = stdout.gets
+      without_newline = buf.sub(/\n$/, '')
+      logger.info "== External: #{without_newline}" unless without_newline.empty?
+    end
+  end
 end
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index fd91ae1e..b70e9c99 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -103,6 +103,8 @@ module Middleman
       def reload
         app.logger.info '== The Middleman is reloading'
 
+        app.execute_callbacks(:reload)
+
         begin
           app = initialize_new_app
         rescue => e
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 80e542d7..741f5c5e 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency('erubis')
   s.add_dependency('fast_blank')
   s.add_dependency('parallel')
+  s.add_dependency('servolux')
 
   # Helpers
   s.add_dependency('activesupport', ['~> 4.2'])

From b794961916565a259c89a0b52d044f7c3c9d8405 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 12 Apr 2016 12:53:50 -0700
Subject: [PATCH 067/122] Only rewrite urls in sitemap. Fixes #1873

---
 Gemfile                                       |  4 +---
 middleman-core/features/asset_hash.feature    | 22 ++++++++++---------
 .../asset-host-app/source/images/blank0.gif   |  0
 .../asset-host-app/source/images/blank1.gif   |  0
 .../asset-host-app/source/images/blank10.gif  |  0
 .../asset-host-app/source/images/blank100.gif |  0
 .../asset-host-app/source/images/blank101.gif |  0
 .../source/images/blank1010.gif               |  0
 .../asset-host-app/source/images/blank102.gif |  0
 .../source/images/blank1020.gif               |  0
 .../source/images/blank1021.gif               |  0
 .../source/images/blank1022.gif               |  0
 .../source/images/blank1023.gif               |  0
 .../source/images/blank1024.gif               |  0
 .../asset-host-app/source/images/blank103.gif |  0
 .../source/images/blank1030.gif               |  0
 .../source/images/blank1031.gif               |  0
 .../source/images/blank1032.gif               |  0
 .../source/images/blank1033.gif               |  0
 .../source/images/blank1034.gif               |  0
 .../asset-host-app/source/images/blank104.gif |  0
 .../source/images/blank1043.gif               |  0
 .../source/images/blank1054.gif               |  0
 .../asset-host-app/source/images/blank2.gif   |  0
 .../asset-host-app/source/images/blank20.gif  |  0
 .../asset-host-app/source/images/blank21.gif  |  0
 .../asset-host-app/source/images/blank22.gif  |  0
 .../asset-host-app/source/images/blank23.gif  |  0
 .../asset-host-app/source/images/blank24.gif  |  0
 .../asset-host-app/source/images/blank3.gif   |  0
 .../asset-host-app/source/images/blank30.gif  |  0
 .../asset-host-app/source/images/blank31.gif  |  0
 .../asset-host-app/source/images/blank32.gif  |  0
 .../asset-host-app/source/images/blank33.gif  |  0
 .../asset-host-app/source/images/blank34.gif  |  0
 .../asset-host-app/source/images/blank4.gif   |  0
 .../asset-host-app/source/images/blank43.gif  |  0
 .../asset-host-app/source/images/blank54.gif  |  0
 .../core_extensions/inline_url_rewriter.rb    |  2 +-
 .../lib/middleman-core/util/rack.rb           | 18 +++++++++++----
 40 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank0.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank10.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank100.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank101.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1010.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank102.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1020.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1021.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1022.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1023.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1024.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank103.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1030.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1031.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1032.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1033.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1034.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank104.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1043.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank1054.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank2.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank20.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank21.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank22.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank23.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank24.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank3.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank30.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank31.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank32.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank33.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank34.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank4.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank43.gif
 create mode 100644 middleman-core/fixtures/asset-host-app/source/images/blank54.gif

diff --git a/Gemfile b/Gemfile
index b446cdcd..f14eb3b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,9 +5,7 @@ gem 'rake', '~> 10.3', require: false
 gem 'yard', '~> 0.8', require: false
 
 # Test tools
-gem 'pry', '~> 0.10', group: :development, require: false
-gem 'pry-byebug'
-gem 'pry-stack_explorer'
+gem 'byebug'
 gem 'aruba', '~> 0.7.4', require: false
 gem 'rspec', '~> 3.0', require: false
 gem 'cucumber', '~> 2.0', require: false
diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature
index 6a353370..19517e3b 100644
--- a/middleman-core/features/asset_hash.feature
+++ b/middleman-core/features/asset_hash.feature
@@ -111,28 +111,29 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Given a fixture app "asset-hash-host-app"
     And a file named "config.rb" with:
       """
+      set :sass_source_maps, false
       activate :asset_hash
       activate :directory_indexes
       activate :asset_host, host: 'http://middlemanapp.com'
       """
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7000b132.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-7000b132.css"
+    When I go to "/stylesheets/fragment-2902933e.css"
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg");'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test");'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test");'
@@ -142,28 +143,29 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Given a fixture app "asset-hash-host-app"
     And a file named "config.rb" with:
       """
+      set :sass_source_maps, false
       activate :asset_host, host: 'http://middlemanapp.com'
       activate :directory_indexes
       activate :asset_hash
       """
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-7000b132.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-210612a0.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-7000b132.css"
+    When I go to "/stylesheets/fragment-2902933e.css"
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
     And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank0.gif b/middleman-core/fixtures/asset-host-app/source/images/blank0.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank10.gif b/middleman-core/fixtures/asset-host-app/source/images/blank10.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank100.gif b/middleman-core/fixtures/asset-host-app/source/images/blank100.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank101.gif b/middleman-core/fixtures/asset-host-app/source/images/blank101.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1010.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1010.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank102.gif b/middleman-core/fixtures/asset-host-app/source/images/blank102.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1020.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1020.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1021.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1021.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1022.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1022.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1023.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1023.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1024.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1024.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank103.gif b/middleman-core/fixtures/asset-host-app/source/images/blank103.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1030.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1030.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1031.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1031.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1032.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1032.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1033.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1033.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1034.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1034.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank104.gif b/middleman-core/fixtures/asset-host-app/source/images/blank104.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1043.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1043.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank1054.gif b/middleman-core/fixtures/asset-host-app/source/images/blank1054.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank2.gif b/middleman-core/fixtures/asset-host-app/source/images/blank2.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank20.gif b/middleman-core/fixtures/asset-host-app/source/images/blank20.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank21.gif b/middleman-core/fixtures/asset-host-app/source/images/blank21.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank22.gif b/middleman-core/fixtures/asset-host-app/source/images/blank22.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank23.gif b/middleman-core/fixtures/asset-host-app/source/images/blank23.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank24.gif b/middleman-core/fixtures/asset-host-app/source/images/blank24.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank3.gif b/middleman-core/fixtures/asset-host-app/source/images/blank3.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank30.gif b/middleman-core/fixtures/asset-host-app/source/images/blank30.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank31.gif b/middleman-core/fixtures/asset-host-app/source/images/blank31.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank32.gif b/middleman-core/fixtures/asset-host-app/source/images/blank32.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank33.gif b/middleman-core/fixtures/asset-host-app/source/images/blank33.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank34.gif b/middleman-core/fixtures/asset-host-app/source/images/blank34.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank4.gif b/middleman-core/fixtures/asset-host-app/source/images/blank4.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank43.gif b/middleman-core/fixtures/asset-host-app/source/images/blank43.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/fixtures/asset-host-app/source/images/blank54.gif b/middleman-core/fixtures/asset-host-app/source/images/blank54.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb b/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
index 280c8db0..14cf4715 100644
--- a/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
@@ -82,7 +82,7 @@ module Middleman
           dirpath = ::Pathname.new(File.dirname(path))
 
           rewritten = ::Middleman::Util.instrument 'inline_url_rewriter', path: path do
-            ::Middleman::Util.rewrite_paths(body, path, all_asset_exts) do |asset_path|
+            ::Middleman::Util.rewrite_paths(body, path, all_asset_exts, @middleman_app) do |asset_path|
               uri = ::Addressable::URI.parse(asset_path)
 
               relative_path = uri.host.nil?
diff --git a/middleman-core/lib/middleman-core/util/rack.rb b/middleman-core/lib/middleman-core/util/rack.rb
index f8003efe..0aeda851 100644
--- a/middleman-core/lib/middleman-core/util/rack.rb
+++ b/middleman-core/lib/middleman-core/util/rack.rb
@@ -20,8 +20,8 @@ module Middleman
       result
     end
 
-    Contract String, String, ArrayOf[String], Proc => String
-    def rewrite_paths(body, _path, exts, &_block)
+    Contract String, String, ArrayOf[String], IsA['::Middleman::Application'], Proc => String
+    def rewrite_paths(body, path, exts, app, &_block)
       matcher = /([\'\"\(,]\s*|# sourceMappingURL=)([^\s\'\"\)\(>]+(#{::Regexp.union(exts)}))/
 
       url_fn_prefix = 'url('
@@ -35,11 +35,21 @@ module Middleman
           asset_path = asset_path[url_fn_prefix.length..-1]
         end
 
+        current_resource = app.sitemap.find_resource_by_destination_path(path)
+
         begin
           uri = ::Addressable::URI.parse(asset_path)
 
-          if uri.relative? && uri.host.nil? && !(asset_path =~ /^[^\/].*[a-z]+\.[a-z]+\/.*/) && (result = yield(asset_path))
-            "#{opening_character}#{result}"
+          if uri.relative? && uri.host.nil? && !(asset_path =~ /^[^\/].*[a-z]+\.[a-z]+\/.*/)
+            dest_path = ::Middleman::Util.url_for(app, asset_path, relative: false, current_resource: current_resource)
+
+            resource = app.sitemap.find_resource_by_destination_path(dest_path)
+
+            if resource && (result = yield(asset_path))
+              "#{opening_character}#{result}"
+            else
+              match
+            end
           else
             match
           end

From b058d265640e9318ca7b3933a1b2c517cf3022f7 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 12 Apr 2016 13:05:46 -0700
Subject: [PATCH 068/122] Bump fast image

---
 middleman-core/middleman-core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 741f5c5e..2245e16c 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_dependency('i18n', ['~> 0.7.0'])
 
   # Automatic Image Sizes
-  s.add_dependency('fastimage', ['~> 1.7'])
+  s.add_dependency('fastimage', ['~> 2.0'])
 
   # Minify CSS
   s.add_dependency('sass', ['>= 3.4'])

From dd2413857e68e93b7b0d26315259a45b8dcbf330 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 12 Apr 2016 13:12:09 -0700
Subject: [PATCH 069/122] prep

---
 CHANGELOG.md                                 | 7 +++++++
 middleman-core/lib/middleman-core/version.rb | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cb86926..f81321ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 master
 ===
 
+# 4.1.7
+
+* Upgrade fastimage to 2.0
+* Fix shutdown of external_pipeline commands when config.rb is changed. #1877
+* Allow calls to `app.` to work as collections after initial config parse. #1876
+
+
 # 4.1.5-4.1.6
 
 * Fix file recursion when looking for possible asset dependencies. Major preview server performance improvement.
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 364ca123..37f706a4 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.6'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.7'.freeze unless const_defined?(:VERSION)
 end

From f2535f4fdaa6461cecd0da975eb2158aad382469 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 13 Apr 2016 09:23:28 -0700
Subject: [PATCH 070/122] Bump dep

---
 middleman-core/middleman-core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 2245e16c..a589eb56 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_dependency('sass', ['>= 3.4'])
 
   # Minify JS
-  s.add_dependency('uglifier', ['~> 2.6'])
+  s.add_dependency('uglifier', ['~> 3.0'])
   s.add_dependency('execjs', ['~> 2.0'])
 
   # Testing

From a01656df39c7c785fe05ac27e6fb9163886130ba Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 14 Apr 2016 11:26:33 -0700
Subject: [PATCH 071/122] Steps should try passing unknown methods to config
 context before failing. Fixes #1879

---
 CHANGELOG.md                                  |  4 +++
 middleman-core/features/collections.feature   | 27 +++++++++++++++++++
 .../core_extensions/collections.rb            |  2 +-
 .../collections/step_context.rb               | 13 +++++----
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f81321ad..814ca03b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 master
 ===
 
+# 4.1.8
+
+* Let collection loops access ConfigContext for helpers. #1879
+
 # 4.1.7
 
 * Upgrade fastimage to 2.0
diff --git a/middleman-core/features/collections.feature b/middleman-core/features/collections.feature
index e12ca0a5..2d313a3c 100644
--- a/middleman-core/features/collections.feature
+++ b/middleman-core/features/collections.feature
@@ -144,6 +144,33 @@ Feature: Collections
     And I should see 'Article: Blog3 Another Article'
     And I should see 'Article: Blog2 Yet Another Article'
 
+  Scenario: Work with local helpers
+    Given a fixture app "collections-app"
+    And a file named "config.rb" with:
+      """
+      module TestHelper
+        def help_me
+          "ok"
+        end
+      end
+
+      include TestHelper
+
+      data.articles.each_with_index do |a, i|
+        proxy "/#{i}-#{help_me}.html", a
+      end
+      """
+    And a file named "data/articles.yaml" with:
+      """
+      ---
+      - "/blog1/2011-01-01-new-article.html"
+      - "/blog2/2011-01-02-another-article.html"
+      """
+    Given the Server is running at "collections-app"
+    When I go to "0-ok.html"
+    Then I should see 'Newer Article Content'
+    When I go to "1-ok.html"
+    Then I should see 'Another Article Content'
 
   Scenario: Collected data update with file changes
     Given a fixture app "collections-app"
diff --git a/middleman-core/lib/middleman-core/core_extensions/collections.rb b/middleman-core/lib/middleman-core/core_extensions/collections.rb
index 22e6d281..b915fffd 100644
--- a/middleman-core/lib/middleman-core/core_extensions/collections.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/collections.rb
@@ -90,7 +90,7 @@ module Middleman
               pair[:root].realize!(dataset)
             end
 
-            ctx = StepContext.new
+            ctx = StepContext.new(app)
             StepContext.current = ctx
 
             leaves = @leaves.dup
diff --git a/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb b/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb
index 0b17870d..0549b826 100644
--- a/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/collections/step_context.rb
@@ -12,17 +12,20 @@ module Middleman
 
         attr_reader :descriptors
 
-        def initialize
+        def initialize(app)
+          @app = app
           @descriptors = []
         end
 
         def method_missing(name, *args, &block)
           internal = :"_internal_#{name}"
 
-          return super unless respond_to?(internal)
-
-          send(internal, *args, &block).tap do |r|
-            @descriptors << r if r.respond_to?(:execute_descriptor)
+          if respond_to?(internal)
+            send(internal, *args, &block).tap do |r|
+              @descriptors << r if r.respond_to?(:execute_descriptor)
+            end
+          else
+            @app.config_context.send(name, *args, &block)
           end
         end
       end

From 6872e07d34ab037897e8466db634efb9b49b4af5 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 17 Apr 2016 13:02:23 -0700
Subject: [PATCH 072/122] Expose extensions in config. Helps
 middleman/middleman-sprockets#111

---
 middleman-core/lib/middleman-core/config_context.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/config_context.rb b/middleman-core/lib/middleman-core/config_context.rb
index d140e8ea..ebf0d67c 100644
--- a/middleman-core/lib/middleman-core/config_context.rb
+++ b/middleman-core/lib/middleman-core/config_context.rb
@@ -8,7 +8,7 @@ module Middleman
     attr_reader :app
 
     # Whitelist methods that can reach out.
-    def_delegators :@app, :config, :logger, :use, :map, :mime_type, :files, :root, :build?, :server?, :environment?
+    def_delegators :@app, :config, :logger, :use, :map, :mime_type, :files, :root, :build?, :server?, :environment?, :extensions
     def_delegator :"@app.extensions", :activate
 
     def initialize(app, template_context_class)

From 09a7d89fd399401e4aa60cc1c1ea04a5df9da446 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 19 Apr 2016 10:36:49 -0700
Subject: [PATCH 073/122] Throw when trying to overwrite a template context
 value. Fixes #1884

---
 .../features/template-key-collision.feature   | 26 +++++++++++++++++++
 .../lib/middleman-core/template_context.rb    | 12 +++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 middleman-core/features/template-key-collision.feature

diff --git a/middleman-core/features/template-key-collision.feature b/middleman-core/features/template-key-collision.feature
new file mode 100644
index 00000000..6bb1e89c
--- /dev/null
+++ b/middleman-core/features/template-key-collision.feature
@@ -0,0 +1,26 @@
+Feature: Don't allow template locals to overwrite template helpers
+
+  Scenario: Normal Template
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      class TestExt < ::Middleman::Extension
+        expose_to_template foo: :foo
+
+        def foo
+          "bar"
+        end
+      end
+
+      ::Middleman::Extensions.register :test, TestExt
+
+      activate :test
+
+      page "/index.html", locals: { test: false }
+      """
+    And a file named "source/index.erb" with:
+      """
+      <%= foo %>
+      """
+    Given a built app at "empty_app"
+    Then the exit status should be 1
diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index 99ec6ee5..ead3a645 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -34,6 +34,18 @@ module Middleman
       @app = app
       @locs = locs
       @opts = opts
+
+      @locs.each do |k, _|
+        if self.respond_to?(k)
+          msg = "Template local `#{k}` tried to overwrite an existing context value. Please renamed the key when passing to `locals`"
+
+          if app.build?
+            throw msg
+          else
+            logger.error(msg)
+          end
+        end
+      end
     end
 
     # Return the current buffer to the caller and clear the value internally.

From 7e3baed196f5fdd4f6eb1bbdb0ed7efc7e6517f4 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 19 Apr 2016 10:37:23 -0700
Subject: [PATCH 074/122] Throw when trying to overwrite a template context
 value. Fixes #1884

---
 .../lib/middleman-core/template_context.rb         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index ead3a645..08394c24 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -36,14 +36,14 @@ module Middleman
       @opts = opts
 
       @locs.each do |k, _|
-        if self.respond_to?(k)
-          msg = "Template local `#{k}` tried to overwrite an existing context value. Please renamed the key when passing to `locals`"
+        next unless self.respond_to?(k)
 
-          if app.build?
-            throw msg
-          else
-            logger.error(msg)
-          end
+        msg = "Template local `#{k}` tried to overwrite an existing context value. Please renamed the key when passing to `locals`"
+
+        if app.build?
+          throw msg
+        else
+          logger.error(msg)
         end
       end
     end

From 0ac56502290054db455bb71eef79376e5307e4a3 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 19 Apr 2016 10:36:49 -0700
Subject: [PATCH 075/122] Throw when trying to overwrite a template context
 value. Fixes #1884

---
 .../features/template-key-collision.feature   | 26 +++++++++++++++++++
 .../lib/middleman-core/template_renderer.rb   | 14 +++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 middleman-core/features/template-key-collision.feature

diff --git a/middleman-core/features/template-key-collision.feature b/middleman-core/features/template-key-collision.feature
new file mode 100644
index 00000000..9e530dc1
--- /dev/null
+++ b/middleman-core/features/template-key-collision.feature
@@ -0,0 +1,26 @@
+Feature: Don't allow template locals to overwrite template helpers
+
+  Scenario: Normal Template
+    Given an empty app
+    And a file named "config.rb" with:
+      """
+      class TestExt < ::Middleman::Extension
+        expose_to_template foo: :foo
+
+        def foo
+          "bar"
+        end
+      end
+
+      ::Middleman::Extensions.register :test, TestExt
+
+      activate :test
+
+      page "/index.html", locals: { foo: false }
+      """
+    And a file named "source/index.html.erb" with:
+      """
+      <%= foo %>
+      """
+    Given a built app at "empty_app"
+    Then the exit status should be 1
diff --git a/middleman-core/lib/middleman-core/template_renderer.rb b/middleman-core/lib/middleman-core/template_renderer.rb
index 1930d434..1cf9febf 100644
--- a/middleman-core/lib/middleman-core/template_renderer.rb
+++ b/middleman-core/lib/middleman-core/template_renderer.rb
@@ -133,8 +133,20 @@ module Middleman
       # Add extension helpers to context.
       @app.extensions.add_exposed_to_context(context)
 
+      locals.each do |k, _|
+        next unless context.respond_to?(k) && k != :current_path
+
+        msg = "Template local `#{k}` tried to overwrite an existing context value. Please renamed the key when passing to `locals`"
+
+        if @app.build?
+          throw msg
+        else
+          @app.logger.error(msg)
+        end
+      end
+
       content = ::Middleman::Util.instrument 'builder.output.resource.render-template', path: File.basename(path) do
-        _render_with_all_renderers(path, locs, context, opts, &block)
+        _render_with_all_renderers(path, locals, context, options, &block)
       end
 
       # If we need a layout and have a layout, use it

From 2b0f720850ca80e9f28392112d80a47939582a93 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 19 Apr 2016 11:54:00 -0700
Subject: [PATCH 076/122] Bad merge

---
 .../lib/middleman-core/template_context.rb           | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index 08394c24..99ec6ee5 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -34,18 +34,6 @@ module Middleman
       @app = app
       @locs = locs
       @opts = opts
-
-      @locs.each do |k, _|
-        next unless self.respond_to?(k)
-
-        msg = "Template local `#{k}` tried to overwrite an existing context value. Please renamed the key when passing to `locals`"
-
-        if app.build?
-          throw msg
-        else
-          logger.error(msg)
-        end
-      end
     end
 
     # Return the current buffer to the caller and clear the value internally.

From a95f72149093aef2541e8d03d43b9836cdf43290 Mon Sep 17 00:00:00 2001
From: Morton Fox <github@qslw.com>
Date: Wed, 20 Apr 2016 00:27:15 -0400
Subject: [PATCH 077/122] Fix RubyInstaller Devkit link.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 55b81cc1..df4497f7 100644
--- a/README.md
+++ b/README.md
@@ -121,6 +121,6 @@ Copyright (c) 2010-2015 Thomas Reynolds. MIT Licensed, see [LICENSE] for details
 [codeclimate]: https://codeclimate.com/github/middleman/middleman
 [gittip]: https://www.gittip.com/middleman/
 [rubyinstaller]: http://rubyinstaller.org/
-[RubyInstaller-Devkit]: http:rubyinstaller.org/add-ons/devkit/
+[RubyInstaller-Devkit]: http://rubyinstaller.org/add-ons/devkit/
 [rubydoc]: http://rubydoc.info/github/middleman/middleman
 [LICENSE]: https://github.com/middleman/middleman/blob/master/LICENSE.md

From 0f2bc1e0ea65bd6bd1e5e859eb4e4daafbdc8307 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 21 Apr 2016 16:06:26 -0700
Subject: [PATCH 078/122] Minor perf tweaks

---
 .../lib/middleman-core/config_context.rb      |  2 +-
 .../core_extensions/front_matter.rb           | 14 +++---
 .../core_extensions/inline_url_rewriter.rb    | 34 +++++++------
 .../lib/middleman-core/extension.rb           |  5 +-
 .../middleman-core/extensions/asset_hash.rb   |  2 +-
 .../middleman-core/extensions/asset_host.rb   |  3 +-
 .../middleman-core/extensions/minify_css.rb   |  9 +++-
 .../extensions/minify_javascript.rb           |  7 +++
 .../extensions/relative_assets.rb             |  3 +-
 .../lib/middleman-core/file_renderer.rb       |  8 +--
 .../lib/middleman-core/sitemap/resource.rb    |  2 +-
 .../middleman-core/sources/source_watcher.rb  |  6 +++
 .../lib/middleman-core/template_context.rb    |  3 +-
 .../lib/middleman-core/template_renderer.rb   | 21 ++++----
 .../lib/middleman-core/util/data.rb           | 49 ++++++++++++-------
 .../lib/middleman-core/util/files.rb          |  8 +--
 .../lib/middleman-core/util/paths.rb          | 19 +++++++
 .../lib/middleman-core/util/rack.rb           |  2 +-
 middleman-core/middleman-core.gemspec         |  1 +
 19 files changed, 130 insertions(+), 68 deletions(-)

diff --git a/middleman-core/lib/middleman-core/config_context.rb b/middleman-core/lib/middleman-core/config_context.rb
index ebf0d67c..3ee98632 100644
--- a/middleman-core/lib/middleman-core/config_context.rb
+++ b/middleman-core/lib/middleman-core/config_context.rb
@@ -23,7 +23,7 @@ module Middleman
     end
 
     def include(mod)
-      self.extend(mod)
+      extend(mod)
     end
 
     def helpers(*helper_modules, &block)
diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
index 49f4195f..0f69c634 100644
--- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
@@ -73,18 +73,20 @@ module Middleman::CoreExtensions
 
       return [{}, nil] unless file
 
-      return @cache[file[:full_path]] if @cache.key?(file[:full_path])
+      file_path = file[:full_path].to_s
 
-      @cache[file[:full_path]] = ::Middleman::Util::Data.parse(
-        file,
-        app.config[:frontmatter_delims]
-      )
+      @cache[file_path] ||= begin
+        ::Middleman::Util::Data.parse(
+          file,
+          app.config[:frontmatter_delims]
+        )
+      end
     end
 
     Contract ArrayOf[IsA['Middleman::SourceFile']], ArrayOf[IsA['Middleman::SourceFile']] => Any
     def clear_data(updated_files, removed_files)
       (updated_files + removed_files).each do |file|
-        @cache.delete(file[:full_path])
+        @cache.delete(file[:full_path].to_s)
       end
     end
   end
diff --git a/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb b/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
index 14cf4715..24d541fa 100644
--- a/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
@@ -1,6 +1,6 @@
 require 'rack'
 require 'rack/response'
-require 'addressable/uri'
+require 'memoist'
 require 'middleman-core/util'
 require 'middleman-core/contracts'
 
@@ -33,6 +33,8 @@ module Middleman
       end
 
       def after_configuration
+        return if @rewriters.empty?
+
         rewriters = @rewriters.values.sort do |a, b|
           if b[:after] && b[:after] == a[:id]
             1
@@ -45,6 +47,7 @@ module Middleman
       end
 
       class Rack
+        extend Memoist
         include Contracts
 
         Contract RespondTo[:call], {
@@ -55,6 +58,17 @@ module Middleman
           @rack_app = app
           @middleman_app = options.fetch(:middleman_app)
           @rewriters = options.fetch(:rewriters)
+
+          all_source_exts = @rewriters
+                            .reduce([]) { |sum, rewriter| sum + rewriter[:source_extensions] }
+                            .flatten
+                            .uniq
+          @source_exts_regex_text = Regexp.union(all_source_exts).to_s
+
+          @all_asset_exts = @rewriters
+                            .reduce([]) { |sum, rewriter| sum + rewriter[:url_extensions] }
+                            .flatten
+                            .uniq
         end
 
         def call(env)
@@ -63,27 +77,16 @@ module Middleman
           # Allow configuration or upstream request to skip all rewriting
           return [status, headers, response] if env['bypass_inline_url_rewriter'] == 'true'
 
-          all_source_exts = @rewriters
-                            .reduce([]) { |sum, rewriter| sum + rewriter[:source_extensions] }
-                            .flatten
-                            .uniq
-          source_exts_regex_text = Regexp.union(all_source_exts).to_s
-
-          all_asset_exts = @rewriters
-                           .reduce([]) { |sum, rewriter| sum + rewriter[:url_extensions] }
-                           .flatten
-                           .uniq
-
           path = ::Middleman::Util.full_path(env['PATH_INFO'], @middleman_app)
 
-          return [status, headers, response] unless path =~ /(^\/$)|(#{source_exts_regex_text}$)/
+          return [status, headers, response] unless path =~ /(^\/$)|(#{@source_exts_regex_text}$)/
           return [status, headers, response] unless body = ::Middleman::Util.extract_response_text(response)
 
           dirpath = ::Pathname.new(File.dirname(path))
 
           rewritten = ::Middleman::Util.instrument 'inline_url_rewriter', path: path do
-            ::Middleman::Util.rewrite_paths(body, path, all_asset_exts, @middleman_app) do |asset_path|
-              uri = ::Addressable::URI.parse(asset_path)
+            ::Middleman::Util.rewrite_paths(body, path, @all_asset_exts, @middleman_app) do |asset_path|
+              uri = ::Middleman::Util.parse_uri(asset_path)
 
               relative_path = uri.host.nil?
 
@@ -144,6 +147,7 @@ module Middleman
             false
           end
         end
+        memoize :should_ignore?
       end
     end
   end
diff --git a/middleman-core/lib/middleman-core/extension.rb b/middleman-core/lib/middleman-core/extension.rb
index 8f342e69..9805455a 100644
--- a/middleman-core/lib/middleman-core/extension.rb
+++ b/middleman-core/lib/middleman-core/extension.rb
@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'memoist'
 require 'active_support/core_ext/class/attribute'
 require 'middleman-core/configuration'
 require 'middleman-core/contracts'
@@ -66,6 +67,8 @@ module Middleman
   # @see http://middlemanapp.com/advanced/custom/ Middleman Custom Extensions Documentation
   class Extension
     extend Forwardable
+    extend Memoist
+
     include Contracts
 
     def_delegator :@app, :logger
@@ -510,7 +513,7 @@ module Middleman
       self.class.exposed_to_config.each do |k, v|
         ::Middleman::CoreExtensions::Collections::StepContext.add_to_context(k) do |*args, &b|
           r = context.method(:"__original_#{v}").call(*args, &b)
-          self.descriptors << r if r.respond_to?(:execute_descriptor)
+          descriptors << r if r.respond_to?(:execute_descriptor)
         end
       end
     end
diff --git a/middleman-core/lib/middleman-core/extensions/asset_hash.rb b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
index b38bab9f..b0b955f9 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_hash.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
@@ -32,7 +32,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => Maybe[String]
   def rewrite_url(asset_path, dirpath, _request_path)
-    uri = ::Addressable::URI.parse(asset_path)
+    uri = ::Middleman::Util.parse_uri(asset_path)
     relative_path = !uri.path.start_with?('/')
 
     full_asset_path = if relative_path
diff --git a/middleman-core/lib/middleman-core/extensions/asset_host.rb b/middleman-core/lib/middleman-core/extensions/asset_host.rb
index f7c7e8fc..7cb83d07 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_host.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_host.rb
@@ -20,7 +20,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => String
   def rewrite_url(asset_path, dirpath, _request_path)
-    uri = ::Addressable::URI.parse(asset_path)
+    uri = ::Middleman::Util.parse_uri(asset_path)
     relative_path = uri.path[0..0] != '/'
 
     full_asset_path = if relative_path
@@ -37,4 +37,5 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension
 
     File.join(asset_prefix, full_asset_path)
   end
+  memoize :rewrite_url
 end
diff --git a/middleman-core/lib/middleman-core/extensions/minify_css.rb b/middleman-core/lib/middleman-core/extensions/minify_css.rb
index cc513b6c..067b25bf 100644
--- a/middleman-core/lib/middleman-core/extensions/minify_css.rb
+++ b/middleman-core/lib/middleman-core/extensions/minify_css.rb
@@ -1,3 +1,4 @@
+require 'memoist'
 require 'middleman-core/contracts'
 
 # Minify CSS Extension
@@ -30,6 +31,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
 
   # Rack middleware to look for CSS and compress it
   class Rack
+    extend Memoist
     include Contracts
     INLINE_CSS_REGEX = /(<style[^>]*>\s*(?:\/\*<!\[CDATA\[\*\/\n)?)(.*?)((?:(?:\n\s*)?\/\*\]\]>\*\/)?\s*<\/style>)/m
 
@@ -82,8 +84,9 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     # @param [String] path
     # @return [Boolean]
     def ignore?(path)
-      @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) }
+      @ignore.any? { |ignore| ::Middleman::Util.path_match(ignore, path) }
     end
+    memoize :ignore?
 
     # Whether this type of content can be minified
     # @param [String, nil] content_type
@@ -91,6 +94,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minifiable?(content_type)
       @content_types.include?(content_type)
     end
+    memoize :minifiable?
 
     # Whether this type of content contains inline content that can be minified
     # @param [String, nil] content_type
@@ -98,6 +102,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minifiable_inline?(content_type)
       @inline_content_types.include?(content_type)
     end
+    memoize :minifiable_inline?
 
     # Minify the content
     # @param [String] content
@@ -105,6 +110,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
     def minify(content)
       @compressor.compress(content)
     end
+    memoize :minify
 
     # Detect and minify inline content
     # @param [String] content
@@ -114,5 +120,6 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
         $1 + minify($2) + $3
       end
     end
+    memoize :minify_inline
   end
 end
diff --git a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
index acd71224..48490470 100644
--- a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
+++ b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
@@ -1,4 +1,5 @@
 require 'middleman-core/contracts'
+require 'memoist'
 
 # Minify Javascript Extension
 class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
@@ -22,6 +23,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
 
   # Rack middleware to look for JS and compress it
   class Rack
+    extend Memoist
     include Contracts
     INLINE_JS_REGEX = /(<script[^>]*>\s*(?:\/\/(?:(?:<!--)|(?:<!\[CDATA\[))\n)?)(.*?)((?:(?:\n\s*)?\/\/(?:(?:-->)|(?:\]\]>)))?\s*<\/script>)/m
 
@@ -76,6 +78,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     def ignore?(path)
       @ignore.any? { |ignore| Middleman::Util.path_match(ignore, path) }
     end
+    memoize :ignore?
 
     # Whether this type of content can be minified
     # @param [String, nil] content_type
@@ -83,6 +86,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     def minifiable?(content_type)
       @content_types.include?(content_type)
     end
+    memoize :minifiable?
 
     # Whether this type of content contains inline content that can be minified
     # @param [String, nil] content_type
@@ -90,6 +94,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     def minifiable_inline?(content_type)
       @inline_content_types.include?(content_type)
     end
+    memoize :minifiable_inline?
 
     # Minify the content
     # @param [String] content
@@ -100,6 +105,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
       warn "WARNING: Couldn't compress JavaScript in #{@path}: #{e.message}"
       content
     end
+    memoize :minify
 
     # Detect and minify inline content
     # @param [String] content
@@ -119,5 +125,6 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
         end
       end
     end
+    memoize :minify_inline
   end
 end
diff --git a/middleman-core/lib/middleman-core/extensions/relative_assets.rb b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
index b319de1b..33ac420e 100644
--- a/middleman-core/lib/middleman-core/extensions/relative_assets.rb
+++ b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
@@ -33,7 +33,7 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
 
   Contract String, Or[String, Pathname], Any => Maybe[String]
   def rewrite_url(asset_path, dirpath, request_path)
-    uri = ::Addressable::URI.parse(asset_path)
+    uri = ::Middleman::Util.parse_uri(asset_path)
 
     return if uri.path[0..0] != '/'
 
@@ -50,4 +50,5 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
 
     result
   end
+  memoize :rewrite_url
 end
diff --git a/middleman-core/lib/middleman-core/file_renderer.rb b/middleman-core/lib/middleman-core/file_renderer.rb
index ae1212b4..a3e8b193 100644
--- a/middleman-core/lib/middleman-core/file_renderer.rb
+++ b/middleman-core/lib/middleman-core/file_renderer.rb
@@ -59,7 +59,7 @@ module Middleman
       # Overwrite with frontmatter options
       options = options.deep_merge(options[:renderer_options]) if options[:renderer_options]
 
-      template_class = ::Tilt[path]
+      template_class = ::Middleman::Util.tilt_class(path)
 
       # Allow hooks to manipulate the template before render
       body = @app.callbacks_for(:before_render).reduce(body) do |sum, callback|
@@ -99,12 +99,12 @@ module Middleman
     def template_data_for_file
       file = @app.files.find(:source, @path)
 
-      if @app.extensions[:front_matter] || (file && !file[:types].include?(:no_frontmatter))
+      if @app.extensions[:front_matter] && (file && !file[:types].include?(:no_frontmatter))
         result = @app.extensions[:front_matter].template_data_for_file(@path)
         return result unless result.nil?
       end
 
-      file ? file.read : File.read(@path)
+      file ? file.read : ::File.read(@path)
     end
 
     protected
@@ -122,7 +122,7 @@ module Middleman
 
         # Find all the engines which handle this extension in tilt. Look for
         # config variables of that name and merge it
-        extension_class = ::Tilt[ext]
+        extension_class = ::Middleman::Util.tilt_class(ext)
         ::Tilt.mappings.each do |mapping_ext, engines|
           next unless engines.include? extension_class
           engine_options = @app.config[mapping_ext.to_sym] || {}
diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index fd236f3f..7c18078f 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -75,7 +75,7 @@ module Middleman
       Contract Bool
       def template?
         return false if file_descriptor.nil?
-        !::Tilt[file_descriptor[:full_path].to_s].nil?
+        !::Middleman::Util.tilt_class(file_descriptor[:full_path].to_s).nil?
       end
 
       # Backwards compatible method for turning descriptor into a string.
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index 2c034570..9852e223 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -298,9 +298,15 @@ module Middleman
       relative_path = path.relative_path_from(directory)
       relative_path = File.join(destination_dir, relative_path) if destination_dir
 
+      types << :no_frontmatter if partial?(relative_path.to_s)
+
       ::Middleman::SourceFile.new(Pathname(relative_path), path, directory, types, 0)
     end
 
+    def partial?(relative_path)
+      relative_path.split(::File::SEPARATOR).any? { |p| p.start_with?('_') }
+    end
+
     Contract IsA['Middleman::SourceFile'] => Any
     def record_file_change(f)
       if @files[f[:full_path]]
diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index 99ec6ee5..ca5f3632 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -84,6 +84,7 @@ module Middleman
         # Reset stored buffer, regardless of success
         restore_buffer(buf_was)
       end
+
       # Render the layout, with the contents of the block inside.
       concat_safe_content render_file(layout_file, @locs, @opts) { content }
     ensure
@@ -185,7 +186,7 @@ module Middleman
       # handles cases like `style.css.sass.erb`
       content = nil
 
-      while ::Tilt[path]
+      while ::Middleman::Util.tilt_class(path)
         begin
           opts[:template_body] = content if content
 
diff --git a/middleman-core/lib/middleman-core/template_renderer.rb b/middleman-core/lib/middleman-core/template_renderer.rb
index 1cf9febf..0dcf2af8 100644
--- a/middleman-core/lib/middleman-core/template_renderer.rb
+++ b/middleman-core/lib/middleman-core/template_renderer.rb
@@ -61,7 +61,7 @@ module Middleman
 
       # If we're specifically looking for a preferred engine
       if options.key?(:preferred_engine)
-        extension_class = ::Tilt[options[:preferred_engine]]
+        extension_class = ::Middleman::Util.tilt_class(options[:preferred_engine])
 
         # Get a list of extensions for a preferred engine
         preferred_engines += ::Tilt.mappings.select do |_, engines|
@@ -89,7 +89,7 @@ module Middleman
           app.files.find(:source, path_with_ext, globbing)
         end
 
-        found_template = file if file && (preferred_engine.nil? || ::Tilt[file[:full_path]])
+        found_template = file if file && (preferred_engine.nil? || ::Middleman::Util.tilt_class(file[:full_path].to_s))
         break if found_template
       end
 
@@ -134,9 +134,9 @@ module Middleman
       @app.extensions.add_exposed_to_context(context)
 
       locals.each do |k, _|
-        next unless context.respond_to?(k) && k != :current_path
+        next unless context.respond_to?(k) && ![:current_path, :paginate, :page_articles, :blog_controller, :lang, :locale].include?(k.to_sym)
 
-        msg = "Template local `#{k}` tried to overwrite an existing context value. Please renamed the key when passing to `locals`"
+        msg = "Template local `#{k}` tried to overwrite an existing context value. Please rename the key when passing to `locals`"
 
         if @app.build?
           throw msg
@@ -152,13 +152,14 @@ module Middleman
       # If we need a layout and have a layout, use it
       layout_file = fetch_layout(engine, options)
       if layout_file
-        content = ::Middleman::Util.instrument 'builder.output.resource.render-layout', path: File.basename(layout_file[:relative_path].to_s) do
-          if layout_file = fetch_layout(engine, options)
-            layout_renderer = ::Middleman::FileRenderer.new(@app, layout_file[:relative_path].to_s)
+        content = if layout_file = fetch_layout(engine, options)
+          layout_renderer = ::Middleman::FileRenderer.new(@app, layout_file[:relative_path].to_s)
+
+          ::Middleman::Util.instrument 'builder.output.resource.render-layout', path: File.basename(layout_file[:relative_path].to_s) do
             layout_renderer.render(locals, options, context) { content }
-          else
-            content
           end
+        else
+          content
         end
       end
 
@@ -177,7 +178,7 @@ module Middleman
       # handles cases like `style.css.sass.erb`
       content = nil
 
-      while ::Tilt[path]
+      while ::Middleman::Util.tilt_class(path)
         begin
           opts[:template_body] = content if content
 
diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb
index 1a521b8d..ce73540a 100644
--- a/middleman-core/lib/middleman-core/util/data.rb
+++ b/middleman-core/lib/middleman-core/util/data.rb
@@ -3,6 +3,7 @@ require 'json'
 require 'pathname'
 require 'backports/2.1.0/array/to_h'
 require 'hashie'
+require 'memoist'
 
 require 'middleman-core/util/binary'
 require 'middleman-core/contracts'
@@ -36,6 +37,7 @@ module Middleman
     end
 
     module Data
+      extend Memoist
       include Contracts
 
       module_function
@@ -55,20 +57,7 @@ module Middleman
           return [{}, nil]
         end
 
-        start_delims, stop_delims = frontmatter_delims
-                                    .values
-                                    .flatten(1)
-                                    .transpose
-                                    .map(&::Regexp.method(:union))
-
-        match = /
-          \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
-          (?<start>#{start_delims})[ ]*\r?\n
-          (?<frontmatter>.*?)[ ]*\r?\n?
-          ^(?<stop>#{stop_delims})[ ]*\r?\n?
-          \r?\n?
-          (?<additional_content>.*)
-        /mx.match(content) || {}
+        match = build_regex(frontmatter_delims).match(content) || {}
 
         unless match[:frontmatter]
           case known_type
@@ -98,27 +87,53 @@ module Middleman
         end
       end
 
+      def build_regex(frontmatter_delims)
+        start_delims, stop_delims = frontmatter_delims
+                                    .values
+                                    .flatten(1)
+                                    .transpose
+                                    .map(&::Regexp.method(:union))
+
+        match = /
+          \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
+          (?<start>#{start_delims})[ ]*\r?\n
+          (?<frontmatter>.*?)[ ]*\r?\n?
+          ^(?<stop>#{stop_delims})[ ]*\r?\n?
+          \r?\n?
+          (?<additional_content>.*)
+        /mx
+      end
+      memoize :build_regex
+
       # Parse YAML frontmatter out of a string
       # @param [String] content
       # @return [Hash]
-      Contract String, Pathname, Bool => Hash
+      Contract String, Pathname => Hash
       def parse_yaml(content, full_path)
-        symbolize_recursive(::YAML.load(content) || {})
+        c = ::Middleman::Util.instrument 'parse.yaml' do
+          ::YAML.load(content)
+        end
+        c ? symbolize_recursive(c) : {}
       rescue StandardError, ::Psych::SyntaxError => error
         warn "YAML Exception parsing #{full_path}: #{error.message}"
         {}
       end
+      memoize :parse_yaml
 
       # Parse JSON frontmatter out of a string
       # @param [String] content
       # @return [Hash]
       Contract String, Pathname => Hash
       def parse_json(content, full_path)
-        symbolize_recursive(::JSON.parse(content) || {})
+        c = ::Middleman::Util.instrument 'parse.json' do
+          ::JSON.parse(content)
+        end
+        c ? symbolize_recursive(c) : {}
       rescue StandardError => error
         warn "JSON Exception parsing #{full_path}: #{error.message}"
         {}
       end
+      memoize :parse_json
 
       def symbolize_recursive(value)
         case value
diff --git a/middleman-core/lib/middleman-core/util/files.rb b/middleman-core/lib/middleman-core/util/files.rb
index 9ba716f3..e57179a4 100644
--- a/middleman-core/lib/middleman-core/util/files.rb
+++ b/middleman-core/lib/middleman-core/util/files.rb
@@ -54,15 +54,9 @@ module Middleman
       result.encode('UTF-8', 'UTF-8-MAC')
     end
 
-    Contract String => Bool
-    def tilt_recognizes?(path)
-      @@tilt_lookup_cache ||= {}
-      @@tilt_lookup_cache[path] ||= ::Tilt[path]
-    end
-
     Contract String => String
     def step_through_extensions(path)
-      while tilt_recognizes?(path)
+      while ::Middleman::Util.tilt_class(path)
         ext = ::File.extname(path)
         yield ext if block_given?
 
diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index 97abf218..fa25e818 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -1,16 +1,32 @@
 # Core Pathname library used for traversal
 require 'pathname'
 require 'uri'
+require 'memoist'
+require 'addressable'
+require 'tilt'
 
 require 'middleman-core/contracts'
 
 # rubocop:disable ModuleLength
 module Middleman
   module Util
+    extend Memoist
     include Contracts
 
     module_function
 
+    Contract String => ::Addressable::URI
+    def parse_uri(uri)
+      ::Addressable::URI.parse(uri)
+    end
+    memoize :parse_uri
+
+    Contract String => Any
+    def tilt_class(path)
+      ::Tilt[path]
+    end
+    memoize :tilt_class
+
     # Normalize a path to not include a leading slash
     # @param [String] path
     # @return [String]
@@ -19,6 +35,7 @@ module Middleman
       # The tr call works around a bug in Ruby's Unicode handling
       ::URI.decode(path).sub(%r{^/}, '').tr('', '')
     end
+    memoize :normalize_path
 
     # This is a separate method from normalize_path in case we
     # change how we normalize paths
@@ -26,6 +43,7 @@ module Middleman
     def strip_leading_slash(path)
       path.sub(%r{^/}, '')
     end
+    memoize :strip_leading_slash
 
     # Get the path of a file of a given type
     #
@@ -256,5 +274,6 @@ module Middleman
         ::File.fnmatch(matcher.to_s, path)
       end
     end
+    memoize :path_match
   end
 end
diff --git a/middleman-core/lib/middleman-core/util/rack.rb b/middleman-core/lib/middleman-core/util/rack.rb
index 0aeda851..2459052b 100644
--- a/middleman-core/lib/middleman-core/util/rack.rb
+++ b/middleman-core/lib/middleman-core/util/rack.rb
@@ -38,7 +38,7 @@ module Middleman
         current_resource = app.sitemap.find_resource_by_destination_path(path)
 
         begin
-          uri = ::Addressable::URI.parse(asset_path)
+          uri = ::Middleman::Util.parse_uri(asset_path)
 
           if uri.relative? && uri.host.nil? && !(asset_path =~ /^[^\/].*[a-z]+\.[a-z]+\/.*/)
             dest_path = ::Middleman::Util.url_for(app, asset_path, relative: false, current_resource: current_resource)
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index a589eb56..acea6a07 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activesupport', ['~> 4.2'])
   s.add_dependency('padrino-helpers', ['~> 0.13.0'])
   s.add_dependency("addressable", ["~> 2.3"])
+  s.add_dependency('memoist', ['~> 0.14'])
 
   # Watcher
   s.add_dependency('listen', ['~> 3.0'])

From 13d62cb2765c54e8b1e206fa2fce54fe1b3675fe Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 22 Apr 2016 15:52:42 -0700
Subject: [PATCH 079/122] Experiment with non-rack rewriters

---
 .../relative_assets_helpers_only.feature      | 123 ++++++++++++++++++
 .../source/images/blank2.gif                  |   0
 .../core_extensions/default_helpers.rb        |   1 +
 .../core_extensions/inline_url_rewriter.rb    |  23 +---
 .../extensions/relative_assets.rb             |  52 ++++++--
 .../lib/middleman-core/util/paths.rb          |  19 +++
 6 files changed, 184 insertions(+), 34 deletions(-)
 create mode 100644 middleman-core/features/relative_assets_helpers_only.feature
 create mode 100644 middleman-core/fixtures/relative-assets-app/source/images/blank2.gif

diff --git a/middleman-core/features/relative_assets_helpers_only.feature b/middleman-core/features/relative_assets_helpers_only.feature
new file mode 100644
index 00000000..9d508977
--- /dev/null
+++ b/middleman-core/features/relative_assets_helpers_only.feature
@@ -0,0 +1,123 @@
+Feature: Relative Assets (Helpers Only)
+
+  Scenario: Rendering css with the feature enabled
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, helpers_only: true
+      """
+    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+      """
+      h1
+        background: url("<%= asset_url('images/blank.gif') %>")
+      h2
+        background: url("<%= asset_url('/images/blank2.gif') %>")
+      """
+    And a file named "source/javascripts/application.js.erb" with:
+      """
+      function foo() {
+        var img = document.createElement('img');
+        img.src = '<%= asset_url("images/100px.jpg") %>';
+        var body = document.getElementsByTagName('body')[0];
+        body.insertBefore(img, body.firstChild);
+      }
+
+      window.onload = foo;
+      """
+    And a file named "source/stylesheets/fonts3.css.erb" with:
+      """
+      @font-face {
+        font-family: 'Roboto2';
+        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
+        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
+        font-weight: normal;
+        font-style: normal;
+      }
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should see 'url("../images/blank.gif'
+    And I should see 'url("../images/blank2.gif'
+    When I go to "/javascripts/application.js"
+    Then I should not see "../"
+    When I go to "/stylesheets/fonts3.css"
+    Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
+
+  Scenario: Relative css reference with directory indexes
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :directory_indexes
+      activate :relative_assets, helpers_only: true
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/relative_image/index.html"
+    Then I should see "../stylesheets/relative_assets.css"
+
+  Scenario: Relative assets via image_tag
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, helpers_only: true
+      """
+    And a file named "source/sub/image_tag.html.erb" with:
+      """
+      <%= image_tag '/img/blank.gif' %>
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/sub/image_tag.html"
+    Then I should see '<img src="../img/blank.gif" />'
+
+  Scenario: Relative assets should not break data URIs in image_tag
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, helpers_only: true
+      """
+    And a file named "source/sub/image_tag.html.erb" with:
+      """
+      <%= image_tag "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" %>
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/sub/image_tag.html"
+    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
+
+  Scenario: URLs are not rewritten for rewrite ignored paths
+    Given a fixture app "relative-assets-app"
+    And a file named "config.rb" with:
+      """
+      activate :relative_assets, rewrite_ignore: [
+        '/stylesheets/fonts3.css',
+      ], helpers_only: true
+      """
+    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+      """
+      h1
+        background: url("<%= asset_url('images/blank.gif') %>")
+      h2
+        background: url("<%= asset_url('/images/blank2.gif') %>")
+      """
+    And a file named "source/stylesheets/fonts3.css.erb" with:
+      """
+      @font-face {
+        font-family: 'Roboto2';
+        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
+        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
+            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
+        font-weight: normal;
+        font-style: normal;
+      }
+      """
+    And the Server is running at "relative-assets-app"
+    When I go to "/stylesheets/relative_assets.css"
+    Then I should see 'url("../images/blank.gif'
+    When I go to "/stylesheets/fonts3.css"
+    Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'
diff --git a/middleman-core/fixtures/relative-assets-app/source/images/blank2.gif b/middleman-core/fixtures/relative-assets-app/source/images/blank2.gif
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
index 33b411e1..774522db 100644
--- a/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
@@ -1,4 +1,5 @@
 require 'padrino-helpers'
+require 'middleman-core/contracts'
 
 # Don't fail on invalid locale, that's not what our current
 # users expect.
diff --git a/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb b/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
index 24d541fa..43354e97 100644
--- a/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/inline_url_rewriter.rb
@@ -11,13 +11,12 @@ module Middleman
 
       expose_to_application rewrite_inline_urls: :add
 
-      IGNORE_DESCRIPTOR = Or[Regexp, RespondTo[:call], String]
       REWRITER_DESCRIPTOR = {
         id: Symbol,
         proc: Or[Proc, Method],
         url_extensions: ArrayOf[String],
         source_extensions: ArrayOf[String],
-        ignore: ArrayOf[IGNORE_DESCRIPTOR],
+        ignore: ArrayOf[::Middleman::Util::IGNORE_DESCRIPTOR],
         after: Maybe[Symbol]
       }.freeze
 
@@ -109,7 +108,7 @@ module Middleman
                 next unless source_exts.include?(::File.extname(path))
 
                 ignore = rewriter.fetch(:ignore)
-                next if ignore.any? { |r| should_ignore?(r, full_asset_path) }
+                next if ignore.any? { |r| ::Middleman::Util.should_ignore?(r, full_asset_path) }
 
                 rewrite_ignore = Array(rewriter[:rewrite_ignore] || [])
                 next if rewrite_ignore.any? { |i| ::Middleman::Util.path_match(i, path) }
@@ -130,24 +129,6 @@ module Middleman
             headers
           ).finish
         end
-
-        Contract IGNORE_DESCRIPTOR, String => Bool
-        def should_ignore?(validator, value)
-          if validator.is_a? Regexp
-            # Treat as Regexp
-            !!(value =~ validator)
-          elsif validator.respond_to? :call
-            # Treat as proc
-            validator.call(value)
-          elsif validator.is_a? String
-            # Treat as glob
-            File.fnmatch(value, validator)
-          else
-            # If some unknown thing, don't ignore
-            false
-          end
-        end
-        memoize :should_ignore?
       end
     end
   end
diff --git a/middleman-core/lib/middleman-core/extensions/relative_assets.rb b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
index 33ac420e..853a7005 100644
--- a/middleman-core/lib/middleman-core/extensions/relative_assets.rb
+++ b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
@@ -2,15 +2,20 @@ require 'addressable/uri'
 
 # Relative Assets extension
 class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
-  option :exts, nil, 'List of extensions that get cache busters strings appended to them.'
+  option :exts, nil, 'List of extensions that get converted to relative paths.'
   option :sources, %w(.css .htm .html .xhtml), 'List of extensions that are searched for relative assets.'
-  option :ignore, [], 'Regexes of filenames to skip adding query strings to'
-  option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
+  option :ignore, [], 'Regexes of filenames to skip converting to relative paths.'
+  option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites.'
+  option :helpers_only, false, 'Allow only Ruby helpers to change paths.'
 
   def initialize(app, options_hash={}, &block)
     super
 
-    app.rewrite_inline_urls id: :asset_hash,
+    if options[:helpers_only]
+      return
+    end
+
+    app.rewrite_inline_urls id: :relative_assets,
                             url_extensions: options.exts || app.config[:asset_extensions],
                             source_extensions: options.sources,
                             ignore: options.ignore,
@@ -18,16 +23,37 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
                             proc: method(:rewrite_url)
   end
 
-  helpers do
-    # asset_url override for relative assets
-    # @param [String] path
-    # @param [String] prefix
-    # @param [Hash] options Additional options.
-    # @return [String]
-    def asset_url(path, prefix='', options={})
-      options[:relative] = true unless options.key?(:relative)
+  def mark_as_relative(file_path, opts, current_resource)
+    result = opts.dup
 
-      super(path, prefix, options)
+    valid_exts = options.sources
+
+    return result unless current_resource
+    return result unless valid_exts.include?(current_resource.ext)
+
+    rewrite_ignores = Array(options.rewrite_ignore || [])
+
+    path = current_resource.destination_path
+    return result if rewrite_ignores.any? do |i|
+      ::Middleman::Util.path_match(i, path) || ::Middleman::Util.path_match(i, "/#{path}")
+    end
+
+    return result if Array(options.ignore || []).any? do |r|
+      ::Middleman::Util.should_ignore?(r, file_path)
+    end
+
+    result[:relative] = true unless result.key?(:relative)
+
+    result
+  end
+
+  helpers do
+    def asset_url(path, prefix='', options={})
+      super(path, prefix, app.extensions[:relative_assets].mark_as_relative(super, options, current_resource))
+    end
+
+    def asset_path(kind, source, options={})
+      super(kind, source,  app.extensions[:relative_assets].mark_as_relative(super, options, current_resource))
     end
   end
 
diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index fa25e818..26f29442 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -45,6 +45,25 @@ module Middleman
     end
     memoize :strip_leading_slash
 
+    IGNORE_DESCRIPTOR = Or[Regexp, RespondTo[:call], String]
+    Contract IGNORE_DESCRIPTOR, String => Bool
+    def should_ignore?(validator, value)
+      if validator.is_a? Regexp
+        # Treat as Regexp
+        !!(value =~ validator)
+      elsif validator.respond_to? :call
+        # Treat as proc
+        validator.call(value)
+      elsif validator.is_a? String
+        # Treat as glob
+        File.fnmatch(value, validator)
+      else
+        # If some unknown thing, don't ignore
+        false
+      end
+    end
+    memoize :should_ignore?
+
     # Get the path of a file of a given type
     #
     # @param [Middleman::Application] app The app.

From ce5807353988b90702504b5ee4952e216de50bc3 Mon Sep 17 00:00:00 2001
From: Daniel Bayerlein <daniel.bayerlein@googlemail.com>
Date: Sun, 24 Apr 2016 09:57:13 +0200
Subject: [PATCH 080/122] Incompatibility of listen with Ruby < 2.2 fixed

---
 middleman-core/middleman-core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index acea6a07..fde0883c 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency('memoist', ['~> 0.14'])
 
   # Watcher
-  s.add_dependency('listen', ['~> 3.0'])
+  s.add_dependency('listen', ['~> 3.0.0'])
 
   # Tests
   s.add_dependency("capybara", ["~> 2.5.0"])

From 8a8ee768ac3fa88f0bc995459d11d644ba40bbff Mon Sep 17 00:00:00 2001
From: Nick Giancola <nick@philosophie.is>
Date: Mon, 25 Apr 2016 09:50:51 -0700
Subject: [PATCH 081/122] Fix/issue 1889 (#1892)

* Add regression test for infinite loop issue in Util::step_through_extensions (#1889)

* Prevent infinite loop when encountering files where base filename is a possible templating engine
---
 middleman-core/lib/middleman-core/util/files.rb |  2 ++
 middleman-core/spec/middleman-core/util_spec.rb | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/middleman-core/lib/middleman-core/util/files.rb b/middleman-core/lib/middleman-core/util/files.rb
index e57179a4..3d185cea 100644
--- a/middleman-core/lib/middleman-core/util/files.rb
+++ b/middleman-core/lib/middleman-core/util/files.rb
@@ -58,6 +58,8 @@ module Middleman
     def step_through_extensions(path)
       while ::Middleman::Util.tilt_class(path)
         ext = ::File.extname(path)
+        break if ext.empty?
+
         yield ext if block_given?
 
         # Strip templating extensions as long as Tilt knows them
diff --git a/middleman-core/spec/middleman-core/util_spec.rb b/middleman-core/spec/middleman-core/util_spec.rb
index 8385889b..ea9bbd88 100644
--- a/middleman-core/spec/middleman-core/util_spec.rb
+++ b/middleman-core/spec/middleman-core/util_spec.rb
@@ -204,4 +204,20 @@ describe Middleman::Util do
       expect(related).to include File.expand_path("source/stylesheets/include2.css.scss")
     end
   end
+
+  describe "::step_through_extensions" do
+    it "returns the base name after templating engine extensions are removed" do
+      result = Middleman::Util.step_through_extensions('my_file.html.haml.erb')
+      expect(result).to eq 'my_file.html'
+    end
+
+    it "does not loop infinitely when file name is a possible templating engine" do
+      expect do
+        Timeout::timeout(0.5) do
+          result = Middleman::Util.step_through_extensions("markdown.scss")
+          expect(result).to eq "markdown"
+        end
+      end.not_to raise_error
+    end
+  end
 end

From 491870480038e6984bc2a088f2d51f766fa343c7 Mon Sep 17 00:00:00 2001
From: Thomas Bruketta <thomas.bruketta@instrument.com>
Date: Mon, 25 Apr 2016 09:51:11 -0700
Subject: [PATCH 082/122] Allow numbers to be unique page_ids (#1886)

---
 middleman-core/lib/middleman-core/sitemap/resource.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index 7c18078f..ce1bc100 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -85,7 +85,7 @@ module Middleman
         file_descriptor && file_descriptor[:full_path].to_s
       end
 
-      Contract Or[Symbol, String]
+      Contract Or[Symbol, String, Fixnum]
       def page_id
         metadata[:page][:id] || destination_path
       end

From cdcd2bd42d37fe69df7c9953eb47f39df585bfb7 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 26 Apr 2016 09:24:49 -0700
Subject: [PATCH 083/122] Expose development? and production? helpers to
 template context. Related #1895

---
 CHANGELOG.md                                          | 4 ++++
 middleman-core/lib/middleman-core/template_context.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 814ca03b..826135e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 master
 ===
 
+# Next
+
+* Expose `development?` and `production?` helpers to template context.
+
 # 4.1.8
 
 * Let collection loops access ConfigContext for helpers. #1879
diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index ca5f3632..0842b846 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -23,7 +23,7 @@ module Middleman
     attr_accessor :current_engine
 
     # Shorthand references to global values on the app instance.
-    def_delegators :@app, :config, :logger, :sitemap, :server?, :build?, :environment?, :environment, :data, :extensions, :root
+    def_delegators :@app, :config, :logger, :sitemap, :server?, :build?, :environment?, :environment, :data, :extensions, :root, :development?, :production?
 
     # Initialize a context with the current app and predefined locals and options hashes.
     #

From 158c3e9f2549c76ce551e0b10a28b19195a933e4 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 28 Apr 2016 08:47:48 -0700
Subject: [PATCH 084/122] Test new ruby

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42c2903d..e6bc197b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ before_script:
   - bundle update
 rvm:
   - ruby-head
-  - 2.3.0
+  - 2.3.1
   - 2.2.4
   - 2.1
   - 2.0
@@ -15,7 +15,6 @@ os:
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: 2.3.0
     - rvm: ruby-head
 env:
   global:

From 3ebd902ec3afb3bd72e640bc846df8686eaaddf2 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 28 Apr 2016 15:44:50 -0700
Subject: [PATCH 085/122] Move capybara dep

---
 middleman-core/middleman-core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index fde0883c..d8f25c64 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency('listen', ['~> 3.0.0'])
 
   # Tests
-  s.add_dependency("capybara", ["~> 2.5.0"])
+  s.add_development_dependency("capybara", ["~> 2.5.0"])
 
   # i18n
   s.add_dependency('i18n', ['~> 0.7.0'])

From 599cf1e6d32b57d779b65f68fd07f097725cec7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20G=C3=BCnnewig?=
 <dg-ratiodata@users.noreply.github.com>
Date: Fri, 29 Apr 2016 23:23:55 +0200
Subject: [PATCH 086/122] Use https:// to clone templates (#1901)

Using git://-protocol for cloning git repositories does not work via
HTTP proxies. By replacing it with https:// instead it works for more
users.
---
 middleman-cli/lib/middleman-cli/init.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-cli/lib/middleman-cli/init.rb b/middleman-cli/lib/middleman-cli/init.rb
index f1c1927e..e8e5770c 100644
--- a/middleman-cli/lib/middleman-cli/init.rb
+++ b/middleman-cli/lib/middleman-cli/init.rb
@@ -113,7 +113,7 @@ module Middleman::Cli
     end
 
     def repository_path(repo)
-      repo.include?('://') || repo.include?('git@') ? repo : "git://github.com/#{repo}.git"
+      repo.include?('://') || repo.include?('git@') ? repo : "https://github.com/#{repo}.git"
     end
 
     # Add to CLI

From cf4d40caffefced8d7333cc4e207b05e4bfd2cb4 Mon Sep 17 00:00:00 2001
From: Steven Sloan <stevenosloan@gmail.com>
Date: Thu, 5 May 2016 12:08:29 -0400
Subject: [PATCH 087/122] loosen contract on Resource#source_file to
 Maybe[String] (#1906)

this could legitimately return nil if there is no file_descriptor, as would be the case for a StringResource
---
 middleman-core/lib/middleman-core/sitemap/resource.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index ce1bc100..22b13498 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -80,7 +80,7 @@ module Middleman
 
       # Backwards compatible method for turning descriptor into a string.
       # @return [String]
-      Contract String
+      Contract Maybe[String]
       def source_file
         file_descriptor && file_descriptor[:full_path].to_s
       end

From 1c57626445e27e35621242e9b8f5e30977e3af96 Mon Sep 17 00:00:00 2001
From: PiotrMisiurek <PiotrMisiurek@users.noreply.github.com>
Date: Fri, 6 May 2016 09:12:03 +0200
Subject: [PATCH 088/122] Fix contract for
 Sitemap::Store.register_resource_list_manipulator (#1907)

Contract said that optional param priority can be only a number.
But the code also handle the boolean as a value to be compatibile
with old versions

Change contract to accept both Num and Bool
---
 middleman-core/lib/middleman-core/sitemap/store.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/sitemap/store.rb b/middleman-core/lib/middleman-core/sitemap/store.rb
index 47e678ba..25913c7e 100644
--- a/middleman-core/lib/middleman-core/sitemap/store.rb
+++ b/middleman-core/lib/middleman-core/sitemap/store.rb
@@ -102,7 +102,7 @@ module Middleman
       # @param [Numeric] priority Sets the order of this resource list manipulator relative to the rest. By default this is 50, and manipulators run in the order they are registered, but if a priority is provided then this will run ahead of or behind other manipulators.
       # @param [Symbol] custom_name The method name to execute.
       # @return [void]
-      Contract Symbol, RespondTo[:manipulate_resource_list], Maybe[Num], Maybe[Symbol] => Any
+      Contract Symbol, RespondTo[:manipulate_resource_list], Maybe[Num, Bool], Maybe[Symbol] => Any
       def register_resource_list_manipulator(name, manipulator, priority=50, custom_name=nil)
         # The third argument used to be a boolean - handle those who still pass one
         priority = 50 unless priority.is_a? Numeric

From 3e4187568bc363ab9d3fb37bea0afcbe09cf598e Mon Sep 17 00:00:00 2001
From: Matthew Lehner <matthew@mpl.io>
Date: Tue, 10 May 2016 15:17:28 -0700
Subject: [PATCH 089/122] require the `try` core extension (#1911)

---
 middleman-core/lib/middleman-core/extensions/minify_css.rb       | 1 +
 .../lib/middleman-core/extensions/minify_javascript.rb           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/middleman-core/lib/middleman-core/extensions/minify_css.rb b/middleman-core/lib/middleman-core/extensions/minify_css.rb
index 067b25bf..2701b8f2 100644
--- a/middleman-core/lib/middleman-core/extensions/minify_css.rb
+++ b/middleman-core/lib/middleman-core/extensions/minify_css.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/try'
 require 'memoist'
 require 'middleman-core/contracts'
 
diff --git a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
index 48490470..22719e83 100644
--- a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
+++ b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/try'
 require 'middleman-core/contracts'
 require 'memoist'
 

From 849fc65260bb7d25c137e67dd6de637e93bf789c Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 11 May 2016 10:59:48 -0700
Subject: [PATCH 090/122] prep

---
 CHANGELOG.md                                 | 11 +++++++----
 middleman-core/lib/middleman-core/version.rb |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 826135e7..579fa1f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,16 @@
 master
 ===
 
-# Next
-
-* Expose `development?` and `production?` helpers to template context.
-
 # 4.1.8
 
+* Expose `development?` and `production?` helpers to template context.
+* require the `try` core extension (#1911)
+* Fix contract for Sitemap::Store.register_resource_list_manipulator (#1907)
+* Loosen contract on Resource#source_file to Maybe[String] (#1906)
 * Let collection loops access ConfigContext for helpers. #1879
+* Use https:// to clone templates (#1901)
+* Allow numbers to be unique page_ids (#1886)
+* Prevent infinite loop when encountering files where base filename is a possible templating engine
 
 # 4.1.7
 
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 37f706a4..088c1e7f 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.7'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.8'.freeze unless const_defined?(:VERSION)
 end

From ccc1cc1288a18b872beb39e8eb736a9c8ac16e4b Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 11 May 2016 11:48:21 -0700
Subject: [PATCH 091/122] Fix ordering in tests

---
 middleman-core/features/i18n_link_to.feature  | 68 +++++++++----------
 .../features/relative_assets.feature          |  2 +-
 .../relative_assets_helpers_only.feature      |  2 +-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/middleman-core/features/i18n_link_to.feature b/middleman-core/features/i18n_link_to.feature
index a10787c4..9d3f0682 100644
--- a/middleman-core/features/i18n_link_to.feature
+++ b/middleman-core/features/i18n_link_to.feature
@@ -4,7 +4,7 @@ Feature: i18n Paths
     Given a fixture app "empty-app"
     And a file named "data/pages.yml" with:
       """
-      - hello.html 
+      - hello.html
       """
     And a file named "locales/en.yml" with:
       """
@@ -50,24 +50,24 @@ Feature: i18n Paths
     Given the Server is running at "empty-app"
     When I go to "/hello.html"
     Then I should see "Page: Hello"
-    Then I should see '<a class="current" href="/index.html">Current Home</a>'
-    Then I should see '<a title="Other Home" href="/es/index.html">Other Home</a>'
-    Then I should see '<a class="current" href="/index.html"><span>Home: Current Block</span></a>'
-    Then I should see '<a title="Other Home" href="/es/index.html"><span>Home: Other Block</span></a>'
-    Then I should see '<a class="current" href="/hello.html">Current hello.html</a>'
-    Then I should see '<a title="Other hello.html" href="/es/hola.html">Other hello.html</a>'
-    Then I should see '<a class="current" href="/hello.html"><span>Current Block</span></a>'
-    Then I should see '<a title="Other hello.html" href="/es/hola.html"><span>Other Block</span></a>'
+    Then I should see '<a href="/index.html" class="current">Current Home</a>'
+    Then I should see '<a href="/es/index.html" title="Other Home">Other Home</a>'
+    Then I should see '<a href="/index.html" class="current"><span>Home: Current Block</span></a>'
+    Then I should see '<a href="/es/index.html" title="Other Home"><span>Home: Other Block</span></a>'
+    Then I should see '<a href="/hello.html" class="current">Current hello.html</a>'
+    Then I should see '<a href="/es/hola.html" title="Other hello.html">Other hello.html</a>'
+    Then I should see '<a href="/hello.html" class="current"><span>Current Block</span></a>'
+    Then I should see '<a href="/es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
     When I go to "/es/hola.html"
     Then I should see "Page: Hola"
-    Then I should see '<a class="current" href="/es/index.html">Current Home</a>'
-    Then I should see '<a title="Other Home" href="/index.html">Other Home</a>'
-    Then I should see '<a class="current" href="/es/index.html"><span>Home: Current Block</span></a>'
-    Then I should see '<a title="Other Home" href="/index.html"><span>Home: Other Block</span></a>'
-    Then I should see '<a class="current" href="/es/hola.html">Current hello.html</a>'
-    Then I should see '<a title="Other hello.html" href="/hello.html">Other hello.html</a>'
-    Then I should see '<a class="current" href="/es/hola.html"><span>Current Block</span></a>'
-    Then I should see '<a title="Other hello.html" href="/hello.html"><span>Other Block</span></a>'
+    Then I should see '<a href="/es/index.html" class="current">Current Home</a>'
+    Then I should see '<a href="/index.html" title="Other Home">Other Home</a>'
+    Then I should see '<a href="/es/index.html" class="current"><span>Home: Current Block</span></a>'
+    Then I should see '<a href="/index.html" title="Other Home"><span>Home: Other Block</span></a>'
+    Then I should see '<a href="/es/hola.html" class="current">Current hello.html</a>'
+    Then I should see '<a href="/hello.html" title="Other hello.html">Other hello.html</a>'
+    Then I should see '<a href="/es/hola.html" class="current"><span>Current Block</span></a>'
+    Then I should see '<a href="/hello.html" title="Other hello.html"><span>Other Block</span></a>'
 
   Scenario: link_to is i18n aware and supports relative_links
     Given a fixture app "empty-app"
@@ -124,30 +124,30 @@ Feature: i18n Paths
     Then I should see "assets/css/main.css"
     When I go to "/hello.html"
     Then I should see "Page: Hello"
-    Then I should see '<a class="current" href="index.html">Current Home</a>'
-    Then I should see '<a title="Other Home" href="es/index.html">Other Home</a>'
-    Then I should see '<a class="current" href="index.html"><span>Home: Current Block</span></a>'
-    Then I should see '<a title="Other Home" href="es/index.html"><span>Home: Other Block</span></a>'
-    Then I should see '<a class="current" href="hello.html">Current hello.html</a>'
-    Then I should see '<a title="Other hello.html" href="es/hola.html">Other hello.html</a>'
-    Then I should see '<a class="current" href="hello.html"><span>Current Block</span></a>'
-    Then I should see '<a title="Other hello.html" href="es/hola.html"><span>Other Block</span></a>'
+    Then I should see '<a href="index.html" class="current">Current Home</a>'
+    Then I should see '<a href="es/index.html" title="Other Home">Other Home</a>'
+    Then I should see '<a href="index.html" class="current"><span>Home: Current Block</span></a>'
+    Then I should see '<a href="es/index.html" title="Other Home"><span>Home: Other Block</span></a>'
+    Then I should see '<a href="hello.html" class="current">Current hello.html</a>'
+    Then I should see '<a href="es/hola.html" title="Other hello.html">Other hello.html</a>'
+    Then I should see '<a href="hello.html" class="current"><span>Current Block</span></a>'
+    Then I should see '<a href="es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
     When I go to "/es/hola.html"
     Then I should see "Page: Hola"
-    Then I should see '<a class="current" href="index.html">Current Home</a>'
-    Then I should see '<a title="Other Home" href="../index.html">Other Home</a>'
-    Then I should see '<a class="current" href="index.html"><span>Home: Current Block</span></a>'
-    Then I should see '<a title="Other Home" href="../index.html"><span>Home: Other Block</span></a>'
-    Then I should see '<a class="current" href="hola.html">Current hello.html</a>'
-    Then I should see '<a title="Other hello.html" href="../hello.html">Other hello.html</a>'
-    Then I should see '<a class="current" href="hola.html"><span>Current Block</span></a>'
-    Then I should see '<a title="Other hello.html" href="../hello.html"><span>Other Block</span></a>'
+    Then I should see '<a href="index.html" class="current">Current Home</a>'
+    Then I should see '<a href="../index.html" title="Other Home">Other Home</a>'
+    Then I should see '<a href="index.html" class="current"><span>Home: Current Block</span></a>'
+    Then I should see '<a href="../index.html" title="Other Home"><span>Home: Other Block</span></a>'
+    Then I should see '<a href="hola.html" class="current">Current hello.html</a>'
+    Then I should see '<a href="../hello.html" title="Other hello.html">Other hello.html</a>'
+    Then I should see '<a href="hola.html" class="current"><span>Current Block</span></a>'
+    Then I should see '<a href="../hello.html" title="Other hello.html"><span>Other Block</span></a>'
 
   Scenario: url_for is i18n aware
     Given a fixture app "empty-app"
     And a file named "data/pages.yml" with:
       """
-      - hello.html 
+      - hello.html
       - article.html
       """
     And a file named "locales/en.yml" with:
diff --git a/middleman-core/features/relative_assets.feature b/middleman-core/features/relative_assets.feature
index ea6cbff0..ba131396 100644
--- a/middleman-core/features/relative_assets.feature
+++ b/middleman-core/features/relative_assets.feature
@@ -120,7 +120,7 @@ Feature: Relative Assets
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="../img/blank.gif" />'
+    Then I should see '<img src="../img/blank.gif"'
 
   Scenario: Relative assets should not break data URIs in image_tag
     Given a fixture app "relative-assets-app"
diff --git a/middleman-core/features/relative_assets_helpers_only.feature b/middleman-core/features/relative_assets_helpers_only.feature
index 9d508977..194c8b37 100644
--- a/middleman-core/features/relative_assets_helpers_only.feature
+++ b/middleman-core/features/relative_assets_helpers_only.feature
@@ -72,7 +72,7 @@ Feature: Relative Assets (Helpers Only)
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="../img/blank.gif" />'
+    Then I should see '<img src="../img/blank.gif"'
 
   Scenario: Relative assets should not break data URIs in image_tag
     Given a fixture app "relative-assets-app"

From 5de9e86a5529da888907472d7200264596a3cd9b Mon Sep 17 00:00:00 2001
From: Steven Sloan <stevenosloan@gmail.com>
Date: Fri, 13 May 2016 16:01:21 -0400
Subject: [PATCH 092/122] allow partial lookups without a current_resource
 (#1912)

current_resource is only needed for relative lookups, so for lookups from source allow them to run without a current resource.
---
 .../lib/middleman-core/template_context.rb    | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index 0842b846..defb063f 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -127,30 +127,36 @@ module Middleman
     # @return [String]
     Contract String, Maybe[Bool] => Maybe[IsA['Middleman::SourceFile']]
     def locate_partial(partial_path, try_static=true)
-      return unless resource = sitemap.find_resource_by_destination_path(current_path)
-
-      # Look for partials relative to the current path
-      current_dir = resource.file_descriptor[:relative_path].dirname
-      non_root = partial_path.to_s.sub(/^\//, '')
-      relative_dir = current_dir + Pathname(non_root)
-
-      non_root_no_underscore = non_root.sub(/^_/, '').sub(/\/_/, '/')
-      relative_dir_no_underscore = current_dir + Pathname(non_root_no_underscore)
-
       partial_file = nil
+      lookup_stack = []
+      non_root     = partial_path.to_s.sub(/^\//, '')
+      non_root_no_underscore = non_root.sub(/^_/, '').sub(/\/_/, '/')
 
-      [
-        [relative_dir.to_s, { preferred_engine: resource.file_descriptor[:relative_path].extname[1..-1].to_sym }],
-        [non_root],
-        [non_root, { try_static: try_static }],
-        [relative_dir_no_underscore.to_s, { try_static: try_static }],
-        [non_root_no_underscore, { try_static: try_static }]
-      ].each do |args|
+      if resource = current_resource
+        current_dir  = resource.file_descriptor[:relative_path].dirname
+        relative_dir = current_dir + Pathname(non_root)
+        relative_dir_no_underscore = current_dir + Pathname(non_root_no_underscore)
+      end
+
+
+      lookup_stack.push [ relative_dir.to_s,
+                          { preferred_engine: resource.file_descriptor[:relative_path]
+                                                      .extname[1..-1].to_sym }] if relative_dir
+      lookup_stack.push [ non_root ]
+      lookup_stack.push [ non_root,
+                          { try_static: try_static }]
+      lookup_stack.push [ relative_dir_no_underscore.to_s,
+                          { try_static: try_static }] if relative_dir_no_underscore
+      lookup_stack.push [ non_root_no_underscore,
+                          { try_static: try_static }]
+
+
+      lookup_stack.each do |args|
         partial_file = ::Middleman::TemplateRenderer.resolve_template(@app, *args)
         break if partial_file
       end
 
-      partial_file || nil
+      partial_file
     end
 
     def current_path

From 38a90255602082522a73d649e47f0f789f302d3b Mon Sep 17 00:00:00 2001
From: Ben Hollis <ben@benhollis.net>
Date: Sun, 22 May 2016 12:31:53 -0700
Subject: [PATCH 093/122] Fix asset_url with asset_hash (#1919)

* Fix asset_url with asset_hash.

* Fix asset hashes.
---
 middleman-core/lib/middleman-core/util/paths.rb | 4 +++-
 middleman-core/spec/middleman-core/util_spec.rb | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index 26f29442..799e198e 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -118,7 +118,9 @@ module Middleman
       # relative path, since it only takes absolute url paths.
       dest_path = url_for(app, path, options.merge(relative: false))
 
-      result = if resource = app.sitemap.find_resource_by_destination_path(dest_path)
+      result = if resource = app.sitemap.find_resource_by_path(dest_path)
+        resource.url
+      elsif resource = app.sitemap.find_resource_by_destination_path(dest_path)
         resource.url
       else
         path = ::File.join(prefix, path)
diff --git a/middleman-core/spec/middleman-core/util_spec.rb b/middleman-core/spec/middleman-core/util_spec.rb
index ea9bbd88..a852521d 100644
--- a/middleman-core/spec/middleman-core/util_spec.rb
+++ b/middleman-core/spec/middleman-core/util_spec.rb
@@ -162,6 +162,13 @@ describe Middleman::Util do
       expect( Middleman::Util.asset_url( @mm, '/how/about/that.html' ) ).to eq '/how/about/that/'
     end
 
+    it "returns a resource url when asset_hash is on" do
+      Given.fixture 'asset-hash-app'
+      @mm = Middleman::Application.new
+
+      expect( Middleman::Util.asset_url( @mm, '100px.png', 'images') ).to match %r|/images/100px-[a-f0-9]+.png|
+    end
+
   end
 
   describe "::find_related_files" do

From 6440d53e7acd033e77487b84cca071ef6e5da6ce Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 25 May 2016 10:54:49 -0700
Subject: [PATCH 094/122] Add support for dotenv

---
 middleman-cli/bin/middleman              | 5 +++++
 middleman-cli/lib/middleman-cli/build.rb | 2 +-
 middleman-core/middleman-core.gemspec    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman
index b5d1921d..46fa5889 100755
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -9,6 +9,9 @@ end
 require "middleman-core/load_paths"
 Middleman.setup_load_paths
 
+require 'dotenv'
+::Dotenv.load
+
 require 'middleman-core'
 require 'middleman-core/logger'
 
@@ -46,6 +49,8 @@ end
 
 ::Middleman::Logger.singleton(3)
 ::Middleman::Cli.config = ::Middleman::Application.new do
+  #
+  config[:environment] = (ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development').to_sym
   config[:mode] = :config
   config[:exit_before_ready] = true
   config[:watcher_disable] = true
diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index 7d5dd3af..df871ce2 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -10,7 +10,7 @@ module Middleman::Cli
 
     class_option :environment,
                  aliases: '-e',
-                 default: :production
+                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || :production
     class_option :clean,
                  type: :boolean,
                  default: true,
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index d8f25c64..f5509c72 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency('fast_blank')
   s.add_dependency('parallel')
   s.add_dependency('servolux')
+  s.add_dependency('dotenv')
 
   # Helpers
   s.add_dependency('activesupport', ['~> 4.2'])

From 4ffaa9dde52e3f9176a4ba795a66d1cd1eaa0607 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 25 May 2016 11:13:59 -0700
Subject: [PATCH 095/122] Try to encode URI before parsing so spaces in paths
 work. Fixes #1914

---
 middleman-core/features/helpers_link_to.feature | 12 +++++++++++-
 middleman-core/lib/middleman-core/util/paths.rb |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/middleman-core/features/helpers_link_to.feature b/middleman-core/features/helpers_link_to.feature
index 90b6f08a..fe8e8530 100644
--- a/middleman-core/features/helpers_link_to.feature
+++ b/middleman-core/features/helpers_link_to.feature
@@ -40,19 +40,29 @@ Feature: link_to helper
     """
     absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
     relative: <%= link_to "Relative", "needs_index.html", relative: true %>
+
+    absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %>
+    relative spaces: <%= link_to "Spaces Relative", "evil spaces.html", relative: true %>
     """
     And a file named "source/link_to/sub.html.erb" with:
     """
     absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
     relative: <%= link_to "Relative", "../needs_index.html", relative: true %>
+
+    absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %>
+    relative spaces: <%= link_to "Spaces Relative", "../evil spaces.html", relative: true %>
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to.html"
     Then I should see 'absolute: <a href="needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="needs_index.html">Relative</a>'
+    Then I should see 'absolute spaces: <a href="evil%20spaces.html">Spaces Index</a>'
+    Then I should see 'relative spaces: <a href="evil%20spaces.html">Spaces Relative</a>'
     When I go to "/link_to/sub.html"
     Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
+    Then I should see 'absolute spaces: <a href="../evil%20spaces.html">Spaces Index</a>'
+    Then I should see 'relative spaces: <a href="../evil%20spaces.html">Spaces Relative</a>'
 
   Scenario: link_to relative works with strip_index_file
     Given a fixture app "indexable-app"
@@ -113,7 +123,7 @@ Feature: link_to helper
     When I go to "/link_to/sub.html"
     Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
-  
+
   Scenario: link_to knows about directory indexes
     Given a fixture app "indexable-app"
     And a file named "source/link_to.html.erb" with:
diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index 799e198e..0f1d13b2 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -158,7 +158,7 @@ module Middleman
 
       # Try to parse URL
       begin
-        uri = URI(url)
+        uri = URI(::URI.encode(url))
       rescue ::URI::InvalidURIError
         # Nothing we can do with it, it's not really a URI
         return url

From 51ccfe11430416d5903f554c1f48ce6dd43c1044 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 25 May 2016 11:25:24 -0700
Subject: [PATCH 096/122] only encode if current path is broken

---
 middleman-core/lib/middleman-core/util/paths.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index 0f1d13b2..a9b3f2c3 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -158,10 +158,14 @@ module Middleman
 
       # Try to parse URL
       begin
-        uri = URI(::URI.encode(url))
+        uri = URI(url)
       rescue ::URI::InvalidURIError
-        # Nothing we can do with it, it's not really a URI
-        return url
+        begin
+          uri = URI(::URI.encode(url))
+        rescue ::URI::InvalidURIError
+          # Nothing we can do with it, it's not really a URI
+          return url
+        end
       end
 
       relative = options[:relative]

From 0d5c9e4313d4416dd18235cdfb5c52608e73823d Mon Sep 17 00:00:00 2001
From: Shawn Van Ittersum <svicalifornia@gmail.com>
Date: Tue, 31 May 2016 13:15:21 -0700
Subject: [PATCH 097/122] Prevent overwrite of Slim embedded options (#1927)

* Fix middleman/middleman#1925: Slim embedded options overwrite

* Remove context_hack from Slim renderer

* Remove debugging output
---
 .../markdown_redcarpet_in_slim.feature        | 41 +++++++++++++++++++
 middleman-core/features/sass_in_slim.feature  | 40 ++++++++++++++++++
 .../fixtures/sass-in-slim-app/config.rb       |  0
 .../lib/middleman-core/renderers/slim.rb      |  6 +--
 4 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 middleman-core/features/markdown_redcarpet_in_slim.feature
 create mode 100644 middleman-core/features/sass_in_slim.feature
 create mode 100644 middleman-core/fixtures/sass-in-slim-app/config.rb

diff --git a/middleman-core/features/markdown_redcarpet_in_slim.feature b/middleman-core/features/markdown_redcarpet_in_slim.feature
new file mode 100644
index 00000000..250c6857
--- /dev/null
+++ b/middleman-core/features/markdown_redcarpet_in_slim.feature
@@ -0,0 +1,41 @@
+Feature: Markdown support in Slim
+  In order to test support of the Slim markdown filter
+
+  Scenario: Markdown filter in Slim works
+    Given a fixture app "markdown-in-slim-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      activate :directory_indexes
+      """
+    And a file named "source/markdown_filter.html.slim" with:
+      """
+      markdown:
+        # H1
+
+        paragraph
+      """
+    Given the Server is running at "markdown-in-slim-app"
+    When I go to "/markdown_filter/"
+    Then I should see ">H1</h1>"
+    Then I should see "<p>paragraph</p>"
+
+
+  Scenario: Markdown filter in Slim uses our link_to and image_tag helpers
+    Given a fixture app "markdown-in-slim-app"
+    And a file named "config.rb" with:
+      """
+      set :markdown_engine, :redcarpet
+      activate :directory_indexes
+      """
+    And a file named "source/link_and_image.html.slim" with:
+      """
+      markdown:
+        [A link](/link_target.html)
+
+        ![image](blank.gif)
+      """
+    Given the Server is running at "markdown-in-slim-app"
+    When I go to "/link_and_image/"
+    Then I should see "/link_target/"
+    Then I should see 'src="/images/blank.gif"'
diff --git a/middleman-core/features/sass_in_slim.feature b/middleman-core/features/sass_in_slim.feature
new file mode 100644
index 00000000..d04055e4
--- /dev/null
+++ b/middleman-core/features/sass_in_slim.feature
@@ -0,0 +1,40 @@
+Feature: Sass/SCSS support in Slim
+  In order to test support of the Slim sass and scss filters
+
+  Scenario: Sass filter in Slim works
+    Given a fixture app "sass-in-slim-app"
+    And a file named "config.rb" with:
+      """
+      activate :directory_indexes
+      """
+    And a file named "source/sass_filter.html.slim" with:
+      """
+      sass:
+        .sass
+          margin: 0
+      """
+    Given the Server is running at "sass-in-slim-app"
+    When I go to "/sass_filter/"
+    Then I should see "text/css"
+    Then I should see ".sass"
+    Then I should see "margin:0"
+
+
+  Scenario: SCSS filter in Slim works
+    Given a fixture app "sass-in-slim-app"
+    And a file named "config.rb" with:
+      """
+      activate :directory_indexes
+      """
+    And a file named "source/scss_filter.html.slim" with:
+      """
+      scss:
+        .scss {
+          margin: 0;
+        }
+      """
+    Given the Server is running at "sass-in-slim-app"
+    When I go to "/scss_filter/"
+    Then I should see "text/css"
+    Then I should see ".scss"
+    Then I should see "margin:0"
diff --git a/middleman-core/fixtures/sass-in-slim-app/config.rb b/middleman-core/fixtures/sass-in-slim-app/config.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/lib/middleman-core/renderers/slim.rb b/middleman-core/lib/middleman-core/renderers/slim.rb
index 16640f4a..818382ad 100644
--- a/middleman-core/lib/middleman-core/renderers/slim.rb
+++ b/middleman-core/lib/middleman-core/renderers/slim.rb
@@ -12,13 +12,9 @@ class ::Slim::Template
 
   def initialize(file, line, opts, &block)
     if opts.key?(:context)
-      context_hack = {
-        context: opts[:context]
-      }
-
       ::Slim::Embedded::SassEngine.disable_option_validator!
       %w(sass scss markdown).each do |engine|
-        ::Slim::Embedded.options[engine.to_sym] = context_hack
+        (::Slim::Embedded.options[engine.to_sym] ||= {})[:context] = opts[:context]
       end
     end
 

From 1efa585c1151f9141054f6afff04540a90b731b1 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 31 May 2016 13:07:58 -0700
Subject: [PATCH 098/122] Fix #1866

---
 middleman-core/lib/middleman-core/application.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 379d1e81..918f65ee 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -266,6 +266,8 @@ module Middleman
       # Evaluate a passed block if given
       config_context.instance_exec(&block) if block_given?
 
+      apply_cli_options
+
       execute_callbacks(:before_sitemap)
 
       # Initialize the Sitemap
@@ -276,8 +278,6 @@ module Middleman
       # Before config is parsed, before extensions get to it.
       execute_callbacks(:initialized)
 
-      apply_cli_options
-
       # Before config is parsed. Mostly used for extensions.
       execute_callbacks(:before_configuration)
 

From e8f10fe3c22237ced1c8e75b93f69644f89edc18 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 31 May 2016 13:08:04 -0700
Subject: [PATCH 099/122] prep

---
 CHANGELOG.md                                 | 8 ++++++++
 middleman-core/lib/middleman-core/version.rb | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 579fa1f6..b25a9816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 master
 ===
 
+# 4.1.9
+
+* Fix `--watcher-*` CLI flags.
+* Allow spaces in paths to work with `link_to`. Fixes #1914
+* Add support for dotenv
+* Fix asset_url with asset_hash (#1919)
+* Allow partial lookups without a current_resource (#1912)
+
 # 4.1.8
 
 * Expose `development?` and `production?` helpers to template context.
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 088c1e7f..280b2eca 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.8'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.9'.freeze unless const_defined?(:VERSION)
 end

From 1581bfc27e53d71e36c37d2ecf4772e1923ba643 Mon Sep 17 00:00:00 2001
From: Peter Suschlik <splattael@users.noreply.github.com>
Date: Wed, 1 Jun 2016 23:19:13 +0200
Subject: [PATCH 100/122] Convert `latency` option to a Fixnum (#1928)

As @vill pointed out in https://github.com/middleman/middleman/issues/1866#issuecomment-222869287
passing `--watcher-latency=2` fails because the gem `listen` expects `latency` to be an `Fixnum`.

This commit fixes this issue.
---
 middleman-core/lib/middleman-core/sources/source_watcher.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index 9852e223..07d7ff62 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -163,7 +163,7 @@ module Middleman
         wait_for_delay: 0.5
       }
 
-      config[:latency] = @latency if @latency
+      config[:latency] = @latency.to_i if @latency
 
       @listener = ::Listen.to(@directory.to_s, config, &method(:on_listener_change))
 

From ea39d16d811ecff46556d419d86d3732ee3db6f2 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 23 Jun 2016 12:41:12 -0700
Subject: [PATCH 101/122] Try to be safe

---
 .../lib/middleman-core/renderers/sass_functions.rb     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/middleman-core/lib/middleman-core/renderers/sass_functions.rb b/middleman-core/lib/middleman-core/renderers/sass_functions.rb
index dbe4c015..8db5707b 100644
--- a/middleman-core/lib/middleman-core/renderers/sass_functions.rb
+++ b/middleman-core/lib/middleman-core/renderers/sass_functions.rb
@@ -105,10 +105,8 @@ module Middleman
   end
 end
 
-SASS_MODULE = if defined?(::SassC)
-  ::SassC
-else
-  ::Sass
+if defined?(::SassC)
+  ::SassC::Script::Functions.send :include, ::Middleman::Sass::Functions
+elsif defined?(::Sass)
+  ::Sass::Script::Functions.send :include, ::Middleman::Sass::Functions
 end
-
-SASS_MODULE::Script::Functions.send :include, ::Middleman::Sass::Functions

From 389e3f5a8cff6d1e060af53cb8e43b5adfb8b08b Mon Sep 17 00:00:00 2001
From: Adam Heath <adam-h@users.noreply.github.com>
Date: Sun, 3 Jul 2016 08:55:25 +0800
Subject: [PATCH 102/122] Add prefix option to asset_hash (#1949)

This allows manually changing the filename so that fiel header changes
can be reflected on the CDN. E.g. if you turn on crossOrigin serving
(CORS) the asset hash doesn't change, but the CDN cache needs to be
broken in order to pickup the new header.
---
 middleman-core/features/asset_hash.feature      | 14 ++++++++++++++
 .../fixtures/asset-hash-prefix/config.rb        |  7 +++++++
 .../asset-hash-prefix/lib/middleware.rb         | 16 ++++++++++++++++
 .../asset-hash-prefix/source/index.html.erb     |  6 ++++++
 .../source/javascripts/application.js           |  2 ++
 .../source/javascripts/application.js.map       |  1 +
 .../asset-hash-prefix/source/layout.erb         | 17 +++++++++++++++++
 .../lib/middleman-core/extensions/asset_hash.rb |  3 ++-
 8 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 middleman-core/fixtures/asset-hash-prefix/config.rb
 create mode 100644 middleman-core/fixtures/asset-hash-prefix/lib/middleware.rb
 create mode 100644 middleman-core/fixtures/asset-hash-prefix/source/index.html.erb
 create mode 100644 middleman-core/fixtures/asset-hash-prefix/source/javascripts/application.js
 create mode 100644 middleman-core/fixtures/asset-hash-prefix/source/javascripts/application.js.map
 create mode 100644 middleman-core/fixtures/asset-hash-prefix/source/layout.erb

diff --git a/middleman-core/features/asset_hash.feature b/middleman-core/features/asset_hash.feature
index 19517e3b..7c173800 100644
--- a/middleman-core/features/asset_hash.feature
+++ b/middleman-core/features/asset_hash.feature
@@ -308,3 +308,17 @@ Feature: Assets get file hashes appended to them and references to them are upda
       | javascripts/application.js.map |
 
     And the file "javascripts/application-4553338c.js" should contain "//# sourceMappingURL=application.js-22cc2b5f.map"
+
+  Scenario: Hashes can contain a prefix
+    Given a successfully built app at "asset-hash-prefix"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | javascripts/application-myprefix-4553338c.js |
+      | javascripts/application.js-myprefix-22cc2b5f.map |
+      | index.html |
+    And the following files should not exist:
+      | javascripts/application.js |
+      | javascripts/application.js.map |
+
+    And the file "javascripts/application-myprefix-4553338c.js" should contain "//# sourceMappingURL=application.js-myprefix-22cc2b5f.map"
diff --git a/middleman-core/fixtures/asset-hash-prefix/config.rb b/middleman-core/fixtures/asset-hash-prefix/config.rb
new file mode 100644
index 00000000..449a2e98
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-prefix/config.rb
@@ -0,0 +1,7 @@
+
+activate :asset_hash,
+  prefix: "myprefix-"
+
+activate :relative_assets
+
+activate :directory_indexes
diff --git a/middleman-core/fixtures/asset-hash-prefix/lib/middleware.rb b/middleman-core/fixtures/asset-hash-prefix/lib/middleware.rb
new file mode 100644
index 00000000..8ee825fd
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-prefix/lib/middleware.rb
@@ -0,0 +1,16 @@
+class Middleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, response = @app.call(env)
+    body = ''
+    response.each {|part| body += part }
+    if (env["PATH_INFO"] =~ /css$/)
+      body += "\n/* Added by Rack filter */"
+      status, headers, response = Rack::Response.new(body, status, headers).finish
+    end
+    [status, headers, response]
+  end
+end
diff --git a/middleman-core/fixtures/asset-hash-prefix/source/index.html.erb b/middleman-core/fixtures/asset-hash-prefix/source/index.html.erb
new file mode 100644
index 00000000..a88cc13f
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-prefix/source/index.html.erb
@@ -0,0 +1,6 @@
+<% content_for :head do %>
+  <title>The Middleman!</title>
+<% end %>
+
+<h1>Testing the sitemap hashing</h1>
+<br /><br /><br />
diff --git a/middleman-core/fixtures/asset-hash-prefix/source/javascripts/application.js b/middleman-core/fixtures/asset-hash-prefix/source/javascripts/application.js
new file mode 100644
index 00000000..c72f8572
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-prefix/source/javascripts/application.js
@@ -0,0 +1,2 @@
+function foo(){var message="HEY THERE FRIEND!";var para=document.createElement("p");para.innerHTML=message;var body=document.getElementsByTagName("body")[0];body.insertBefore(para,body.firstChild)}window.onload=foo;
+//# sourceMappingURL=application.js.map
diff --git a/middleman-core/fixtures/asset-hash-prefix/source/javascripts/application.js.map b/middleman-core/fixtures/asset-hash-prefix/source/javascripts/application.js.map
new file mode 100644
index 00000000..6a5acd5c
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-prefix/source/javascripts/application.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["source/javascripts/application.js"],"names":["foo","message","para","document","createElement","innerHTML","body","getElementsByTagName","insertBefore","firstChild","window","onload"],"mappings":"AAAA,QAASA,OACP,GAAIC,SAAU,mBACd,IAAIC,MAAOC,SAASC,cAAc,IAClCF,MAAKG,UAAYJ,OACb,IAAIK,MAAOH,SAASI,qBAAqB,QAAQ,EAC/CD,MAAKE,aAAaN,KAAMI,KAAKG,YAGpCC,OAAOC,OAASX"}
\ No newline at end of file
diff --git a/middleman-core/fixtures/asset-hash-prefix/source/layout.erb b/middleman-core/fixtures/asset-hash-prefix/source/layout.erb
new file mode 100644
index 00000000..c8aacecf
--- /dev/null
+++ b/middleman-core/fixtures/asset-hash-prefix/source/layout.erb
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+
+    <%= javascript_include_tag "application" %>
+    <%= yield_content :head %>
+  </head>
+
+  <body class="<%= page_classes %>">
+
+    <div id="main" role="main">
+      <%= yield %>
+    </div>
+
+  </body>
+</html>
diff --git a/middleman-core/lib/middleman-core/extensions/asset_hash.rb b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
index b0b955f9..3e2a02aa 100644
--- a/middleman-core/lib/middleman-core/extensions/asset_hash.rb
+++ b/middleman-core/lib/middleman-core/extensions/asset_hash.rb
@@ -6,6 +6,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
   option :exts, nil, 'List of extensions that get asset hashes appended to them.'
   option :ignore, [], 'Regexes of filenames to skip adding asset hashes to'
   option :rewrite_ignore, [], 'Regexes of filenames to skip processing for path rewrites'
+  option :prefix, '', 'Prefix for hash'
 
   def initialize(app, options_hash={}, &block)
     super
@@ -92,7 +93,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
       ::Digest::SHA1.hexdigest(response.body)[0..7]
     end
 
-    resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
+    resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{options.prefix}#{digest}#{ext}" }
     resource
   end
 

From 62dba443a0f2d2bcc1abf50b20a71c47ac6e2bc0 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sun, 10 Jul 2016 17:03:22 -0700
Subject: [PATCH 103/122] Fix japanese characters encoding in URLs

---
 CHANGELOG.md                                  |  5 +++
 .../extensions/relative_assets.rb             |  6 +--
 .../sitemap/extensions/redirects.rb           |  3 +-
 .../lib/middleman-core/template_context.rb    | 22 +++++----
 .../lib/middleman-core/util/binary.rb         |  9 ++--
 .../lib/middleman-core/util/data.rb           |  2 +-
 .../lib/middleman-core/util/paths.rb          | 45 +++++++++++--------
 middleman-core/lib/middleman-core/version.rb  |  2 +-
 8 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b25a9816..a6494a17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 master
 ===
 
+# 4.1.10
+
+* Fix unicode issues in URL deeplinks.
+* Add prefix option to asset_hash (#1949)
+
 # 4.1.9
 
 * Fix `--watcher-*` CLI flags.
diff --git a/middleman-core/lib/middleman-core/extensions/relative_assets.rb b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
index 853a7005..432072c3 100644
--- a/middleman-core/lib/middleman-core/extensions/relative_assets.rb
+++ b/middleman-core/lib/middleman-core/extensions/relative_assets.rb
@@ -11,9 +11,7 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
   def initialize(app, options_hash={}, &block)
     super
 
-    if options[:helpers_only]
-      return
-    end
+    return if options[:helpers_only]
 
     app.rewrite_inline_urls id: :relative_assets,
                             url_extensions: options.exts || app.config[:asset_extensions],
@@ -53,7 +51,7 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension
     end
 
     def asset_path(kind, source, options={})
-      super(kind, source,  app.extensions[:relative_assets].mark_as_relative(super, options, current_resource))
+      super(kind, source, app.extensions[:relative_assets].mark_as_relative(super, options, current_resource))
     end
   end
 
diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb b/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb
index 48ede6a0..3ff15718 100644
--- a/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb
+++ b/middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb
@@ -53,8 +53,7 @@ module Middleman
         def render(*)
           url = ::Middleman::Util.url_for(@store.app, @request_path,
                                           relative: false,
-                                          find_resource: true
-                                         )
+                                          find_resource: true)
 
           if output
             output.call(path, url)
diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index defb063f..5efd8c41 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -138,18 +138,16 @@ module Middleman
         relative_dir_no_underscore = current_dir + Pathname(non_root_no_underscore)
       end
 
-
-      lookup_stack.push [ relative_dir.to_s,
-                          { preferred_engine: resource.file_descriptor[:relative_path]
-                                                      .extname[1..-1].to_sym }] if relative_dir
-      lookup_stack.push [ non_root ]
-      lookup_stack.push [ non_root,
-                          { try_static: try_static }]
-      lookup_stack.push [ relative_dir_no_underscore.to_s,
-                          { try_static: try_static }] if relative_dir_no_underscore
-      lookup_stack.push [ non_root_no_underscore,
-                          { try_static: try_static }]
-
+      lookup_stack.push [relative_dir.to_s,
+                         { preferred_engine: resource.file_descriptor[:relative_path]
+                           .extname[1..-1].to_sym }] if relative_dir
+      lookup_stack.push [non_root]
+      lookup_stack.push [non_root,
+                         { try_static: try_static }]
+      lookup_stack.push [relative_dir_no_underscore.to_s,
+                         { try_static: try_static }] if relative_dir_no_underscore
+      lookup_stack.push [non_root_no_underscore,
+                         { try_static: try_static }]
 
       lookup_stack.each do |args|
         partial_file = ::Middleman::TemplateRenderer.resolve_template(@app, *args)
diff --git a/middleman-core/lib/middleman-core/util/binary.rb b/middleman-core/lib/middleman-core/util/binary.rb
index 71e584d1..be131965 100644
--- a/middleman-core/lib/middleman-core/util/binary.rb
+++ b/middleman-core/lib/middleman-core/util/binary.rb
@@ -47,14 +47,13 @@ module Middleman
     # @return [Boolean]
     Contract String => Bool
     def nonbinary_mime?(mime)
-      case
-      when mime.start_with?('text/')
+      if mime.start_with?('text/')
         true
-      when mime.include?('xml') && !mime.include?('officedocument')
+      elsif mime.include?('xml') && !mime.include?('officedocument')
         true
-      when mime.include?('json')
+      elsif mime.include?('json')
         true
-      when mime.include?('javascript')
+      elsif mime.include?('javascript')
         true
       else
         false
diff --git a/middleman-core/lib/middleman-core/util/data.rb b/middleman-core/lib/middleman-core/util/data.rb
index ce73540a..b0026293 100644
--- a/middleman-core/lib/middleman-core/util/data.rb
+++ b/middleman-core/lib/middleman-core/util/data.rb
@@ -94,7 +94,7 @@ module Middleman
                                     .transpose
                                     .map(&::Regexp.method(:union))
 
-        match = /
+        /
           \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
           (?<start>#{start_delims})[ ]*\r?\n
           (?<frontmatter>.*?)[ ]*\r?\n?
diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index a9b3f2c3..2814cfc9 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -1,8 +1,8 @@
 # Core Pathname library used for traversal
 require 'pathname'
 require 'uri'
-require 'memoist'
 require 'addressable'
+require 'memoist'
 require 'tilt'
 
 require 'middleman-core/contracts'
@@ -32,9 +32,9 @@ module Middleman
     # @return [String]
     Contract String => String
     def normalize_path(path)
-      # The tr call works around a bug in Ruby's Unicode handling
+     # The tr call works around a bug in Ruby's Unicode handling
       ::URI.decode(path).sub(%r{^/}, '').tr('', '')
-    end
+     end
     memoize :normalize_path
 
     # This is a separate method from normalize_path in case we
@@ -111,7 +111,7 @@ module Middleman
         raise ArgumentError, '#asset_url must be run in a context with current_resource if relative: true'
       end
 
-      uri = URI(path)
+      uri = ::Middleman::Util.parse_uri(path)
       path = uri.path
 
       # Ensure the url we pass into find_resource_by_destination_path is not a
@@ -131,9 +131,15 @@ module Middleman
         end
       end
 
-      final_result = ::URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative]))
+      final_result = ::Addressable::URI.encode(
+        relative_path_from_resource(
+          options[:current_resource],
+          result,
+          options[:relative]
+        )
+      )
 
-      result_uri = URI(final_result)
+      result_uri = ::Middleman::Util.parse_uri(final_result)
       result_uri.query = uri.query
       result_uri.fragment = uri.fragment
       result_uri.to_s
@@ -158,14 +164,10 @@ module Middleman
 
       # Try to parse URL
       begin
-        uri = URI(url)
-      rescue ::URI::InvalidURIError
-        begin
-          uri = URI(::URI.encode(url))
-        rescue ::URI::InvalidURIError
-          # Nothing we can do with it, it's not really a URI
-          return url
-        end
+        uri = ::Middleman::Util.parse_uri(url)
+      rescue ::Addressable::URI::InvalidURIError
+        # Nothing we can do with it, it's not really a URI
+        return url
       end
 
       relative = options[:relative]
@@ -206,7 +208,13 @@ module Middleman
 
       if resource
         uri.path = if this_resource
-          ::URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
+          ::Addressable::URI.encode(
+            relative_path_from_resource(
+              this_resource,
+              resource_url,
+              effective_relative
+            )
+          )
         else
           resource_url
         end
@@ -284,16 +292,15 @@ module Middleman
     # @return [Boolean] Whether the path matches the matcher
     Contract PATH_MATCHER, String => Bool
     def path_match(matcher, path)
-      case
-      when matcher.is_a?(String)
+      if matcher.is_a?(String)
         if matcher.include? '*'
           ::File.fnmatch(matcher, path)
         else
           path == matcher
         end
-      when matcher.respond_to?(:match)
+      elsif matcher.respond_to?(:match)
         !!(path =~ matcher)
-      when matcher.respond_to?(:call)
+      elsif matcher.respond_to?(:call)
         matcher.call(path)
       else
         ::File.fnmatch(matcher.to_s, path)
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 280b2eca..6f3f1228 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.9'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.10'.freeze unless const_defined?(:VERSION)
 end

From ffef14deb48bdf18037675607fb2b501a4033203 Mon Sep 17 00:00:00 2001
From: sandstrom <alexander@skovik.com>
Date: Fri, 29 Jul 2016 18:00:10 +0200
Subject: [PATCH 104/122] Create ISSUE_TEMPLATE.md (#1966)

---
 ISSUE_TEMPLATE.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ISSUE_TEMPLATE.md

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..6d2dc0e0
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,9 @@
+## Expected behavior and actual behavior
+
+## Steps to reproduce the problem (from a clean middleman installation)
+
+## Additional information
+
+- Ruby version: 
+- Middleman version: 
+- OS version: 

From cbad5713384f809115b81f396637b8d692228f33 Mon Sep 17 00:00:00 2001
From: Peter Sankauskas <pas256@gmail.com>
Date: Wed, 3 Aug 2016 12:59:57 -0700
Subject: [PATCH 105/122] Updating to activesupport version 5 (#1967)

---
 middleman-core/middleman-core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index f5509c72..a0427b1d 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency('dotenv')
 
   # Helpers
-  s.add_dependency('activesupport', ['~> 4.2'])
+  s.add_dependency('activesupport', ['~> 5.0'])
   s.add_dependency('padrino-helpers', ['~> 0.13.0'])
   s.add_dependency("addressable", ["~> 2.3"])
   s.add_dependency('memoist', ['~> 0.14'])

From 7027b4933a0ba86ec95e78a41b963186e94c7eeb Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 3 Aug 2016 13:00:25 -0700
Subject: [PATCH 106/122] Update .travis.yml

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e6bc197b..ac5a7f06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ rvm:
   - ruby-head
   - 2.3.1
   - 2.2.4
-  - 2.1
-  - 2.0
 os:
   - linux
   # - osx

From dcd36a4f99a45af9e19d044c764bb8a6926499d4 Mon Sep 17 00:00:00 2001
From: Mark Rowe <mrowe@bdash.net.nz>
Date: Thu, 11 Aug 2016 00:24:42 -0700
Subject: [PATCH 107/122] Eliminate quadratic behavior in
 `SourceWatcher::poll_once!`.

Both `Array#reject` and `Array#include?` have linear time
complexity. This results in quadratic time complexity when
`Array#include?` is called within `Array#reject`'s block. Using
`Array`'s difference operator gives the same result in linear time.

In a site with ~14,000 files, this drops the time taken by some calls to
`SourceWatcher::poll_once!` from ~15 seconds each to just a few
milliseconds.
---
 middleman-core/lib/middleman-core/sources/source_watcher.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index 07d7ff62..88d75f3f 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -199,7 +199,7 @@ module Middleman
     Contract ArrayOf[Pathname]
     def poll_once!
       updated = ::Middleman::Util.all_files_under(@directory.to_s, &method(:should_not_recurse?))
-      removed = @files.keys.reject { |p| updated.include?(p) }
+      removed = @files.keys - updated
 
       result = update(updated, removed)
 

From 65462cbc4395a4d39b3b11b64e36edc4f5348782 Mon Sep 17 00:00:00 2001
From: Mark Rowe <mrowe@bdash.net.nz>
Date: Fri, 12 Aug 2016 16:33:18 -0700
Subject: [PATCH 108/122] Improve performance of ignoring files (#1971)

* Determine the type of ignore pattern once per pattern.

Performing this work when checking when each file was ignored accounted
for around 4.5 of the 6 seconds that processing ignored files was taking
on a site with ~14,000 files and a small number of ignore patterns.
After this change, processing ignored files takes less than 1.5 seconds.

* Cache the normalized paths on Resource and SourceFile.

Normalizing the paths is expensive, so avoid doing it multiple
times. `Util::normalize_path` is marked as memoized, but this
is not effective as:

1. `memoize` doesn't appear to work with module functions.
2. Checking whether we have a memoized value is as expensive as
   normalizing the path.

This further drops the time it takes to process ignored files on a site
with ~14,000 files from ~1.5 seconds to ~0.6 seconds.
---
 .../sitemap/extensions/ignores.rb             | 64 +++++++++++++------
 .../sitemap/extensions/proxies.rb             |  2 +-
 .../lib/middleman-core/sitemap/resource.rb    |  7 ++
 middleman-core/lib/middleman-core/sources.rb  |  4 ++
 4 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb
index dfa80304..ad2d95c0 100644
--- a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb
+++ b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb
@@ -14,16 +14,31 @@ module Middleman
         Contract Or[String, Regexp, Proc] => RespondTo[:execute_descriptor]
         def ignore(path=nil, &block)
           @app.sitemap.invalidate_resources_not_ignored_cache!
-          IgnoreDescriptor.new(path, block)
+
+          if path.is_a? Regexp
+            RegexpIgnoreDescriptor.new(path)
+          elsif path.is_a? String
+            path_clean = ::Middleman::Util.normalize_path(path)
+
+            if path_clean.include?('*') # It's a glob
+              GlobIgnoreDescriptor.new(path_clean)
+            else
+              StringIgnoreDescriptor.new(path_clean)
+            end
+          elsif block
+            BlockIgnoreDescriptor.new(nil, block)
+          else
+            IgnoreDescriptor.new(path, block)
+          end
         end
 
         IgnoreDescriptor = Struct.new(:path, :block) do
           def execute_descriptor(_app, resources)
             resources.map do |r|
               # Ignore based on the source path (without template extensions)
-              if ignored?(r.path)
+              if ignored?(r.normalized_path)
                 r.ignore!
-              elsif !r.is_a?(ProxyResource) && r.file_descriptor && ignored?(r.file_descriptor[:relative_path].to_s)
+              elsif !r.is_a?(ProxyResource) && r.file_descriptor && ignored?(r.file_descriptor.normalized_relative_path)
                 # This allows files to be ignored by their source file name (with template extensions)
                 r.ignore!
               end
@@ -33,27 +48,38 @@ module Middleman
           end
 
           def ignored?(match_path)
-            match_path = ::Middleman::Util.normalize_path(match_path)
+            raise NotImplementedError
+          end
+        end
 
-            if path.is_a? Regexp
-              match_path =~ path
-            elsif path.is_a? String
-              path_clean = ::Middleman::Util.normalize_path(path)
+        class RegexpIgnoreDescriptor < IgnoreDescriptor
+          def ignored?(match_path)
+            match_path =~ path
+          end
+        end
 
-              if path_clean.include?('*') # It's a glob
-                if defined?(::File::FNM_EXTGLOB)
-                  ::File.fnmatch(path_clean, match_path, ::File::FNM_EXTGLOB)
-                else
-                  ::File.fnmatch(path_clean, match_path)
-                end
-              else
-                match_path == path_clean
-              end
-            elsif block
-              block.call(match_path)
+        class GlobIgnoreDescriptor < IgnoreDescriptor
+          def ignored?(match_path)
+            if defined?(::File::FNM_EXTGLOB)
+              ::File.fnmatch(path, match_path, ::File::FNM_EXTGLOB)
+            else
+              ::File.fnmatch(path, match_path)
             end
           end
         end
+
+        class StringIgnoreDescriptor < IgnoreDescriptor
+          def ignored?(match_path)
+            match_path == path
+          end
+        end
+
+        class BlockIgnoreDescriptor
+          def ignored?(match_path)
+            block.call(match_path)
+          end
+        end
+
       end
     end
   end
diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb
index b11e02eb..42098ae8 100644
--- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb
+++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb
@@ -47,7 +47,7 @@ module Middleman
           )
 
           if should_ignore
-            d = ::Middleman::Sitemap::Extensions::Ignores::IgnoreDescriptor.new(target)
+            d = ::Middleman::Sitemap::Extensions::Ignores::StringIgnoreDescriptor.new(target)
             d.execute_descriptor(app, resources)
           end
 
diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index 22b13498..9ff97478 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -197,6 +197,13 @@ module Middleman
         options[:content_type] || ::Rack::Mime.mime_type(ext, nil)
       end
 
+      # The normalized source path of this resource (relative to the source directory,
+      # without template extensions)
+      # @return [String]
+      def normalized_path
+        @normalized_path ||= ::Middleman::Util.normalize_path @path
+      end
+
       def to_s
         "#<#{self.class} path=#{@path}>"
       end
diff --git a/middleman-core/lib/middleman-core/sources.rb b/middleman-core/lib/middleman-core/sources.rb
index f0d3cc91..d2f64a40 100644
--- a/middleman-core/lib/middleman-core/sources.rb
+++ b/middleman-core/lib/middleman-core/sources.rb
@@ -8,6 +8,10 @@ module Middleman
       ::Middleman::Sources.file_cache[full_path] ||= {}
       ::Middleman::Sources.file_cache[full_path][version] ||= ::File.read(full_path)
     end
+
+    def normalized_relative_path
+      @normalized_relative_path ||= ::Middleman::Util.normalize_path relative_path.to_s
+    end
   end
 
   # Sources handle multiple on-disk collections of files which make up

From 07651c63a693bff183af907d274641d08f598565 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 13 Aug 2016 15:41:19 -0700
Subject: [PATCH 109/122] Update Ruby version requirement.

---
 middleman-cli/middleman-cli.gemspec   | 2 +-
 middleman-core/middleman-core.gemspec | 2 +-
 middleman/middleman.gemspec           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/middleman-cli/middleman-cli.gemspec b/middleman-cli/middleman-cli.gemspec
index f2719efc..e9447a9c 100644
--- a/middleman-cli/middleman-cli.gemspec
+++ b/middleman-cli/middleman-cli.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.executable   = 'middleman'
   s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.2.0'
 
   # CLI
   s.add_dependency('thor', ['>= 0.17.0', '< 2.0'])
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index a0427b1d..81f7712a 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files -z`.split("\0")
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.2.0'
 
   # Core
   s.add_dependency('bundler', ['~> 1.1'])
diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec
index 06dd3144..a172005f 100644
--- a/middleman/middleman.gemspec
+++ b/middleman/middleman.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files -z`.split("\0")
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.2.0'
 
   s.add_dependency('middleman-core', Middleman::VERSION)
   s.add_dependency('middleman-cli', Middleman::VERSION)

From ea2115f3f87d6e881fe9517dc65735c96735faf3 Mon Sep 17 00:00:00 2001
From: Kevin Glowacz <glowacz@gmail.com>
Date: Tue, 30 Aug 2016 19:22:31 -0500
Subject: [PATCH 110/122] Allow for activesupport 4.2 again (#1976)

There is no current reason to remove support for 4.2
This now makes for a backwards compatible change whereas before this would
have called for a new major version of middleman-core
---
 middleman-core/middleman-core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 81f7712a..9e50403b 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency('dotenv')
 
   # Helpers
-  s.add_dependency('activesupport', ['~> 5.0'])
+  s.add_dependency('activesupport', ['>= 4.2', '< 5.1'])
   s.add_dependency('padrino-helpers', ['~> 0.13.0'])
   s.add_dependency("addressable", ["~> 2.3"])
   s.add_dependency('memoist', ['~> 0.14'])

From 197093b36cf3e93ec0fc35f18e33dc6bff75e87c Mon Sep 17 00:00:00 2001
From: Kevin Glowacz <glowacz@gmail.com>
Date: Thu, 8 Sep 2016 17:18:34 -0500
Subject: [PATCH 111/122] Tilt 2 (#1974)

* Updates for mappings change in tilt 2

* drop RedcarpetTemplate::Redcarpet2 which was removed in tilt 2

* require Tilt 2.0 or higher

* Make use of tilt 2's extensions_for method instead
---
 middleman-core/lib/middleman-core/application.rb         | 4 ++--
 middleman-core/lib/middleman-core/file_renderer.rb       | 8 ++++----
 middleman-core/lib/middleman-core/renderers/redcarpet.rb | 2 +-
 middleman-core/lib/middleman-core/template_renderer.rb   | 4 +---
 middleman-core/middleman-core.gemspec                    | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 918f65ee..fb1ab93f 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -344,11 +344,11 @@ module Middleman
 
     # Clean up missing Tilt exts
     def prune_tilt_templates!
-      ::Tilt.mappings.each_key do |key|
+      ::Tilt.default_mapping.lazy_map.each_key do |key|
         begin
           ::Tilt[".#{key}"]
         rescue LoadError, NameError
-          ::Tilt.mappings.delete(key)
+          ::Tilt.default_mapping.lazy_map.delete(key)
         end
       end
     end
diff --git a/middleman-core/lib/middleman-core/file_renderer.rb b/middleman-core/lib/middleman-core/file_renderer.rb
index a3e8b193..26a38dc7 100644
--- a/middleman-core/lib/middleman-core/file_renderer.rb
+++ b/middleman-core/lib/middleman-core/file_renderer.rb
@@ -3,8 +3,8 @@ require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/module/delegation'
 require 'middleman-core/contracts'
 
-::Tilt.mappings.delete('html') # WTF, Tilt?
-::Tilt.mappings.delete('csv')
+::Tilt.default_mapping.lazy_map.delete('html')
+::Tilt.default_mapping.lazy_map.delete('csv')
 
 module Middleman
   class FileRenderer
@@ -123,8 +123,8 @@ module Middleman
         # Find all the engines which handle this extension in tilt. Look for
         # config variables of that name and merge it
         extension_class = ::Middleman::Util.tilt_class(ext)
-        ::Tilt.mappings.each do |mapping_ext, engines|
-          next unless engines.include? extension_class
+
+        ::Tilt.default_mapping.extensions_for(extension_class).each do |mapping_ext|
           engine_options = @app.config[mapping_ext.to_sym] || {}
           options.merge!(engine_options)
         end
diff --git a/middleman-core/lib/middleman-core/renderers/redcarpet.rb b/middleman-core/lib/middleman-core/renderers/redcarpet.rb
index 1542489c..b2171f22 100644
--- a/middleman-core/lib/middleman-core/renderers/redcarpet.rb
+++ b/middleman-core/lib/middleman-core/renderers/redcarpet.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/module/attribute_accessors'
 
 module Middleman
   module Renderers
-    class RedcarpetTemplate < ::Tilt::RedcarpetTemplate::Redcarpet2
+    class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
       # because tilt has decided to convert these
       # in the wrong direction
       ALIASES = {
diff --git a/middleman-core/lib/middleman-core/template_renderer.rb b/middleman-core/lib/middleman-core/template_renderer.rb
index 0dcf2af8..8100a56d 100644
--- a/middleman-core/lib/middleman-core/template_renderer.rb
+++ b/middleman-core/lib/middleman-core/template_renderer.rb
@@ -64,9 +64,7 @@ module Middleman
         extension_class = ::Middleman::Util.tilt_class(options[:preferred_engine])
 
         # Get a list of extensions for a preferred engine
-        preferred_engines += ::Tilt.mappings.select do |_, engines|
-          engines.include? extension_class
-        end.keys
+        preferred_engines += ::Tilt.default_mapping.extensions_for(extension_class)
       end
 
       preferred_engines << '*'
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 9e50403b..44626407 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # Core
   s.add_dependency('bundler', ['~> 1.1'])
   s.add_dependency('rack', ['>= 1.4.5', '< 2.0'])
-  s.add_dependency('tilt', ['~> 1.4.1'])
+  s.add_dependency('tilt', ['~> 2.0'])
   s.add_dependency('erubis')
   s.add_dependency('fast_blank')
   s.add_dependency('parallel')

From 7c968b9572923fd0f7fb176ca8e52a91727adf84 Mon Sep 17 00:00:00 2001
From: Mike Vastola <mike@vasto.la>
Date: Tue, 13 Sep 2016 04:25:17 -0400
Subject: [PATCH 112/122] Updates to support Rails 5, Rack 3 and Sinatra 2
 (beta) (#1984)

* Updates to support Rails 5, Rack 3 and Sinatra 2 (beta).

- Bump upper boundary of version for Rack dependency from 2.0 to 3 (exclusive).
- Version bump sinatra for CI testing to >= 2.0.0.beta2.
- Also replaces use of String#hash in middleman-core/features/asset_host.feature
to ensure sufficiently random variables are returned.

Closes middleman/middleman#1983.

* Testing revert of the version requirements...

To confirm my changes don't cause a regression for any of:
- Rails < 5
- Sinatra < 2
- Rack < 2

* Revert "Testing revert of the version requirements..."

This reverts commit 5cf4c2a07c0814eefa573358b1bc9b0eeb62f9c1.
---
 Gemfile                                              |  2 +-
 middleman-core/features/asset_host.feature           |  3 ++-
 .../lib/middleman-core/extensions/minify_css.rb      |  2 +-
 .../middleman-core/extensions/minify_javascript.rb   |  2 +-
 middleman-core/lib/middleman-core/rack.rb            | 12 +++++++++---
 middleman-core/middleman-core.gemspec                |  2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index f14eb3b1..a4415ab8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'kramdown', '~> 1.2', require: false
 gem 'slim', '>= 2.0', require: false
 gem 'liquid', '>= 2.6', require: false
 gem 'stylus', '>= 1.0', require: false
-gem 'sinatra', '>= 1.4', require: false
+gem 'sinatra', '>= 2.0.0.beta2', require: false
 gem 'redcarpet', '>= 3.1', require: false
 
 # Dns server to test preview server
diff --git a/middleman-core/features/asset_host.feature b/middleman-core/features/asset_host.feature
index 646f1154..0433b61b 100644
--- a/middleman-core/features/asset_host.feature
+++ b/middleman-core/features/asset_host.feature
@@ -25,7 +25,8 @@ Feature: Alternate between multiple asset hosts
     And a file named "config.rb" with:
       """
       activate :asset_host, host: Proc.new { |asset|
-        "http://assets%d.example.com" % (asset.hash % 4)
+        hash = Digest::MD5.digest(asset).bytes.map!(&:ord).reduce(&:+)
+        "http://assets%d.example.com" % (hash % 4)
       }
       """
     And the Server is running
diff --git a/middleman-core/lib/middleman-core/extensions/minify_css.rb b/middleman-core/lib/middleman-core/extensions/minify_css.rb
index 2701b8f2..aca9c60b 100644
--- a/middleman-core/lib/middleman-core/extensions/minify_css.rb
+++ b/middleman-core/lib/middleman-core/extensions/minify_css.rb
@@ -72,7 +72,7 @@ class Middleman::Extensions::MinifyCss < ::Middleman::Extension
       end
 
       if minified
-        headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s
+        headers['Content-Length'] = minified.bytesize.to_s
         response = [minified]
       end
 
diff --git a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
index 22719e83..714d0645 100644
--- a/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
+++ b/middleman-core/lib/middleman-core/extensions/minify_javascript.rb
@@ -64,7 +64,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
       end
 
       if minified
-        headers['Content-Length'] = ::Rack::Utils.bytesize(minified).to_s
+        headers['Content-Length'] = minified.bytesize.to_s
         response = [minified]
       end
 
diff --git a/middleman-core/lib/middleman-core/rack.rb b/middleman-core/lib/middleman-core/rack.rb
index 293a2e43..640dbad9 100644
--- a/middleman-core/lib/middleman-core/rack.rb
+++ b/middleman-core/lib/middleman-core/rack.rb
@@ -133,9 +133,15 @@ module Middleman
 
     # Immediately send static file
     def send_file(resource, env)
-      file      = ::Rack::File.new nil
-      file.path = resource.file_descriptor[:full_path]
-      response = file.serving(env)
+      file     = ::Rack::File.new nil
+      path     = resource.file_descriptor[:full_path]
+      if !file.respond_to?(:path=)
+        request  = ::Rack::Request.new(env)
+        response = file.serving(request, path)
+      else
+        file.path = path
+        response = file.serving(env)
+      end
       status = response[0]
       response[1]['Content-Encoding'] = 'gzip' if %w(.svgz .gz).include?(resource.ext)
       # Do not set Content-Type if status is 1xx, 204, 205 or 304, otherwise
diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec
index 44626407..38df7be7 100644
--- a/middleman-core/middleman-core.gemspec
+++ b/middleman-core/middleman-core.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Core
   s.add_dependency('bundler', ['~> 1.1'])
-  s.add_dependency('rack', ['>= 1.4.5', '< 2.0'])
+  s.add_dependency('rack', ['>= 1.4.5', '< 3'])
   s.add_dependency('tilt', ['~> 2.0'])
   s.add_dependency('erubis')
   s.add_dependency('fast_blank')

From 604c0e2b5d2c17a4fee85f8fd80d62cacd1f1652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Kla=C4=8Dan?= <rene@klacan.sk>
Date: Mon, 31 Oct 2016 18:50:03 +0100
Subject: [PATCH 113/122] Fix source watcher configuration (#1999)

* Fix source watcher configuration

* Keep old Sources#initialize signature

* Poll source on path change
---
 .../lib/middleman-core/application.rb         |  1 +
 .../core_extensions/file_watcher.rb           | 12 ++++--
 middleman-core/lib/middleman-core/sources.rb  |  6 +--
 .../middleman-core/sources/source_watcher.rb  | 41 +++++++++++++++----
 4 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index fb1ab93f..52b31c92 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -203,6 +203,7 @@ module Middleman
     define_setting :watcher_disable, false, 'If the Listen watcher should not run'
     define_setting :watcher_force_polling, false, 'If the Listen watcher should run in polling mode'
     define_setting :watcher_latency, nil, 'The Listen watcher latency'
+    define_setting :watcher_wait_for_delay, 0.5, 'The Listen watcher delay between calls when changes exist'
 
     # Delegate convenience methods off to their implementations
     def_delegator :"::Middleman::Logger", :singleton, :logger
diff --git a/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb b/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
index 82df8f73..6fd16ae9 100644
--- a/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
@@ -28,10 +28,7 @@ module Middleman
         super
 
         # Setup source collection.
-        @sources = ::Middleman::Sources.new(app,
-                                            disable_watcher: app.config[:watcher_disable],
-                                            force_polling: app.config[:watcher_force_polling],
-                                            latency: app.config[:watcher_latency])
+        @sources = ::Middleman::Sources.new(app)
 
         # Add default ignores.
         IGNORES.each do |key, value|
@@ -55,6 +52,13 @@ module Middleman
       # @return [void]
       Contract Any
       def after_configuration
+        @watcher.update_config(
+          disable_watcher: app.config[:watcher_disable],
+          force_polling: app.config[:watcher_force_polling],
+          latency: app.config[:watcher_latency],
+          wait_for_delay: app.config[:watcher_wait_for_delay]
+        )
+
         if @original_source_dir != app.config[:source]
           @watcher.update_path(app.config[:source])
         end
diff --git a/middleman-core/lib/middleman-core/sources.rb b/middleman-core/lib/middleman-core/sources.rb
index d2f64a40..ced46227 100644
--- a/middleman-core/lib/middleman-core/sources.rb
+++ b/middleman-core/lib/middleman-core/sources.rb
@@ -56,15 +56,13 @@ module Middleman
     # @param [Hash] options Global options.
     # @param [Array] watchers Default watchers.
     Contract IsA['Middleman::Application'], Maybe[Hash], Maybe[Array] => Any
-    def initialize(app, options={}, watchers=[])
+    def initialize(app, _options={}, watchers=[])
       @app = app
       @watchers = watchers
       @sorted_watchers = @watchers.dup.freeze
 
       ::Middleman::Sources.file_cache = {}
 
-      @options = options
-
       # Set of procs wanting to be notified of changes
       @on_change_callbacks = ::Hamster::Vector.empty
 
@@ -172,7 +170,7 @@ module Middleman
     # @return [Middleman::Sources]
     Contract Symbol => ::Middleman::Sources
     def by_type(type)
-      self.class.new @app, @options, watchers.select { |d| d.type == type }
+      self.class.new @app, nil, watchers.select { |d| d.type == type }
     end
 
     # Get all files for this collection of watchers.
diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb
index 88d75f3f..8e3a3550 100644
--- a/middleman-core/lib/middleman-core/sources/source_watcher.rb
+++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb
@@ -75,9 +75,10 @@ module Middleman
       @ignored = options.fetch(:ignored, proc { false })
       @only = Array(options.fetch(:only, []))
 
-      @disable_watcher = app.build? || @parent.options.fetch(:disable_watcher, false)
-      @force_polling = @parent.options.fetch(:force_polling, false)
-      @latency = @parent.options.fetch(:latency, nil)
+      @disable_watcher = app.build?
+      @force_polling = false
+      @latency = nil
+      @wait_for_delay = nil
 
       @listener = nil
 
@@ -95,13 +96,20 @@ module Middleman
     def update_path(directory)
       @directory = Pathname(File.expand_path(directory, app.root))
 
-      stop_listener! if @listener
-
-      update([], @files.values.map { |source_file| source_file[:full_path] })
+      without_listener_running do
+        update([], @files.values.map { |source_file| source_file[:full_path] })
+      end
 
       poll_once!
+    end
 
-      listen! unless @disable_watcher
+    def update_config(options={})
+      without_listener_running do
+        @disable_watcher = options.fetch(:disable_watcher, false)
+        @force_polling = options.fetch(:force_polling, false)
+        @latency = options.fetch(:latency, nil)
+        @wait_for_delay = options.fetch(:wait_for_delay, nil)
+      end
     end
 
     # Stop watching.
@@ -160,10 +168,10 @@ module Middleman
 
       config = {
         force_polling: @force_polling,
-        wait_for_delay: 0.5
       }
 
-      config[:latency] = @latency.to_i if @latency
+      config[:wait_for_delay] = @wait_for_delay.try(:to_f) || 0.5
+      config[:latency] = @latency.to_f if @latency
 
       @listener = ::Listen.to(@directory.to_s, config, &method(:on_listener_change))
 
@@ -343,5 +351,20 @@ module Middleman
         @only.any? { |reg| file[:relative_path].to_s =~ reg }
       end
     end
+
+    private
+
+    def without_listener_running
+      listener_running = @listener && @listener.processing?
+
+      stop_listener! if listener_running
+
+      yield
+
+      if listener_running
+        poll_once!
+        listen!
+      end
+    end
   end
 end

From 97082d5fc47513c78ed69d8319bb3002c57c732d Mon Sep 17 00:00:00 2001
From: James Pearson <james@superset.io>
Date: Fri, 4 Nov 2016 14:56:30 +0000
Subject: [PATCH 114/122] Added addressable to the gemfile (#2001)

addressable is required for middleman init, but was not installed as part of a fresh install of Middleman
---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index a4415ab8..491a940d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem 'byebug'
 gem 'aruba', '~> 0.7.4', require: false
 gem 'rspec', '~> 3.0', require: false
 gem 'cucumber', '~> 2.0', require: false
+gem 'addressable', '~> 2.4.0', require: false
 
 # Optional middleman dependencies, included for tests
 gem 'haml', '>= 4.0.5', require: false

From 5adea781c9087689e9e11a57aaff6bbf3921e9f0 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 4 Nov 2016 08:23:33 -0700
Subject: [PATCH 115/122] Fix up tests

---
 .rubocop.yml                                 | 2 ++
 Gemfile                                      | 2 +-
 middleman-core/lib/middleman-core/version.rb | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index dbd74993..c92b709f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -67,3 +67,5 @@ Style/MultilineBlockChain:
   Enabled: false
 Style/SpecialGlobalVars:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
diff --git a/Gemfile b/Gemfile
index 491a940d..54dc7b36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem 'rubydns', '~> 1.0.1', require: false
 
 # To test javascript
 gem 'poltergeist', '~> 1.8', require: false
-gem 'phantomjs', '~> 1.9.8.0', require: false
+gem 'phantomjs', '~> 2.1.1.0', require: false
 
 # For less, note there is no compatible JS runtime for windows
 gem 'therubyrhino', '>= 2.0', platforms: :jruby
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 6f3f1228..cd959488 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.10'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.11'.freeze unless const_defined?(:VERSION)
 end

From 046d15cfa5f91cf29b8bfa8f041930db152fe3e2 Mon Sep 17 00:00:00 2001
From: sandstrom <alexander@skovik.com>
Date: Thu, 17 Nov 2016 05:59:25 +0100
Subject: [PATCH 116/122] Fix addressable require (#2009)

---
 middleman-core/lib/middleman-core/util/paths.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index 2814cfc9..dfa60f15 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -1,7 +1,7 @@
 # Core Pathname library used for traversal
 require 'pathname'
 require 'uri'
-require 'addressable'
+require 'addressable/uri'
 require 'memoist'
 require 'tilt'
 

From 42e31c8c5ebc4580d391353fe69f391f8d0a708c Mon Sep 17 00:00:00 2001
From: Jonathan Allard <jonathan@allard.io>
Date: Thu, 17 Nov 2016 00:00:16 -0500
Subject: [PATCH 117/122] Make .html implicit for page IDs (#1996)

* Make .html implicit for page IDs

* Add Pry gem

* Add setting :page_id_generator to override page ID derivation
---
 Gemfile                                       |  5 ++
 middleman-core/features/page-id.feature       | 48 ++++++++++++++++++-
 .../fixtures/page-id-app/config-proc.rb       |  7 +++
 .../fixtures/page-id-app/source/feed.xml.erb  |  1 +
 .../source/folder/foldern.html.erb            |  1 +
 .../page-id-app/source/implicit.html.erb      |  1 +
 .../page-id-app/source/index.html.erb         |  8 ++++
 .../lib/middleman-core/sitemap/resource.rb    | 26 +++++++++-
 .../lib/middleman-core/util/paths.rb          |  3 +-
 9 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 middleman-core/fixtures/page-id-app/config-proc.rb
 create mode 100644 middleman-core/fixtures/page-id-app/source/feed.xml.erb
 create mode 100644 middleman-core/fixtures/page-id-app/source/folder/foldern.html.erb
 create mode 100644 middleman-core/fixtures/page-id-app/source/implicit.html.erb

diff --git a/Gemfile b/Gemfile
index 54dc7b36..db4043a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,11 @@ gem 'rspec', '~> 3.0', require: false
 gem 'cucumber', '~> 2.0', require: false
 gem 'addressable', '~> 2.4.0', require: false
 
+# Pry tools
+gem 'pry'
+gem 'pry-stack_explorer'
+gem 'pry-rescue'
+
 # Optional middleman dependencies, included for tests
 gem 'haml', '>= 4.0.5', require: false
 gem 'sassc', '~> 1.8', require: false
diff --git a/middleman-core/features/page-id.feature b/middleman-core/features/page-id.feature
index 63dd6fad..74d08cb5 100644
--- a/middleman-core/features/page-id.feature
+++ b/middleman-core/features/page-id.feature
@@ -3,14 +3,60 @@ Feature: Page IDs
   Scenario: link_to works with blocks (erb)
     Given the Server is running at "page-id-app"
     When I go to "/index.html"
-    Then I should see "I am: index.html"
+    Then I should see "I am: index"
     And I should see "URL1: /fm.html"
     And I should see "URL2: /2.html"
     And I should see 'URL3: <a href="/3.html">Hi</a>'
     And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
+    And I should see 'URL5: <a href="/implicit.html">Imp</a>'
+    And I should see 'URL6: <a href="/folder/foldern.html">Foldern</a>'
+    And I should see 'URL7: <a href="/feed.xml">Feed</a>'
 
     When I go to "/fm.html"
     Then I should see "I am: frontmatter"
+    When I go to "/implicit.html"
+    Then I should see "I am: implicit"
+    When I go to "/feed.xml"
+    Then I should see "I am: feed.xml"
+    When I go to "/folder/foldern.html"
+    Then I should see "I am: folder/foldern"
+
+    When I go to "/1.html"
+    Then I should see "I am: page1"
+    When I go to "/2.html"
+    Then I should see "I am: page2"
+    When I go to "/3.html"
+    Then I should see "I am: page3"
+
+    When I go to "/overwrites/from-default.html"
+    Then I should see "I am: something-else"
+
+    When I go to "/overwrites/from-frontmatter.html"
+    Then I should see "I am: from_frontmatter"
+
+  Scenario: Override page ID derivation with a proc
+    Given a fixture app "page-id-app"
+    And app "page-id-app" is using config "proc"
+    And the Server is running at "page-id-app"
+
+    When I go to "/index.html"
+    Then I should see "I am: index.html-foo"
+    And I should see "URL1: /fm.html"
+    And I should see "URL2: /2.html"
+    And I should see 'URL3: <a href="/3.html">Hi</a>'
+    And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
+    And I should see 'URL8: <a href="/implicit.html">Imp</a>'
+    And I should see 'URL9: <a href="/folder/foldern.html">Foldern</a>'
+    And I should see 'URL10: <a href="/feed.xml">Feed</a>'
+
+    When I go to "/fm.html"
+    Then I should see "I am: frontmatter"
+    When I go to "/implicit.html"
+    Then I should see "I am: implicit.html-foo"
+    When I go to "/feed.xml"
+    Then I should see "I am: feed.xml-foo"
+    When I go to "/folder/foldern.html"
+    Then I should see "I am: folder/foldern.html-foo"
 
     When I go to "/1.html"
     Then I should see "I am: page1"
diff --git a/middleman-core/fixtures/page-id-app/config-proc.rb b/middleman-core/fixtures/page-id-app/config-proc.rb
new file mode 100644
index 00000000..03070f0e
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/config-proc.rb
@@ -0,0 +1,7 @@
+%w(1 2 3).each do |n|
+  proxy "/#{n}.html", "/index.html", id: "page#{n}"
+end
+
+page "/overwrites/*", id: :"something-else"
+
+config[:page_id_generator] = ->(path){ path + "-foo" }
diff --git a/middleman-core/fixtures/page-id-app/source/feed.xml.erb b/middleman-core/fixtures/page-id-app/source/feed.xml.erb
new file mode 100644
index 00000000..a27800bd
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/source/feed.xml.erb
@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>
diff --git a/middleman-core/fixtures/page-id-app/source/folder/foldern.html.erb b/middleman-core/fixtures/page-id-app/source/folder/foldern.html.erb
new file mode 100644
index 00000000..a27800bd
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/source/folder/foldern.html.erb
@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>
diff --git a/middleman-core/fixtures/page-id-app/source/implicit.html.erb b/middleman-core/fixtures/page-id-app/source/implicit.html.erb
new file mode 100644
index 00000000..a27800bd
--- /dev/null
+++ b/middleman-core/fixtures/page-id-app/source/implicit.html.erb
@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>
diff --git a/middleman-core/fixtures/page-id-app/source/index.html.erb b/middleman-core/fixtures/page-id-app/source/index.html.erb
index 8f2997b6..6060bc3f 100644
--- a/middleman-core/fixtures/page-id-app/source/index.html.erb
+++ b/middleman-core/fixtures/page-id-app/source/index.html.erb
@@ -4,3 +4,11 @@ URL1: <%= url_for "frontmatter" %>
 URL2: <%= url_for "page2" %>
 URL3: <%= link_to "Hi", "page3" %>
 URL4: <%= link_to "Sym", :"something-else" %>
+URL5: <%= link_to "Imp", :implicit %>
+URL6: <%= link_to "Foldern", "folder/foldern" %>
+URL7: <%= link_to "Feed", "feed.xml" %>
+
+<%# If custom proc %>
+URL8: <%= link_to "Imp", "implicit.html-foo" %>
+URL9: <%= link_to "Foldern", "folder/foldern.html-foo" %>
+URL10: <%= link_to "Feed", "feed.xml-foo" %>
diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb
index 9ff97478..f3619873 100644
--- a/middleman-core/lib/middleman-core/sitemap/resource.rb
+++ b/middleman-core/lib/middleman-core/sitemap/resource.rb
@@ -87,7 +87,7 @@ module Middleman
 
       Contract Or[Symbol, String, Fixnum]
       def page_id
-        metadata[:page][:id] || destination_path
+        metadata[:page][:id] || make_implicit_page_id(destination_path)
       end
 
       # Merge in new metadata specific to this resource.
@@ -208,6 +208,30 @@ module Middleman
         "#<#{self.class} path=#{@path}>"
       end
       alias inspect to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
+
+      protected
+
+      # Makes a page id based on path (when not otherwise given)
+      #
+      # Removes .html extension and potential leading slashes or dots
+      # eg. "foo/bar/baz.foo.html" => "foo/bar/baz.foo"
+      Contract String => String
+      def make_implicit_page_id(path)
+        @id ||= begin
+          if prok = @app.config[:page_id_generator]
+            return prok.call(path)
+          end
+
+          basename = if ext == ".html"
+                       File.basename(path, ext)
+                     else
+                       File.basename(path)
+                     end
+
+          # Remove leading dot or slash if present
+          File.join(File.dirname(path), basename).gsub(/^\.?\//, '')
+        end
+      end
     end
 
     class StringResource < Resource
diff --git a/middleman-core/lib/middleman-core/util/paths.rb b/middleman-core/lib/middleman-core/util/paths.rb
index dfa60f15..2e229392 100644
--- a/middleman-core/lib/middleman-core/util/paths.rb
+++ b/middleman-core/lib/middleman-core/util/paths.rb
@@ -152,7 +152,8 @@ module Middleman
     def url_for(app, path_or_resource, options={})
       if path_or_resource.is_a?(String) || path_or_resource.is_a?(Symbol)
         r = app.sitemap.find_resource_by_page_id(path_or_resource)
-        path_or_resource = r if r
+
+        path_or_resource = r ? r : path_or_resource.to_s
       end
 
       # Handle Resources and other things which define their own url method

From a680fb30c54886a6b427ea9b11121b938281e106 Mon Sep 17 00:00:00 2001
From: Stanislav <c01nd01r@users.noreply.github.com>
Date: Wed, 23 Nov 2016 20:34:53 +0300
Subject: [PATCH 118/122] Add bower_components ignore (#2010)

---
 middleman-core/lib/middleman-core/preview_server.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index b70e9c99..4b2b713b 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -160,6 +160,9 @@ module Middleman
                                     path: root,
                                     only: match_against
 
+              # Hack around bower_components in root.
+              watcher.listener.ignore(/^bower_components/)
+              
               # Hack around node_modules in root.
               watcher.listener.ignore(/^node_modules/)
 

From e30f413376840967157977f56b6298758c222745 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 25 Nov 2016 13:58:35 -0800
Subject: [PATCH 119/122] Fix broken block ignore form.

---
 CHANGELOG.md                                              | 8 ++++++++
 .../lib/middleman-core/sitemap/extensions/ignores.rb      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6494a17..ccfc2272 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 master
 ===
 
+# 4.1.12
+
+* Fix broken `ignore { |p| true }` form.
+
+# 4.1.11
+
+* Upgrade to Rack 2.
+
 # 4.1.10
 
 * Fix unicode issues in URL deeplinks.
diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb
index ad2d95c0..0367c64a 100644
--- a/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb
+++ b/middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb
@@ -74,7 +74,7 @@ module Middleman
           end
         end
 
-        class BlockIgnoreDescriptor
+        class BlockIgnoreDescriptor < IgnoreDescriptor
           def ignored?(match_path)
             block.call(match_path)
           end

From 073f273fe4465fdfb642adb567153d806c67dfcc Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Fri, 25 Nov 2016 14:03:56 -0800
Subject: [PATCH 120/122] Prep

---
 middleman-core/lib/middleman-core/version.rb    | 2 +-
 middleman-core/spec/middleman-core/util_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index cd959488..2519db9e 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.11'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.12'.freeze unless const_defined?(:VERSION)
 end
diff --git a/middleman-core/spec/middleman-core/util_spec.rb b/middleman-core/spec/middleman-core/util_spec.rb
index a852521d..9c429145 100644
--- a/middleman-core/spec/middleman-core/util_spec.rb
+++ b/middleman-core/spec/middleman-core/util_spec.rb
@@ -220,7 +220,7 @@ describe Middleman::Util do
 
     it "does not loop infinitely when file name is a possible templating engine" do
       expect do
-        Timeout::timeout(0.5) do
+        Timeout::timeout(3.0) do
           result = Middleman::Util.step_through_extensions("markdown.scss")
           expect(result).to eq "markdown"
         end

From 30217d2c04d52179aca6d0dc1dd07fdee7d56ed2 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 29 Nov 2016 20:14:19 -0800
Subject: [PATCH 121/122] Change how config options are passed to Thor. Removes
 new Thor warnings from #2017

---
 CHANGELOG.md                                        | 4 ++++
 middleman-cli/bin/middleman                         | 2 --
 middleman-cli/lib/middleman-cli/build.rb            | 4 ++--
 middleman-cli/lib/middleman-cli/server.rb           | 2 +-
 middleman-core/lib/middleman-core/application.rb    | 1 +
 middleman-core/lib/middleman-core/preview_server.rb | 6 +++---
 middleman-core/lib/middleman-core/version.rb        | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccfc2272..148aa2e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 master
 ===
 
+# 4.1.13
+
+* Change how config options are passed to Thor. Removes new Thor warnings from #2017
+
 # 4.1.12
 
 * Fix broken `ignore { |p| true }` form.
diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman
index 46fa5889..8b381a08 100755
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -25,12 +25,10 @@ module Middleman::Cli
       if setting.default.is_a?(String) || setting.default.is_a?(NilClass)
         base.class_option setting.key,
                           type: :string,
-                          default: :undefined,
                           desc: setting.description
       elsif setting.default.is_a?(TrueClass) || setting.default.is_a?(FalseClass)
         base.class_option setting.key,
                           type: :boolean,
-                          default: :undefined,
                           desc: setting.description
       end
     end
diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index df871ce2..9e521dde 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -29,7 +29,7 @@ module Middleman::Cli
                  default: false,
                  desc: 'Print debug messages'
     class_option :instrument,
-                 type: :string,
+                 type: :boolean,
                  default: false,
                  desc: 'Print instrument messages'
     class_option :profile,
@@ -64,7 +64,7 @@ module Middleman::Cli
           config[:mode] = :build
           config[:show_exceptions] = false
           config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
-            sum[k] = v unless v == :undefined
+            sum[k] = v
           end
         end
 
diff --git a/middleman-cli/lib/middleman-cli/server.rb b/middleman-cli/lib/middleman-cli/server.rb
index 479f53bd..85e75a9f 100644
--- a/middleman-cli/lib/middleman-cli/server.rb
+++ b/middleman-cli/lib/middleman-cli/server.rb
@@ -17,7 +17,7 @@ module Middleman::Cli
                  default: false,
                  desc: 'Print debug messages'
     class_option :instrument,
-                 type: :string,
+                 type: :boolean,
                  default: false,
                  desc: 'Print instrument messages'
     class_option :profile,
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 52b31c92..eb819433 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -306,6 +306,7 @@ module Middleman
       execute_callbacks(:after_configuration)
 
       # Everything is stable
+      $stderr.puts config[:exit_before_ready].inspect
       execute_callbacks(:ready) unless config[:exit_before_ready]
     end
 
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index 4b2b713b..1a3d220e 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -143,7 +143,7 @@ module Middleman
 
         app = ::Middleman::Application.new do
           config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
-            sum[k] = v unless v == :undefined
+            sum[k] = v
           end
 
           ready do
@@ -162,7 +162,7 @@ module Middleman
 
               # Hack around bower_components in root.
               watcher.listener.ignore(/^bower_components/)
-              
+
               # Hack around node_modules in root.
               watcher.listener.ignore(/^node_modules/)
 
@@ -207,7 +207,7 @@ module Middleman
       end
 
       def possible_from_cli(key, config)
-        if @cli_options[key] && @cli_options[key] != :undefined
+        if @cli_options[key]
           @cli_options[key]
         else
           config[key]
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 2519db9e..94753eef 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.12'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.13'.freeze unless const_defined?(:VERSION)
 end

From b6167b1369827d871421eb0ee88cb7bf15fbdc5c Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Sat, 3 Dec 2016 11:32:09 -0800
Subject: [PATCH 122/122] Fix #2019

---
 middleman-core/lib/middleman-core/application.rb | 1 -
 middleman-core/lib/middleman-core/version.rb     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index eb819433..52b31c92 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -306,7 +306,6 @@ module Middleman
       execute_callbacks(:after_configuration)
 
       # Everything is stable
-      $stderr.puts config[:exit_before_ready].inspect
       execute_callbacks(:ready) unless config[:exit_before_ready]
     end
 
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 94753eef..7b1bf403 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.13'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.14'.freeze unless const_defined?(:VERSION)
 end