Changeset 20

Timestamp:

11/26/04 02:04:35 (4 years ago)

Author:

david

Message:

Added a new container for cookies that makes them more intuative to use. The old methods of cookie and @cookies have been deprecated.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/install.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/base.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/cookies.rb (added)
• trunk/actionpack/test/controller/cookie_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-* Added the opportunity to defined method_missing on a controller which will handle all requests for actions not otherwise defined #223 [timb]

trunk/actionpack/install.rb

@@ -42 +42 @@
- action_controller/cgi_ext/cgi_methods.rb
- action_controller/cgi_process.rb
+ action_controller/cookies.rb
- action_controller/filters.rb
- action_controller/flash.rb

trunk/actionpack/lib/action_controller.rb

@@ -35 +35 @@
-require 'action_controller/helpers'
-require 'action_controller/dependencies'
+require 'action_controller/cookies'
-require 'action_controller/cgi_process'
-
@@ -46 +47 @@
-  include ActionController::Helpers
-  include ActionController::Dependencies
+  include ActionController::Cookies
-end
-

trunk/actionpack/lib/action_controller/base.rb

@@ -540 +540 @@
-      end
-
-      # Creates a new cookie that is sent along-side the next render or redirect command. API is the same as for CGI::Cookie.
-      # Examples:
-      #
-      #   cookie("name", "value1", "value2", ...)
-      #   cookie("name" => "name", "value" => "value")
-      #   cookie('name'    => 'name',
-      #          'value'   => ['value1', 'value2', ...],
-      #          'path'    => 'path',   # optional
-      #          'domain'  => 'domain', # optional
-      #          'expires' => Time.now, # optional
-      #          'secure'  => true      # optional
-      #   )
-      def cookie(*options) #:doc:
-        @response.headers["cookie"] << CGI::Cookie.new(*options)
-      end
-
-      # Alias for cookie "name", "value"
-      def cookies[]=(name, value)
-        cookie(name, value)
-      end
-
-      # Returns the value of the cookie by +name+ -- or nil if no such cookie exist. You set new cookies using either the cookie method
-      # or cookies[]= (for simple name/value cookies without options).
-      def cookies[](name)
-        @cookies[name].value if @cookies[name]
-      end
-      
-      # Resets the session by clearsing out all the objects stored within and initializing a new session object.
-      def reset_session #:doc:
@@ -574 +547 @@
-      end
-    
+      # Deprecated cookie writer method
+      def cookie(*options)
+        @response.headers["cookie"] << CGI::Cookie.new(*options)
+      end
+
-    private
-      def initialize_template_class(response)

trunk/actionpack/test/controller/cookie_test.rb

@@ -3 +3 @@
-class CookieTest < Test::Unit::TestCase
-  class TestController < ActionController::Base
+    def authenticate_with_deprecated_writer
+      cookie "name" => "user_name", "value" => "david"
+      render_text "hello world"
+    end
+
-    def authenticate
-
+
+
+
+
+
+
+
+
+
+
+
+
-      render_text "hello world"
-    end
@@ -22 +38 @@
-  end
-
+  def test_setting_cookie_with_deprecated_writer
+    @request.action = "authenticate_with_deprecated_writer"
+    assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david") ], process_request.headers["cookie"]
+  end
+
-  def test_setting_cookie
-    @request.action = "authenticate"
@@ -27 +48 @@
-  end
-
-
+
+
+
+
+
+
+
+
+
+
+
-    @request.action = "access_frozen_cookies"
-    assert_raises(TypeError) { process_request }