middleman 2.0.0.rc92 → 2.0.0.rc93

data/features/minify_css.feature

@@ -8,7 +8,7 @@ Feature: Minify CSS
     
   Scenario: Rendering external css with the feature disabled
     Given "minify_css" feature is "disabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/stylesheets/site.css"
     Then I should see "55" lines
 
@@ -19,6 +19,6 @@ Feature: Minify CSS
     
   Scenario: Rendering external css with the feature enabled
     Given "minify_css" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/stylesheets/site.css"
     Then I should see "1" lines

data/features/minify_javascript.feature

@@ -6,18 +6,18 @@ Feature: Minify Javascript
 
   Scenario: Rendering inline js with the feature disabled
     Given "minify_javascript" feature is "disabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/inline-js.html"
     Then I should see "10" lines
 
   Scenario: Rendering inline js with the feature enabled
     Given "minify_javascript" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/inline-js.html"
     Then I should see "5" lines
 
   Scenario: Rendering inline js (coffeescript) with the feature enabled
     Given "minify_javascript" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/inline-coffeescript.html"
     Then I should see "5" lines

data/features/padrino_helpers.feature

@@ -2,7 +2,7 @@ Feature: Built-in macro view helpers
   In order to simplify generating HTML
 
   Scenario: Using the link_to helper
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/padrino_test.html"
     And I should see 'href="test2.com"'
     And I should see 'src="/images/test2.png"'

data/features/page_alias_and_layouts.feature

@@ -3,19 +3,19 @@ Feature: Custom layouts
   
   Scenario: Using custom :layout attribute
     Given page "/custom-layout.html" has layout "custom"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
     
   Scenario: Using with_layout block
     Given "/custom-layout.html" with_layout block has layout "custom"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
     
   Scenario: Using custom :layout attribute with folders
     Given page "/custom-layout-dir/" has layout "custom"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/"
@@ -25,7 +25,7 @@ Feature: Custom layouts
     
   Scenario: Using custom :layout attribute with folders
     Given page "/custom-layout-dir" has layout "custom"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/"
@@ -35,7 +35,7 @@ Feature: Custom layouts
     
   Scenario: Using custom :layout attribute with folders
     Given page "/custom-layout-dir/index.html" has layout "custom"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/"

data/features/relative_assets.feature

@@ -3,26 +3,26 @@ Feature: Relative Assets
     
   Scenario: Rendering css with the feature disabled
     Given "relative_assets" feature is "disabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should not see "url('../"
     And I should see "/images/blank.gif"
     
   Scenario: Rendering html with the feature disabled
     Given "relative_assets" feature is "disabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/relative_image.html"
     Then I should see "/images/blank.gif"
 
   Scenario: Rendering css with the feature enabled
     Given "relative_assets" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should see "url('../images/blank.gif"
     
   Scenario: Rendering html with the feature disabled
     Given "relative_assets" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/relative_image.html"
     Then I should not see "/images/blank.gif"
     And I should see "images/blank.gif"
@@ -30,14 +30,14 @@ Feature: Relative Assets
   Scenario: Rendering html with a custom images_dir
     Given "relative_assets" feature is "enabled"
     And "images_dir" is set to "img"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should see "url('../img/blank.gif"
     
   Scenario: Rendering css with a custom images_dir
     Given "relative_assets" feature is "enabled"
     And "images_dir" is set to "img"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/relative_image.html"
     Then I should not see "/images/blank.gif"
     Then I should not see "/img/blank.gif"

data/features/scss-support.feature

@@ -2,11 +2,11 @@ Feature: Support SCSS Syntax
  In order to offer an alternative when writing Sass
 
  Scenario: Rendering scss
-   Given the Server is running
+   Given the Server is running at "test-app"
    When I go to "/stylesheets/site_scss.css"
    Then I should see "html"
 
  Scenario: Rendering scss
-   Given the Server is running
+   Given the Server is running at "test-app"
    When I go to "/stylesheets/layout.css"
    Then I should see "html"

data/features/sinatra.feature

@@ -1,6 +1,6 @@
 Feature: Sinatra Routes
 
   Scenario: Rendering html
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/sinatra_test"
     Then I should see "Ratpack"

data/features/slim.feature

@@ -2,6 +2,6 @@ Feature: Support slim templating language
   In order to offer an alternative to Haml
 
   Scenario: Rendering Slim
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/slim.html"
     Then I should see "<h1>Welcome to Slim</h1>"

data/features/sprockets.feature

@@ -1,6 +1,6 @@
 Feature: Sprockets
 
   Scenario: Sprockets require
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/javascripts/sprockets_base.js"
     Then I should see "sprockets_sub_function"

data/features/step_definitions/builder_steps.rb

@@ -1,34 +1,39 @@
 require 'fileutils'
 
-Given /^a built test app$/ do
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
-  build_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "mm-build"))
-  `cd #{target} && MM_DIR="#{target}" #{build_cmd}`
+Given /^a built app at "([^"]*)"$/ do |path|
+  root = File.dirname(File.dirname(File.dirname(__FILE__)))
+  target = File.join(root, "fixtures", path)
+  build_cmd = File.expand_path(File.join(root, "bin", "middleman build"))
+  `cd #{target} && #{build_cmd}`
 end
 
-Given /^a built test app with flags "([^"]*)"$/ do |flags|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
-  build_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "mm-build"))
-  `cd #{target} && MM_DIR="#{target}" #{build_cmd} #{flags}`
+Then /^cleanup built app at "([^"]*)"$/ do |path|
+  root = File.dirname(File.dirname(File.dirname(__FILE__)))
+  target = File.join(root, "fixtures", path, "build")
+  FileUtils.rm_rf(target)
 end
 
-Given /^cleanup built test app$/ do
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build")
-  FileUtils.rm_rf(target)
+Given /^a built test app with flags "([^"]*)"$/ do |flags|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
+  build_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "middleman build"))
+  `cd #{target} && #{build_cmd} #{flags}`
 end
 
-Then /^"([^"]*)" should exist$/ do |target_file,|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build", target_file)
+Then /^"([^"]*)" should exist at "([^"]*)"$/ do |target_file, path|
+  root = File.dirname(File.dirname(File.dirname(__FILE__)))
+  target = File.join(root, "fixtures", path, "build", target_file)
   File.exists?(target).should be_true
 end
 
-Then /^"([^"]*)" should exist and include "([^"]*)"$/ do |target_file, expected|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build", target_file)
+Then /^"([^"]*)" should exist at "([^"]*)" and include "([^"]*)"$/ do |target_file, path, expected|
+  root = File.dirname(File.dirname(File.dirname(__FILE__)))
+  target = File.join(root, "fixtures", path, "build", target_file)
   File.exists?(target).should be_true
   File.read(target).should include(expected)
 end
 
-Then /^"([^"]*)" should not exist$/ do |target_file|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build", target_file)
+Then /^"([^"]*)" should not exist at "([^"]*)"$/ do |target_file, path|
+  root = File.dirname(File.dirname(File.dirname(__FILE__)))
+  target = File.join(root, "fixtures", path, "build", target_file)
   File.exists?(target).should be_false
 end

data/features/step_definitions/generator_steps.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 
 Given /^generated directory at "([^\"]*)"$/ do |dirname|
   target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
-  init_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "mm-init"))
+  init_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "middleman init"))
   `cd #{File.dirname(target)} && #{init_cmd} #{File.basename(target)}`
 end
 

data/features/step_definitions/middleman_steps.rb

@@ -15,8 +15,10 @@ Given /^current environment is "([^\"]*)"$/ do |env|
   @current_env = env.to_sym
 end
 
-Given /^the Server is running$/ do
+Given /^the Server is running at "([^\"]*)"$/ do |app_path|
   @server ||= Middleman.server
+  root = File.dirname(File.dirname(File.dirname(__FILE__)))
+  @server.set :root, File.join(root, "fixtures", app_path)
   @browser = Rack::Test::Session.new(Rack::MockSession.new(@server.new))
 end
 

data/features/step_definitions/page_layout_steps.rb

@@ -1,12 +1,10 @@
 Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
   @server ||= Middleman.server
-  @server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
   @server.page(url, :layout => layout.to_sym)
 end
 
 Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
   @server ||= Middleman.server
-  @server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
   @server.with_layout(layout.to_sym) do
     page(url)
   end

data/features/support/env.rb

@@ -1,4 +1,3 @@
 root_path = File.dirname(File.dirname(File.dirname(__FILE__)))
-ENV["MM_DIR"] = File.join(root_path, "fixtures", "test-app")
 require File.join(root_path, 'lib', 'middleman')
 require "rack/test"

data/features/tiny_src.feature

@@ -4,12 +4,12 @@ Feature: Tiny Src
     
   Scenario: Rendering html with the feature disabled
     Given "tiny_src" feature is "disabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/tiny_src.html"
     Then I should see "http://test.com/image.jpg"
 
   Scenario: Rendering html with the feature enabled
     Given "tiny_src" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/tiny_src.html"
     Then I should see "http://i.tinysrc.mobi/http://test.com/image.jpg"

data/fixtures/indexable-app/config.rb

@@ -0,0 +1,2 @@
+activate :directory_indexes
+page "/leave_me_alone.html", :directory_index => false

data/fixtures/indexable-app/source/a_folder/needs_index.html

@@ -0,0 +1 @@
+Indexable

data/fixtures/indexable-app/source/leave_me_alone.html

@@ -0,0 +1 @@
+Stay away

data/fixtures/indexable-app/source/needs_index.html

@@ -0,0 +1 @@
+Indexable

data/fixtures/test-app/config.rb

@@ -1,5 +1,9 @@
 page "/fake.html", :proxy => "/real.html", :layout => false
 
+ignore "/should_be_ignored.html"
+page "/should_be_ignored2.html", :ignore => true
+page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true
+
 %w(one two).each do |num|
   page "/fake/#{num}.html", :proxy => "/real/index.html" do
     @num = num

data/fixtures/test-app/source/a_folder/needs_index.html

@@ -0,0 +1 @@
+Indexable

data/fixtures/test-app/source/needs_index.html

@@ -0,0 +1 @@
+Indexable

data/fixtures/test-app/source/should_be_ignored.html

@@ -0,0 +1 @@
+<h1>Ignore me!</h1>

data/fixtures/test-app/source/should_be_ignored2.html

@@ -0,0 +1 @@
+<h1>Ignore me! 2</h1>

data/fixtures/test-app/source/should_be_ignored3.html

@@ -0,0 +1 @@
+<h1>Ignore me! 3</h1>

data/lib/middleman.rb

@@ -8,10 +8,10 @@
 #
 # To accomplish its goals, Middleman supports provides access to:
 # 
-#### Command-line tools:
-# * **mm-init**: A tool for creating to new static sites.
-# * **mm-server**: A tool for rapidly developing your static site.
-# * **mm-build**: A tool for exporting your site into optimized HTML, CSS & JS.
+#### Command-line tool:
+# * **middleman init**: A tool for creating to new static sites.
+# * **middleman server**: A tool for rapidly developing your static site.
+# * **middleman build**: A tool for exporting your site into optimized HTML, CSS & JS.
 #
 #### Tons of templating languages including:
 # * ERB                        (.erb)
@@ -51,13 +51,10 @@
 # [Email the users group]: http://groups.google.com/group/middleman-users
 # [Submit bug reports]:    https://github.com/tdreyno/middleman/issues
 
-# Setup out load paths
+# Setup our load paths
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-# Require Rubygems (probably not necessary)
-require 'rubygems'
-
 # We're riding on Sinatra, so let's include it.
 require "sinatra/base"
 
@@ -66,6 +63,8 @@ module Middleman
   # Auto-load modules on-demand
   autoload :Base,      "middleman/base"
   autoload :Builder,   "middleman/builder"
+  autoload :CLI,       "middleman/cli"
+  autoload :Templates, "middleman/templates"
   autoload :Guard,     "middleman/guard"
   
   # Custom Renderers
@@ -150,6 +149,9 @@ module Middleman
 
     # Automatically resize images for mobile devises
     # autoload :TinySrc,             "middleman/features/tiny_src"
+    
+    # Automatically convert filename.html files into filename/index.html
+    autoload :DirectoryIndexes,    "middleman/features/directory_indexes"
   end
   
   def self.server(&block)

data/lib/middleman/base.rb

@@ -6,7 +6,7 @@ module Middleman::Base
       
       # Basic Sinatra config
       app.set :app_file,    __FILE__
-      app.set :root,        ENV["MM_DIR"] || Dir.pwd
+      app.set :root,        Dir.pwd
       app.set :sessions,    false
       app.set :logging,     false
       app.set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
@@ -86,7 +86,9 @@ module Middleman::Base
         request_path = request.path_info.gsub("%20", " ")
         result = resolve_template(request_path, :raise_exceptions => false)
         
-        if result
+        should_be_ignored = !(request["is_proxy"]) && settings.excluded_paths.include?("/#{request_path}")
+        
+        if result && !should_be_ignored
           extensionless_path, template_engine = result
 
           # Return static files
@@ -119,6 +121,27 @@ module Middleman::Base
       super(option, value, &nil)
     end
     
+    def build_reroute(&block)
+      @build_rerouters ||= []
+      @build_rerouters << block
+    end
+    
+    def reroute_builder(desination, request_path)
+      @build_rerouters ||= []
+      
+      result = [desination, request_path]
+      
+      @build_rerouters.each do |block|
+        output = block.call(desination, request_path)
+        if output
+          result = output
+          break
+        end
+      end
+      
+      result
+    end
+    
     def before_processing(&block)
       @before_processes ||= []
       @before_processes << block

data/lib/middleman/builder.rb

@@ -3,8 +3,9 @@ require "thor/group"
 require 'rack/test'
 
 SHARED_SERVER = Middleman.server
+SHARED_SERVER.set :environment, :build
 
-module Middleman  
+module Middleman
   module ThorActions
     def tilt_template(source, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
@@ -12,14 +13,17 @@ module Middleman
       
       # source  = File.expand_path(find_in_source_paths(source.to_s))
       context = instance_eval('binding')
-
-      @@rack_test ||= ::Rack::Test::Session.new(::Rack::MockSession.new(SHARED_SERVER))
       
-      create_file destination, nil, config do
-        # The default render just requests the page over Rack and writes the response
-        request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
-        @@rack_test.get(request_path.gsub(/\s/, "%20"))
-        @@rack_test.last_response.body
+      request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
+      
+      begin        
+        destination, request_page = SHARED_SERVER.reroute_builder(destination, request_path)
+      
+        create_file destination, nil, config do
+          Middleman::Builder.shared_rack.get(request_path.gsub(/\s/, "%20"))
+          Middleman::Builder.shared_rack.last_response.body
+        end
+      rescue
       end
     end
   end
@@ -28,13 +32,20 @@ module Middleman
     include Thor::Actions
     include Middleman::ThorActions
     
+    def self.shared_rack
+      @shared_rack ||= begin  
+        mock = ::Rack::MockSession.new(SHARED_SERVER)
+        sess = ::Rack::Test::Session.new(mock)
+        sess.get("/")
+        sess
+      end
+    end
+    
     class_option :relative, :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
     
     def initialize(*args)
       super
       
-      SHARED_SERVER.new
-      
       if options.has_key?("relative") && options["relative"]
         SHARED_SERVER.activate :relative_assets
       end
@@ -47,6 +58,8 @@ module Middleman
     end
     
     def build_all_files
+      self.class.shared_rack
+      
       action Directory.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true })
       
       SHARED_SERVER.proxied_paths.each do |url, proxy|