actionpack 1.13.2 → 1.13.3

data/CHANGELOG

@@ -1,3 +1,12 @@
+*1.13.3* (March 12th, 2007)
+
+* Apply [5709] to stable.
+
+* session_enabled? works with session :off.  #6680 [Catfish]
+
+* Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id.  [Stefan Kaes]
+
+
 *1.13.2* (February 5th, 2007)
 
 * Add much-needed html-scanner tests.  Fixed CDATA parsing bug. [Rick]
@@ -10,8 +19,6 @@
 
 * Add singleton resources from trunk [Rick Olson]
 
-* TestSession supports indifferent access so session['foo'] == session[:foo] in your tests.  #7372 [julik, jean.helou]
-
 * select :multiple => true suffixes the attribute name with [] unless already suffixed.  #6977 [nik.kakelin, ben, julik]
 
 * Improve routes documentation.  #7095 [zackchandler]

data/Rakefile

@@ -75,7 +75,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.4.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.4.2' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
@@ -144,11 +144,11 @@ end
 
 desc "Publish the release files to RubyForge."
 task :release => [ :package ] do
-  `rubyforge login`
+  require 'rubyforge'
 
-  for ext in %w( gem tgz zip )
-    release_command = "rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}"
-    puts release_command
-    system(release_command)
-  end
-end
+  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
+
+  rubyforge = RubyForge.new
+  rubyforge.login
+  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
+end

data/lib/action_controller/base.rb

@@ -539,7 +539,7 @@ module ActionController #:nodoc:
       end
 
       def session_enabled?
-        request.session_options[:disabled] != false
+        request.session_options && request.session_options[:disabled] != false
       end
 
     protected

data/lib/action_controller/cgi_ext/session_performance_fix.rb

@@ -0,0 +1,30 @@
+# CGI::Session#create_new_id requires 'digest/md5' on every call.  This makes
+# sense when spawning processes per request, but is unnecessarily expensive
+# when serving requests from a long-lived process.
+#
+# http://railsexpress.de/blog/articles/2005/11/22/speeding-up-the-creation-of-new-sessions
+require 'cgi/session'
+require 'digest/md5'
+
+class CGI
+  class Session #:nodoc:
+    private
+      # Create a new session id.
+      #
+      # The session id is an MD5 hash based upon the time,
+      # a random number, and a constant string.  This routine
+      # is used internally for automatically generated
+      # session ids.
+      def create_new_id
+        md5 = Digest::MD5::new
+        now = Time::now
+        md5.update(now.to_s)
+        md5.update(String(now.usec))
+        md5.update(String(rand(0)))
+        md5.update(String($$))
+        md5.update('foobar')
+        @new_session = true
+        md5.hexdigest
+      end
+  end
+end

data/lib/action_controller/cgi_process.rb

@@ -1,6 +1,7 @@
 require 'action_controller/cgi_ext/cgi_ext'
 require 'action_controller/cgi_ext/cookie_performance_fix'
 require 'action_controller/cgi_ext/raw_post_data_fix'
+require 'action_controller/cgi_ext/session_performance_fix'
 
 module ActionController #:nodoc:
   class Base

data/lib/action_controller/routing.rb

@@ -344,10 +344,10 @@ module ActionController
         # the query string. (Never use keys from the recalled request when building the
         # query string.)
 
-        method_decl = "def generate(#{args})\npath, hash = generate_raw(options, hash, expire_on)\nappend_query_string(path, hash, extra_keys(hash, expire_on))\nend"
+        method_decl = "def generate(#{args})\npath, hash = generate_raw(options, hash, expire_on)\nappend_query_string(path, hash, extra_keys(options))\nend"
         instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
 
-        method_decl = "def generate_extras(#{args})\npath, hash = generate_raw(options, hash, expire_on)\n[path, extra_keys(hash, expire_on)]\nend"
+        method_decl = "def generate_extras(#{args})\npath, hash = generate_raw(options, hash, expire_on)\n[path, extra_keys(options)]\nend"
         instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})"
         raw_method
       end
@@ -1238,7 +1238,7 @@ module ActionController
         # drop the leading '/' on the controller name
         options[:controller] = options[:controller][1..-1] if options[:controller] && options[:controller][0] == ?/
         merged = recall.merge(options)
-    
+
         if named_route
           path = named_route.generate(options, merged, expire_on)
           if path.nil? 

data/lib/action_controller/test_process.rb

@@ -288,11 +288,11 @@ module ActionController #:nodoc:
     end
 
     def [](key)
-      data[key.to_s]
+      data[key]
     end
 
     def []=(key, value)
-      data[key.to_s] = value
+      data[key] = value
     end
 
     def update

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 13
-    TINY  = 2
+    TINY  = 3
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/controller/routing_test.rb

@@ -1717,6 +1717,17 @@ class RouteSetTest < Test::Unit::TestCase
     )
   end
   
+  def test_query_params_will_be_shown_when_recalled
+    set.draw do |map|
+      map.connect 'show_post/:parameter', :controller => 'post', :action => 'show'
+      map.connect ':controller/:action/:id'
+    end
+    assert_equal '/post/edit?parameter=1', set.generate(
+      {:action => 'edit', :parameter => 1},
+      {:controller => 'post', :action => 'show', :parameter => 1}
+    )
+  end
+  
 end
 
 class RoutingTest < Test::Unit::TestCase

data/test/controller/session_management_test.rb

@@ -142,4 +142,15 @@ class SessionManagementTest < Test::Unit::TestCase
     get :tell
     assert_equal "does not have cached associations", @response.body
   end
+  
+  def test_session_is_enabled
+    @controller = TestController.new
+    get :show
+    assert_nothing_raised do
+      assert_equal false, @controller.session_enabled?
+    end
+    
+    get :tell
+    assert @controller.session_enabled?
+  end
 end

data/test/controller/test_test.rb

@@ -8,12 +8,6 @@ class TestTest < Test::Unit::TestCase
       render :text => 'ignore me'
     end
 
-    def set_session
-      session['string'] = 'A wonder'
-      session[:symbol] = 'it works'
-      render :text => 'Success'
-    end
-
     def render_raw_post
       raise Test::Unit::AssertionFailedError, "#raw_post is blank" if request.raw_post.blank?
       render :text => request.raw_post
@@ -117,14 +111,6 @@ HTML
     assert_equal '>value<', flash['test']
   end
 
-  def test_process_with_session
-    process :set_session
-    assert_equal 'A wonder', session['string'], "A value stored in the session should be available by string key"
-    assert_equal 'A wonder', session[:string], "Test session hash should allow indifferent access"
-    assert_equal 'it works', session['symbol'], "Test session hash should allow indifferent access"
-    assert_equal 'it works', session[:symbol], "Test session hash should allow indifferent access"
-  end
-
   def test_process_with_request_uri_with_no_params
     process :test_uri
     assert_equal "/test_test/test/test_uri", @response.body

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.13.2
-date: 2007-02-05 00:00:00 -06:00
+  version: 1.13.3
+date: 2007-03-13 00:00:00 -05:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
 - lib
@@ -89,6 +89,7 @@ files:
 - lib/action_controller/cgi_ext/cgi_methods.rb
 - lib/action_controller/cgi_ext/cookie_performance_fix.rb
 - lib/action_controller/cgi_ext/raw_post_data_fix.rb
+- lib/action_controller/cgi_ext/session_performance_fix.rb
 - lib/action_controller/macros/auto_complete.rb
 - lib/action_controller/macros/in_place_editing.rb
 - lib/action_controller/session/active_record_store.rb
@@ -375,5 +376,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.1
+        version: 1.4.2
     version: