First take on ViewPaths clean up.
This commit is contained in:
parent
a424f199a9
commit
6e0443fd43
@ -1,46 +1,17 @@
|
||||
module ActionView #:nodoc:
|
||||
class PathSet < Array #:nodoc:
|
||||
def self.type_cast(obj, cache = nil)
|
||||
# TODO: Clean this up
|
||||
if obj.is_a?(String)
|
||||
if cache.nil?
|
||||
cache = !defined?(Rails.application) || Rails.application.config.cache_classes
|
||||
%w(initialize << concat insert push unshift).each do |method|
|
||||
class_eval <<-METHOD, __FILE__, __LINE__ + 1
|
||||
def #{method}(*args)
|
||||
super
|
||||
typecast!
|
||||
end
|
||||
FileSystemResolverWithFallback.new(obj, :cache => cache)
|
||||
else
|
||||
obj
|
||||
end
|
||||
end
|
||||
|
||||
def initialize(*args)
|
||||
super(*args).map! { |obj| self.class.type_cast(obj) }
|
||||
end
|
||||
|
||||
def <<(obj)
|
||||
super(self.class.type_cast(obj))
|
||||
end
|
||||
|
||||
def concat(array)
|
||||
super(array.map! { |obj| self.class.type_cast(obj) })
|
||||
end
|
||||
|
||||
def insert(index, obj)
|
||||
super(index, self.class.type_cast(obj))
|
||||
end
|
||||
|
||||
def push(*objs)
|
||||
super(*objs.map { |obj| self.class.type_cast(obj) })
|
||||
end
|
||||
|
||||
def unshift(*objs)
|
||||
super(*objs.map { |obj| self.class.type_cast(obj) })
|
||||
METHOD
|
||||
end
|
||||
|
||||
def find(path, details = {}, prefix = nil, partial = false)
|
||||
template_path = path
|
||||
|
||||
each do |load_path|
|
||||
if template = load_path.find(template_path, details, prefix, partial)
|
||||
each do |resolver|
|
||||
if template = resolver.find(path, details, prefix, partial)
|
||||
return template
|
||||
end
|
||||
end
|
||||
@ -48,33 +19,22 @@ def find(path, details = {}, prefix = nil, partial = false)
|
||||
raise ActionView::MissingTemplate.new(self, "#{prefix}/#{path}", details, partial)
|
||||
end
|
||||
|
||||
def exists?(path, extension = nil, prefix = nil, partial = false)
|
||||
template_path = path.sub(/^\//, '')
|
||||
|
||||
each do |load_path|
|
||||
return true if template = load_path.find(template_path, extension, prefix, partial)
|
||||
end
|
||||
def exists?(path, details = {}, prefix = nil, partial = false)
|
||||
each do |resolver|
|
||||
if resolver.find(path, details, prefix, partial)
|
||||
return true
|
||||
end
|
||||
end
|
||||
false
|
||||
end
|
||||
|
||||
def find_template(original_template_path, format = nil, html_fallback = true)
|
||||
return original_template_path if original_template_path.respond_to?(:render)
|
||||
template_path = original_template_path.sub(/^\//, '')
|
||||
protected
|
||||
|
||||
each do |load_path|
|
||||
if template = load_path.find(template_path, format)
|
||||
return template
|
||||
# Try to find html version if the format is javascript
|
||||
elsif format == :js && html_fallback && template = load_path["#{template_path}.#{I18n.locale}.html"]
|
||||
return template
|
||||
elsif format == :js && html_fallback && template = load_path["#{template_path}.html"]
|
||||
return template
|
||||
end
|
||||
def typecast!
|
||||
each_with_index do |path, i|
|
||||
next unless path.is_a?(String)
|
||||
self[i] = FileSystemResolverWithFallback.new(path)
|
||||
end
|
||||
|
||||
return Template.new(original_template_path, original_template_path.to_s =~ /\A\// ? "" : ".") if File.file?(original_template_path)
|
||||
|
||||
raise MissingTemplate.new(self, original_template_path, format)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -22,8 +22,7 @@ def self.register_detail(name, options = {})
|
||||
register_detail(:formats) { Mime::SET.symbols }
|
||||
register_detail(:handlers) { Template::Handlers.extensions }
|
||||
|
||||
def initialize(options = {})
|
||||
@cache = options[:cache]
|
||||
def initialize
|
||||
@cached = {}
|
||||
end
|
||||
|
||||
@ -43,6 +42,10 @@ def find_all(name, details = {}, prefix = nil, partial = nil)
|
||||
|
||||
private
|
||||
|
||||
def caching?
|
||||
@caching ||= !defined?(Rails.application) || Rails.application.config.cache_classes
|
||||
end
|
||||
|
||||
# This is what child classes implement. No defaults are needed
|
||||
# because Resolver guarantees that the arguments are present and
|
||||
# normalized.
|
||||
@ -72,7 +75,7 @@ def normalize_name(name, prefix)
|
||||
end
|
||||
|
||||
def cached(key)
|
||||
return yield unless @cache
|
||||
return yield unless caching?
|
||||
return @cached[key] if @cached.key?(key)
|
||||
@cached[key] = yield
|
||||
end
|
||||
@ -133,18 +136,18 @@ def path_to_details(path)
|
||||
end
|
||||
|
||||
class FileSystemResolver < PathResolver
|
||||
def initialize(path, options = {})
|
||||
def initialize(path)
|
||||
raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
|
||||
super(options)
|
||||
super()
|
||||
@path = Pathname.new(path).expand_path
|
||||
end
|
||||
end
|
||||
|
||||
# TODO: remove hack
|
||||
class FileSystemResolverWithFallback < Resolver
|
||||
def initialize(path, options = {})
|
||||
super(options)
|
||||
@paths = [FileSystemResolver.new(path, options), FileSystemResolver.new("", options), FileSystemResolver.new("/", options)]
|
||||
def initialize(path)
|
||||
super()
|
||||
@paths = [FileSystemResolver.new(path), FileSystemResolver.new(""), FileSystemResolver.new("/")]
|
||||
end
|
||||
|
||||
def find_templates(*args)
|
||||
|
@ -1,7 +1,7 @@
|
||||
module ActionView #:nodoc:
|
||||
class FixtureResolver < PathResolver
|
||||
def initialize(hash = {}, options = {})
|
||||
super(options)
|
||||
def initialize(hash = {})
|
||||
super()
|
||||
@hash = hash
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user