diff options
author | José Valim <jose.valim@gmail.com> | 2010-03-08 03:23:16 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-03-08 03:23:23 +0100 |
commit | 34b2180451f842b180dd925bab10e8f4afa34490 (patch) | |
tree | fd364e4ee5944c6bb99c1badc97caa815e8eae1e /actionpack/lib/action_controller | |
parent | 4bae77a89baf0fee15c6b2cfd3987f7344b56a1f (diff) | |
download | rails-34b2180451f842b180dd925bab10e8f4afa34490.tar.gz rails-34b2180451f842b180dd925bab10e8f4afa34490.tar.bz2 rails-34b2180451f842b180dd925bab10e8f4afa34490.zip |
More refactoring. Split _normalize_args and _normalize_options concerns.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index e2d2e2312b..60d61999de 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -18,6 +18,11 @@ module ActionController response_body end + def render_to_body(options) + _process_options(options) + super + end + private def _render_partial(options) @@ -30,7 +35,7 @@ module ActionController formats.first end - def _normalize_options(action=nil, options={}, &blk) + def _normalize_args(action=nil, options={}, &blk) case action when NilClass when Hash @@ -38,9 +43,14 @@ module ActionController when String, Symbol options = super else - options.merge! :partial => action + options.merge!(:partial => action) end + options[:update] = blk if block_given? + options + end + + def _normalize_options(options) if options.key?(:text) && options[:text].respond_to?(:to_text) options[:text] = options[:text].to_text end @@ -49,10 +59,7 @@ module ActionController options[:status] = Rack::Utils.status_code(options[:status]) end - options[:update] = blk if block_given? - - _process_options(options) - options + super end def _process_options(options) |