middleman 2.0.0.rc3 → 2.0.0.rc4

data/CHANGELOG

@@ -1,9 +1,8 @@
 2.0.0
 =====
 
-- Use sinatra before/after hooks for Blog and FrontMatter
-- Converted a lot of Middleman::Server in CoreExtensions
+- Sprockets JS
+- Refactored Dynamically Reloadable Core
 - Combine views/ and public/ into a single source/ folder.
 - Support YAML front-matter
-- Blog-aware
-- Replaced Blueprint CSS templates with Susy
+- Blog-aware Feature

data/Rakefile

@@ -4,19 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--drb --color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
-end
-
-namespace :spork do
- desc "start spork in background"
- task :start do
-   sh %{spork &}
- end
-
- desc "stop spork"
- task :stop do
-   Process.kill(:TERM, `ps -ef | grep spork | grep -v grep | awk '{ print $2 }'`.to_i)
- end
+  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
 #$LOAD_PATH.unshift 'lib'
@@ -24,7 +12,7 @@ end
 require 'rake/testtask'
 require 'rake/clean'
 
-task :test => ["spork:start", "cucumber", "spork:stop"]
+task :test => ["cucumber"]
 
 # rocco depends on rdiscount, which makes me sad.
 unless defined?(JRUBY_VERSION)

data/bin/mm-build

@@ -5,5 +5,5 @@ ENV['MM_ENV'] = "build"
 # Require app
 require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
 
-require 'middleman/builder'
+require 'middleman'
 Middleman::Builder.start

data/bin/mm-server

@@ -5,6 +5,8 @@ require 'optparse'
 # Require Middleman
 require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 
+sandboxed_server = Middleman.server
+
 env = ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
 options = { :Port => 4567, :AccessLog => [] }
 
@@ -20,7 +22,7 @@ OptionParser.new { |opts|
     env = e
   }
   opts.on("--debug", "Debug mode") {
-    ::Middleman::Server.set :logging, true
+    sandboxed_server.set :logging, true
   }
 
   opts.parse! ARGV
@@ -65,8 +67,8 @@ if File.exists?(old_views) || File.exists?(old_public)
   exit
 end
 
-Middleman::Server.root = @current_path
-options[:app]    = Middleman::Server.new
+sandboxed_server.set :root, @current_path
+options[:app]    = sandboxed_server.new
 # options[:server] = 'webrick'
 
 puts "== The Middleman is standing watch on port #{options[:Port]}"

data/features/minify_css.feature

@@ -1,20 +1,20 @@
 Feature: Minify CSS
   In order reduce bytes sent to client and appease YSlow
     
-  Scenario: Rendering inline css with the feature disabled
-    Given "minify_css" feature is "disabled"
-    When I go to "/inline-css.html"
-    Then I should see "4" lines
+  # Scenario: Rendering inline css with the feature disabled
+  #   Given "minify_css" feature is "disabled"
+  #   When I go to "/inline-css.html"
+  #   Then I should see "4" lines
     
   Scenario: Rendering external css with the feature disabled
     Given "minify_css" feature is "disabled"
     When I go to "/stylesheets/site.css"
     Then I should see "56" lines
 
-  Scenario: Rendering inline css with the feature enabled
-    Given "minify_css" feature is "enabled"
-    When I go to "/inline-css.html"
-    Then I should see "1" lines
+  # Scenario: Rendering inline css with the feature enabled
+  #   Given "minify_css" feature is "enabled"
+  #   When I go to "/inline-css.html"
+  #   Then I should see "1" lines
     
   Scenario: Rendering external css with the feature enabled
     Given "minify_css" feature is "enabled"

data/features/step_definitions/asset_host_steps.rb

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

data/features/step_definitions/middleman_steps.rb

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

data/features/step_definitions/page_layout_steps.rb

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

data/features/support/env.rb

@@ -1,53 +1,4 @@
-require 'rubygems'
-require 'spork'
-
 root_path = File.dirname(File.dirname(File.dirname(__FILE__)))
-
-Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However,
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
-  
-  ENV["MM_DIR"] = File.join(root_path, "fixtures", "test-app")
-end
-
-Spork.each_run do
-  # This code will be run each time you run your specs.
-  require File.join(root_path, 'lib', 'middleman')
-  require "rack/test"
-
-  # absolute views path
-  # otherwise resolve_template (padrino-core) can't find templates
-  Before do
-    Middleman::Server.views = File.join(Middleman::Server.root, "source")
-  end
-end
-
-# --- Instructions ---
-# Sort the contents of this file into a Spork.prefork and a Spork.each_run
-# block.
-#
-# The Spork.prefork block is run only once when the spork server is started.
-# You typically want to place most of your (slow) initializer code in here, in
-# particular, require'ing any 3rd-party gems that you don't normally modify
-# during development.
-#
-# The Spork.each_run block is run each time you run your specs.  In case you
-# need to load files that tend to change during development, require them here.
-# With Rails, your application modules are loaded automatically, so sometimes
-# this block can remain empty.
-#
-# Note: You can modify files loaded *from* the Spork.each_run block without
-# restarting the spork server.  However, this file itself will not be reloaded,
-# so if you change any of the code inside the each_run block, you still need to
-# restart the server.  In general, if you have non-trivial code in this file,
-# it's advisable to move it into a separate file so you can easily edit it
-# without restarting spork.  (For example, with RSpec, you could move
-# non-trivial code into a file spec/support/my_helper.rb, making sure that the
-# spec/support/* files are require'd from inside the each_run block.)
-#
-# Any code that is left outside the two blocks will be run during preforking
-# *and* during each_run -- that's probably not what you want.
-#
-# These instructions should self-destruct in 10 seconds.  If they don't, feel
-# free to delete them.
+ENV["MM_DIR"] = File.join(root_path, "fixtures", "test-app")
+require File.join(root_path, 'lib', 'middleman')
+require "rack/test"

data/fixtures/test-app/source/{front-matter.html.slim → front-matter.html.erb}

@@ -3,4 +3,4 @@ layout: false
 title: This is the title
 ---
 
-h1= data.page.title
+<h1><%= data.page.title %></h1>

data/fixtures/test-app/source/stylesheets/auto-css.css

@@ -0,0 +1,3 @@
+auto {
+  css: 1;
+}

data/fixtures/test-app/source/stylesheets/auto-css/auto-css.css

@@ -0,0 +1,3 @@
+auto {
+  css: 2;
+}

data/fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css

@@ -0,0 +1,3 @@
+auto {
+  css: 3;
+}

data/lib/middleman.rb

@@ -58,10 +58,14 @@ $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"
+
 # Top-level Middleman object
 module Middleman
   # Auto-load modules on-demand
-  autoload :Server, "middleman/server"
+  autoload :Base,      "middleman/base"
+  autoload :Builder,   "middleman/builder"
   
   # Custom Renderers
   module Renderers
@@ -142,9 +146,12 @@ module Middleman
 
     # Automatically resize images for mobile devises
     # autoload :TinySrc,             "middleman/features/tiny_src"
-
-    # LiveReload will auto-reload browsers with the live reload extension
-    # installed after changes. Currently disabled and untested.
-    # autoload :LiveReload,          "middleman/features/live_reload"
+  end
+  
+  def self.server(&block)
+    sandbox = Class.new(Sinatra::Base)
+    sandbox.register Base
+    sandbox.class_eval(&block) if block_given?
+    sandbox
   end
 end

data/lib/middleman/base.rb

@@ -0,0 +1,156 @@
+module Middleman::Base
+  class << self
+    def registered(app)
+      app.extend ClassMethods
+      app.send :include, InstanceMethods
+      
+      # Basic Sinatra config
+      app.set :app_file,    __FILE__
+      app.set :root,        ENV["MM_DIR"] || Dir.pwd
+      app.set :sessions,    false
+      app.set :logging,     false
+      app.set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
+
+      # Middleman-specific options
+      app.set :index_file,  "index.html"  # What file responds to folder requests
+                                      # Such as the homepage (/) or subfolders (/about/)
+
+      # These directories are passed directly to Compass
+      app.set :js_dir,      "javascripts" # Where to look for javascript files
+      app.set :css_dir,     "stylesheets" # Where to look for CSS files
+      app.set :images_dir,  "images"      # Where to look for images
+      app.set :fonts_dir,   "fonts"       # Where to look for fonts
+
+      app.set :build_dir,   "build"       # Which folder are builds output to
+      app.set :http_prefix, nil           # During build, add a prefix for absolute paths
+
+      # Pass all request to Middleman, even "static" files
+      app.set :static, false
+
+      app.set :views, "source"
+
+      # Add Rack::Builder.map to Sinatra
+      app.register Middleman::CoreExtensions::RackMap
+
+      # Activate custom features
+      app.register Middleman::CoreExtensions::Features
+
+      # Setup custom rendering
+      app.register Middleman::CoreExtensions::Rendering
+
+      # Compass framework
+      app.register Middleman::CoreExtensions::Compass
+
+      # Sprockets asset handling
+      app.register Middleman::CoreExtensions::Sprockets
+
+      # Setup asset path pipeline
+      app.register Middleman::CoreExtensions::Assets
+
+      # Activate built-in helpers
+      app.register Middleman::CoreExtensions::DefaultHelpers
+
+      # Activate Yaml Data package
+      app.register Middleman::CoreExtensions::Data
+
+      # with_layout and page routing
+      app.register Middleman::CoreExtensions::Routing
+
+      # Parse YAML from templates
+      app.register Middleman::CoreExtensions::FrontMatter
+
+      app.set :default_features, [
+        :lorem
+      ]
+
+      # Default layout name
+      app.set :layout, :layout
+
+      # This will match all requests not overridden in the project's config.rb
+      app.not_found do
+        process_request
+      end
+
+      # Custom 404 handler (to be styled)
+      app.error Sinatra::NotFound do
+        content_type 'text/html'
+        "<html><body><h1>File Not Found</h1><p>#{request.path_info}</p></body>"
+      end
+
+      # See if Tilt cannot handle this file
+      app.before do
+        if !settings.views.include?(settings.root)
+          settings.set :views, File.join(settings.root, settings.views)
+        end
+
+        result = resolve_template(request.path_info, :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'
+            status 200
+            send_file File.join(settings.views, request.path_info)
+            request["already_sent"] = true
+          end
+        else
+          $stderr.puts "File not found: #{request.path_info}"
+          status 404
+          request["already_sent"] = true
+        end
+      end
+    end
+    alias :included :registered
+  end
+  
+  module ClassMethods
+    # Override Sinatra's set to accept a block
+    # Specifically for the asset_host feature
+    def set(option, value=self, &block)
+      if block_given?
+        value = Proc.new { block }
+      end
+    
+      super(option, value, &nil)
+    end
+    
+    # Convenience method to check if we're in build mode
+    def build?; environment == :build; end
+  end
+  
+  module InstanceMethods
+    # Internal method to look for templates and evaluate them if found
+    def process_request(options={})
+      return if request["already_sent"]
+
+      options.merge!(request['custom_options'] || {})
+
+      old_layout = settings.layout
+      settings.set :layout, options[:layout] if !options[:layout].nil?
+
+      layout = if settings.layout
+        if options[:layout] == false || request.path_info =~ /\.(css|js)$/
+          false
+        else
+          settings.fetch_layout_path(settings.layout).to_sym
+        end
+      else
+        false
+      end
+
+      render_options = { :layout => layout }
+      render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine
+      result = render(request.path_info, render_options)
+      settings.set :layout, old_layout
+
+      if result
+        content_type mime_type(File.extname(request.path_info)), :charset => 'utf-8'
+        status 200
+        body result
+      else
+        status 404
+      end
+    end
+  end
+end