middleman 3.0.0.alpha.2 → 3.0.0.alpha.3

data/.gitignore

@@ -12,3 +12,5 @@ docs
 fixtures/test-app/build
 .*.swp
 build
+doc
+.yardoc

data/.yardopts

@@ -0,0 +1,5 @@
+lib/**/*.rb 
+--exclude lib/middleman/vendor 
+--exclude lib/middleman/extensions/automatic_image_sizes/fastimage.rb 
+--exclude lib/middleman/extensions/minify_css/cssmin.rb
+--no-private

data/CHANGELOG

@@ -1,6 +1,11 @@
 3.0.pre
 ====
 Rewritten to work directly with Rack (Sinatra apps can still be mounted)
+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
+Enable chained templates outside of sprockets (file.html.markdown.erb)
 
 2.1.pre
 ====

data/README.md

@@ -14,6 +14,9 @@ http://middlemanapp.com
 
 If you have questions, answers can be found on community forum: https://convore.com/middleman/
 
+## Generated Source Documentation
+http://rubydoc.info/github/tdreyno/middleman/master/frames
+
 ## Copyright
 
 Copyright (c) 2010 Thomas Reynolds. See LICENSE for details.

data/Rakefile

@@ -7,8 +7,6 @@ Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
   t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
-#$LOAD_PATH.unshift 'lib'
-
 require 'rake/testtask'
 require 'rake/clean'
 

data/bin/middleman

@@ -8,48 +8,50 @@ require 'rubygems'
 
 module Middleman
   module ProjectLocator
-    def self.locate_middleman_root!(args)
-      cwd = Dir.pwd
+    class << self
+      def locate_middleman_root!(args)
+        cwd = Dir.pwd
       
-      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
-      end
+        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
+        end
       
-      if in_middleman_project?
-        did_locate_middleman_project(cwd, args)
-        return
-      end
+        if in_middleman_project?
+          did_locate_middleman_project(cwd, args)
+          return
+        end
       
-      Dir.chdir("..") do
-        # Recurse in a chdir block: if the search fails we want to be sure
-        # the application is generated in the original working directory.
-        locate_middleman_root!(args) unless cwd == Dir.pwd
+        Dir.chdir("..") do
+          # Recurse in a chdir block: if the search fails we want to be sure
+          # the application is generated in the original working directory.
+          locate_middleman_root!(args) unless cwd == Dir.pwd
+        end
+      rescue SystemCallError
+        # could not chdir, no problem just return
       end
-    rescue SystemCallError
-      # could not chdir, no problem just return
-    end
 
-    def self.in_middleman_project?
-      File.exists?('config.rb')
-    end
+      def in_middleman_project?
+        File.exists?('config.rb')
+      end
 
-    def self.in_middleman_project_subdirectory?(path = Pathname.new(Dir.pwd))
-      File.exists?(File.join(path, 'config.rb')) || !path.root? && in_middleman_project_subdirectory?(path.parent)
-    end
+      def in_middleman_project_subdirectory?(path = Pathname.new(Dir.pwd))
+        File.exists?(File.join(path, 'config.rb')) || !path.root? && in_middleman_project_subdirectory?(path.parent)
+      end
     
-    def self.did_locate_middleman_project(path, args)
-      # Set up gems listed in the Gemfile.
-      ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', path)
+      def did_locate_middleman_project(path, args)
+        # Set up gems listed in the Gemfile.
+        ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', path)
 
-      require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+        require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 
-      start_cli!(args)
-    end
+        start_cli!(args)
+      end
     
-    def self.start_cli!(args)
-      require 'middleman'
-      Middleman::CLI.start(args)
+      def start_cli!(args)
+        require 'middleman'
+        Middleman::CLI.start(args)
+      end
     end
   end
 end
@@ -59,7 +61,8 @@ args = ARGV.dup
 ARG_ALIASES = {
   "s" => "server",
   "b" => "build",
-  "i" => "init"
+  "i" => "init",
+  "w" => "watch"
 }
 
 if ARG_ALIASES.has_key?(args[0])

data/features/auto_layout.feature

@@ -0,0 +1,37 @@
+Feature: Provide Sane Defaults for Layout Behavior
+
+  Scenario: Template and Layout of same engine exist
+    Given the Server is running at "engine-matching-layout"
+    When I go to "/index.html"
+    Then I should see "Comment in layout"
+  
+  Scenario: Template and Layout of different engine
+    Given the Server is running at "different-engine-layout"
+    When I go to "/index.html"
+    Then I should see "Comment in layout"
+  
+  Scenario: Multiple layouts exist, prefer same engine
+    Given the Server is running at "multiple-layouts"
+    When I go to "/index.html"
+    Then I should see "ERb Comment in layout"
+  
+  Scenario: No layout exists
+    Given the Server is running at "no-layout"
+    When I go to "/index.html"
+    Then I should not see "Comment in layout"
+  
+  Scenario: Manually set default layout in config (exists)
+    Given the Server is running at "manual-layout"
+    When I go to "/index.html"
+    Then I should see "Custom Comment in layout"
+    
+  Scenario: Manually set default layout in config (does not exist)
+    Given the Server is running at "manual-layout-missing"
+    When I go to "/index.html"
+    Then I should see "Error"
+  
+  Scenario: Overwrite manual layout
+    Given the Server is running at "manual-layout-override"
+    When I go to "/index.html"
+    Then I should see "Another Comment in layout"
+    

data/features/builder.feature

@@ -15,6 +15,7 @@ Feature: Builder
     Then "spaces in file.html" should exist at "test-app" and include "spaces"
     Then "images/Read me (example).txt" should exist at "test-app"
     Then "images/Child folder/regular_file(example).txt" should exist at "test-app"
+    Then ".htaccess" should exist at "test-app"
     
   Scenario: Build glob
     Given a built app at "glob-app" with flags "--glob '*.css'"

data/features/chained_templates.feature

@@ -0,0 +1,15 @@
+Feature: Templates should be chainable
+  In order to insert variables and data in "static" engines
+
+  Scenario: Data in Erb in Markdown
+    Given the Server is running at "chained-app"
+    When I go to "/index.html"
+    Then I should see "Title</h1>"
+    And I should see "Subtitle</h2>"
+    And I should see "Sup</h3>"
+    
+  Scenario: Build chained template
+    Given a built app at "chained-app"
+    Then "index.html" should exist at "chained-app" and include "Title</h1>"
+    Then "index.html" should exist at "chained-app" and include "Subtitle</h2>"
+    Then "index.html" should exist at "chained-app" and include "Sup</h3>"

data/features/content_for.feature

@@ -0,0 +1,16 @@
+Feature: Support content_for and yield_content helpers
+
+  Scenario: content_for works as expected in erb
+    Given the Server is running at "test-app"
+    When I go to "/content_for_erb.html"
+    Then I should see "In Layout: I am the yielded content erb"
+    
+  Scenario: content_for works as expected in haml
+    Given the Server is running at "test-app"
+    When I go to "/content_for_haml.html"
+    Then I should see "In Layout: I am the yielded content haml"
+    
+  Scenario: content_for works as expected in slim
+    Given the Server is running at "test-app"
+    When I go to "/content_for_slim.html"
+    Then I should see "In Layout: I am the yielded content slim"

data/features/directory_index.feature

@@ -11,6 +11,7 @@ Feature: Directory Index
     Then "needs_index.html" should not exist at "indexable-app"
     Then "a_folder/needs_index.html" should not exist at "indexable-app"
     Then "leave_me_alone/index.html" should not exist at "indexable-app"
+    Then ".htaccess" should exist at "indexable-app"
     
   Scenario: Preview normal file
     Given the Server is running at "indexable-app"

data/features/front-matter.feature

@@ -4,4 +4,5 @@ Feature: YAML Front Matter
   Scenario: Rendering html
     Given the Server is running at "test-app"
     When I go to "/front-matter.html"
-    Then I should see "<h1>This is the title</h1>"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see "---"

data/features/partials.feature

@@ -0,0 +1,35 @@
+Feature: Provide Sane Defaults for Partial Behavior
+
+  Scenario: Finds shared partials relative to the root
+    Given the Server is running at "partials-app"
+    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: 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 "Haml 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"
+    Then I should see "Local Partial"
+
+  Scenario: Partials can be passed locals
+    Given the Server is running at "partials-app"
+    When I go to "/locals.html"
+    Then I should see "Local var is bar"

data/features/support/env.rb

@@ -1,3 +1,3 @@
-root_path = File.dirname(File.dirname(File.dirname(__FILE__)))
-require File.join(root_path, 'lib', 'middleman')
-require "rack/test"
+PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman')
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman', 'step_definitions')

data/fixtures/chained-app/data/article.yml

@@ -0,0 +1,2 @@
+title: "Title"
+subtitle: "Subtitle"

data/fixtures/chained-app/source/index.html.markdown.erb

@@ -0,0 +1,8 @@
+---
+layout: false
+sup: "Sup"
+---
+
+# <%= data.article.title %>
+## <%= data.article.subtitle %>
+### <%= data.page.sup %>

data/fixtures/different-engine-layout/source/index.html.haml

@@ -0,0 +1 @@
+%h1 Welcome

data/fixtures/different-engine-layout/source/layout.erb

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/engine-matching-layout/source/index.html.erb

@@ -0,0 +1 @@
+<h1>Welcome</h1>

data/fixtures/engine-matching-layout/source/layout.erb

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/indexable-app/source/.htaccess

@@ -0,0 +1 @@
+# I'm an htaccess file!

data/fixtures/manual-layout-missing/config.rb

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

data/fixtures/manual-layout-missing/source/index.html.erb

@@ -0,0 +1 @@
+<h1>Welcome</h1>

data/fixtures/manual-layout-override/config.rb

@@ -0,0 +1,3 @@
+set :layout, :custom
+
+page "/", :layout => :another

data/fixtures/manual-layout-override/source/index.html.erb

@@ -0,0 +1 @@
+<h1>Welcome</h1>

data/fixtures/manual-layout-override/source/layouts/another.erb

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Another Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/manual-layout-override/source/layouts/custom.erb

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Custom Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/manual-layout/config.rb

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

data/fixtures/manual-layout/source/index.html.erb

@@ -0,0 +1 @@
+<h1>Welcome</h1>

data/fixtures/manual-layout/source/layouts/custom.erb

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Custom Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/multiple-layouts/source/index.html.erb

@@ -0,0 +1 @@
+<h1>Welcome</h1>

data/fixtures/multiple-layouts/source/layout.erb

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- ERb Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/multiple-layouts/source/layout.haml

@@ -0,0 +1,6 @@
+%html
+  %head
+    %title My Sample Site
+    / Haml Comment in layout
+  %body
+    = yield

data/fixtures/no-layout/source/index.html.erb

@@ -0,0 +1 @@
+<h1>Welcome</h1>

data/fixtures/partials-app/source/_locals.erb

@@ -0,0 +1 @@
+Local var is <%= foo %>

data/fixtures/partials-app/source/_main.erb

@@ -0,0 +1 @@
+ERb Main

data/fixtures/partials-app/source/_main.haml

@@ -0,0 +1 @@
+Haml Main

data/fixtures/partials-app/source/index.html.erb

@@ -0,0 +1,3 @@
+<%= partial "shared/header" %>
+<%= partial "main" %>
+<%= partial "shared/footer" %>