diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-29 08:04:39 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-29 08:04:39 +0000 |
| commit | 4f3bf6cb23991af8fac69b67dc73844f6a92205e (patch) | |
| tree | bfb4b5e74fc9bbfe61d7ad91781d2a2256348b3c /actionpack | |
| parent | f0152fb610df134f5b3aaeea08ab82cd9643dd5a (diff) | |
| download | rails-4f3bf6cb23991af8fac69b67dc73844f6a92205e.tar.gz rails-4f3bf6cb23991af8fac69b67dc73844f6a92205e.tar.bz2 rails-4f3bf6cb23991af8fac69b67dc73844f6a92205e.zip | |
Deprecate @cookies
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5205 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
6 files changed, 8 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 77e75ec36b..24ef8d01a1 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -2,7 +2,7 @@ * assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them. #6240 [japgolly] -* Deprecation: @request will be removed after 1.2. Use the request method instead. [Jeremy Kemper] +* Deprecation: @cookies, @request will be removed after 1.2. Use the corresponding method instead. [Jeremy Kemper] * Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. [Jamis Buck]. Examples: diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 743c97863a..02d731c4c8 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1014,7 +1014,7 @@ module ActionController #:nodoc: end def assign_shortcuts(request, response) - @_request, @_params, @cookies = request, request.parameters, request.cookies + @_request, @_params, @_cookies = request, request.parameters, request.cookies @response = response @response.session = request.session @@ -1030,7 +1030,7 @@ module ActionController #:nodoc: # TODO: assigns cookies headers params request response template - DEPRECATED_INSTANCE_VARIABLES = %w(flash params request session) + DEPRECATED_INSTANCE_VARIABLES = %w(cookies flash params request session) # Gone after 1.2. def assign_deprecated_shortcuts(request, response) @@ -1129,7 +1129,7 @@ module ActionController #:nodoc: else %w(@assigns @performed_redirect @performed_render @_request @request @response @_params @params @_session @session - @cookies @template @request_origin @parent_controller) + @_cookies @cookies @template @request_origin @parent_controller) end end diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb index f5484f3676..67086a09cb 100644 --- a/actionpack/lib/action_controller/cookies.rb +++ b/actionpack/lib/action_controller/cookies.rb @@ -39,7 +39,7 @@ module ActionController #:nodoc: class CookieJar < Hash #:nodoc: def initialize(controller) - @controller, @cookies = controller, controller.instance_variable_get("@cookies") + @controller, @cookies = controller, controller.request.cookies super() update(@cookies) end diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb index f0189ebb11..2e1c7f0eb0 100644 --- a/actionpack/test/controller/cookie_test.rb +++ b/actionpack/test/controller/cookie_test.rb @@ -29,7 +29,7 @@ class CookieTest < Test::Unit::TestCase end def access_frozen_cookies - @cookies["will"] = "work" + cookies["will"] = "work" render_text "hello world" end diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml new file mode 100644 index 0000000000..4e8a2d804c --- /dev/null +++ b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml @@ -0,0 +1 @@ +<%= @cookies[:test] %> diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml new file mode 100644 index 0000000000..68e88bb746 --- /dev/null +++ b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml @@ -0,0 +1 @@ +<%= cookies[:test] %> |