Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 5205

Show
Ignore:
Timestamp:
09/29/06 08:04:39 (2 years ago)
Author:
bitsweat
Message:

Deprecate @cookies

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r5202 r5205  
    33* assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them.  #6240 [japgolly] 
    44 
    5 * Deprecation: @request will be removed after 1.2. Use the request method instead.  [Jeremy Kemper] 
     5* Deprecation: @cookies, @request will be removed after 1.2. Use the corresponding method instead.  [Jeremy Kemper] 
    66 
    77* 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: 

  • trunk/actionpack/lib/action_controller/base.rb

    r5201 r5205  
    10151015 
    10161016      def assign_shortcuts(request, response) 
    1017         @_request, @_params, @cookies = request, request.parameters, request.cookies 
     1017        @_request, @_params, @_cookies = request, request.parameters, request.cookies 
    10181018 
    10191019        @response         = response 
    …… 
    10311031 
    10321032      # TODO: assigns cookies headers params request response template 
    1033       DEPRECATED_INSTANCE_VARIABLES = %w(flash params request session) 
     1033      DEPRECATED_INSTANCE_VARIABLES = %w(cookies flash params request session) 
    10341034 
    10351035      # Gone after 1.2. 
    …… 
    11301130          %w(@assigns @performed_redirect @performed_render 
    11311131             @_request @request @response @_params @params @_session @session 
    1132              @cookies @template @request_origin @parent_controller) 
     1132             @_cookies @cookies @template @request_origin @parent_controller) 
    11331133        end 
    11341134      end 

  • trunk/actionpack/lib/action_controller/cookies.rb

    r4793 r5205  
    4040  class CookieJar < Hash #:nodoc: 
    4141    def initialize(controller) 
    42       @controller, @cookies = controller, controller.instance_variable_get("@cookies") 
     42      @controller, @cookies = controller, controller.request.cookies 
    4343      super() 
    4444      update(@cookies) 

  • trunk/actionpack/test/controller/cookie_test.rb

    r1065 r5205  
    3030 
    3131    def access_frozen_cookies 
    32       @cookies["will"] = "work" 
     32      cookies["will"] = "work" 
    3333      render_text "hello world" 
    3434    end 

  • trunk/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml

    r4824 r5205  
    1 <%= @session[:test] %> 
     1<%= @cookies[:test] %> 

  • trunk/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml

    r4824 r5205  
    1 <%= session[:test] %> 
     1<%= cookies[:test] %>