Ticket #9823: mem_cache_store_fixed_session_initialization.diff

actionpack/test/controller/session/mem_cache_store_test.rb

@@ +1 @@
+require "#{File.dirname(__FILE__)}/../../abstract_unit"
+require 'action_controller/cgi_process'
+require 'action_controller/cgi_ext'
+
+class MemCacheStoreTest < Test::Unit::TestCase
+
+  CONN_TEST_KEY = 'connection_test'
+  TEST_DATA = 'Hello test'
+
+  @@init_error = nil
+  begin
+    require 'memcache'
+    CACHE = MemCache.new('127.0.0.1')
+    # Test availability of the connection
+    CACHE.set(CONN_TEST_KEY, 1)
+    unless CACHE.get(CONN_TEST_KEY) == 1
+      @@init_error = 'Communication with memcache server failed'
+      CACHE = nil
+    end
+  rescue LoadError
+    @@init_error = "Client for memcache not installed."
+    CACHE = nil
+  rescue MemCache::MemCacheError
+    @@init_error = 'Could not connect to memcache server.'
+  end
+  puts @@init_error + ' Skiping MemCacheStoreTest.' if @@init_error
+
+
+  def run(result)
+    return if @@init_error
+    super
+  end
+
+
+  def test_initialization
+    new_session do |s|
+      assert_raise(ArgumentError) { new_session('session_id' => '!invalid_id') }
+    end
+    new_session do |s|
+      assert_equal Hash.new, CACHE.get('session:' + s.session_id)
+    end
+  end
+
+  def test_storage
+    d = rand(0xffff)
+    new_session do |s|
+      s[:test] = d
+      s.close
+      assert_equal d, CACHE.get('session:' + s.session_id)[:test]
+      assert_equal d, s[:test]
+    end
+  end
+
+  def test_deletion
+    new_session do |s|
+      s[:test] = rand(0xffff)
+      s.delete
+      assert_nil CACHE.get('session:' + s.session_id)
+    end
+  end
+  
+  def test_other_session_retrieval
+    new_session do |sa|
+      sa[:test] = TEST_DATA
+      sa.close
+      new_session('session_id' => sa.session_id) do |sb|
+        assert_equal(TEST_DATA, sb[:test])
+      end
+    end
+  end
+  
+  def test_multiple_sessions
+    s_slots = Array.new(10)
+    operation = :write
+    last_data = nil
+    reads = writes = 0
+    50.times do
+      current = rand(10)
+      s_slots[current] ||= new_session('session_id' => '0123456789',
+                                       'new_session' => true)
+      s = s_slots[current]
+      case operation
+      when :write
+        last_data = rand(0xffff)
+        s[:test] = last_data
+        s.close
+        writes += 1
+      when :read
+        # Make CGI::Session#[] think there was no data retrieval yet.
+        # Normally, the session caches the data during its lifetime.
+        s.instance_variable_set(:@data, nil)
+        d = s[:test]
+        assert_equal(last_data, d, "OK reads: #{reads}, OK writes: #{writes}")
+        reads += 1
+      end
+      operation = rand(5) == 0 ? :write : :read
+    end
+  end
+  
+  
+  
+  private
+  def obtain_session_options
+    { 'database_manager' => CGI::Session::MemCacheStore,
+      'session_key' => '_test_app_session'
+    }
+  end
+  
+  
+  def new_session(options = {})
+    with_cgi do |cgi|
+      @options = obtain_session_options.merge(options)
+      session = CGI::Session.new(cgi, @options)
+      yield session if block_given?
+      return session
+    end
+  end
+  
+  def with_cgi
+    ENV['REQUEST_METHOD'] = 'GET'
+    ENV['HTTP_HOST'] = 'example.com'
+    ENV['QUERY_STRING'] = ''
+
+    cgi = CGI.new('query', StringIO.new(''))
+    yield cgi if block_given?
+    cgi
+  end
+end

actionpack/lib/action_controller/session/mem_cache_store.rb

@@ -57 +57 @@
-          @expires = options['expires'] || 0
-          @session_key = "session:#{id}"
-          @session_data = {}
+          # Add this key to the store if haven't done so yet
+          @cache.add(@session_key, @session_data, @expires) \
+            unless @cache.get(@session_key)
-        end
-
-        # Restore session state from the session's memcache entry.
-        #
-        # Returns the session state as a hash.
-        def restore
-
-
-
-
-
+
-        end
-
-        # Save session state to the session's memcache entry.
-        def update
-
-
-
-
-
+
-        end
-      
-        # Update and close the session's memcache entry.
@@ -86 +81 @@
-
-        # Delete the session's memcache entry.
-        def delete
-
-
-
-
-
+
-          @session_data = {}
-        end
-        
-        def data
-          @session_data
-        end
+
-      end
-    end
-  end