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

simpler guard-based frontmatter, use rackmap everywhere (tests, server, build)

Browse source
This commit is contained in:
Thomas Reynolds 2011-11-10 12:26:20 -08:00
parent 055f7c2a41
commit 2682bbf6ea
14 changed files with 104 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
features/step_definitions/middleman_steps.rb
View file

@ -29,7 +29,9 @@ Given /^the Server is running at "([^\"]*)"$/ do |app_path|
@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))
@app = @server.new!
app_rack = @server.build_new(@app)
@browser = Rack::Test::Session.new(Rack::MockSession.new(app_rack))
end
When /^I go to "([^\"]*)"$/ do |url|

4
fixtures/clean-app/build/fake/one.html
View file

@ -1,5 +1 @@
---
layout: false
---
I am real: one

4
fixtures/clean-app/build/fake/two.html
View file

@ -1,5 +1 @@
---
layout: false
---
I am real: two

4
fixtures/clean-app/build/real/index.html
View file

@ -1,5 +1 @@
---
layout: false
---
I am real:

3
lib/middleman/base.rb
View file

@ -186,7 +186,6 @@ module Middleman::Base
# Normalize the path and add index if we're looking at a directory
request.path_info = self.class.path_to_index(request.path)
request_path = request.path_info.gsub("%20", " ")
found_template = resolve_template(request_path, :raise_exceptions => false)
return status(404) unless found_template
@ -206,7 +205,7 @@ module Middleman::Base
else
false
end
render_options = { :layout => local_layout }
render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine

4
lib/middleman/builder.rb
View file

@ -38,7 +38,9 @@ module Middleman
def self.shared_rack
@shared_rack ||= begin
mock = ::Rack::MockSession.new(SHARED_SERVER)
app = SHARED_SERVER.new!
app_rack = SHARED_SERVER.build_new(app)
mock = ::Rack::MockSession.new(app_rack)
sess = ::Rack::Test::Session.new(mock)
response = sess.get("__middleman__")
sess

15
lib/middleman/core_extensions/compass.rb
View file

@ -3,10 +3,9 @@ module Middleman::CoreExtensions::Compass
def registered(app)
# Where to look for fonts
app.set :fonts_dir, "fonts"
app.define_hook :compass_config
app.define_hook :after_compass_config
app.extend ClassMethods
require "compass"
# Susy grids
@ -84,16 +83,10 @@ module Middleman::CoreExtensions::Compass
end
end
run_hook :after_compass_config, ::Compass.configuration
run_hook :compass_config, ::Compass.configuration
run_hook :after_compass_config
end
end
alias :included :registered
end
module ClassMethods
# Add a block/proc to be run after features have been setup
def compass_config(&block)
after_compass_config(&block)
end
end
end

8
lib/middleman/core_extensions/data.rb
View file

@ -20,7 +20,6 @@ module Middleman::CoreExtensions::Data
data.remove_file(file)
end
end
end
alias :included :registered
end
@ -35,14 +34,11 @@ module Middleman::CoreExtensions::Data
def initialize(app)
@app = app
@local_data = {}
setup
end
def setup
data_path = File.join(@app.root, @app.data_dir)
local_path = File.join(data_path, "*.{yaml,yml,json}")
Dir[local_path].each do |f|
touch_file(f)#.sub(data_path, ""))
touch_file(f)
end
end

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

@ -65,7 +65,7 @@ module Middleman::CoreExtensions::Features
end
# Load features before starting server
def new
def new!
# Check for and evaluate local configuration
local_config = File.join(self.root, "config.rb")
if File.exists? local_config

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

@ -6,42 +6,36 @@ module Middleman::CoreExtensions::FrontMatter
def registered(app)
app.extend ClassMethods
::Tilt::register RDiscountTemplate, 'markdown', 'mkd', 'md'
::Tilt::register RedcarpetTemplate, 'markdown', 'mkd', 'md'
::Tilt::register MarukuTemplate, 'markdown', 'mkd', 'md'
::Tilt::register KramdownTemplate, 'markdown', 'mkd', 'md'
app.set :markdown_engine_prefix, ::Middleman::CoreExtensions::FrontMatter
app.file_changed do |file|
data.touch_file(file)
end
::Tilt::register RedClothTemplate, 'textile'
::Tilt.prefer(RedClothTemplate)
::Tilt::register ERBTemplate, 'erb', 'rhtml'
::Tilt.prefer(ERBTemplate)
::Tilt::register LiquidTemplate, 'liquid'
::Tilt.prefer(LiquidTemplate)
::Tilt::register SlimTemplate, 'slim'
::Tilt.prefer(SlimTemplate)
::Tilt::register HamlTemplate, 'haml'
::Tilt.prefer(HamlTemplate)
app.file_deleted do |file|
data.remove_file(file)
end
app.after_configuration do
app.before_processing(:front_matter, 0) do |result|
if result && Tilt.mappings.has_key?(result[1].to_s)
extensionless_path, template_engine = result
full_file_path = "#{extensionless_path}.#{template_engine}"
system_path = File.join(settings.views, full_file_path)
data, content = app.parse_front_matter(File.read(system_path))
request['custom_options'] = {}
%w(layout layout_engine).each do |opt|
if data.has_key?(opt)
request['custom_options'][opt.to_sym] = data.delete(opt)
if app.frontmatter.has_data?(full_file_path)
result = app.frontmatter.data(full_file_path)
data = result.first.dup
request['custom_options'] = {}
%w(layout layout_engine).each do |opt|
if data.has_key?(opt)
request['custom_options'][opt.to_sym] = data.delete(opt)
end
end
app.settings.templates[extensionless_path] = [result[1], extensionless_path, 1]
else
data = {}
end
# Forward remaining data to helpers
app.data_content("page", data)
end
@ -51,7 +45,62 @@ module Middleman::CoreExtensions::FrontMatter
end
end
alias :included :registered
end
module ClassMethods
def frontmatter
@frontmatter ||= FrontmatterData.new(self)
end
end
class FrontmatterData
def initialize(app)
@app = app
@source ||= File.expand_path(@app.views, @app.root)
@local_data = {}
views_dir = @app.views
views_dir = File.join(@app.root, @app.views) unless views_dir.include?(@app.root)
Dir[File.join(views_dir, "**/*")].each do |file|
next if file.match(/\/\./) ||
(file.match(/\/_/) && !file.match(/\/__/)) ||
File.directory?(file)
touch_file(file)
end
end
def has_data?(path)
@local_data.has_key?(path.to_s)
end
def touch_file(file)
content = File.read(file)
file = file.sub(@source, "")
result = parse_front_matter(content)
if result
@local_data[file] = result
end
end
def remove_file(file)
file = file.sub(@source, "")
if @local_data.has_key?(file)
@local_data.delete(file)
end
end
def data(path)
if @local_data.has_key?(path.to_s)
@local_data[path.to_s]
else
nil
end
end
private
def parse_front_matter(content)
yaml_regex = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
if content =~ yaml_regex
@ -59,61 +108,15 @@ module Middleman::CoreExtensions::FrontMatter
data = YAML.load($1)
rescue => e
puts "YAML Exception: #{e.message}"
return false
end
content = content.split(yaml_regex).last
else
return false
end
data ||= {}
[data, content]
end
end
module ClassMethods
def parse_front_matter(content)
Middleman::CoreExtensions::FrontMatter.parse_front_matter(content)
end
end
module YamlAware
def prepare
@frontmatter, @data = Middleman::CoreExtensions::FrontMatter.parse_front_matter(@data)
super
end
end
class RDiscountTemplate < ::Tilt::RDiscountTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class RedcarpetTemplate < ::Tilt::RedcarpetTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class MarukuTemplate < ::Tilt::MarukuTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class RedClothTemplate < ::Tilt::RedClothTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class KramdownTemplate < ::Tilt::KramdownTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class ERBTemplate < ::Tilt::ERBTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class ErubisTemplate < ::Tilt::ErubisTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class LiquidTemplate < ::Tilt::LiquidTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class HamlTemplate < ::Tilt::HamlTemplate
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
class SlimTemplate < ::Slim::Template
include Middleman::CoreExtensions::FrontMatter::YamlAware
end
end

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

@ -18,14 +18,15 @@ module Middleman::CoreExtensions::RackMap
# Creates a Rack::Builder instance with all the middleware set up and
# an instance of this class as end point.
def build(builder, *args, &bk)
def build_new(inst=false)
builder = Rack::Builder.new
setup_default_middleware builder
setup_middleware builder
maps.each { |p,b| builder.map(p, &b) }
app = self
builder.map "/" do
run app.new!(*args, &bk)
run (inst || app.new!)
end
builder

8
lib/middleman/core_extensions/routing.rb
View file

@ -45,19 +45,21 @@ module Middleman::CoreExtensions::Routing
def page(url, options={}, &block)
has_block = block_given?
options[:layout] = layout if options[:layout].nil?
if options.has_key?(:proxy)
reroute(url, options[:proxy])
if options.has_key?(:ignore) && options[:ignore]
ignore(options[:proxy])
end
end
options.delete(:proxy)
else
if options.has_key?(:ignore) && options[:ignore]
ignore(url)
end
end
paths_for_url(url).each do |p|
get(p) do
if settings.sitemap.path_is_proxy?(url)

4
lib/middleman/core_extensions/sitemap.rb
View file

@ -50,10 +50,6 @@ module Middleman::CoreExtensions::Sitemap
build_static_map
end
def setup?
@is_setup
end
# Check to see if we know about a specific path
def path_exists?(path)
path = path.sub(/^\//, "")

4
middleman.gemspec
View file

@ -41,7 +41,9 @@ Gem::Specification.new do |s|
s.add_dependency("hooks", ["~> 0.2.0"])
s.add_dependency("guard", ["~> 0.8.8"])
s.add_dependency("eventmachine", ["1.0.0.beta.4"])
s.add_dependency("rb-fsevent")
s.add_dependency("rb-inotify")
# s.add_dependency("eventmachine", ["1.0.0.beta.4"])
# s.add_dependency("middleman-livereload", ["~> 0.2.0"])
# Development and test