Removing some commented out code, removing benchmark test, using YAML…

… for data serialization
fgrehm · Jul 20, 2010 · 964d042 · 964d042
1 parent 3f8f589
commit 964d042
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 221 deletions.
diff --git a/burn/session_benchmark b/burn/session_benchmark
diff --git a/lib/harbor/contrib/session/data_objects.rb b/lib/harbor/contrib/session/data_objects.rb
@@ -1,4 +1,5 @@
 require "data_objects"
+require 'yaml'
 
 module Harbor
   module Contrib
@@ -83,9 +84,6 @@ def self.commit_session(data, request)
             user_id = data[:user_id]
             statement = "UPDATE sessions SET data = ?, user_id = ?, updated_at = ? WHERE id = ?;"
             execute(statement, self.dump(data.to_hash), user_id, Time.now, session_id)
-#          else
-#            statement = "UPDATE sessions SET updated_at = ? WHERE id = ?;"
-#            execute(statement, Time.now, session_id)
           end
 
           session_id
@@ -162,15 +160,14 @@ def self.get_raw_session(cookie, updated_at=nil)
           raw
         end
 
-        def self.dump(data)
-          Marshal.dump(data)
+        def self.dump(value)
+          YAML::dump value
         end
 
-        def self.load(data)
-          Marshal.load(data)
+        def self.load(value)
+          YAML::load value
         end
 
-      protected
         def self.execute(statement, *bind_values)
           with_connection do |connection|
             command = connection.create_command(statement)

diff --git a/test/contrib/session/data_objects_test.rb b/test/contrib/session/data_objects_test.rb
@@ -14,18 +14,16 @@ def cookies
         end
       end
 
-      def setup
-#        @connection = DataObjects::Connection.new('sqlite3::memory:')
-
+      def setup        
         Harbor::Session.configure do |session|
           session[:store] = Harbor::Contrib::Session::DataObjects
           session[:connection_uri] = 'sqlite3::memory:'
         end
       end
 
       def teardown
-        Harbor::Contrib::Session::DataObjects.with_connection do |connection|
-          connection.create_command('DROP TABLE sessions').execute_non_query if Harbor::Contrib::Session::DataObjects.session_table_exists?
+        if Harbor::Contrib::Session::DataObjects.session_table_exists?
+          Harbor::Contrib::Session::DataObjects.execute('DROP TABLE sessions')
         end
 
         Harbor::Contrib::Session::DataObjects.instance_eval do
@@ -139,7 +137,6 @@ def test_user_id_is_not_lazy_parsed
 
         assert request_session.data.instance_variable_get(:@data).nil?
 
-        # Parses data
         request_session[:user_id]
 
         assert request_session.data.instance_variable_get(:@data).nil?