lib/ramaze/option/holder.rb in manveru-ramaze-2008.09 vs lib/ramaze/option/holder.rb in manveru-ramaze-2008.10
- old
+ new
@@ -76,11 +76,11 @@
# Find a suitable public_root, if none of these is a directory just use the
# currently set one.
def public_root
[ @public_root,
- root/@public_root
+ File.join(root, @public_root)
].find{|path| File.directory?(path) } || @public_root
end
def view_root=(vr)
@view_root = vr
@@ -88,11 +88,11 @@
# Find a suitable view_root, if none of these is a directory just use
# the currently set one.
def view_root
[ @view_root,
- root/@view_root,
- root/'template',
+ File.join(root, @view_root),
+ File.join(root, 'template'),
].find{|path| File.directory?(path) } || @view_root
end
def adapter
find_from_aliases(@adapter, :adapter_aliases, Ramaze::Adapter, "ramaze/adapter")