middleman-core 3.0.0.beta.3 → 3.0.0.rc.1

data/bin/middleman

@@ -4,56 +4,58 @@
 libdir = File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), "lib"))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-# Setup RubyGems
-require "rubygems"
+moredir = File.expand_path(File.join(File.dirname(File.dirname(libdir)), "middleman-more", "lib", "middleman-more"))
+$LOAD_PATH.unshift(moredir) unless $LOAD_PATH.include?(moredir)
 
 # Core Pathname library used for traversal
 require "pathname"
 
 # Recursive method to find config.rb
-def locate_middleman_root!(cwd = Pathname.new(Dir.pwd))
-  return cwd.to_s if File.exists?(File.join(cwd, 'config.rb'))
+def locate_root(cwd = Pathname.new(Dir.pwd))
+  return cwd.to_s if (cwd + 'config.rb').exist?
   return false if cwd.root?
-  locate_middleman_root!(cwd.parent)
+  locate_root(cwd.parent)
 end
 
 # Only look for config.rb if MM_ROOT isn't set
-if !ENV["MM_ROOT"] && found_path = locate_middleman_root!
+if !ENV["MM_ROOT"] && found_path = locate_root
   ENV["MM_ROOT"] = found_path
 end
 
 # If we've found the root, try to setup Bundler
 if ENV["MM_ROOT"]
   
-  # Set up gems listed in the Gemfile.
-  ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ENV["MM_ROOT"])
-  require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-end
-
-# Default command is server
-ARGV.unshift("server") if ARGV.length < 1 || ARGV.first.include?("-")
-
-begin
-  # Local
-  require File.expand_path(File.join(File.dirname(File.dirname(libdir)), "middleman-more", "lib", "middleman-more"))
-rescue LoadError
-  begin
-    # Rubygems
-    require "middleman-more"
-  rescue LoadError
-    # Require Middleman
-    require 'middleman-core'
+  root_gemfile = File.expand_path('Gemfile', ENV["MM_ROOT"])
+  ENV['BUNDLE_GEMFILE'] ||= root_gemfile
+  
+  if !File.exists?(ENV['BUNDLE_GEMFILE'])
+    git_gemfile = Pathname.new(__FILE__).expand_path.parent.parent.parent + "Gemfile"
+    ENV['BUNDLE_GEMFILE'] = git_gemfile.to_s
   end
+  
+  require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 end
 
 # Automatically discover extensions in RubyGems
-Middleman.load_extensions_in_path
+require "middleman-core/extensions"
+::Middleman.load_extensions_in_path
 
 require "middleman-core/cli"
 
-# Change directory to the root
-Dir.chdir(ENV["MM_ROOT"] || Dir.pwd) do
-  
-  # Start the CLI
-  Middleman::Cli::Base.start
+# Change flag to a module
+ARGV.unshift("help") if ARGV.delete("--help")
+
+# Default command is server
+if ARGV[0] != "help" && (ARGV.length < 1 || ARGV.first.include?("-"))
+  ARGV.unshift("server")
 end
+
+# Start the CLI
+if ENV["MM_ROOT"]
+  # Change directory to the root
+  Dir.chdir(ENV["MM_ROOT"]) do
+    Middleman::Cli::Base.start
+  end
+else
+  Middleman::Cli::Base.start
+end

data/features/clean_build.feature

@@ -16,19 +16,6 @@ Feature: Build Clean
       | build/should_be_ignored3.html |
     And the file "build/index.html" should contain "Comment in layout"
 
-  Scenario: Clean an app with directory indexes
-    Given a successfully built app at "clean-dir-app"
-    Then the following files should exist:
-      | build/about/index.html        |
-    Given a successfully built app at "clean-dir-app" with flags "--clean"
-    Then the following files should exist:
-      | build/about/index.html        |
-    
-  Scenario: Clean build an app that's never been built
-    Given a successfully built app at "clean-dir-app" with flags "--clean"
-    Then the following files should exist:
-      | build/about/index.html        |
-
   Scenario: Clean build an app with newly ignored files and a nested output directory
     Given a built app at "clean-nested-app"
     Then a directory named "sub/dir" should exist

data/features/extensionless_text_files.feature

@@ -1,46 +1,14 @@
 Feature: Text Files Without Extensions Should Build and Preview
 
   Scenario: Building Text Files without directory indexes
-    Given a fixture app "extensionless-text-files-app"
-    And a file named "config.rb" with:
-      """
-      """
-    And a successfully built app at "extensionless-text-files-app"
+    Given a successfully built app at "extensionless-text-files-app"
     When I cd to "build"
     Then the following files should exist:
       | CNAME   |
       | LICENSE |
       | README  |
-
-  Scenario: Building Text Files with directory indexes
-    Given a fixture app "extensionless-text-files-app"
-    And a file named "config.rb" with:
-      """
-      activate :directory_indexes
-      """
-    And a successfully built app at "extensionless-text-files-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | CNAME   |
-      | LICENSE |
-      | README  |
-    Then the following files should not exist:
-      | CNAME/index.html   |
-      | LICENSE/index.html |
-      | README/index.html  |
   
-  Scenario: Previewing Text Files without directory indexes
-    Given "directory_indexes" feature is "disabled"
-    Given the Server is running at "extensionless-text-files-app"
-    When I go to "/CNAME"
-    Then I should see "test.github.com"
-    When I go to "/LICENSE"
-    Then I should see "You have the right to remain classy."
-    When I go to "/README"
-    Then I should see "Bork bork bork"
-    
-  Scenario: Previewing Text Files with directory indexes
-    Given "directory_indexes" feature is "enabled"
+  Scenario: Previewing Text Files
     Given the Server is running at "extensionless-text-files-app"
     When I go to "/CNAME"
     Then I should see "test.github.com"

data/features/front-matter.feature

@@ -6,26 +6,47 @@ Feature: YAML Front Matter
     When I go to "/front-matter-auto.html"
     Then I should see "<h1>This is the title</h1>"
     Then I should not see "---"
-    When I go to "/front-matter.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see "---"
     When I go to "/front-matter-2.php"
     Then I should see "<h1>This is the title</h1>"
     Then I should see "<?php"
     Then I should not see "---"
+
+  Scenario: YAML not on first line, no encoding
+    Given the Server is running at "frontmatter-app"
+    When I go to "/front-matter-line-2.html"
+    Then I should see "<h1></h1>"
+    Then I should see "---"
+    
+  Scenario: YAML not on first line, with encoding
+    Given the Server is running at "frontmatter-app"
+    When I go to "/front-matter-encoding.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see "---"
     
   Scenario: Rendering html (json)
     Given the Server is running at "frontmatter-app"
     When I go to "/json-front-matter-auto.html"
     Then I should see "<h1>This is the title</h1>"
-    Then I should not see "{"
+    Then I should not see ";;;"
     When I go to "/json-front-matter.html"
     Then I should see "<h1>This is the title</h1>"
-    Then I should not see "{"
+    Then I should not see ";;;"
     When I go to "/json-front-matter-2.php"
     Then I should see "<h1>This is the title</h1>"
     Then I should see "<?php"
-    Then I should not see "{"
+    Then I should not see ";;;"
+
+  Scenario: JSON not on first line, no encoding
+    Given the Server is running at "frontmatter-app"
+    When I go to "/json-front-matter-line-2.html"
+    Then I should see "<h1></h1>"
+    Then I should see ";;;"
+    
+  Scenario: JSON not on first line, with encoding
+    Given the Server is running at "frontmatter-app"
+    When I go to "/json-front-matter-encoding.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see ";;;"
 
   Scenario: A template changes frontmatter during preview
     Given the Server is running at "frontmatter-app"

data/features/frontmatter_page_settings.feature

@@ -2,33 +2,24 @@ Feature: Setting page settings through frontmatter
   Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (build)
     Given a successfully built app at "frontmatter-settings-app"
     Then the following files should exist:
-      | build/proxied/index.html  |
-      | build/no_index.html       |
-    And the file "build/alternate_layout/index.html" should contain "Alternate layout"
+      | build/proxied.html  |
+    And the file "build/alternate_layout.html" should contain "Alternate layout"
     And the following files should not exist:
-      | build/ignored/index.html  |
-      | build/no_index/index.html |
-    
+      | build/ignored.html  |
     
   Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (preview)
     Given the Server is running at "frontmatter-settings-app"
-    # When I go to "/proxied/"
-    # Then I should not see "File Not Found"
-    When I go to "/no_index.html"
-    Then I should not see "File Not Found"
-    When I go to "/alternate_layout/"
+    When I go to "/alternate_layout.html"
     Then I should not see "File Not Found"
     And I should see "Alternate layout"
     When I go to "/ignored.html"
     Then I should see "File Not Found"
     When I go to "/ignored/index.html"
     Then I should see "File Not Found"
-    When I go to "/no_index/index.html"
-    Then I should see "File Not Found"
 
   Scenario: Changing frontmatter in preview server
     Given the Server is running at "frontmatter-settings-app"
-    When I go to "/ignored/index.html"
+    When I go to "/ignored.html"
     Then I should see "File Not Found"
     And the file "source/ignored.html.erb" has the contents
       """
@@ -38,5 +29,5 @@ Feature: Setting page settings through frontmatter
 
       This file is no longer ignored.
       """
-    When I go to "/ignored/index.html"
+    When I go to "/ignored.html"
     Then I should see "This file is no longer ignored."

data/features/ignore.feature

@@ -118,81 +118,4 @@ Feature: Ignoring paths
     When I go to "/reports/another.html"
     Then I should see "File Not Found"
     When I go to "/images/icons/messages.png"
-    Then I should see "File Not Found"
-
-  Scenario: Ignore with directory indexes (source file, build)
-    Given a fixture app "ignore-app"
-    And a file named "config.rb" with:
-      """
-      activate :directory_indexes
-      ignore 'about.html.erb'
-      ignore 'plain.html'
-      """
-    And a successfully built app at "ignore-app"
-    Then the following files should exist:
-      | build/index.html |
-    And the following files should not exist:
-      | build/about/index.html |
-      | build/plain/index.html |
-      
-  Scenario: Ignore with directory indexes (source file, server)
-    Given a fixture app "ignore-app"
-    And a file named "config.rb" with:
-      """
-      activate :directory_indexes
-      ignore 'about.html.erb'
-      ignore 'plain.html'
-      """
-    And the Server is running
-    When I go to "/index.html"
-    Then I should not see "File Not Found"
-    When I go to "/about/index.html"
-    Then I should see "File Not Found"
-    When I go to "/plain/index.html"
-    Then I should see "File Not Found"
-    
-  Scenario: Ignore with directory indexes (output path splat, build)
-    Given a fixture app "ignore-app"
-    And a file named "config.rb" with:
-      """
-      activate :directory_indexes
-      ignore 'about*'
-      ignore 'plain*'
-      """
-    And a successfully built app at "ignore-app"
-    Then the following files should exist:
-      | build/index.html |
-    And the following files should not exist:
-      | build/about/index.html |
-      | build/plain/index.html |
-	    
-  Scenario: Ignore with directory indexes (output path splat, server)
-    Given a fixture app "ignore-app"
-    And a file named "config.rb" with:
-      """
-      activate :directory_indexes
-      ignore 'about*'
-      ignore 'plain*'
-      """
-    And the Server is running
-    When I go to "/index.html"
-    Then I should not see "File Not Found"
-    When I go to "/about/index.html"
-    Then I should see "File Not Found"
-    When I go to "/plain/index.html"
-    Then I should see "File Not Found"
-    
-  # Scenario: Ignore with directory indexes (output path index)
-  #   Given a fixture app "ignore-app"
-  #   And a file named "config.rb" with:
-  #     """
-  #     activate :directory_indexes
-  #     ignore 'about/index.html'
-  #     ignore 'plain/index.html'
-  #     """
-  #   And a successfully built app at "ignore-app"
-  #   Then the following files should exist:
-  #     | build/index.html |
-  #   And the following files should not exist:
-  #     | build/about/index.html |
-  #     | build/plain/index.html |
+    Then I should see "File Not Found"

data/features/sitemap_traversal.feature

@@ -35,7 +35,7 @@ Feature: Step through sitemap as a tree
     
   Scenario: Page has siblings, parent, and source file
     Given the Server is running at "traversal-app"
-    When I go to "/sub/sibling/"
+    When I go to "/sub/sibling.html"
     Then I should see "Parent: sub/index.html"
     Then I should see "Sibling: sub/fake.html"
     Then I should see "Sibling: sub/fake2.html"
@@ -45,7 +45,7 @@ Feature: Step through sitemap as a tree
   
   Scenario: Proxied page has siblings, parent, and source file
     Given the Server is running at "traversal-app"
-    When I go to "/sub/fake/"
+    When I go to "/sub/fake.html"
     Then I should see "Path: sub/fake.html"
     Then I should see "Parent: sub/index.html"
     Then I should see "Sibling: sub/fake2.html"
@@ -56,13 +56,13 @@ Feature: Step through sitemap as a tree
 
   Scenario: Child pages have data
     Given the Server is running at "traversal-app"
-    When I go to "/directory-indexed"
+    When I go to "/directory-indexed.html"
     Then I should see "Title of Sibling One"
     Then I should see "Title of Sibling Two"
 
-  Scenario: When directory_index extension is active, child pages are found in named directory
+  Scenario: When directory_index extension is inactive, child pages are found in named directory
     Given the Server is running at "traversal-app"
-    When I go to "/directory-indexed"
+    When I go to "/directory-indexed.html"
     Then I should see "Path: directory-indexed.html"
     Then I should see "Parent: index.html"
     Then I should see "Child: directory-indexed/fake.html"

data/features/support/env.rb

@@ -1,3 +1,6 @@
+ENV["TEST"] = "true"
+ENV["AUTOLOAD_SPROCKETS"] = "false"
+
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core', 'step_definitions')

data/features/wildcard_page_helper.feature

@@ -7,13 +7,4 @@ Feature: Wildcards in Page helper
     When I go to "/admin/index.html"
     Then I should see "Admin Layout"
     When I go to "/admin/page.html"
-    Then I should see "Admin Layout"
-    
-  Scenario: Setting the layout for a folder
-    Given the Server is running at "wildcard-directory-index-app"
-    When I go to "/"
-    Then I should see "Normal Layout"
-    When I go to "/admin/"
-    Then I should see "Admin Layout"
-    When I go to "/admin/page/"
     Then I should see "Admin Layout"

data/fixtures/frontmatter-app/source/front-matter-encoding.html.erb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+---
+layout: false
+title: This is the title
+---
+
+<h1><%= data.page.title %></h1>

data/fixtures/frontmatter-app/source/{front-matter.html.erb → front-matter-line-2.html.erb}

@@ -1,5 +1,4 @@
 <h2> Test</h2>
-
 ---
 layout: false
 title: This is the title

data/fixtures/frontmatter-app/source/json-front-matter-2.php.erb

@@ -1,7 +1,7 @@
-{{{
+;;;
   "layout": false,
   "title":  "This is the title"
-}}}
+;;;
 
 <h1><%= data.page.title %></h1>
 <?php echo "sup"; ?>

data/fixtures/frontmatter-app/source/json-front-matter-auto.erb

@@ -1,6 +1,6 @@
-{{{
+;;;
   "layout": false,
   "title":  "This is the title"
-}}}
+;;;
 
 <h1><%= data.page.title %></h1>

data/fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+;;;
+"layout": false,
+"title": "This is the title"
+;;;
+
+<h1><%= data.page.title %></h1>