middleman 3.0.0.alpha.3 → 3.0.0.alpha.4

data/features/mount_rack.feature

@@ -0,0 +1,8 @@
+Feature: Support Rack apps mounted using map
+
+  Scenario: Mounted Rack App at /sinatra
+    Given the Server is running at "sinatra-app"
+    When I go to "/"
+    Then I should see "Hello World (Middleman)"
+    When I go to "/sinatra/"
+    Then I should see "Hello World (Sinatra)"

data/features/partials.feature

@@ -32,4 +32,10 @@ Feature: Provide Sane Defaults for Partial Behavior
   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"
+    Then I should see "Local var is bar"
+  
+  Scenario: Partial and Layout use different engines
+    Given the Server is running at "different-engine-partial"
+    When I go to "/index.html"
+    Then I should see "ERb Header"
+    And I should see "Slim Footer"

data/features/preview_changes.feature

@@ -0,0 +1,18 @@
+Feature: Preview Changes
+  In order to run quickly, we should update internal caches on file changes
+  
+  Scenario: A template changes contents during preview
+    Given the Server is running at "preview-app"
+    And the file "source/content.html.erb" has the contents
+      """
+      Hello World
+      """
+    When I go to "/content.html"
+    Then I should see "Hello World"
+    And the file "source/content.html.erb" has the contents
+      """
+      Hola Mundo
+      """
+    When I go to "/content.html"
+    Then I should see "Hola Mundo"
+    

data/features/wildcard_page_helper.feature

@@ -0,0 +1,19 @@
+Feature: Wildcards in Page helper
+
+  Scenario: Setting the layout for a folder
+    Given the Server is running at "wildcard-app"
+    When I go to "/index.html"
+    Then I should see "Normal Layout"
+    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.html"
+    Then I should see "Admin Layout"

data/fixtures/build-with-errors-app/config.rb

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

data/fixtures/build-with-errors-app/source/index.html.erb

@@ -0,0 +1 @@
+<%= error_error_error %>

data/fixtures/clean-app/source/index.html.haml

@@ -1,6 +1 @@
-%h1 Welcome
-
-:markdown
-  ## H2
-  
-  Paragraph
+h1 Welcome

data/fixtures/clean-dir-app/config.rb

@@ -0,0 +1,2 @@
+
+activate :directory_indexes

data/fixtures/clean-dir-app/source/about.html

@@ -0,0 +1 @@
+Fun times

data/fixtures/different-engine-partial/source/index.html.erb

@@ -0,0 +1 @@
+Index

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

@@ -0,0 +1,7 @@
+<%= partial 'shared/header' %>
+
+<div id="main">
+  <%= yield %>
+</div>
+
+<%= partial 'shared/footer' %>

data/fixtures/different-engine-partial/source/shared/_footer.slim

@@ -0,0 +1 @@
+footer Slim Footer

data/fixtures/different-engine-partial/source/shared/_header.erb

@@ -0,0 +1 @@
+<header>ERb Header</header>

data/fixtures/external-helpers/config.rb

@@ -0,0 +1,4 @@
+require "lib/hello_helper"
+helpers HelloHelper
+
+page "/", :layout => false

data/fixtures/external-helpers/lib/hello_helper.rb

@@ -0,0 +1,5 @@
+module HelloHelper
+  def hello
+    "Hello World"
+  end
+end

data/fixtures/external-helpers/source/index.html.erb

@@ -0,0 +1 @@
+<%= hello %>

data/fixtures/instance-vars-app/source/_vartial.erb

@@ -0,0 +1,5 @@
+<% if @my_var %>
+  My var is here!
+<% else %>
+  No var...
+<% end %>

data/fixtures/instance-vars-app/source/instance-var-set.html.erb

@@ -0,0 +1,2 @@
+<% @my_var = 100 %>
+<%= partial 'vartial' %>

data/fixtures/instance-vars-app/source/layout.erb

@@ -0,0 +1,3 @@
+Var is <%= @my_var %>
+
+<%= yield %>

data/fixtures/instance-vars-app/source/no-instance-var.html.erb

@@ -0,0 +1 @@
+<%= partial 'vartial' %>

data/fixtures/markdown-app/config.rb

@@ -0,0 +1,9 @@
+set :markdown, :smartypants => true,
+               :no_intra_emphasis => true,
+               :tables => true,
+               :fenced_code_blocks => true,
+               :autolink => true,
+               :strikethrough => true,
+               :lax_html_blocks => true,
+               :space_after_headers => true,
+               :superscript => true

data/fixtures/markdown-app/source/autolink.html.markdown

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+http://example.com

data/fixtures/markdown-app/source/fenced_code_blocks.html.markdown

@@ -0,0 +1,7 @@
+---
+layout: false
+---
+
+~~~~~~~~~~~~~~~~~~~~~
+a one-line code block
+~~~~~~~~~~~~~~~~~~~~~

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

@@ -0,0 +1,4 @@
+---
+layout: false
+---
+Hello World

data/fixtures/markdown-app/source/no_intra_emphasis.html.markdown

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+foo_bar_baz

data/fixtures/markdown-app/source/smarty_pants.html.markdown

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+"Hello"

data/fixtures/markdown-app/source/space_after_headers.html.markdown

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+#this is my header

data/fixtures/markdown-app/source/strikethrough.html.markdown

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+~~Nope~~

data/fixtures/markdown-app/source/superscript.html.markdown

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+this is the 2^(nd) time

data/fixtures/markdown-app/source/tables.html.markdown

@@ -0,0 +1,8 @@
+---
+layout: false
+---
+
+First Header  | Second Header
+------------- | -------------
+Content Cell  | Content Cell
+Content Cell  | Content Cell

data/fixtures/passthrough-app/config.rb

@@ -0,0 +1,17 @@
+module ::PassThrough
+  def self.compress(data)
+    data
+  end
+end
+
+set :js_compressor, ::PassThrough
+set :css_compressor, ::PassThrough
+
+activate :minify_javascript
+activate :minify_css
+
+with_layout false do
+  page "/inline-css.html"
+  page "/inline-js.html"
+  page "/inline-coffeescript.html"
+end

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

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

data/fixtures/passthrough-app/source/inline-coffeescript.html.haml

@@ -0,0 +1,3 @@
+:coffeescript
+  race = (winner, runners...) ->
+    print winner, runners

data/fixtures/passthrough-app/source/inline-css.html.haml

@@ -0,0 +1,4 @@
+:sass
+  body
+    test: style
+    good: deal

data/fixtures/passthrough-app/source/inline-js.html.haml

@@ -0,0 +1,7 @@
+:javascript
+  ;(function() {
+    this;
+    should();
+    all.be();
+    on = { one: line };
+  })();

data/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee

@@ -0,0 +1,3 @@
+# Splats:
+race = (winner, runners...) ->
+  print winner, runners

data/fixtures/passthrough-app/source/javascripts/js_test.js

@@ -0,0 +1,8 @@
+var race;
+var __slice = Array.prototype.slice;
+
+race = function() {
+  var runners, winner;
+  winner = arguments[0], runners = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+  return print(winner, runners);
+};

data/fixtures/passthrough-app/source/stylesheets/site.css.sass

@@ -0,0 +1 @@
+@import "compass/reset"

data/fixtures/preview-app/source/content.html.erb

@@ -0,0 +1 @@
+Hola Mundo

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

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

data/fixtures/sinatra-app/config.rb

@@ -0,0 +1,11 @@
+require "sinatra"
+
+class MySinatra < Sinatra::Base
+  get "/" do
+    "Hello World (Sinatra)"
+  end
+end
+
+map "/sinatra" do
+  run MySinatra
+end

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

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+Hello World (Middleman)

data/fixtures/test-app/config.rb

@@ -1,4 +1,3 @@
-require "maruku"
 require "slim"
 require "liquid"
 require "coffee-filter"
@@ -22,7 +21,8 @@ with_layout :content_for do
 end
 
 with_layout false do
-  page "/markdown.html"
+  page "/request-path.html"
+  page "/lorem.html"
   page "/relative_image.html"
   page "/inline-css.html"
   page "/inline-js.html"

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

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

data/fixtures/test-app/source/front-matter-change.html.erb

@@ -0,0 +1,5 @@
+---
+title: Hola Mundo
+layout: false
+---
+<%= data.page.title %>

data/fixtures/test-app/source/index.html.slim

@@ -0,0 +1,9 @@
+h1 Welcome
+
+== image_tag "Chrome_Logo.svg"
+== image_tag "cfb_tomb-perennial-energy.svgz"
+
+markdown:
+  ## H2
+  
+  Paragraph

data/fixtures/test-app/source/javascripts/js_test.js

@@ -0,0 +1,8 @@
+var race;
+var __slice = Array.prototype.slice;
+
+race = function() {
+  var runners, winner;
+  winner = arguments[0], runners = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+  return print(winner, runners);
+};

data/fixtures/test-app/source/lorem.html.erb

@@ -0,0 +1,12 @@
+<%= lorem.word %>
+<%= lorem.words(5) %>
+<%= lorem.sentence %>
+<%= lorem.sentences(2) %>
+<%= lorem.paragraph %>
+<%= lorem.paragraphs(2) %>
+<%= lorem.date %>
+<%= lorem.name %>
+<%= lorem.first_name %>
+<%= lorem.last_name %>
+<%= lorem.email %>
+<%= lorem.image(100) %>

data/fixtures/test-app/source/request-path.html.erb

@@ -0,0 +1 @@
+<%= current_path == request.path %>

data/fixtures/wildcard-app/config.rb

@@ -0,0 +1 @@
+page "/admin/*", :layout => :admin

data/fixtures/wildcard-app/source/admin/index.html.erb

@@ -0,0 +1 @@
+Index

data/fixtures/wildcard-app/source/admin/page.html.erb

@@ -0,0 +1 @@
+Page

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

@@ -0,0 +1 @@
+Index

data/fixtures/wildcard-app/source/layouts/admin.erb

@@ -0,0 +1,2 @@
+Admin Layout
+<%= yield %>

data/fixtures/wildcard-app/source/layouts/layout.erb

@@ -0,0 +1,2 @@
+Normal Layout
+<%= yield %>

data/fixtures/wildcard-directory-index-app/config.rb

@@ -0,0 +1,2 @@
+activate :directory_indexes
+page "/admin/*", :layout => :admin

data/fixtures/wildcard-directory-index-app/source/admin/index.html.erb

@@ -0,0 +1 @@
+Index

data/fixtures/wildcard-directory-index-app/source/admin/page.html.erb

@@ -0,0 +1 @@
+Page

data/fixtures/wildcard-directory-index-app/source/index.html.erb

@@ -0,0 +1 @@
+Index

data/fixtures/wildcard-directory-index-app/source/layouts/admin.erb

@@ -0,0 +1,2 @@
+Admin Layout
+<%= yield %>

data/fixtures/wildcard-directory-index-app/source/layouts/layout.erb

@@ -0,0 +1,2 @@
+Normal Layout
+<%= yield %>

data/lib/middleman.rb

@@ -5,12 +5,12 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 # Top-level Middleman object
 module Middleman
   # Auto-load modules on-demand
-  autoload :Base,        "middleman/base"
-  autoload :Cache,       "middleman/cache"
-  autoload :Builder,     "middleman/builder"
-  autoload :CLI,         "middleman/cli"
-  autoload :Templates,   "middleman/templates"
-  autoload :Guard,       "middleman/guard"
+  autoload :Base,           "middleman/base"
+  autoload :Cache,          "middleman/cache"
+  autoload :Builder,        "middleman/builder"
+  autoload :CLI,            "middleman/cli"
+  autoload :Templates,      "middleman/templates"
+  autoload :Guard,          "middleman/guard"
   
   # Custom Renderers
   module Renderers
@@ -57,13 +57,16 @@ module Middleman
     autoload :Rendering,      "middleman/core_extensions/rendering"
     
     # Compass framework for Sass
-    autoload :Compass,         "middleman/core_extensions/compass"
+    autoload :Compass,        "middleman/core_extensions/compass"
     
     # Sprockets 2
-    autoload :Sprockets,       "middleman/core_extensions/sprockets"
+    autoload :Sprockets,      "middleman/core_extensions/sprockets"
   
     # Pass custom options to views
     autoload :Routing,        "middleman/core_extensions/routing"
+    
+    # Catch and show exceptions at the Rack level
+    autoload :ShowExceptions, "middleman/core_extensions/show_exceptions"
   end
 
   module Extensions
@@ -100,6 +103,52 @@ module Middleman
     
     # Organize the sitemap as a tree
     autoload :SitemapTree,         "middleman/extensions/sitemap_tree"
+    
+    class << self
+      def registered
+        @_registered ||= {}
+      end
+
+      def register(name, namespace=nil, version=nil, &block)
+        # If we've already got a matching extension that passed the 
+        # version check, bail out.
+        return if registered.has_key?(name.to_sym) && 
+        !registered[name.to_sym].is_a?(String)
+
+        if block_given?
+          version = namespace
+        end
+
+        passed_version_check = true
+        if !version.nil?
+          requirement = ::Gem::Requirement.create(version)
+          if !requirement.satisfied_by?(Middleman::GEM_VERSION)
+            passed_version_check = false
+          end
+        end
+
+        registered[name.to_sym] = if !passed_version_check
+          "== #{name} failed version check. Requested #{version}, got #{Middleman::VERSION}"
+        elsif block_given?
+          block
+        elsif namespace
+          namespace
+        end
+      end
+
+      def load(name)
+        name = name.to_sym
+        return nil unless registered.has_key?(name)
+
+        extension = registered[name]
+        if extension.is_a?(Proc)
+          extension = extension.call() || nil
+          registered[name] = extension
+        end
+
+        extension
+      end
+    end
   end
   
   # Where to look in gems for extensions to auto-register
@@ -107,6 +156,12 @@ module Middleman
   
   class << self
     
+    # Where to look for custom templates
+    # @returns [String]
+    def templates_path
+      File.join(File.expand_path("~/"), ".middleman")
+    end
+    
     # Automatically load extensions from available RubyGems
     # which contain the EXTENSION_FILE
     #