actionpack/test/abstract/render_test.rb @@ -386,11 +386,6 @@ module ActionMailer #:nodoc: [:"*/*"] end - # Refactor out all mailer_name - def _prefix - mailer_name - end - class << self attr_writer :mailer_name actionmailer/lib/action_mailer/base.rb @@ -195,7 +195,7 @@ module AbstractController def _determine_template(options) super - return if (options.key?(:text) || options.key?(:inline) || options.key?(:partial)) && !options.key?(:layout) + return unless (options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout) layout = options.key?(:layout) ? options[:layout] : :default options[:_layout] = _layout_for_option(layout, options[:_template].details) end actionpack/lib/abstract_controller/layouts.rb @@ -118,9 +118,6 @@ module AbstractController options[:_template_name] = options[:template] elsif options.key?(:file) options[:_template_name] = options[:file] - elsif !options.key?(:partial) - options[:_template_name] ||= options[:action] - options[:_prefix] = _prefix end name = (options[:_template_name] || action_name).to_s @@ -138,10 +135,6 @@ module AbstractController view_paths.exists?(name, details, options[:_prefix], options[:_partial]) end - def _prefix - self.class.name.underscore - end - def with_template_cache(name) yield end actionpack/lib/abstract_controller/rendering_controller.rb @@ -65,6 +65,15 @@ module ActionController controller_path end + def _determine_template(options) + if (options.keys & [:partial, :file, :template, :text, :inline]).empty? + options[:_template_name] ||= options[:action] + options[:_prefix] = _prefix + end + + super + end + def format_for_text formats.first end actionpack/lib/action_controller/metal/rendering_controller.rb 0cf16ddb88b4fa28c37e576d50d835b100c3f6a1 José Valim jose.valim@gmail.com http://github.com/feldpost/rails/commit/03960048616593c249745d1e321dbcc7f0483c76 03960048616593c249745d1e321dbcc7f0483c76 2009-10-31T18:23:48-07:00 2009-10-21T12:47:10-07:00 Add some basic render_test to AbstractController. e8ef23941eb4e9ea02610921c783504991edfe2a Yehuda Katz wycats@gmail.com