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

use private before filters, leave sinatra alone. fixes #76

Browse source
This commit is contained in:
Thomas Reynolds 2011-07-14 12:32:39 -07:00
parent be506c60cc
commit 292ec97bd8
6 changed files with 84 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,25 +23,27 @@ module Middleman::CoreExtensions::FrontMatter
::Tilt.prefer(HamlTemplate)
app.after_feature_init do
app.before do
app.before_processing do
result = resolve_template(request.path_info, :raise_exceptions => false)
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)
end
end
# Forward remaining data to helpers
app.data_content("page", data)
end
true
end
end
end

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

@ -4,8 +4,9 @@ module Middleman::CoreExtensions::Routing
app.extend ClassMethods
# Normalize the path and add index if we're looking at a directory
app.before do
app.before_processing do
request.path_info = self.class.path_to_index(request.path)
true
end
end
alias :included :registered
@ -43,7 +44,7 @@ module Middleman::CoreExtensions::Routing
paths = [url]
paths << "#{url}/" if url.length > 1 && url.split("/").last.split('.').length <= 1
paths << "#{path_to_index(url)}"
paths << "/#{path_to_index(url)}"
options[:layout] = settings.layout if options[:layout].nil?