github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make ActionController#render(symbol) behave same as ActionController#render(string) [#1435]

Browse Source
This commit is contained in:
Pratik Naik
2008-12-26 01:03:18 +00:00
parent cd1d6e8768
commit 80307c8b0a
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
actionpack/CHANGELOG
View File

@@ -4,6 +4,7 @@
# Instead of render(:action => 'other_action')
render('other_action') # argument has no '/'
render(:other_action)
# Instead of render(:template => 'controller/action')
render('controller/action') # argument must not begin with a '/', but contain a '/'

10
actionpack/lib/action_controller/base.rb
View File

@@ -859,14 +859,14 @@ module ActionController #:nodoc:
def render(options = nil, extra_options = {}, &block) #:doc:
raise DoubleRenderError, "Can only render or redirect once per action" if performed?
validate_render_arguments(options, extra_options)
validate_render_arguments(options, extra_options, block_given?)
if options.nil?
return render(:file => default_template, :layout => true)
elsif options == :update
options = extra_options.merge({ :update => true })
elsif options.is_a?(String)
case options.index('/')
elsif options.is_a?(String) || options.is_a?(Symbol)
case options.to_s.index('/')
when 0
extra_options[:file] = options
when nil
@@ -1193,8 +1193,8 @@ module ActionController #:nodoc:
end
end
def validate_render_arguments(options, extra_options)
if options && options != :update && !options.is_a?(String) && !options.is_a?(Hash)
def validate_render_arguments(options, extra_options, has_block)
if options && (has_block && options != :update) && !options.is_a?(String) && !options.is_a?(Hash) && !options.is_a?(Symbol)
raise RenderError, "You called render with invalid options : #{options.inspect}"
end

11
actionpack/test/controller/render_test.rb
View File

@@ -304,6 +304,10 @@ class TestController < ActionController::Base
render "hello_world", :layout => "standard"
end
def layout_test_with_different_layout_and_symbol_action
render :hello_world, :layout => "standard"
end
def rendering_without_layout
render :action => "hello_world", :layout => false
end
@@ -1057,11 +1061,16 @@ class RenderTest < ActionController::TestCase
assert_equal "<html>Hello world!</html>", @response.body
end
def test_layout_test_with_different_layout
def test_layout_test_with_different_layout_and_string_action
get :layout_test_with_different_layout_and_string_action
assert_equal "<html>Hello world!</html>", @response.body
end
def test_layout_test_with_different_layout_and_symbol_action
get :layout_test_with_different_layout_and_symbol_action
assert_equal "<html>Hello world!</html>", @response.body
end
def test_rendering_without_layout
get :rendering_without_layout
assert_equal "Hello world!", @response.body