deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor Server into a dynamically loadable class

Browse source
This commit is contained in:
Thomas Reynolds 2011-07-13 00:38:04 -07:00
parent 61ef9ee3da
commit 17be87bafd
30 changed files with 300 additions and 337 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Rakefile
View file

@ -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)

2
bin/mm-build
View file

@ -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

8
bin/mm-server
View file

@ -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]}"

0
features/v_asset_host.feature → features/asset_host.feature
View file

0
features/w_automatic_image_sizes.feature → features/automatic_image_sizes.feature
View file

0
features/x_cache_buster.feature → features/cache_buster.feature
View file

16
features/minify_css.feature
View file

@ -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"

0
features/y_relative_assets.feature → features/relative_assets.feature
View file

8
features/step_definitions/asset_host_steps.rb
View file

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

11
features/step_definitions/middleman_steps.rb
View file

@ -1,9 +1,11 @@
Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
sandbox_server = Middleman.server do
if state == "enabled"
Middleman::Server.activate(feature.to_sym)
activate(feature.to_sym)
end
Middleman::Server.environment = @current_env || :development
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
set :environment, @current_env || :development
end
@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|

16
features/step_definitions/page_layout_steps.rb
View file

@ -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
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
@browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
end
@browser = Rack::Test::Session.new(Rack::MockSession.new(sandbox_server.new))
end

49
features/support/env.rb
View file

@ -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.

2
fixtures/test-app/source/front-matter.html.slim → fixtures/test-app/source/front-matter.html.erb
View file

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

3
fixtures/test-app/source/stylesheets/auto-css.css
View file

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

3
fixtures/test-app/source/stylesheets/auto-css/auto-css.css
View file

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

3
fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css
View file

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

15
lib/middleman.rb
View file

@ -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"
end
# LiveReload will auto-reload browsers with the live reload extension
# installed after changes. Currently disabled and untested.
# autoload :LiveReload, "middleman/features/live_reload"
def self.server(&block)
sandbox = Class.new(Sinatra::Base)
sandbox.register Base
sandbox.class_eval(&block) if block_given?
sandbox
end
end

156
lib/middleman/base.rb Normal file
View file

@ -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

25
lib/middleman/builder.rb
View file

@ -1,8 +1,9 @@
require 'middleman/server'
require "thor"
require "thor/group"
require 'rack/test'
SHARED_SERVER = Middleman.server
module Middleman
module ThorActions
def tilt_template(source, *args, &block)
@ -12,11 +13,11 @@ 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(Middleman::Server))
@@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(/^#{Middleman::Server.build_dir}/, "")
request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
@@rack_test.get(request_path)
@@rack_test.last_response.body
end
@ -32,22 +33,22 @@ module Middleman
def initialize(*args)
super
Middleman::Server.new
SHARED_SERVER.new
if options.has_key?("relative") && options["relative"]
Middleman::Server.activate :relative_assets
SHARED_SERVER.activate :relative_assets
end
end
def source_paths
@source_paths ||= [
Middleman::Server.root
SHARED_SERVER.root
]
end
def build_all_files
action Directory.new(self, Middleman::Server.views, Middleman::Server.build_dir, { :force => true })
action Directory.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true })
end
@@hooks = {}
@ -85,15 +86,15 @@ module Middleman
lookup = File.join(lookup, '*')
results = Dir[lookup].sort do |a, b|
simple_a = a.gsub(Middleman::Server.root + "/", '').gsub(Middleman::Server.views + "/", '')
simple_b = b.gsub(Middleman::Server.root + "/", '').gsub(Middleman::Server.views + "/", '')
simple_a = a.gsub(SHARED_SERVER.root + "/", '').gsub(SHARED_SERVER.views + "/", '')
simple_b = b.gsub(SHARED_SERVER.root + "/", '').gsub(SHARED_SERVER.views + "/", '')
a_dir = simple_a.split("/").first
b_dir = simple_b.split("/").first
if a_dir == Middleman::Server.images_dir
if a_dir == SHARED_SERVER.images_dir
-1
elsif b_dir == Middleman::Server.images_dir
elsif b_dir == SHARED_SERVER.images_dir
1
else
0
@ -109,7 +110,7 @@ module Middleman
next if file_source.include?('layout') && !file_source.include?('.css')
# Skip partials prefixed with an underscore
next unless file_source.gsub(Middleman::Server.root, '').split('/').select { |p| p[0,1] == '_' }.empty?
next unless file_source.gsub(SHARED_SERVER.root, '').split('/').select { |p| p[0,1] == '_' }.empty?
file_extension = File.extname(file_source)
file_destination = File.join(given_destination, file_source.gsub(source, '.'))

2
lib/middleman/config.ru
View file

@ -1,2 +1,2 @@
require 'middleman'
run Middleman::Server
run Middleman.server

24
lib/middleman/core_extensions/features.rb
View file

@ -50,29 +50,29 @@ module Middleman::CoreExtensions::Features
#
# activate MyFeatureModule
def activate(feature)
feature = feature.to_s if feature.is_a? Symbol
if feature.is_a? Symbol
feature = feature.to_s
end
if feature.is_a? String
feature = feature.camelize
feature = Middleman::Features.const_get(feature)
end
$stderr.puts "== Activating: #{feature}" if logging?
register feature
end
# Deprecated API. Please use `activate` instead.
def enable(feature_name)
$stderr.puts "Warning: Feature activation has been renamed from enable to activate"
activate(feature_name)
super(feature_name)
end
# Add a block/proc to be run after features have been setup
def after_feature_init(&block)
@run_after_features ||= []
@run_after_features << block
end
def run_after_features
@run_after_features || []
end
# Load features before starting server
def new
# Check for and evaluate local configuration
@ -88,7 +88,13 @@ module Middleman::CoreExtensions::Features
activate ext
end
@run_after_features.each { |block| class_eval(&block) }
run_after_features.each { |block| class_eval(&block) }
if logging?
extensions.each do |ext|
$stderr.puts "== Extension: #{ext}"
end
end
super
end

14
lib/middleman/core_extensions/front_matter.rb
View file

@ -42,11 +42,7 @@ module Middleman::CoreExtensions::FrontMatter
app.data_content("page", data)
end
end
end
alias :included :registered
end
module ClassMethods
def parse_front_matter(content)
yaml_regex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
if content =~ yaml_regex
@ -63,10 +59,18 @@ module Middleman::CoreExtensions::FrontMatter
[data, content]
end
end
alias :included :registered
end
module ClassMethods
def parse_front_matter(content)
Middleman::CoreExtensions::FrontMatter.parse_front_matter(content)
end
end
module YamlAware
def prepare
options, @data = Middleman::Server.parse_front_matter(@data)
options, @data = Middleman::CoreExtensions::FrontMatter.parse_front_matter(@data)
super
end
end

3
lib/middleman/core_extensions/rack_map.rb
View file

@ -25,8 +25,9 @@ module Middleman::CoreExtensions::RackMap
builder.use ::Rack::Head
middleware.each { |c,a,b| builder.use(c, *a, &b) }
maps.each { |p,b| builder.map(p, &b) }
app = self
builder.map "/" do
run Middleman::Server.new!(*args, &bk)
run app.new!(*args, &bk)
end
builder
end

26
lib/middleman/features/live_reload.rb
View file

@ -1,26 +0,0 @@
module Middleman::Features::LiveReload
class << self
def registered(app)
return unless Middleman::Server.development?
begin
require 'livereload'
rescue LoadError
puts "Livereload not available. Install it with: gem install livereload"
end
new_config = ::LiveReload::Config.new do |config|
::Tilt.mappings.each do |key, v|
config.exts << key
end
end
pid = fork {
require 'livereload'
::LiveReload.run [Middleman::Server.views], new_config
}
end
alias :included :registered
end
end

38
lib/middleman/renderers/sass.rb
View file

@ -11,22 +11,24 @@ module Middleman::Renderers::Sass
end
class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
def sass_options
return super if basename.nil?
def sass_options_with_scope(scope)
return sass_options if basename.nil?
location_of_sass_file = if Middleman::Server.build?
File.join(Middleman::Server.root, Middleman::Server.build_dir)
location_of_sass_file = if scope.build?
File.join(scope.root, scope.build_dir)
else
Middleman::Server.views
scope.views
end
parts = basename.split('.')
parts.pop
css_filename = File.join(location_of_sass_file, Middleman::Server.css_dir, parts.join("."))
super.merge(Middleman::Server.settings.sass).merge(:css_filename => css_filename)
css_filename = File.join(location_of_sass_file, scope.css_dir, parts.join("."))
sass_options.merge(scope.settings.sass).merge(:css_filename => css_filename)
end
def evaluate(scope, locals, &block)
@engine = ::Sass::Engine.new(data, sass_options_with_scope(scope.class))
begin
super
rescue Sass::SyntaxError => e
@ -38,7 +40,7 @@ module Middleman::Renderers::Sass
::Tilt.prefer(SassPlusCSSFilenameTemplate)
class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
def sass_options
def sass_options_with_scope(scope)
super.merge(:syntax => :scss)
end
end
@ -49,13 +51,13 @@ end
# Use sass settings in Haml filters
# Other, tilt-based filters (like those used in Slim) will
# work automatically.
module Middleman::Renderers::Haml
module Sass
include ::Haml::Filters::Base
def render(text)
sass_options = Middleman::Server.settings.sass
::Sass::Engine.new(text, sass_options).render
end
end
end
# module Middleman::Renderers::Haml
# module Sass
# include ::Haml::Filters::Base
#
# def render(text)
# sass_options = scope.settings.sass
# ::Sass::Engine.new(text, sass_options).render
# end
# end
# end

148
lib/middleman/server.rb
View file

@ -1,148 +0,0 @@
# We're riding on Sinatra, so let's include it.
require "sinatra/base"
module Middleman
class Server < Sinatra::Base
class << self
# 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
# Basic Sinatra config
set :app_file, __FILE__
set :root, ENV["MM_DIR"] || Dir.pwd
set :sessions, false
set :logging, false
set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
# Middleman-specific options
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
set :js_dir, "javascripts" # Where to look for javascript files
set :css_dir, "stylesheets" # Where to look for CSS files
set :images_dir, "images" # Where to look for images
set :fonts_dir, "fonts" # Where to look for fonts
set :build_dir, "build" # Which folder are builds output to
set :http_prefix, nil # During build, add a prefix for absolute paths
# Pass all request to Middleman, even "static" files
set :static, false
set :views, "source"
# Add Rack::Builder.map to Sinatra
register Middleman::CoreExtensions::RackMap
# Activate custom features
register Middleman::CoreExtensions::Features
# Setup custom rendering
register Middleman::CoreExtensions::Rendering
# Compass framework
register Middleman::CoreExtensions::Compass
# Sprockets asset handling
register Middleman::CoreExtensions::Sprockets
# Setup asset path pipeline
register Middleman::CoreExtensions::Assets
# Activate built-in helpers
register Middleman::CoreExtensions::DefaultHelpers
# Activate Yaml Data package
register Middleman::CoreExtensions::Data
# with_layout and page routing
register Middleman::CoreExtensions::Routing
# Parse YAML from templates
register Middleman::CoreExtensions::FrontMatter
set :default_features, [
:lorem
]
# Default layout name
set :layout, :layout
# This will match all requests not overridden in the project's config.rb
not_found do
process_request
end
# Custom 404 handler (to be styled)
error Sinatra::NotFound do
content_type 'text/html'
"<html><body><h1>File Not Found</h1></body>"
end
# See if Tilt cannot handle this file
before do
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(Middleman::Server.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
private
# 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

2
lib/middleman/templates/default/config.ru
View file

@ -1,4 +1,4 @@
require 'rubygems'
require 'middleman'
run Middleman::Server
run Middleman.server

2
lib/middleman/templates/html5/config.ru
View file

@ -1,4 +1,4 @@
require 'rubygems'
require 'middleman'
run Middleman::Server
run Middleman.server

2
lib/middleman/templates/xhtml/config.ru
View file

@ -1,4 +1,4 @@
require 'rubygems'
require 'middleman'
run Middleman::Server
run Middleman.server

3
middleman.gemspec
View file

@ -30,10 +30,11 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("slim", ["~> 0.9.4"])
s.add_runtime_dependency("haml", ["~> 3.1.0"])
s.add_runtime_dependency("sass", ["~> 3.1.0"])
s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
s.add_runtime_dependency("compass", ["~> 0.11.3"])
s.add_runtime_dependency("sprockets", ["2.0.0.beta.10"])
s.add_runtime_dependency("httparty", ["~> 0.7.0"])
s.add_development_dependency("spork", ["~> 0.9.0.rc8"])
s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
s.add_development_dependency("cucumber", ["~> 0.10.0"])
s.add_development_dependency("rake", ["0.8.7"])
s.add_development_dependency("rspec", [">= 0"])