aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorVasiliy Ermolovich <younash@gmail.com>2012-01-14 14:31:53 +0300
committerVasiliy Ermolovich <younash@gmail.com>2012-01-14 14:33:52 +0300
commit6f3420c0375bb6308b60c2d8df676aabf463a7cb (patch)
tree65ea7eb85d304627877799380998ee6879aeb3ca /actionpack
parent591fcbafcd2eea58ac2ede2bb4daed8c713d07da (diff)
downloadrails-6f3420c0375bb6308b60c2d8df676aabf463a7cb.tar.gz
rails-6f3420c0375bb6308b60c2d8df676aabf463a7cb.tar.bz2
rails-6f3420c0375bb6308b60c2d8df676aabf463a7cb.zip
refactor response_body= method
response_to?(:each) returns false for strings in ruby 1.9, so there is no need for these checks
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 125dbf6bb5..3aab77a069 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -182,13 +182,7 @@ module ActionController
end
def response_body=(val)
- body = if val.is_a?(String)
- [val]
- elsif val.nil? || val.respond_to?(:each)
- val
- else
- [val]
- end
+ body = (val.nil? || val.respond_to?(:each)) ? val : [val]
super body
end