Session configuration in config/environment.rb instead of app/controllers/application.rb

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6198 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_controller/session_management.rb

@@ -81,6 +81,9 @@ def session(*args)
         write_inheritable_array("session_options", [options])
       end
 
+      # So we can declare session options in the Rails initializer.
+      alias_method :session=, :session
+
       def cached_session_options #:nodoc:
         @session_options ||= read_inheritable_attribute("session_options") || []
       end

railties/environments/environment.rb

@@ -41,6 +41,10 @@
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 
+  # Your secret key for verifying cookie session data integrity.
+  # If you change this key, all old sessions will become invalid!
+  config.action_controller.session = { :secret => '<%= CGI::Session.generate_unique_id(app_name) %>' }
+
   # See Rails::Configuration for more options
 end
 

railties/helpers/application.rb

@@ -2,9 +2,4 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  # Pick a unique cookie name to distinguish our session from others.
-  # Session data is stored in a cookie by default, so the data is hashed
-  # with a secret to ensure its integrity.
-  session :session_key => '_<%= app_name %>_session',
-          :secret => '<%= CGI::Session.generate_unique_id(app_name) %>'
 end