middleman 2.0.0.rc8 → 2.0.0.rc91

data/CHANGELOG

@@ -7,4 +7,6 @@
 - Refactored Dynamically Reloadable Core
 - Combine views/ and public/ into a single source/ folder.
 - Support YAML front-matter
-- Blog-aware Feature
+- Added callback to run code after Compass is configured
+- Added support for a compass.config file which is passed directly to Compass
+- Blog-aware Feature (and project template)

data/bin/mm-server

@@ -15,7 +15,7 @@ module Middleman
     
     class_option :port, :aliases => "-p", :default => "4567"
     class_option :"livereload-port", :default => "35729"
-    class_option :"livereload", :default => true, :type => :boolean
+    class_option :"livereload", :default => false, :type => :boolean
     
     def start_guard
       if !File.exists?("config.rb")

data/features/asset_host.feature

@@ -3,10 +3,12 @@ Feature: Alternate between multiple asset hosts
   
   Scenario: Rendering css with the feature enabled
     Given I am using an asset host
+    And the Server is running
     When I go to "/stylesheets/asset_host.css"
     Then I should see "http://assets"
     
   Scenario: Rendering html with the feature enabled
     Given I am using an asset host
+    And the Server is running
     When I go to "/asset_host.html"
     Then I should see "http://assets"

data/features/automatic_image_sizes.feature

@@ -3,12 +3,14 @@ Feature: Automatically detect and insert image dimensions into tags
 
   Scenario: Rendering an image with the feature disabled
     Given "automatic_image_sizes" feature is "disabled"
+    And the Server is running
     When I go to "/auto-image-sizes.html"
     Then I should not see "width="
     And I should not see "height="
   
   Scenario: Rendering an image with the feature enabled
     Given "automatic_image_sizes" feature is "enabled"
+    And the Server is running
     When I go to "/auto-image-sizes.html"
     Then I should see "width="
     And I should see "height="

data/features/builder.feature

@@ -12,9 +12,12 @@ Feature: Builder
     Then "stylesheets/site_scss.css" should exist and include "html, body, div, span"
     Then "stylesheets/static.css" should exist and include "body"
     Then "_partial.html" should not exist
+    Then "spaces in file.html" should exist and include "spaces"
+    Then "images/Read me (example).txt" should exist
+    Then "images/Child folder/regular_file(example).txt" should exist
     And cleanup built test app
     
   Scenario: Force relative assets
     Given a built test app with flags "--relative"
-    Then "stylesheets/site.css" should exist and include "../"
+    Then "stylesheets/relative_assets.css" should exist and include "../"
     And cleanup built test app

data/features/cache_buster.feature

@@ -3,20 +3,24 @@ Feature: Generate mtime-based query string for busting browser caches
     
   Scenario: Rendering css with the feature disabled
     Given "cache_buster" feature is "disabled"
+    And the Server is running
     When I go to "/stylesheets/relative_assets.css"
     Then I should not see "?"
     
   Scenario: Rendering html with the feature disabled
     Given "cache_buster" feature is "disabled"
+    And the Server is running
     When I go to "/cache-buster.html"
     Then I should not see "?"
 
   Scenario: Rendering css with the feature enabled
     Given "cache_buster" feature is "enabled"
+    And the Server is running
     When I go to "/stylesheets/relative_assets.css"
     Then I should see "?"
 
   Scenario: Rendering html with the feature enabled
     Given "cache_buster" feature is "enabled"
+    And the Server is running
     When I go to "/cache-buster.html"
     Then I should not see "?"

data/features/coffee-script.feature

@@ -9,4 +9,9 @@ Feature: Support coffee-script
   Scenario: Rendering coffee-script with :coffeescript haml-filter
     Given the Server is running
     When I go to "/inline-coffeescript.html"
-    Then I should see "Array.prototype.slice"
+    Then I should see "Array.prototype.slice"
+  
+  Scenario: Rendering broken coffee
+    Given the Server is running
+    When I go to "/javascripts/broken-coffee.js"
+    Then I should see "Reserved word"

data/features/dynamic_pages.feature

@@ -0,0 +1,24 @@
+Feature: Dynamic Pages
+  In order to use a single view to generate multiple output files
+
+  Scenario: Checking built folder for content
+    Given a built test app
+    Then "fake.html" should exist and include "I am real"
+    Then "fake/one.html" should exist and include "I am real: one"
+    Then "fake/two.html" should exist and include "I am real: two"
+    And cleanup built test app
+    
+  Scenario: Preview basic proxy
+    Given the Server is running
+    When I go to "/fake.html"
+    Then I should see "I am real"
+    
+  Scenario: Preview proxy with variable one
+    Given the Server is running
+    When I go to "/fake/one.html"
+    Then I should see "I am real: one"
+    
+  Scenario: Preview proxy with variable two
+    Given the Server is running
+    When I go to "/fake/two.html"
+    Then I should see "I am real: two"

data/features/minify_css.feature

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

data/features/minify_javascript.feature

@@ -6,15 +6,18 @@ Feature: Minify Javascript
 
   Scenario: Rendering inline js with the feature disabled
     Given "minify_javascript" feature is "disabled"
+    And the Server is running
     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
     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
     When I go to "/inline-coffeescript.html"
     Then I should see "5" lines

data/features/page_alias_and_layouts.feature

@@ -3,16 +3,19 @@ Feature: Custom layouts
   
   Scenario: Using custom :layout attribute
     Given page "/custom-layout.html" has layout "custom"
+    And the Server is running
     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
     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
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/"
@@ -22,6 +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
     When I go to "/custom-layout-dir"
     Then I should see "Custom Layout"
     When I go to "/custom-layout-dir/"
@@ -31,6 +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
     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,10 +3,42 @@ Feature: Relative Assets
     
   Scenario: Rendering css with the feature disabled
     Given "relative_assets" feature is "disabled"
+    And the Server is running
     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
+    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
     When I go to "/stylesheets/relative_assets.css"
-    Then I should see "url('../"
+    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
+    When I go to "/relative_image.html"
+    Then I should not see "/images/blank.gif"
+    And I should see "images/blank.gif"
+    
+  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
+    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
+    When I go to "/relative_image.html"
+    Then I should not see "/images/blank.gif"
+    Then I should not see "/img/blank.gif"
+    And I should see "img/blank.gif"

data/features/step_definitions/asset_host_steps.rb

@@ -1,9 +1,7 @@
 Given /^I am using an asset host$/ do
-  sandbox_server = Middleman.server do
-    activate :asset_host
-    set :asset_host do |asset|
-      "http://assets%d.example.com" % (asset.hash % 4)
-    end
+  @server ||= Middleman.server
+  @server.activate :asset_host
+  @server.set :asset_host do |asset|
+    "http://assets%d.example.com" % (asset.hash % 4)
   end
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(sandbox_server.new))
 end

data/features/step_definitions/builder_steps.rb

@@ -17,6 +17,11 @@ Given /^cleanup built test app$/ do
   FileUtils.rm_rf(target)
 end
 
+Then /^"([^"]*)" should exist$/ do |target_file,|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "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)
   File.exists?(target).should be_true

data/features/step_definitions/middleman_steps.rb

@@ -1,11 +1,14 @@
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
-  sandbox_server = Middleman.server do
-    if state == "enabled"
-      activate(feature.to_sym)
-    end
-    set :environment, @current_env || :development
+  @server ||= Middleman.server
+  if state == "enabled"
+    @server.activate(feature.to_sym)
   end
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(sandbox_server.new))
+  @server.set :environment, @current_env || :development
+end
+
+Given /^"([^\"]*)" is set to "([^\"]*)"$/ do |variable, value|
+  @server ||= Middleman.server
+  @server.set variable.to_sym, value
 end
 
 Given /^current environment is "([^\"]*)"$/ do |env|
@@ -13,8 +16,8 @@ Given /^current environment is "([^\"]*)"$/ do |env|
 end
 
 Given /^the Server is running$/ do
-  sandbox_server = Middleman.server
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(sandbox_server.new))
+  @server ||= Middleman.server
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(@server.new))
 end
 
 When /^I go to "([^\"]*)"$/ do |url|

data/features/step_definitions/page_layout_steps.rb

@@ -1,17 +1,13 @@
 Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
-  sandbox_server = Middleman.server do
-    set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
-    page(url, :layout => layout.to_sym)
-  end
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(sandbox_server.new))
+  @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|
-  sandbox_server = Middleman.server do
-    set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
-    with_layout(layout.to_sym) do
-      page(url)
-    end
+  @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
-  @browser = Rack::Test::Session.new(Rack::MockSession.new(sandbox_server.new))
 end

data/features/tiny_src.feature

@@ -4,10 +4,12 @@ Feature: Tiny Src
     
   Scenario: Rendering html with the feature disabled
     Given "tiny_src" feature is "disabled"
+    And the Server is running
     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
     When I go to "/tiny_src.html"
     Then I should see "http://i.tinysrc.mobi/http://test.com/image.jpg"

data/fixtures/test-app/config.rb

@@ -1,7 +1,17 @@
+page "/fake.html", :proxy => "/real.html", :layout => false
+
+%w(one two).each do |num|
+  page "/fake/#{num}.html", :proxy => "/real/index.html" do
+    @num = num
+  end
+end
+
 with_layout false do
+  page "/relative_image.html"
   page "/inline-css.html"
   page "/inline-js.html"
   page "/inline-coffeescript.html"
+  page "/spaces in file.html"
   page "/slim.html"
   page "/data.html"
   page "/page-classes.html"

data/fixtures/test-app/source/images/Child folder/regular_file(example).txt

@@ -0,0 +1 @@
+Regular

data/fixtures/test-app/source/images/Read me (example).txt

@@ -0,0 +1 @@
+README

data/fixtures/test-app/source/javascripts/broken-coffee.js.coffee

@@ -0,0 +1,3 @@
+function test() {
+  hello
+}

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

@@ -0,0 +1 @@
+I am real

data/fixtures/test-app/source/real/index.html.erb

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+I am real: <%= @num %>

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

@@ -0,0 +1 @@
+<%= image_tag "blank.gif" %>

data/fixtures/test-app/source/spaces in file.html.erb

@@ -0,0 +1 @@
+<%= "spaces" %>

data/lib/middleman/base.rb

@@ -83,21 +83,23 @@ module Middleman::Base
           settings.set :views, File.join(settings.root, settings.views)
         end
 
-        result = resolve_template(request.path_info, :raise_exceptions => false)
+        request_path = request.path_info.gsub("%20", " ")
+        result = resolve_template(request_path, :raise_exceptions => false)
+        
         if result
           extensionless_path, template_engine = result
 
           # Return static files
           if !::Tilt.mappings.has_key?(template_engine.to_s)
-            content_type mime_type(File.extname(request.path_info)), :charset => 'utf-8'
+            content_type mime_type(File.extname(request_path)), :charset => 'utf-8'
             status 200
-            send_file File.join(settings.views, request.path_info)
+            send_file File.join(settings.views, request_path)
             false
           else
             true
           end
         else
-          $stderr.puts "File not found: #{request.path_info}"
+          $stderr.puts "File not found: #{request_path}"
           status 404
           false
         end
@@ -156,11 +158,12 @@ module Middleman::Base
 
       render_options = { :layout => layout }
       render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine
-      result = render(request.path_info, render_options)
+      request_path = request.path_info.gsub("%20", " ")
+      result = render(request_path, render_options)
       settings.set :layout, old_layout
 
       if result
-        content_type mime_type(File.extname(request.path_info)), :charset => 'utf-8'
+        content_type mime_type(File.extname(request_path)), :charset => 'utf-8'
         status 200
         body result
       else

data/lib/middleman/builder.rb

@@ -10,15 +10,15 @@ module Middleman
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first || source
       
-      source  = File.expand_path(find_in_source_paths(source.to_s))
+      # 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)
+        @@rack_test.get(request_path.gsub(/\s/, "%20"))
         @@rack_test.last_response.body
       end
     end
@@ -40,7 +40,6 @@ module Middleman
       end
     end
     
-    
     def source_paths
       @source_paths ||= [
         SHARED_SERVER.root
@@ -49,6 +48,10 @@ module Middleman
     
     def build_all_files
       action Directory.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true })
+      
+      SHARED_SERVER.proxied_paths.each do |url, proxy|
+        tilt_template(url.gsub(/^\//, "#{SHARED_SERVER.build_dir}/"), { :force => true })
+      end
     end
     
     @@hooks = {}