kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Allow code execution in case no variant has been set with variant.none

Browse source
This commit is contained in:
David Heinemeier Hansson 2013-12-07 15:00:35 -08:00
parent 76dae289ed
commit a16fa9abfd
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
actionpack/lib/action_controller/metal/mime_responds.rb
View file

@ -196,9 +196,10 @@ module ActionController #:nodoc:
# Respond to variants in the action just like you respond to formats:
#
# respond_to do |format|
# format.html do |html|
# html.tablet # renders app/views/projects/show.html+tablet.erb
# html.phone { extra_setup; render ... }
# format.html do |variant|
# variant.tablet # renders app/views/projects/show.html+tablet.erb
# variant.phone { extra_setup; render ... }
# variant.none { special_setup } # executed only if there is no variant set
# end
# end
#
@ -465,7 +466,7 @@ module ActionController #:nodoc:
end
def method_missing(name)
yield if name == @variant
yield if name == @variant || (name == :none && @variant.nil?)
end
end
end

16
actionpack/test/controller/mime/respond_to_test.rb
View file

@ -166,6 +166,15 @@ class RespondToController < ActionController::Base
end
end
def variant_plus_none_for_format
respond_to do |format|
format.html do |variant|
variant.phone { render text: "phone" }
variant.none { render text: "none" }
end
end
end
protected
def set_layout
case action_name
@ -544,4 +553,11 @@ class RespondToControllerTest < ActionController::TestCase
assert_equal "text/html", @response.content_type
assert_equal "tablet", @response.body
end
def test_no_variant_in_variant_setup
get :variant_plus_none_for_format
assert_equal "text/html", @response.content_type
assert_equal "none", @response.body
end
end