Permalink
Browse files

Process view paths passed to AV::Base#initialize instead of raising.

  • Loading branch information...
1 parent c88f2b5 commit 057768cd2c8541f9c466131cb6c77f13ce12204d @jeremy jeremy committed Jun 9, 2008
Showing with 1 addition and 16 deletions.
  1. +1 −10 actionpack/lib/action_view/template_finder.rb
  2. +0 −6 actionpack/test/template/template_finder_test.rb
@@ -1,14 +1,5 @@
module ActionView #:nodoc:
class TemplateFinder #:nodoc:
-
- class InvalidViewPath < StandardError #:nodoc:
- attr_reader :unprocessed_path
- def initialize(path)
- @unprocessed_path = path
- super("Unprocessed view path found: #{@unprocessed_path.inspect}. Set your view paths with #append_view_path, #prepend_view_path, or #view_paths=.")
- end
- end
-
cattr_reader :processed_view_paths
@@processed_view_paths = Hash.new {|hash, key| hash[key] = []}
@@ -76,7 +67,7 @@ def initialize(*args)
@view_paths = args.flatten
@view_paths = @view_paths.respond_to?(:find) ? @view_paths.dup : [*@view_paths].compact
- check_view_paths(@view_paths)
+ self.class.process_view_paths(@view_paths)
end
def prepend_view_path(path)
@@ -11,12 +11,6 @@ def setup
@finder = ActionView::TemplateFinder.new(@template, LOAD_PATH_ROOT)
end
- def test_should_raise_exception_for_unprocessed_view_path
- assert_raises ActionView::TemplateFinder::InvalidViewPath do
- ActionView::TemplateFinder.new(@template, File.dirname(__FILE__))
- end
- end
-
def test_should_cache_file_extension_properly
assert_equal ["builder", "erb", "rhtml", "rjs", "rxml", "mab"].sort,
ActionView::TemplateFinder.file_extension_cache[LOAD_PATH_ROOT].values.flatten.uniq.sort

0 comments on commit 057768c

Please sign in to comment.