133c21b801
Update to Rails 2.3.1.
(Actually, not quite. Doesn't look like 2.3.1 will be released
today, but I REALLY want to push these bugfixes out.)
Removed bundled Rack (Rails 2.3.1 comes bundled with Rack 1.0).
Add
config.action_view.cache_template_loading = true
to production environment.
Fix FastCGI bug (http://rubyforge.org/tracker/index.php?func=detail&aid=24191&group_id=186&atid=783).
Fix WikiWords bug (http://rubyforge.org/pipermail/instiki-users/2009-February/001181.html).
69 lines
2 KiB
Ruby
69 lines
2 KiB
Ruby
module ActionView #:nodoc:
|
|
class PathSet < Array #:nodoc:
|
|
def self.type_cast(obj)
|
|
if obj.is_a?(String)
|
|
if Base.cache_template_loading?
|
|
Template::EagerPath.new(obj.to_s)
|
|
else
|
|
ReloadableTemplate::ReloadablePath.new(obj.to_s)
|
|
end
|
|
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) })
|
|
end
|
|
|
|
def load!
|
|
each(&:load!)
|
|
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(/^\//, '')
|
|
|
|
each do |load_path|
|
|
if format && (template = load_path["#{template_path}.#{I18n.locale}.#{format}"])
|
|
return template
|
|
elsif format && (template = load_path["#{template_path}.#{format}"])
|
|
return template
|
|
elsif template = load_path["#{template_path}.#{I18n.locale}"]
|
|
return template
|
|
elsif template = load_path[template_path]
|
|
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
|
|
end
|
|
|
|
return Template.new(original_template_path, original_template_path =~ /\A\// ? "" : ".") if File.file?(original_template_path)
|
|
|
|
raise MissingTemplate.new(self, original_template_path, format)
|
|
end
|
|
end
|
|
end
|