diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-08-06 20:05:14 -0300 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-08-06 20:05:14 -0300 |
| commit | 16c01224cbe503ab1f4d0f02955b16662be00116 (patch) | |
| tree | 95b6e24ad99d661d4d36f2c46683c0eda9c76a21 /actionpack | |
| parent | 70d779aaea719e747b242ad88f1489bf19c6795e (diff) | |
| download | rails-16c01224cbe503ab1f4d0f02955b16662be00116.tar.gz rails-16c01224cbe503ab1f4d0f02955b16662be00116.tar.bz2 rails-16c01224cbe503ab1f4d0f02955b16662be00116.zip | |
ActionController::Metal#to_rack converted to #to_a to match normal rack convention
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/rack_convenience.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index e7d776b63e..82d05414b9 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -72,11 +72,11 @@ module ActionController def call(name, env) @_env = env process(name) - to_rack + to_a end # :api: private - def to_rack + def to_a [status, headers, response_body] end diff --git a/actionpack/lib/action_controller/metal/rack_convenience.rb b/actionpack/lib/action_controller/metal/rack_convenience.rb index 805157b0e3..5fac445dab 100644 --- a/actionpack/lib/action_controller/metal/rack_convenience.rb +++ b/actionpack/lib/action_controller/metal/rack_convenience.rb @@ -20,7 +20,7 @@ module ActionController end # :api: private - def to_rack + def to_a @_response.prepare! @_response.to_a end |