vendor/rails/actionpack/lib/action_view/template.rb in radiantcms-couchrest_model-0.1.4 vs vendor/rails/actionpack/lib/action_view/template.rb in radiantcms-couchrest_model-0.1.5
- old
+ new
@@ -55,18 +55,13 @@
full_file_path.split("#{@path}/").last
end
end
class EagerPath < Path
- def initialize(path)
- super
- @loaded = false
- end
-
def load!
return if @loaded
-
+
@paths = {}
templates_in_path do |template|
template.load!
template.accessible_paths.each do |path|
@paths[path] = template
@@ -106,12 +101,11 @@
extension.is_a?(Regexp) ? extension : /\.#{Regexp.escape(extension.to_s)}$/
end
@@exempt_from_layout.merge(regexps)
end
- attr_accessor :template_path, :load_path, :base_path
+ attr_accessor :template_path, :filename, :load_path, :base_path
attr_accessor :locale, :name, :format, :extension
- attr_writer :filename
delegate :to_s, :to => :path
def initialize(template_path, load_path = nil)
@template_path, @load_path = template_path.dup, load_path
@base_path, @name, @locale, @format, @extension = split(template_path)