middleman 2.0.16.1 → 3.0.0.alpha.2

data/.gitignore

@@ -10,4 +10,5 @@ docs
 .rvmrc
 .rbenv-version
 fixtures/test-app/build
-.*.swp
+.*.swp
+build

data/CHANGELOG

@@ -1,19 +1,27 @@
-2.0.16.1
+3.0.pre
 ====
-Update EventMachine to 1.0.0.rc.4 on Windows
+Rewritten to work directly with Rack (Sinatra apps can still be mounted)
 
-2.0.16
+2.1.pre
 ====
-Update Guard to v1.1
-
-2.0.15.4
-====
-Lock Padrino version to 0.10.6
+Finally support Compass in Sprockets! Thanks to @xdite and @petebrowne
+Sitemap object representing the known world
+FileWatcher proxies file change events
+Unified callback solution
+Removed Slim and Maruku from base install. Will need to be installed and required by the user (in config.rb)
 
 2.0.14
 ====
 Minor fix for i18n
 
+2.0.13.2
+====
+Update Windows eventmachine dep
+
+2.0.13.1
+====
+build --clean shouldn't remove dotfiles
+
 2.0.13
 ====
 middleman build --clean keeps the build directory clean of leftover files

data/features/builder.feature

@@ -4,7 +4,7 @@ Feature: Builder
   Scenario: Checking built folder for content
     Given a built app at "test-app"
     Then "index.html" should exist at "test-app" and include "Comment in layout"
-    Then "javascripts/coffee_test.js" should exist at "test-app" and include ".slice"
+    Then "javascripts/coffee_test.js" should exist at "test-app" and include "Array.prototype.slice"
     Then "index.html" should exist at "test-app" and include "<h1>Welcome</h1>"
     Then "static.html" should exist at "test-app" and include "Static, no code!"
     Then "services/index.html" should exist at "test-app" and include "Services"
@@ -15,15 +15,12 @@ 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"
-    And cleanup built app at "test-app"
     
   Scenario: Build glob
-    Given a built app at "glob-app" with flags "--glob '**/*.sass'"
+    Given a built app at "glob-app" with flags "--glob '*.css'"
     Then "stylesheets/site.css" should exist at "glob-app" and include "html"
     Then "index.html" should not exist at "glob-app"
-    And cleanup built app at "glob-app"
     
   # Scenario: Force relative assets
   #   Given a built app at "relative-app" with flags "--relative"
   #   Then "stylesheets/relative_assets.css" should exist at "relative-app" and include "../"
-  #   And cleanup built app at "relative-app"

data/features/cache_buster.feature

@@ -23,4 +23,4 @@ Feature: Generate mtime-based query string for busting browser caches
     Given "cache_buster" feature is "enabled"
     And the Server is running at "test-app"
     When I go to "/cache-buster.html"
-    Then I should not see "?"
+    Then I should see "?"

data/features/clean_build.feature

@@ -7,4 +7,3 @@ Feature: Build Clean
     Then "should_be_ignored.html" should not exist at "clean-app"
     And "should_be_ignored2.html" should not exist at "clean-app"
     And "should_be_ignored3.html" should not exist at "clean-app"
-    And cleanup built app at "clean-app"

data/features/coffee-script.feature

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

data/features/custom_layout_engines.feature

@@ -0,0 +1,10 @@
+Feature: Custom Layout Engine
+
+  Scenario: Checking built folder for content
+    Given a built app at "custom-layout-app"
+    Then "index.html" should exist at "custom-layout-app" and include "Comment in layout"
+    
+  Scenario: Checking server for content
+    Given the Server is running at "test-app"
+    When I go to "/index.html"
+    Then I should see "Comment in layout"

data/features/directory_index.feature

@@ -11,7 +11,6 @@ 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"
-    And cleanup built app at "indexable-app"
     
   Scenario: Preview normal file
     Given the Server is running at "indexable-app"

data/features/dynamic_pages.feature

@@ -10,7 +10,6 @@ Feature: Dynamic Pages
     Then "should_be_ignored.html" should not exist at "test-app"
     Then "should_be_ignored2.html" should not exist at "test-app"
     Then "should_be_ignored3.html" should not exist at "test-app"
-    And cleanup built app at "test-app"
     
   Scenario: Preview basic proxy
     Given the Server is running at "test-app"

data/features/fonts.feature

@@ -3,7 +3,6 @@ Feature: Web Fonts
   Scenario: Checking built folder for content
     Given a built app at "fonts-app"
     Then "stylesheets/fonts.css" should exist at "fonts-app" and include "/fonts/StMarie-Thin.otf"
-    And cleanup built app at "fonts-app"
     
   Scenario: Rendering scss
     Given the Server is running at "fonts-app"

data/features/{padrino_helpers.feature → former_padrino_helpers.feature}

@@ -3,7 +3,7 @@ Feature: Built-in macro view helpers
 
   Scenario: Using the link_to helper
     Given the Server is running at "test-app"
-    When I go to "/padrino_test.html"
+    When I go to "/former_padrino_test.html"
     And I should see 'href="test2.com"'
     And I should see 'src="/images/test2.png"'
     Then I should see 'src="/javascripts/test1.js"'

data/features/sprockets.feature

@@ -1,16 +1,21 @@
 Feature: Sprockets
 
-  Scenario: Sprockets require
+  Scenario: Sprockets JS require
     Given the Server is running at "test-app"
     When I go to "/javascripts/sprockets_base.js"
     Then I should see "sprockets_sub_function"
     
-  Scenario: Sprockets require with custom :js_dir
+  Scenario: Sprockets JS require with custom :js_dir
     Given the Server is running at "sprockets-app"
-    When I go to "/library/javascripts/sprockets_base.js"
+    When I go to "/library/js/sprockets_base.js"
     Then I should see "sprockets_sub_function"
     
-  Scenario: Sprockets should have access to yaml data
+  Scenario: Plain JS require with custom :js_dir
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/css/plain.css"
+    Then I should see "helloWorld"
+    
+  Scenario: Sprockets JS should have access to yaml data
     Given the Server is running at "test-app"
     When I go to "/javascripts/multiple_engines.js"
     Then I should see "Hello One"
@@ -18,4 +23,28 @@ Feature: Sprockets
   Scenario: Multiple engine files should build correctly
     Given a built app at "test-app"
     Then "javascripts/multiple_engines.js" should exist at "test-app" and include "Hello One"
-    And cleanup built app at "test-app"
+  
+  Scenario: Sprockets CSS require //require
+    Given the Server is running at "test-app"
+    When I go to "/stylesheets/sprockets_base1.css"
+    Then I should see "hello"
+    
+  Scenario: Sprockets CSS require @import
+    Given the Server is running at "test-app"
+    When I go to "/stylesheets/sprockets_base2.css"
+    Then I should see "hello"
+
+  Scenario: Sprockets CSS require with custom :css_dir //require
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/css/sprockets_base1.css"
+    Then I should see "hello"
+    
+  Scenario: Plain CSS require with custom :css_dir
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/css/plain.css"
+    Then I should see "helloWorld"
+    
+  Scenario: Sprockets CSS require with custom :css_dir @import
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/css/sprockets_base2.css"
+    Then I should see "hello"

data/features/sprockets_gems.feature

@@ -1,7 +1,10 @@
-@wip
 Feature: Sprockets Gems
-
   Scenario: Sprockets can pull jQuery from gem
     Given the Server is running at "sprockets-app"
-    When I go to "/javascripts/jquery_include.js"
-    Then I should see "var jQuery ="
+    When I go to "/library/js/jquery_include.js"
+    Then I should see "var jQuery ="
+    
+  # Scenario: Sprockets can pull CSS from gem
+  #   Given the Server is running at "sprockets-app"
+  #   When I go to "/library/css/bootstrap_include.css"
+  #   Then I should see "Bootstrap"

data/features/step_definitions/asset_host_steps.rb

@@ -1,8 +1,9 @@
 Given /^I am using an asset host$/ do
-  @server ||= Middleman.server
-  @server.set :show_exceptions, false
-  @server.activate :asset_host
-  @server.set :asset_host do |asset|
-    "http://assets%d.example.com" % (asset.hash % 4)
-  end
+  @initialize_commands ||= []
+  @initialize_commands << lambda { 
+    activate :asset_host
+    set :asset_host do |asset|
+      "http://assets%d.example.com" % (asset.hash % 4)
+    end
+  }
 end

data/features/step_definitions/builder_steps.rb

@@ -11,6 +11,10 @@ end
 Given /^a built app at "([^"]*)"$/ do |path|
   root = File.dirname(File.dirname(File.dirname(__FILE__)))
   target = File.join(root, "fixtures", path)
+  
+  build_target = File.join(target, "build")
+  FileUtils.rm_rf(build_target)
+  
   build_cmd = File.expand_path(File.join(root, "bin", "middleman build"))
   `cd #{target} && #{build_cmd}`
 end

data/features/step_definitions/middleman_steps.rb

@@ -1,23 +1,18 @@
 Given /^a clean server$/ do
-  @server = Middleman.server
-  @server.set :show_exceptions, false
+  @initialize_commands = []
 end
 
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
-  @server = Middleman.server
-  @server.set :show_exceptions, false
+  @initialize_commands ||= []
   
   if state == "enabled"
-    @server.activate(feature.to_sym)
-  end  
-  
-  @server.set :environment, @current_env || :development
+    @initialize_commands << lambda { activate(feature.to_sym) }
+  end
 end
 
 Given /^"([^\"]*)" is set to "([^\"]*)"$/ do |variable, value|
-  @server ||= Middleman.server
-  @server.set :show_exceptions, false
-  @server.set variable.to_sym, value
+  @initialize_commands ||= []
+  @initialize_commands << lambda { set(variable.to_sym, value) }
 end
 
 Given /^current environment is "([^\"]*)"$/ do |env|
@@ -25,11 +20,22 @@ Given /^current environment is "([^\"]*)"$/ do |env|
 end
 
 Given /^the Server is running at "([^\"]*)"$/ do |app_path|
-  @server ||= Middleman.server
-  @server.set :show_exceptions, false
-  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))
+  root_dir = File.dirname(File.dirname(File.dirname(__FILE__)))
+
+  initialize_commands = @initialize_commands || []
+  initialize_commands.unshift lambda { 
+    set :root, File.join(root_dir, "fixtures", app_path)
+    set :environment, @current_env || :development
+  }
+  
+  @server_inst = Middleman.server.inst do
+    initialize_commands.each do |p|
+      instance_exec(&p)
+    end
+  end
+  
+  app_rack = @server_inst.class.to_rack_app
+  @browser = ::Rack::Test::Session.new(::Rack::MockSession.new(app_rack))
 end
 
 When /^I go to "([^\"]*)"$/ do |url|

data/features/step_definitions/page_layout_steps.rb

@@ -1,13 +1,15 @@
 Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
-  @server ||= Middleman.server
-  @server.set :show_exceptions, false
-  @server.page(url, :layout => layout.to_sym)
+  @initialize_commands ||= []
+  @initialize_commands << lambda { 
+    page(url, :layout => layout.to_sym) 
+  }
 end
 
 Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
-  @server ||= Middleman.server
-  @server.set :show_exceptions, false
-  @server.with_layout(layout.to_sym) do
-    page(url)
-  end
+  @initialize_commands ||= []
+  @initialize_commands << lambda {
+    with_layout(layout.to_sym) do
+      page(url)
+    end
+  }
 end

data/fixtures/custom-layout-app/config.rb

@@ -0,0 +1 @@
+set :erb, :layout_engine => :haml

data/fixtures/custom-layout-app/source/index.html.erb

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

data/fixtures/custom-layout-app/source/layout.haml

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

data/fixtures/sprockets-app/config.rb

@@ -1 +1,2 @@
-set :js_dir, "library/javascripts"
+set :js_dir, "library/js"
+set :css_dir, "library/css"

data/fixtures/sprockets-app/source/library/css/bootstrap_include.css.scss

@@ -0,0 +1 @@
+//= require "bootstrap.scss"

data/fixtures/sprockets-app/source/library/css/plain.css

@@ -0,0 +1,3 @@
+#helloWorld {
+  color: red;
+}

data/fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss

@@ -0,0 +1 @@
+//= require "sprockets_sub"

data/fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss

@@ -0,0 +1 @@
+@import "sprockets_sub";

data/fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss

@@ -0,0 +1 @@
+hello { world: "hi"; }

data/fixtures/sprockets-app/source/library/js/plain.js

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

data/fixtures/test-app/config.rb

@@ -1,3 +1,8 @@
+require "maruku"
+require "slim"
+require "liquid"
+require "coffee-filter"
+
 page "/fake.html", :proxy => "/real.html", :layout => false
 
 ignore "/should_be_ignored.html"
@@ -45,8 +50,4 @@ with_layout false do
   }.each do |path|
     page path
   end
-end
-
-get "/sinatra_test" do
-  "Ratpack"
 end

data/fixtures/test-app/source/stylesheets/sprockets_base1.css.scss

@@ -0,0 +1 @@
+//= require "sprockets_sub"

data/fixtures/test-app/source/stylesheets/sprockets_base2.css.scss

@@ -0,0 +1 @@
+@import "sprockets_sub";

data/fixtures/test-app/source/stylesheets/sprockets_sub.css.scss

@@ -0,0 +1 @@
+hello { world: "hi"; }

data/lib/middleman.rb

@@ -48,42 +48,42 @@
 #
 # [Visit the website]:     http://middlemanapp.com
 # [Read the wiki]:         https://github.com/tdreyno/middleman/wiki
-# [Email the users group]: http://groups.google.com/group/middleman-users
+# [Email the users group]: https://convore.com/middleman/
 # [Submit bug reports]:    https://github.com/tdreyno/middleman/issues
 
 # Setup our load paths
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-# We're riding on Sinatra, so let's include it.
-require "sinatra/base"
-
 # Top-level Middleman object
 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"
+  autoload :Base,        "middleman/base"
+  autoload :Hooks,       "middleman/hooks"
+  autoload :Builder,     "middleman/builder"
+  autoload :CLI,         "middleman/cli"
+  autoload :Templates,   "middleman/templates"
+  autoload :Guard,       "middleman/guard"
   
   # Custom Renderers
   module Renderers
-    autoload :Haml,         "middleman/renderers/haml"
     autoload :Sass,         "middleman/renderers/sass"
-    autoload :Slim,         "middleman/renderers/slim"
     autoload :Markdown,     "middleman/renderers/markdown"
+    autoload :ERb,          "middleman/renderers/erb"
     autoload :CoffeeScript, "middleman/renderers/coffee_script"
     autoload :Liquid,       "middleman/renderers/liquid"
   end
   
   module CoreExtensions
+    # File Change Notifier
+    autoload :FileWatcher,   "middleman/core_extensions/file_watcher"
+    
+    # In-memory Sitemap
+    autoload :Sitemap,     "middleman/core_extensions/sitemap"
+    
     # Add Builder callbacks
     autoload :Builder,       "middleman/core_extensions/builder"
     
-    # Add Rack::Builder.map support
-    autoload :RackMap,       "middleman/core_extensions/rack_map"
-    
     # Custom Feature API
     autoload :Features,      "middleman/core_extensions/features"
   
@@ -142,11 +142,11 @@ module Middleman
     # words, paragraphs, fake images, names and email addresses.
     autoload :Lorem,               "middleman/features/lorem"
     
-    # guard-livereload
-    autoload :LiveReload,          "middleman/features/live_reload"
-    
     # Automatically convert filename.html files into filename/index.html
     autoload :DirectoryIndexes,    "middleman/features/directory_indexes"
+    
+    # Organize the sitemap as a tree
+    autoload :SitemapTree,         "middleman/features/sitemap_tree"
   end
   
   EXTENSION_FILE = File.join("lib", "middleman_init.rb")
@@ -176,9 +176,8 @@ module Middleman
   end
   
   def self.server(&block)
-    sandbox = Class.new(Sinatra::Base)
-    sandbox.register Base
-    sandbox.class_eval(&block) if block_given?
+    sandbox = Class.new(Middleman::Base)
+    # sandbox.class_eval(&block) if block_given?
     sandbox
   end
   
@@ -188,13 +187,16 @@ module Middleman
       :AccessLog => []
     }
     
-    app = ::Middleman.server
-    app.set :environment, options[:environment].to_sym
-    opts[:app] = app.new
+    app_class = options[:app] ||= ::Middleman.server.new
+    opts[:app] = app_class
     opts[:server] = 'thin'
+    
+    # require "thin"
+    # ::Thin::Logging.silent = true if options[:debug] != "true"
 
-    $stderr.puts "== The Middleman is standing watch on port #{opts[:Port]}"
-    ::Rack::Server.new(opts).start
+    server = ::Rack::Server.new(opts)
+    server.start
+    server
   end
 end