aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Pospisil <mekishizufu@gmail.com>2012-12-31 17:46:19 +0100
committerJiri Pospisil <mekishizufu@gmail.com>2012-12-31 17:46:19 +0100
commitdbacb95a2187e853c0615f30919a407744162595 (patch)
tree016784d9adcdeb389d0cde881bb28fe15fe71f05
parent5e5107430bccc0a536e0b264c951793d8fe62235 (diff)
downloadrails-dbacb95a2187e853c0615f30919a407744162595.tar.gz
rails-dbacb95a2187e853c0615f30919a407744162595.tar.bz2
rails-dbacb95a2187e853c0615f30919a407744162595.zip
Fix usage of lambda as a Rack endpoint
The response body needs to respond_to? :each.
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb4
-rw-r--r--railties/test/application/assets_test.rb2
-rw-r--r--railties/test/railties/engine_test.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 3c99932e72..0dc6403ec0 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -315,7 +315,7 @@ module ActionDispatch
# A pattern can also point to a +Rack+ endpoint i.e. anything that
# responds to +call+:
#
- # match 'photos/:id', to: lambda {|hash| [200, {}, "Coming soon"] }
+ # match 'photos/:id', to: lambda {|hash| [200, {}, ["Coming soon"]] }
# match 'photos/:id', to: PhotoRackApp
# # Yes, controller actions are just rack endpoints
# match 'photos/:id', to: PhotosController.action(:show)
@@ -360,7 +360,7 @@ module ActionDispatch
# +call+ or a string representing a controller's action.
#
# match 'path', to: 'controller#action'
- # match 'path', to: lambda { |env| [200, {}, "Success!"] }
+ # match 'path', to: lambda { |env| [200, {}, ["Success!"]] }
# match 'path', to: RackApp
#
# [:on]
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index f98915d1cc..638df8ca23 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -45,7 +45,7 @@ module ApplicationTests
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do
- get '*path', to: lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
+ get '*path', to: lambda { |env| [200, { "Content-Type" => "text/html" }, ["Not an asset"]] }
end
RUBY
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index fcbe7b6cda..a4a75fe459 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -568,7 +568,7 @@ YAML
@plugin.write "lib/bukkits.rb", <<-RUBY
module Bukkits
class Engine < ::Rails::Engine
- endpoint lambda { |env| [200, {'Content-Type' => 'text/html'}, 'hello'] }
+ endpoint lambda { |env| [200, {'Content-Type' => 'text/html'}, ['hello']] }
end
end
RUBY