diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 6bfe0a361f562..93ded404d6224 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -41,6 +41,9 @@ def render_to_string(*args, &block) def render_to_body(options = {}) end + # Normalize arguments, options and then delegates render_to_body and + # sticks the result in self.response_body. + # :api: public def render(*args, &block) end diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index ee7cc4e470191..9d8f316a1170a 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -71,24 +71,28 @@ def view_context end # Returns an object that is able to render templates. + # :api: private def view_renderer @_view_renderer ||= ActionView::Renderer.new(lookup_context) end - # Normalize arguments, options and then delegates render_to_body and - # sticks the result in self.response_body. + # Render template to response_body + # :api: public def render(*args, &block) super options = _normalize_render(*args, &block) self.response_body = render_to_body(options) end + # Raw rendering of a template to a string. + # :api: public def render_to_string(*args, &block) options = _normalize_render(*args, &block) render_to_body(options) end # Raw rendering of a template. + # :api: public def render_to_body(options = {}) _process_options(options) _render_template(options) @@ -117,6 +121,7 @@ def _normalize_render(*args, &block) # Normalize args by converting render "foo" to render :action => "foo" and # render "foo/bar" to render :file => "foo/bar". + # :api: private def _normalize_args(action=nil, options={}) options = super(action, options) case action @@ -135,6 +140,7 @@ def _normalize_args(action=nil, options={}) end # Normalize options. + # :api: private def _normalize_options(options) options = super(options) if options[:partial] == true