middleman 3.0.0.alpha.5 → 3.0.0.alpha.6

data/CHANGELOG.md

@@ -4,7 +4,7 @@
 * Sitemap maintains own state
 * New Extension Registration API
 * Remove old 1.x mm- binaries and messaging
-* New default layout functionality: https://github.com/tdreyno/middleman/issues/165
+* New default layout functionality: https://github.com/middleman/middleman/issues/165
 * Enable chained templates outside of sprockets (file.html.markdown.erb)
 * Finally support Compass in Sprockets! Thanks to @xdite and @petebrowne
 * Sitemap object representing the known world
@@ -14,8 +14,9 @@
 * Activate mobile html5boilerplate template
 * Update to Redcarpet for Markdown (breaks Haml :markdown filter)
 * Return correct exit codes (0 for success, 1 for failure) from CLI
-* Yard code docs: http://rubydoc.info/github/tdreyno/middleman
+* Yard code docs: http://rubydoc.info/github/middleman/middleman
 * config.rb and extensions can add command-line commands
+* Nested layouts using `wrap_layout` helper
 
 2.0.14
 ====

data/README.md

@@ -50,10 +50,10 @@ A full set of in-depth instructional guides are available on the official websit
 
 The community maintains it's own collection of tips and tricks in the GitHub wiki:
 
-  https://github.com/tdreyno/middleman/wiki
+  https://github.com/middleman/middleman/wiki
 
 Finally, up-to-date generated code documentation is available on RubyDoc: 
-http://rubydoc.info/github/tdreyno/middleman
+http://rubydoc.info/github/middleman/middleman
 
 # Community
 
@@ -65,18 +65,18 @@ The official community forum is available on Convore at:
 
 GitHub Issues are used for managing bug reports and feature requests. If you run into issues, please search the issues and submit new problems:
 
-https://github.com/tdreyno/middleman/issues
+https://github.com/middleman/middleman/issues
 
 The best way to get quick responses to your issues and swift fixes to your bugs is to submit detailed bug reports, include test cases and respond to developer questions in a timely manner. Even better, if you know Ruby, you can submit Pull Requests containing Cucumber Features which describe how your feature should work or exploit the bug you are submitting.
 
 # Build & Dependency Status
 
-[![Build Status](http://travis-ci.org/tdreyno/middleman.png)](http://travis-ci.org/tdreyno/middleman)
-[![Dependency Status](https://gemnasium.com/tdreyno/middleman.png?travis)](https://gemnasium.com/tdreyno/middleman)
+[![Build Status](http://travis-ci.org/middleman/middleman.png)](http://travis-ci.org/middleman/middleman)
+[![Dependency Status](https://gemnasium.com/middleman/middleman.png?travis)](https://gemnasium.com/middleman/middleman)
 
 # How to Run Cucumber Tests
 
-1. Checkout Repository: `git clone https://tdreyno@github.com/tdreyno/middleman.git`
+1. Checkout Repository: `git clone https://tdreyno@github.com/middleman/middleman.git`
 2. Install Bundler: `gem install bundler`
 3. Run `bundle` inside the project root to install the gem dependencies.
 4. Run test cases: `bundle exec rake test`
@@ -90,4 +90,4 @@ The best way to get quick responses to your issues and swift fixes to your bugs
 Copyright (c) 2010 Thomas Reynolds. MIT Licensed, see [LICENSE] for details.
 
 [RubyInstaller]: http://rubyinstaller.org/
-[LICENSE]: https://github.com/tdreyno/middleman/blob/master/LICENSE
+[LICENSE]: https://github.com/middleman/middleman/blob/master/LICENSE

data/bin/middleman

@@ -14,7 +14,7 @@ module Middleman
       
         if !in_middleman_project? && !in_middleman_project_subdirectory?
           $stderr.puts "== Error: Could not find a Middleman project config, perhaps you are in the wrong folder?"
-          return
+          exit(1)
         end
       
         if in_middleman_project?
@@ -56,7 +56,8 @@ module Middleman
   end
 end
 
-if ARGV.length < 1 || %w(server build migrate).include?(ARGV.first)
+ARGV << "server" if ARGV.length < 1
+if %w(server s build b).include?(ARGV[0])
   Middleman::ProjectLocator.locate_middleman_root!
 else
   Middleman::ProjectLocator.start_cli!

data/features/builder.feature

@@ -45,6 +45,10 @@ Feature: Builder
   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 alias (b)
     Given a fixture app "test-app"

data/features/cli.feature

@@ -1,20 +1,19 @@
 Feature: Middleman CLI
 
   Scenario: Create a new project
-    When I run `middleman init MY_PROJECT`
-    Then a directory named "MY_PROJECT" should exist
+    Given I run `middleman init MY_PROJECT`
+    Then the exit status should be 0
     When I cd to "MY_PROJECT"
     Then the following files should exist:
       | config.rb                                     |
-    Then the following files should not exist:
-      | config.ru                                     |
-      | Gemfile                                       |
-    Then a directory named "source" should exist
-    When I cd to "source"
-    Then the following files should exist:
-      | index.html.erb                                |
-      | layout.erb                                    |
-      | stylesheets/site.css.scss                     |
+      | source/index.html.erb                         |
+      | source/images/background.png                  |
+      | source/images/middleman.png                   |
+      | source/layouts/layout.erb                     |
+      | source/javascripts/all.js                     |
+      | source/stylesheets/all.css.scss               |
+      | source/stylesheets/_animate.scss              |
+      | source/stylesheets/_normalize.scss            |
       
   Scenario: Create a new project (alias i)
     When I run `middleman i MY_PROJECT`

data/features/nested_layouts.feature

@@ -0,0 +1,24 @@
+Feature: Allow nesting of layouts
+
+  Scenario: A page uses an inner layout when uses an outer layout
+    Given the Server is running at "nested-layout-app"
+    When I go to "/index.html"
+    Then I should see "Template"
+    And I should see "Inner"
+    And I should see "Outer"
+    And I should see "Master"
+
+  Scenario: YAML Front Matter isn't clobbered with nested 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"
+    When I go to "/data-two.html"
+    Then I should see "Page Number Two"
+    And I should not see "Inner"
+    When I go to "/data-one.html"
+    Then I should see "Page Number One"
+    And I should see "Inner"
+    When I go to "/data-two.html"
+    Then I should see "Page Number Two"
+    And I should not see "Inner"

data/features/sitemap_traversal.features

@@ -0,0 +1,56 @@
+Feature: Step through sitemap as a tree
+
+  Scenario: Root
+    Given the Server is running at "traversal-app"
+    When I go to "/index.html"
+    Then I should not see "Parent: index.html"
+    Then I should see "Child: sub/index.html"
+    Then I should see "Child: root.html"
+    Then I should not see "Child: proxied.html"
+  
+  Scenario: Directories have children and a parent
+    Given the Server is running at "traversal-app"
+    When I go to "/sub/index.html"
+    Then I should see "Parent: index.html"
+    Then I should see "Child: sub/fake.html"
+    Then I should see "Child: sub/fake2.html"
+    Then I should see "Child: sub/sibling.html"
+    Then I should see "Child: sub/sibling2.html"
+    Then I should see "Child: sub/sub2/index.html"
+    Then I should see "Sibling: root.html"
+  
+  Scenario: Page has siblings
+    Given the Server is running at "traversal-app"
+    When I go to "/sub/sibling.html"
+    Then I should see "Sibling: sub/fake.html"
+    Then I should see "Sibling: sub/fake2.html"
+    Then I should see "Sibling: sub/sibling2.html"
+    Then I should see "Sibling: sub/sub2/index.html"
+  
+  Scenario: Proxied page has siblings
+    Given the Server is running at "traversal-app"
+    When I go to "/sub/fake.html"
+    Then I should see "Sibling: sub/fake2.html"
+    Then I should see "Sibling: sub/sibling.html"
+    Then I should see "Sibling: sub/sibling2.html"
+    Then I should see "Sibling: sub/sub2/index.html"
+  
+  Scenario: Page has parent
+    Given the Server is running at "traversal-app"
+    When I go to "/sub/sibling.html"
+    Then I should see "Parent: sub/index.html"
+  
+  Scenario: Proxied page has parent
+    Given the Server is running at "traversal-app"
+    When I go to "/sub/fake.html"
+    Then I should see "Parent: sub/index.html"
+  
+  Scenario: Page has source_file
+    Given the Server is running at "traversal-app"
+    When I go to "/sub/sibling.html"
+    Then I should see "Source: source/sub/sibling.html.erb"
+  
+  Scenario: Proxied page has source_file
+    Given the Server is running at "traversal-app"
+    When I go to "/sub/fake.html"
+    Then I should see "Source: source/proxied.html.erb"

data/fixtures/nested-layout-app/config.rb

@@ -0,0 +1 @@
+set :layout, :inner

data/fixtures/nested-layout-app/source/data-one.html.erb

@@ -0,0 +1,5 @@
+---
+title: Page Number One
+layout: inner
+---
+Page #1

data/fixtures/nested-layout-app/source/data-two.html.erb

@@ -0,0 +1,5 @@
+---
+title: Page Number Two
+layout: outer
+---
+Page #2

data/fixtures/nested-layout-app/source/index.html.erb

@@ -0,0 +1 @@
+Template

data/fixtures/nested-layout-app/source/layouts/inner.erb

@@ -0,0 +1,4 @@
+<% wrap_layout :outer do %>
+  Inner
+  <%= yield %>
+<% end %>

data/fixtures/nested-layout-app/source/layouts/master.erb

@@ -0,0 +1,3 @@
+Master
+<%= data.page.title %>
+<%= yield %>

data/fixtures/nested-layout-app/source/layouts/outer.erb

@@ -0,0 +1,4 @@
+<% wrap_layout :master do %>
+  Outer
+  <%= yield %>
+<% end %>

data/fixtures/traversal-app/config.rb

@@ -0,0 +1,2 @@
+page "/sub/fake.html", :proxy => "/proxied.html", :ignore => true
+page "/sub/fake2.html", :proxy => "/proxied.html", :ignore => true

data/fixtures/traversal-app/source/layout.erb

@@ -0,0 +1,13 @@
+Source: <%= current_page.source_file.sub(root + "/", "") %>
+
+<% if current_page.parent %>
+  Parent: <%= current_page.parent.path %>
+<% end %>
+
+<% current_page.children.each do |p| %>
+  Child: <%= p.path %>
+<% end %>
+
+<% current_page.siblings.each do |p| %>
+  Sibling: <%= p.path %>
+<% end %>

data/lib/middleman.rb

@@ -111,9 +111,6 @@ module Middleman
     # Automatically convert filename.html files into filename/index.html
     autoload :DirectoryIndexes,    "middleman/extensions/directory_indexes"
     
-    # Organize the sitemap as a tree
-    autoload :SitemapTree,         "middleman/extensions/sitemap_tree"
-    
     class << self
       def registered
         @_registered ||= {}

data/lib/middleman/base.rb

@@ -192,8 +192,7 @@ class Middleman::Base
   # Automatically loaded extensions
   # @return [Array<Symbol>]
   set :default_extensions, [
-    :lorem,
-    # :sitemap_tree
+    :lorem
   ]
 
   # Default layout name
@@ -256,8 +255,6 @@ class Middleman::Base
     Middleman::Extensions::MinifyJavascript }
   Middleman::Extensions.register(:relative_assets) {
     Middleman::Extensions::RelativeAssets }
-  Middleman::Extensions.register(:sitemap_tree) { 
-    Middleman::Extensions::SitemapTree }
   
   # Backwards-compatibility with old request.path signature
   attr :request
@@ -304,14 +301,7 @@ class Middleman::Base
   def self.cache
     @_cache ||= ::Middleman::Cache.new
   end
-  
-  # Cache accessor for instance, simply forwards to class
-  #
-  # @private
-  # @return [Middleman::Cache] The cache
-  def cache
-    self.class.cache
-  end
+  delegate :cache, :to => :"self.class"
   
   # Rack env
   attr :env
@@ -465,22 +455,7 @@ protected
     @res.finish
   end
   
-  # Set helpers at the class level
-  def helpers(*extensions, &block)
-    self.class.helpers(*extensions, &block)
-  end
-  
-  # Set middleware at the class level
-  # @return [void]
-  def use(middleware, *args, &block)
-    self.class.use(middleware, *args, &block)
-  end
-  
-  # Set mapped rack app at the class level
-  # @return [void]
-  def map(map, &block)
-    self.class.map(map, &block)
-  end
+  delegate :helpers, :use, :map, :to => :"self.class"
   
   # Immediately send static file
   #

data/lib/middleman/cli/server.rb

@@ -37,5 +37,4 @@ module Middleman::Cli
   end
   
   Base.map({ "s" => "server" })
-  Base.default_task :server
 end

data/lib/middleman/core_extensions/builder.rb

@@ -8,6 +8,7 @@ module Middleman::CoreExtensions::Builder
       app.define_hook :after_build
       app.extend ClassMethods
       app.send :include, InstanceMethods
+      app.delegate :build_reroute, :to => :"self.class"
     end
     alias :included :registered
   end
@@ -26,13 +27,6 @@ module Middleman::CoreExtensions::Builder
   
   # Build Instance Methods
   module InstanceMethods
-    # Forward to class method
-    #
-    # @return [Array<Proc>]
-    def build_reroute(&block)
-      self.class.build_reroute(&block)
-    end
-    
     # Run through callbacks and get the new values
     #
     # @param [String] destination The current destination of the built file

data/lib/middleman/core_extensions/default_helpers.rb

@@ -9,8 +9,12 @@ require 'active_support/inflector'                    # humanize
 
 FileSet.glob_require('../vendor/padrino-helpers-0.10.5/lib/padrino-helpers/**/*.rb', __FILE__)
 
+# Built-in helpers
 module Middleman::CoreExtensions::DefaultHelpers
+  
+  # Extension registered
   class << self
+    # @private
     def registered(app)
       app.helpers ::Padrino::Helpers::OutputHelpers
       app.helpers ::Padrino::Helpers::TagHelpers
@@ -30,19 +34,34 @@ module Middleman::CoreExtensions::DefaultHelpers
     alias :included :registered
   end
   
+  # The helpers
   module Helpers
+    # Output a stylesheet link tag based on the current path
+    #
+    # @param [String] separator How to break up path in parts
+    # @return [String]
     def auto_stylesheet_link_tag(separator="/")
       auto_tag(:css, separator) do |path|
         stylesheet_link_tag path
       end
     end
     
+    # Output a javascript tag based on the current path
+    #
+    # @param [String] separator How to break up path in parts
+    # @return [String]
     def auto_javascript_include_tag(separator="/")
       auto_tag(:js, separator) do |path|
         javascript_include_tag path
       end
     end
 
+    # Output a stylesheet link tag based on the current path
+    #
+    # @param [Symbol] asset_ext The type of asset
+    # @param [String] separator How to break up path in parts
+    # @param [String] asset_dir Where to look for assets
+    # @return [void]
     def auto_tag(asset_ext, separator="/", asset_dir=nil)
       if asset_dir.nil?
         asset_dir = case asset_ext
@@ -61,6 +80,9 @@ module Middleman::CoreExtensions::DefaultHelpers
       yield path if sitemap.exists?(File.join(asset_dir, path))
     end
 
+    # Generate body css classes based on the current path
+    #
+    # @return [String]
     def page_classes
       path = current_path.dup
       path << index_file if path.match(%r{/$})
@@ -73,7 +95,11 @@ module Middleman::CoreExtensions::DefaultHelpers
       classes.join(' ')
     end
     
-    # Padrino's asset handling needs to pass through ours
+    # Get the path of a file of a given type
+    # 
+    # @param [Symbol] kind The type of file
+    # @param [String] source The path to the file
+    # @return [String]
     def asset_path(kind, source)
        return source if source =~ /^http/
        asset_folder  = case kind