middleman-core 3.0.0.rc.1 → 3.0.0.rc.2

data/bin/middleman

@@ -22,6 +22,8 @@ if !ENV["MM_ROOT"] && found_path = locate_root
   ENV["MM_ROOT"] = found_path
 end
 
+is_bundler_setup = false
+
 # If we've found the root, try to setup Bundler
 if ENV["MM_ROOT"]
   
@@ -33,12 +35,20 @@ if ENV["MM_ROOT"]
     ENV['BUNDLE_GEMFILE'] = git_gemfile.to_s
   end
   
-  require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+  if File.exists?(ENV['BUNDLE_GEMFILE'])
+    is_bundler_setup = true
+    require 'bundler/setup'
+  end
 end
 
 # Automatically discover extensions in RubyGems
 require "middleman-core/extensions"
-::Middleman.load_extensions_in_path
+
+if is_bundler_setup
+  Bundler.require
+else
+  ::Middleman.load_extensions_in_path
+end
 
 require "middleman-core/cli"
 

data/features/custom_layouts.feature

@@ -47,4 +47,18 @@ Feature: Custom layouts
     When I go to "/custom-layout-dir/"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/index.html"
-    Then I should see "Custom Layout"
+    Then I should see "Custom Layout"
+  
+  Scenario: Setting layout inside a matching page block
+    Given the Server is running at "page-helper-layout-block-app"
+    When I go to "/index.html"
+    Then I should see "Hello"
+    And I should see "World"
+    When I go to "/path/child.html"
+    Then I should see "Alt"
+    And I should see "Child"
+    And I should not see "Hello"
+    When I go to "/path/index.html"
+    Then I should see "Alt"
+    And I should see "Monde"
+    And I should not see "Hello"

data/fixtures/page-helper-layout-block-app/config.rb

@@ -0,0 +1,6 @@
+page "/path/*", :layout => "alt"
+
+# Doesn't work, and shouldn't
+# page "/path/*" do
+#   set :layout, "alt"
+# end

data/fixtures/page-helper-layout-block-app/source/index.html.erb

@@ -0,0 +1 @@
+World

data/fixtures/page-helper-layout-block-app/source/layouts/alt.erb

@@ -0,0 +1,3 @@
+Alt
+
+<%= yield %>

data/fixtures/page-helper-layout-block-app/source/layouts/layout.erb

@@ -0,0 +1,3 @@
+Hello
+
+<%= yield %>

data/fixtures/page-helper-layout-block-app/source/path/child.html.erb

@@ -0,0 +1 @@
+Child

data/fixtures/page-helper-layout-block-app/source/path/index.html.erb

@@ -0,0 +1 @@
+Monde

data/lib/middleman-core/application.rb

@@ -11,19 +11,19 @@ require "middleman-core/vendor/hooks-0.2.0/lib/hooks"
 require "middleman-core/sitemap"
 
 require "middleman-core/core_extensions"
-  
+
 # Core Middleman Class
 module Middleman
   class Application
     # Uses callbacks
     include Hooks
-  
+
     # Before request hook
     define_hook :before
-  
+
     # Ready (all loading and parsing of extensions complete) hook
     define_hook :ready
-  
+
     class << self
       # Mix-in helper methods. Accepts either a list of Modules
       # and/or a block to be evaluated
@@ -32,7 +32,7 @@ module Middleman
         class_eval(&block)   if block_given?
         include(*extensions) if extensions.any?
       end
-    
+
       # Access class-wide defaults
       #
       # @private
@@ -40,7 +40,7 @@ module Middleman
       def defaults
         @defaults ||= {}
       end
-    
+
       # Set class-wide defaults
       #
       # @param [Symbol] key Unique key name
@@ -49,13 +49,13 @@ module Middleman
       def set(key, value=nil, &block)
         @defaults ||= {}
         @defaults[key] = value
-      
+
         @inst.set(key, value, &block) if @inst
       end
     end
-    
+
     delegate :helpers, :to => :"self.class"
-    
+
     # Set attributes (global variables)
     #
     # @param [Symbol] key Name of the attribue
@@ -67,24 +67,24 @@ module Middleman
       value = block if block_given?
       send(setter, value)
     end
-  
+
     # Root project directory (overwritten in middleman build/server)
     # @return [String]
     set :root,        ENV["MM_ROOT"] || Dir.pwd
-  
+
     # Pathname-addressed root
     def root_path
       @_root_path ||= Pathname.new(root)
     end
-  
+
     # Name of the source directory
     # @return [String]
     set :source,      "source"
-  
+
     # Middleman environment. Defaults to :development, set to :build by the build process
     # @return [String]
     set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
-  
+
     # Whether logging is active, disabled by default
     # @return [String]
     set :logging, false
@@ -96,23 +96,31 @@ module Middleman
     # Location of javascripts within source.
     # @return [String]
     set :js_dir,      "javascripts"
-  
+
     # Location of stylesheets within source. Used by Compass.
     # @return [String]
     set :css_dir,     "stylesheets"
-  
+
     # Location of images within source. Used by HTML helpers and Compass.
     # @return [String]
     set :images_dir,  "images"
 
+    # Location of fonts within source. Used by Compass.
+    # @return [String]
+    set :fonts_dir,   "fonts"
+
     # Where to build output files
     # @return [String]
     set :build_dir,   "build"
-  
+
     # Default prefix for building paths. Used by HTML helpers and Compass.
     # @return [String]
     set :http_prefix, "/"
 
+    # Default string encoding for templates and output.
+    # @return [String]
+    set :encoding,    "utf-8"
+
     # Whether to catch and display exceptions
     # @return [Boolean]
     set :show_exceptions, true
@@ -120,61 +128,64 @@ module Middleman
     # Default layout name
     # @return [String, Symbold]
     set :layout, :_auto_layout
-  
+
     # Activate custom features and extensions
     include Middleman::CoreExtensions::Extensions
-    
+
+    # Manage Ruby string encodings
+    include Middleman::CoreExtensions::RubyEncoding
+
     # Basic Rack Request Handling
     include Middleman::CoreExtensions::Request
-  
+
     # Handle exceptions
     register Middleman::CoreExtensions::ShowExceptions
-    
+
     # Add Builder Callbacks
     register Middleman::CoreExtensions::Builder
-  
+
     # Add Watcher Callbacks
     register Middleman::CoreExtensions::FileWatcher
-  
+
     # Activate Data package
     register Middleman::CoreExtensions::Data
 
     # Setup custom rendering
     register Middleman::CoreExtensions::Rendering
-  
+
     # Parse YAML from templates. Must be before sitemap so sitemap
     # extensions see updated frontmatter!
     register Middleman::CoreExtensions::FrontMatter
 
     # Sitemap
     register Middleman::Sitemap
-  
+
     # Setup external helpers
     register Middleman::CoreExtensions::ExternalHelpers
-  
+
     # with_layout and page routing
     register Middleman::CoreExtensions::Routing
-  
+
     # Initialize the Middleman project
     def initialize(&block)
       # Clear the static class cache
       cache.clear
-    
+
       # Setup the default values from calls to set before initialization
       self.class.superclass.defaults.each { |k,v| set(k,v) }
-    
+
       # Evaluate a passed block if given
       instance_exec(&block) if block_given?
-    
+
       # Build expanded source path once paths have been parsed
       path = root.dup
       source_path = ENV["MM_SOURCE"] || self.source
       path = File.join(root, source_path) unless source_path.empty?
       set :source_dir, path
-    
+
       super
     end
-  
+
     # Shared cache instance
     #
     # @private
@@ -187,7 +198,7 @@ module Middleman
     # Whether we're in development mode
     # @return [Boolean] If we're in dev mode
     def development?; environment == :development; end
-  
+
     # Whether we're in build mode
     # @return [Boolean] If we're in build mode
     def build?; environment == :build; end
@@ -205,7 +216,7 @@ module Middleman
     def logging?
       logging
     end
-  
+
     # Expand a path to include the index file if it's a directory
     #
     # @private
@@ -215,11 +226,11 @@ module Middleman
       cache.fetch(:full_path, path) do
         parts = path ? path.split('/') : []
         if parts.last.nil? || parts.last.split('.').length == 1
-          path = File.join(path, index_file) 
+          path = File.join(path, index_file)
         end
         "/" + path.sub(%r{^/}, '')
       end
     end
-  
+
   end
 end

data/lib/middleman-core/cli/build.rb

@@ -265,7 +265,11 @@ end
 # Quiet down create file
 class ::Thor::Actions::CreateFile
   def on_conflict_behavior(&block)
-    say_status :create, :green
-    block.call unless pretend?
+    if identical?
+      say_status :identical, :blue
+    else
+      say_status :create, :green
+      block.call unless pretend?
+    end
   end
 end

data/lib/middleman-core/core_extensions.rb

@@ -27,4 +27,7 @@ require "middleman-core/core_extensions/rendering"
 require "middleman-core/core_extensions/routing"
 
 # Catch and show exceptions at the Rack level
-require "middleman-core/core_extensions/show_exceptions"
+require "middleman-core/core_extensions/show_exceptions"
+
+# Manage Ruby string encodings
+require "middleman-core/core_extensions/ruby_encoding"

data/lib/middleman-core/core_extensions/request.rb

@@ -17,8 +17,8 @@ module Middleman
           ::Rack::Mime::MIME_TYPES['.htc'] = 'text/x-component'
 
           # Let's serve all HTML as UTF-8
-          ::Rack::Mime::MIME_TYPES['.html'] = 'text/html;charset=utf8'
-          ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html;charset=utf8'
+          ::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=utf-8'
+          ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=utf-8'
           
           app.extend ClassMethods
           app.extend ServerMethods
@@ -170,7 +170,7 @@ module Middleman
           })
         end
         
-        def use(*args, &block); self.class.use(*args); end
+        def use(*args, &block); self.class.use(*args, &block); end
         def map(*args, &block); self.class.map(*args, &block); end
         
         # Rack env

data/lib/middleman-core/core_extensions/ruby_encoding.rb

@@ -0,0 +1,24 @@
+# Simple extension to manage Ruby encodings
+module Middleman::CoreExtensions::RubyEncoding
+
+  # Setup extension
+  class << self
+    
+    # Once registerd
+    def registered(app)
+      app.send :include, InstanceMethods
+    end
+
+  end
+
+  module InstanceMethods
+    def initialize
+      if Object.const_defined?(:Encoding)
+        Encoding.default_internal = encoding
+        Encoding.default_external = encoding
+      end
+
+      super
+    end
+  end
+end

data/lib/middleman-core/extensions.rb

@@ -58,23 +58,19 @@ module Middleman
     #
     # @private
     def load_extensions_in_path
-      if defined?(Bundler)
-        Bundler.require
-      else
-        require "rubygems"
-        
-        begin
-          require "middleman-more"
-        rescue LoadError
-        end
-        
-        extensions = rubygems_latest_specs.select do |spec|
-          spec_has_file?(spec, EXTENSION_FILE)
-        end
-        
-        extensions.each do |spec|
-          require spec.name
-        end
+      require "rubygems"
+      
+      begin
+        require "middleman-more"
+      rescue LoadError
+      end
+      
+      extensions = rubygems_latest_specs.select do |spec|
+        spec_has_file?(spec, EXTENSION_FILE)
+      end
+      
+      extensions.each do |spec|
+        require spec.name
       end
     end
 

data/lib/middleman-core/preview_server.rb

@@ -32,6 +32,8 @@ module Middleman
         )
         
         mount_instance(app)
+
+        start_file_watcher unless options[:"disable-watcher"]
         
         @initialized ||= false
         unless @initialized
@@ -39,7 +41,9 @@ module Middleman
           
           register_signal_handlers unless ::Middleman::WINDOWS
           
-          start_file_watcher unless options[:"disable-watcher"]
+          # Save the last-used options so it may be re-used when
+          # reloading later on.
+          @last_options = options
           
           @webrick.start
         end
@@ -56,7 +60,7 @@ module Middleman
       # @return [void]
       def reload
         stop
-        start
+        start @last_options
       end
 
       # Stop the current instance, exit Webrick
@@ -79,7 +83,10 @@ module Middleman
 
           if added_and_modified.length > 0
             # See if the changed file is config.rb or lib/*.rb
-            return reload if needs_to_reload?(added_and_modified)
+            if needs_to_reload?(added_and_modified)
+              reload
+              return listener.stop
+            end
 
             # Otherwise forward to Middleman
             added_and_modified.each do |path|
@@ -89,7 +96,10 @@ module Middleman
       
           if removed.length > 0
             # See if the changed file is config.rb or lib/*.rb
-            return reload if needs_to_reload?(removed)
+            if needs_to_reload?(removed)
+              reload
+              return listener.stop
+            end
 
             # Otherwise forward to Middleman
             removed.each do |path|

data/lib/middleman-core/util.rb

@@ -56,6 +56,25 @@ module Middleman
       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 matcher A matcher string/regexp/proc/etc
+    # @param path A path as a string
+    # @return [Boolean] Whether the path matches the matcher
+    def self.path_match(matcher, path)
+      if matcher.respond_to? :match
+        matcher.match path
+      elsif matcher.respond_to? :call
+        matcher.call path
+      else
+        File.fnmatch(matcher.to_s, path)
+      end
+    end
+
     # Simple shared cache implementation
     class Cache
       # Initialize
@@ -113,4 +132,4 @@ module Middleman
       end
     end
   end
-end
+end

data/lib/middleman-core/version.rb

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

data/middleman-core.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |s|
   s.add_dependency("thor", ["~> 0.14.3"])
   
   # Helpers
-  s.add_dependency("activesupport", ["~> 3.2.4"])
+  s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.4.2"])
+  s.add_dependency("listen", ["~> 0.4.5"])
 end
 

metadata

@@ -1,148 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: middleman-core
-version: !ruby/object:Gem::Version 
-  hash: 15424119
+version: !ruby/object:Gem::Version
+  version: 3.0.0.rc.2
   prerelease: 6
-  segments: 
-  - 3
-  - 0
-  - 0
-  - rc
-  - 1
-  version: 3.0.0.rc.1
 platform: ruby
-authors: 
+authors:
 - Thomas Reynolds
 - Ben Hollis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-06 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-06-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  version_requirements: *id001
-  name: bundler
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  version_requirements: *id002
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
   name: tilt
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
-  version_requirements: *id004
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
   name: rack-test
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 0
-        - 14
-        - 3
-        version: 0.14.3
-  version_requirements: *id005
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.3
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 2
-        - 4
-        version: 3.2.4
-  version_requirements: *id006
+      - !ruby/object:Gem::Version
+        version: 0.14.3
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.6
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
-        version: 0.4.2
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: 3.2.6
+- !ruby/object:Gem::Dependency
   name: listen
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.5
   type: :runtime
-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.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+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.
+email:
 - me@tdreyno.com
 - ben@benhollis.net
-executables: 
+executables:
 - middleman
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - Rakefile
 - bin/middleman
@@ -314,6 +306,12 @@ files:
 - fixtures/multiple-layouts/source/layout.str
 - fixtures/no-layout/config.rb
 - fixtures/no-layout/source/index.html.erb
+- fixtures/page-helper-layout-block-app/config.rb
+- fixtures/page-helper-layout-block-app/source/index.html.erb
+- fixtures/page-helper-layout-block-app/source/layouts/alt.erb
+- fixtures/page-helper-layout-block-app/source/layouts/layout.erb
+- fixtures/page-helper-layout-block-app/source/path/child.html.erb
+- fixtures/page-helper-layout-block-app/source/path/index.html.erb
 - fixtures/plain-app/index.html
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
@@ -338,7 +336,7 @@ files:
 - fixtures/traversal-app/source/sub/sub2/index.html.erb
 - fixtures/traversal-app/source/sub/sub3/deep.html.erb
 - fixtures/unicode-filenames-app/config.rb
-- "fixtures/unicode-filenames-app/source/snowmen-rule-\xE2\x98\x83.html"
+- fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
 - fixtures/wildcard-app/config.rb
 - fixtures/wildcard-app/source/admin/index.html.erb
 - fixtures/wildcard-app/source/admin/page.html.erb
@@ -363,6 +361,7 @@ files:
 - lib/middleman-core/core_extensions/rendering.rb
 - lib/middleman-core/core_extensions/request.rb
 - lib/middleman-core/core_extensions/routing.rb
+- lib/middleman-core/core_extensions/ruby_encoding.rb
 - lib/middleman-core/core_extensions/show_exceptions.rb
 - lib/middleman-core/extensions.rb
 - lib/middleman-core/preview_server.rb
@@ -510,43 +509,35 @@ files:
 - lib/middleman-core/vendor/hooks-0.2.0/test/test_helper.rb
 - lib/middleman-core/version.rb
 - middleman-core.gemspec
-has_rdoc: true
 homepage: http://middlemanapp.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1155091797610046415
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
-test_files: 
+test_files:
 - features/3rd_party_cli.feature
 - features/auto_layout.feature
 - features/builder.feature
@@ -715,6 +706,12 @@ test_files:
 - fixtures/multiple-layouts/source/layout.str
 - fixtures/no-layout/config.rb
 - fixtures/no-layout/source/index.html.erb
+- fixtures/page-helper-layout-block-app/config.rb
+- fixtures/page-helper-layout-block-app/source/index.html.erb
+- fixtures/page-helper-layout-block-app/source/layouts/alt.erb
+- fixtures/page-helper-layout-block-app/source/layouts/layout.erb
+- fixtures/page-helper-layout-block-app/source/path/child.html.erb
+- fixtures/page-helper-layout-block-app/source/path/index.html.erb
 - fixtures/plain-app/index.html
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
@@ -739,10 +736,11 @@ test_files:
 - fixtures/traversal-app/source/sub/sub2/index.html.erb
 - fixtures/traversal-app/source/sub/sub3/deep.html.erb
 - fixtures/unicode-filenames-app/config.rb
-- "fixtures/unicode-filenames-app/source/snowmen-rule-\xE2\x98\x83.html"
+- fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
 - fixtures/wildcard-app/config.rb
 - fixtures/wildcard-app/source/admin/index.html.erb
 - fixtures/wildcard-app/source/admin/page.html.erb
 - fixtures/wildcard-app/source/index.html.erb
 - fixtures/wildcard-app/source/layouts/admin.erb
 - fixtures/wildcard-app/source/layouts/layout.erb
+has_rdoc: