提交 191a2f78 编写于 作者: J José Valim

Sending the partial as info is no longer required.

上级 41af6d9a
......@@ -57,7 +57,7 @@ def to_s
def find_templates(name, prefix, partial, details)
path = build_path(name, prefix, partial, details)
query(partial, path, EXTENSION_ORDER.map { |ext| details[ext] })
query(path, EXTENSION_ORDER.map { |ext| details[ext] })
end
def build_path(name, prefix, partial, details)
......@@ -67,7 +67,7 @@ def build_path(name, prefix, partial, details)
path
end
def query(partial, path, exts)
def query(path, exts)
query = File.join(@path, path)
exts.each do |ext|
......@@ -77,7 +77,7 @@ def query(partial, path, exts)
Dir[query].reject { |p| File.directory?(p) }.map do |p|
handler, format = extract_handler_and_format(p)
Template.new(File.read(p), File.expand_path(p), handler,
:partial => partial, :virtual_path => path, :format => format)
:virtual_path => path, :format => format)
end
end
......
......@@ -9,7 +9,7 @@ def initialize(hash = {})
private
def query(partial, path, exts)
def query(path, exts)
query = Regexp.escape(path)
exts.each do |ext|
query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)'
......@@ -19,7 +19,7 @@ def query(partial, path, exts)
@hash.select { |k,v| k =~ /^#{query}$/ }.each do |path, source|
handler, format = extract_handler_and_format(path)
templates << Template.new(source, path, handler,
:partial => partial, :virtual_path => path, :format => format)
:virtual_path => path, :format => format)
end
templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册