github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 16:28:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed TemplateFinder.update_extension_cache_for since view path cache will be updated on boot.

Browse Source
This commit is contained in:
Joshua Peek
2008-06-09 10:21:30 -05:00
parent 55791c6c00
commit 2336430471
3 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
actionpack/lib/action_view/template.rb
View File

@@ -99,7 +99,6 @@ module ActionView #:nodoc:
# return the rendered template as a string.
def self.register_template_handler(extension, klass)
@@template_handlers[extension.to_sym] = klass
TemplateFinder.update_extension_cache_for(extension.to_s)
end
def self.template_handler_extensions

16
actionpack/lib/action_view/template_finder.rb
View File

@@ -9,7 +9,6 @@ module ActionView #:nodoc:
}
class << self #:nodoc:
# This method is not thread safe. Mutex should be used whenever this is accessed from an instance method
def process_view_paths(*view_paths)
view_paths.flatten.compact.each do |dir|
@@ -26,7 +25,7 @@ module ActionView #:nodoc:
# Build extension cache
extension = file.split(".").last
if template_handler_extensions.include?(extension)
if ActionView::Template.template_handler_extensions.include?(extension)
key = file.split(dir).last.sub(/^\//, '').sub(/\.(\w+)$/, '')
@@file_extension_cache[dir][key] << extension
end
@@ -35,19 +34,6 @@ module ActionView #:nodoc:
end
end
def update_extension_cache_for(extension)
@@processed_view_paths.keys.each do |dir|
Dir.glob("#{dir}/**/*.#{extension}").each do |file|
key = file.split(dir).last.sub(/^\//, '').sub(/\.(\w+)$/, '')
@@file_extension_cache[dir][key] << extension
end
end
end
def template_handler_extensions
ActionView::Template.template_handler_extensions
end
def reload!
view_paths = @@processed_view_paths.keys

7
actionpack/test/template/template_finder_test.rb
View File

@@ -57,11 +57,4 @@ class TemplateFinderTest < Test::Unit::TestCase
assert_equal false, @finder.send(:file_exists?, 'baz')
assert_equal false, @finder.send(:file_exists?, 'baz.rb')
end
uses_mocha 'Template finder tests' do
def test_should_update_extension_cache_when_template_handler_is_registered
ActionView::TemplateFinder.expects(:update_extension_cache_for).with("funky")
ActionView::Template::register_template_handler :funky, Class.new(ActionView::TemplateHandler)
end
end
end