diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:44:45 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:44:45 -0700 |
commit | a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73 (patch) | |
tree | 3d90ed4e56055eb4f4a7b7760321007586b3c87c /actionpack/lib/action_controller/base/renderer.rb | |
parent | 614374b3e5b19b737175a82c6dad2f146800eef1 (diff) | |
download | rails-a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73.tar.gz rails-a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73.tar.bz2 rails-a63caa4c0c2a8aabc13c354a9193ebd9c5e8ba73.zip |
Get tests to run (with failures) without old base around
Diffstat (limited to 'actionpack/lib/action_controller/base/renderer.rb')
-rw-r--r-- | actionpack/lib/action_controller/base/renderer.rb | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base/renderer.rb b/actionpack/lib/action_controller/base/renderer.rb new file mode 100644 index 0000000000..2fab501302 --- /dev/null +++ b/actionpack/lib/action_controller/base/renderer.rb @@ -0,0 +1,78 @@ +module ActionController + module Renderer + extend ActiveSupport::Concern + + include AbstractController::Renderer + + def process_action(*) + self.formats = request.formats.map {|x| x.to_sym} + super + end + + def render(options) + super + options[:_template] ||= _action_view._partial + self.content_type ||= begin + mime = options[:_template].mime_type + formats.include?(mime && mime.to_sym) || formats.include?(:all) ? mime : Mime::Type.lookup_by_extension(formats.first) + end + response_body + end + + def render_to_body(options) + _process_options(options) + + if options.key?(:partial) + _render_partial(options[:partial], options) + end + + super + end + + private + def _prefix + controller_path + end + + def _determine_template(options) + if options.key?(:text) + options[:_template] = ActionView::TextTemplate.new(options[:text], formats.first) + elsif options.key?(:inline) + handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb") + template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {}) + options[:_template] = template + elsif options.key?(:template) + options[:_template_name] = options[:template] + elsif options.key?(:file) + options[:_template_name] = options[:file] + elsif !options.key?(:partial) + options[:_template_name] = (options[:action] || action_name).to_s + options[:_prefix] = _prefix + end + + super + end + + def _render_partial(partial, options) + case partial + when true + options[:_prefix] = _prefix + when String + options[:_prefix] = _prefix unless partial.index('/') + options[:_template_name] = partial + else + options[:_partial_object] = true + return + end + + options[:_partial] = options[:object] || true + end + + def _process_options(options) + status, content_type, location = options.values_at(:status, :content_type, :location) + self.status = status if status + self.content_type = content_type if content_type + self.headers["Location"] = url_for(location) if location + end + end +end |