From c044c079ab14487b4410874be2169ab4aa9b8a23 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Fri, 19 Dec 2008 13:05:45 +0000 Subject: Revert "Auto-load template handlers based on unmatched extensions [#1540 state:resolved]" This reverts commit e8c1915416579a3840573ca2c80822d96cb31823. Reasons : - ActionPack tests run very slow - Gem.searcher hanging for long time when extension is nil --- actionpack/lib/action_view/template_handlers.rb | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'actionpack/lib/action_view/template_handlers.rb') diff --git a/actionpack/lib/action_view/template_handlers.rb b/actionpack/lib/action_view/template_handlers.rb index c50a51b0d1..d06ddd5fb5 100644 --- a/actionpack/lib/action_view/template_handlers.rb +++ b/actionpack/lib/action_view/template_handlers.rb @@ -28,10 +28,6 @@ module ActionView #:nodoc: @@template_handlers[extension.to_sym] = klass end - def valid_extension?(extension) - template_handler_extensions.include?(extension) || init_path_for_extension(extension) - end - def template_handler_extensions @@template_handlers.keys.map(&:to_s).sort end @@ -42,26 +38,7 @@ module ActionView #:nodoc: end def handler_class_for_extension(extension) - (extension && @@template_handlers[extension.to_sym] || autoload_handler_class(extension)) || - @@default_template_handlers + (extension && @@template_handlers[extension.to_sym]) || @@default_template_handlers end - - private - def autoload_handler_class(extension) - return if Gem.loaded_specs[extension] - return unless init_path = init_path_for_extension(extension) - Gem.activate(extension) - load(init_path) - handler_class_for_extension(extension) - end - - # Returns the path to the rails/init.rb file for the given extension, - # or nil if no gem provides it. - def init_path_for_extension(extension) - return unless spec = Gem.searcher.find(extension.to_s) - returning File.join(spec.full_gem_path, 'rails', 'init.rb') do |path| - return unless File.file?(path) - end - end end end -- cgit v1.2.3