middleman-core 3.2.2 → 3.3.0

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.2.2' unless const_defined?(:VERSION)
+  VERSION = '3.3.0' unless const_defined?(:VERSION)
 end

data/lib/middleman-more/core_extensions/compass.rb

@@ -20,7 +20,7 @@ class Middleman::CoreExtensions::Compass < ::Middleman::Extension
     ::Compass.configuration do |compass_config|
       compass_config.project_path    = app.source_dir
       compass_config.environment     = :development
-      compass_config.cache_path      = app.config[:sass_cache_path]
+      compass_config.cache           = false
       compass_config.sass_dir        = app.config[:css_dir]
       compass_config.css_dir         = app.config[:css_dir]
       compass_config.javascripts_dir = app.config[:js_dir]
@@ -48,7 +48,7 @@ class Middleman::CoreExtensions::Compass < ::Middleman::Extension
     end
 
     # Call hook
-    app.run_hook :compass_config, ::Compass.configuration
+    app.run_hook_for :compass_config, app, ::Compass.configuration
 
     # Tell Tilt to use it as well (for inline sass blocks)
     ::Tilt.register 'sass', CompassSassTemplate
@@ -72,4 +72,4 @@ class Middleman::CoreExtensions::Compass < ::Middleman::Extension
       super.merge(::Compass.configuration.to_sass_engine_options)
     end
   end
-end
+end

data/lib/middleman-more/core_extensions/default_helpers.rb

@@ -1,16 +1,17 @@
-if !defined?(::Padrino::Helpers)
-  require 'vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/support_lite'
-  require 'vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers'
-end
+require 'padrino-helpers'
+
+# Don't fail on invalid locale, that's not what our current
+# users expect.
+::I18n.enforce_available_locales = false
 
 class Padrino::Helpers::OutputHelpers::ErbHandler
   # Force Erb capture not to use safebuffer
   def capture_from_template(*args, &block)
     self.output_buffer, _buf_was = '', self.output_buffer
-    captured_block = block.call(*args)
-    ret = eval('@_out_buf', block.binding)
+    raw = block.call(*args)
+    captured = template.instance_variable_get(:@_out_buf)
     self.output_buffer = _buf_was
-    [ ret, captured_block ]
+    engine_matches?(block) ? captured : raw
   end
 end
 
@@ -48,6 +49,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
       attributes = tag_attributes(options)
       output = ActiveSupport::SafeBuffer.new
       output.safe_concat "<#{name}#{attributes}>"
+
       if content.respond_to?(:each) && !content.is_a?(String)
         content.each { |c| output.safe_concat c; output.safe_concat ::Padrino::Helpers::TagHelpers::NEWLINE }
       else
@@ -59,19 +61,20 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     end
 
     def capture_html(*args, &block)
-      handler = auto_find_proper_handler(&block)
-      captured_block, captured_html = nil, ''
-      if handler && handler.is_type? && handler.block_is_type?(block)
-        captured_html, captured_block = handler.capture_from_template(*args, &block)
+      result = if handler = auto_find_proper_handler(&block)
+        handler.capture_from_template(*args, &block)
+      else
+        block.call(*args)
       end
-      # invoking the block directly if there was no template
-      captured_html = block_given? && ( captured_block || block.call(*args) )  if captured_html.blank?
-      captured_html
+
+      ActiveSupport::SafeBuffer.new.safe_concat(result)
     end
 
     def auto_find_proper_handler(&block)
       engine = block_given? ? File.extname(block.source_location[0])[1..-1].to_sym : current_engine
-      ::Padrino::Helpers::OutputHelpers.handlers.map { |h| h.new(self) }.find { |h| h.engines.include?(engine) && h.is_type? }
+      return if engine == :slim && engine == current_engine
+      handler_class = ::Padrino::Helpers::OutputHelpers.handlers[engine]
+      handler_class && handler_class.new(self)
     end
 
     # Disable Padrino cache buster

data/lib/middleman-more/extensions/asset_hash.rb

@@ -41,6 +41,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
   def manipulate_single_resource(resource)
     return unless options.exts.include?(resource.ext)
     return if ignored_resource?(resource)
+    return if resource.ignored?
 
     # Render through the Rack interface so middleware and mounted apps get a shot
     response = @rack_client.get(URI.escape(resource.destination_path), {}, { 'bypass_asset_hash' => 'true' })

data/middleman-core.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.version     = Middleman::VERSION
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"
-  s.authors     = ["Thomas Reynolds", "Ben Hollis"]
-  s.email       = ["me@tdreyno.com", "ben@benhollis.net"]
+  s.authors     = ["Thomas Reynolds", "Ben Hollis", "Karl Freeman"]
+  s.email       = ["me@tdreyno.com", "ben@benhollis.net", "karlfreeman@gmail.com"]
   s.homepage    = "http://middlemanapp.com"
   s.summary     = "Hand-crafted frontend development"
   s.description = "A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle."
@@ -20,17 +20,20 @@ Gem::Specification.new do |s|
 
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
-  s.add_dependency("rack", [">= 1.4.5"])
-  s.add_dependency("tilt", ["~> 1.4.1"])
+  s.add_dependency("rack", [">= 1.4.5", "< 2.0"])
+  s.add_dependency("tilt", ["~> 1.4.1", "< 2.0"])
+  s.add_dependency("erubis")
+  s.add_dependency("hooks", ["~> 0.3"])
 
   # Builder
-  s.add_dependency("rack-test", ["~> 0.6.1"])
+  s.add_dependency("rack-test", ["~> 0.6.2"])
 
   # CLI
   s.add_dependency("thor", [">= 0.15.2", "< 2.0"])
 
   # Helpers
-  s.add_dependency("activesupport", ["~> 3.2.6"])
+  s.add_dependency("activesupport", ["~> 4.0.1"])
+  s.add_dependency("padrino-helpers", ["~> 0.12.1"])
 
   # Watcher
   s.add_dependency("listen", ["~> 1.1"])

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Thomas Reynolds
 - Ben Hollis
+- Karl Freeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -32,6 +33,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,6 +43,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -46,6 +53,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,20 +63,51 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +134,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: padrino-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +190,7 @@ description: A static site generator. Provides dozens of templating languages (H
 email:
 - me@tdreyno.com
 - ben@benhollis.net
+- karlfreeman@gmail.com
 executables:
 - middleman
 extensions: []
@@ -224,7 +280,6 @@ files:
 - features/relative_assets.feature
 - features/request_params.feature
 - features/sass-assets-paths.feature
-- features/sass_cache_path.feature
 - features/sass_partials.feature
 - features/scss-support.feature
 - features/sitemap_traversal.feature
@@ -570,10 +625,13 @@ files:
 - fixtures/large-build-app/source/spaces in file.html.erb
 - fixtures/large-build-app/source/static.html
 - fixtures/large-build-app/source/stylesheets/static.css
+- fixtures/layouts-dir-app/source/ambiguous.html.erb
 - fixtures/layouts-dir-app/source/index.html.erb
 - fixtures/layouts-dir-app/source/layouts/layout.erb
+- fixtures/layouts-dir-app/source/layouts/other.erb
 - fixtures/layouts-dir-app/source/layouts2/layout.erb
 - fixtures/layouts-dir-app/source/nested/layouts2/layout.erb
+- fixtures/layouts-dir-app/source/other.erb
 - fixtures/link-to-app/config.rb
 - fixtures/link-to-app/source/link_to_erb.html.erb
 - fixtures/link-to-app/source/link_to_haml.html.haml
@@ -802,10 +860,6 @@ files:
 - fixtures/sass-assets-path-app/config.rb
 - fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
 - fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
-- fixtures/sass-cache-path-custom-app/config.rb
-- fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass
-- fixtures/sass-cache-path-default-app/config.rb
-- fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass
 - fixtures/scss-app/config.rb
 - fixtures/scss-app/source/stylesheets/layout.css.sass
 - fixtures/scss-app/source/stylesheets/site_scss.css.scss
@@ -957,6 +1011,7 @@ files:
 - lib/middleman-core/core_extensions/request.rb
 - lib/middleman-core/core_extensions/routing.rb
 - lib/middleman-core/core_extensions/show_exceptions.rb
+- lib/middleman-core/extension.rb
 - lib/middleman-core/extensions.rb
 - lib/middleman-core/load_paths.rb
 - lib/middleman-core/logger.rb
@@ -1150,217 +1205,6 @@ files:
 - lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss
 - lib/middleman/rack.rb
 - lib/vendored-middleman-deps/fastimage.rb
-- lib/vendored-middleman-deps/hooks-0.2.0/CHANGES.textile
-- lib/vendored-middleman-deps/hooks-0.2.0/Gemfile
-- lib/vendored-middleman-deps/hooks-0.2.0/README.rdoc
-- lib/vendored-middleman-deps/hooks-0.2.0/Rakefile
-- lib/vendored-middleman-deps/hooks-0.2.0/hooks.gemspec
-- lib/vendored-middleman-deps/hooks-0.2.0/lib/hooks.rb
-- lib/vendored-middleman-deps/hooks-0.2.0/lib/hooks/inheritable_attribute.rb
-- lib/vendored-middleman-deps/hooks-0.2.0/test/hooks_test.rb
-- lib/vendored-middleman-deps/hooks-0.2.0/test/inheritable_attribute_test.rb
-- lib/vendored-middleman-deps/hooks-0.2.0/test/test_helper.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/.document
-- lib/vendored-middleman-deps/padrino-core-0.11.4/.gitignore
-- lib/vendored-middleman-deps/padrino-core-0.11.4/.yardopts
-- lib/vendored-middleman-deps/padrino-core-0.11.4/LICENSE.txt
-- lib/vendored-middleman-deps/padrino-core-0.11.4/README.rdoc
-- lib/vendored-middleman-deps/padrino-core-0.11.4/Rakefile
-- lib/vendored-middleman-deps/padrino-core-0.11.4/bin/padrino
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/application.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/application/flash.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/application/rendering.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/application/rendering/extensions/erubis.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/application/rendering/extensions/haml.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/application/rendering/extensions/slim.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/application/routing.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/application/showexceptions.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/caller.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/cli/adapter.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/cli/base.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/cli/console.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/cli/rake.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/cli/rake_tasks.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/command.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/images/404.png
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/images/500.png
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/loader.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/cs.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/da.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/de.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/en.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/es.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/fr.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/hu.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/it.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/ja.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/lv.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/nl.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/no.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/pl.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/pt_br.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/ro.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/ru.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/sv.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/tr.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/uk.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/zh_cn.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/locale/zh_tw.yml
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/logger.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/module.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/mounter.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/reloader.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/router.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/server.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/support_lite.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/tasks.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/lib/padrino-core/version.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/padrino-core.gemspec
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/app_gem/Gemfile
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/app_gem/app/app.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/app_gem/app_gem.gemspec
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/app_gem/lib/app_gem.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/app_gem/lib/app_gem/version.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/apps/.components
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/apps/.gitignore
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/apps/complex.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/apps/simple.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/dependencies/a.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/dependencies/b.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/dependencies/c.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/dependencies/circular/e.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/dependencies/circular/f.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/dependencies/circular/g.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/fixtures/dependencies/d.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/helper.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/mini_shoulda.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_application.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_core.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_csrf_protection.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_dependencies.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_filters.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_flash.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_locale.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_logger.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_mounter.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_reloader_complex.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_reloader_simple.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_rendering.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_rendering_extensions.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_restful_routing.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_router.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_routing.rb
-- lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_support_lite.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/.document
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/.gitignore
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/.yardopts
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/LICENSE.txt
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/README.rdoc
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/Rakefile
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/asset_tag_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/breadcrumb_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/form_builder/abstract_form_builder.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/form_builder/standard_form_builder.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/form_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/format_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/cs.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/da.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/de.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/en.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/es.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/fr.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/hu.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/it.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/ja.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/lv.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/nl.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/no.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/pl.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/pt_br.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/ro.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/ru.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/sv.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/tr.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/uk.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/zh_cn.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/locale/zh_tw.yml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/number_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/output_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/output_helpers/abstract_handler.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/output_helpers/erb_handler.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/output_helpers/haml_handler.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/output_helpers/slim_handler.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/render_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/tag_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/lib/padrino-helpers/translation_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/padrino-helpers.gemspec
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/app.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/button_to.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/button_to.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/button_to.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/capture_concat.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/capture_concat.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/capture_concat.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/content_for.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/content_for.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/content_for.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/content_tag.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/content_tag.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/content_tag.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/current_engine.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/current_engine.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/current_engine.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/fields_for.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/fields_for.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/fields_for.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/form_for.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/form_for.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/form_for.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/form_tag.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/form_tag.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/form_tag.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/link_to.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/link_to.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/link_to.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/mail_to.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/mail_to.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/mail_to.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/meta_tag.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/meta_tag.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/meta_tag.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/partials/_erb.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/partials/_haml.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/partials/_slim.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/simple_partial.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/simple_partial.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/markup_app/views/simple_partial.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/app.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/current_engine.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/current_engines/_erb.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/current_engines/_haml.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/current_engines/_slim.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/double_capture_erb.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/double_capture_haml.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/double_capture_slim.slim
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/erb/test.erb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/explicit_engine.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/haml/test.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/template/_user.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/template/haml_template.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/fixtures/render_app/views/template/some_template.haml
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/helper.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_asset_tag_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_breadcrumb_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_form_builder.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_form_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_format_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_locale.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_number_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_output_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_render_helpers.rb
-- lib/vendored-middleman-deps/padrino-helpers-0.11.4/test/test_tag_helpers.rb
 - middleman-core.gemspec
 - spec/middleman-core/binary_spec.rb
 - spec/middleman-core/binary_spec/middleman
@@ -1474,7 +1318,6 @@ test_files:
 - features/relative_assets.feature
 - features/request_params.feature
 - features/sass-assets-paths.feature
-- features/sass_cache_path.feature
 - features/sass_partials.feature
 - features/scss-support.feature
 - features/sitemap_traversal.feature
@@ -1820,10 +1663,13 @@ test_files:
 - fixtures/large-build-app/source/spaces in file.html.erb
 - fixtures/large-build-app/source/static.html
 - fixtures/large-build-app/source/stylesheets/static.css
+- fixtures/layouts-dir-app/source/ambiguous.html.erb
 - fixtures/layouts-dir-app/source/index.html.erb
 - fixtures/layouts-dir-app/source/layouts/layout.erb
+- fixtures/layouts-dir-app/source/layouts/other.erb
 - fixtures/layouts-dir-app/source/layouts2/layout.erb
 - fixtures/layouts-dir-app/source/nested/layouts2/layout.erb
+- fixtures/layouts-dir-app/source/other.erb
 - fixtures/link-to-app/config.rb
 - fixtures/link-to-app/source/link_to_erb.html.erb
 - fixtures/link-to-app/source/link_to_haml.html.haml
@@ -2052,10 +1898,6 @@ test_files:
 - fixtures/sass-assets-path-app/config.rb
 - fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass
 - fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass
-- fixtures/sass-cache-path-custom-app/config.rb
-- fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass
-- fixtures/sass-cache-path-default-app/config.rb
-- fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass
 - fixtures/scss-app/config.rb
 - fixtures/scss-app/source/stylesheets/layout.css.sass
 - fixtures/scss-app/source/stylesheets/site_scss.css.scss