lib/dm_session_store/session_store.rb @@ -6,6 +6,9 @@ For those using DataMapper with Rails there was no option for storing sessions in a database (most people remove ActiveRecord). This little gem adds the required classes to use DataMapper to store sessions in the database. +Now supports Rails >= 2.3.0 in version 0.2.0. If you need support before that, +try version 0.1.0. + h2. Installation sudo gem install tpitale-dm_session_store @@ -15,7 +18,10 @@ h2. Usage In Rails config/environment.rb config.gem 'tpitale-dm_session_store, :lib => 'dm_session_store' - config.action_controller.session_store = CGI::Session::DMSessionStore + +In the session_store initializer: + + ActionController::Base.session_store = DataMapper::SessionStore Obviously, for this to work, you had better follow one of the many online resources for using DataMapper with Rails. README.textile @@ -17,6 +17,7 @@ spec = Gem::Specification.new do |s| s.test_files = Dir.glob("test/**/*_test.rb") s.add_dependency('dm-core', '~> 0.9.11') + s.add_dependency('actionpack', '~> 2.3.0') end Rake::GemPackageTask.new(spec) do |pkg| Rakefile @@ -1,3 +1,3 @@ $:.unshift File.dirname(__FILE__) -require 'dm_session_store/session_ext' +require 'dm_session_store/session_store' lib/dm_session_store.rb @@ -2,7 +2,7 @@ module DmSessionStore module Version MAJOR = 0 - MINOR = 1 + MINOR = 2 TINY = 0 def self.to_s # :nodoc: lib/dm_session_store/version.rb @@ -5,5 +5,6 @@ require 'rubygems' require 'test/unit' require 'shoulda' require 'mocha' +require 'action_controller' # version >= 2.3.0 require File.dirname(__FILE__) + '/../lib/dm_session_store' \ No newline at end of file test/test_helper.rb @@ -1,61 +1,35 @@ require File.join(File.dirname(__FILE__), "..", "test_helper") -require 'cgi' -require 'cgi/session' -class CGI - class Session - - class DMSessionStoreTest < Test::Unit::TestCase - context "The DMSessionStore initialize method" do - should "raise CGI:Session::NoSession if session is not a new_session" do - DMSessionStore::DMSession.stubs(:find_by_session_id).with("1").returns(nil) - session = DMSessionStore::DMSession.new(:session_id => "1") - session.stubs(:new_session).with().returns(false) - assert_raise CGI::Session::NoSession, "uninitialized session" do - DMSessionStore.new(session) - end - end +module DataMapper + class SessionStoreTest < Test::Unit::TestCase + context "An instance of the SessionStore class" do + setup do + @session_klass = SessionStore::Session + @session_store = SessionStore.new('app') end - context "An instance of the DMSessionStore class" do - setup do - @session = DMSessionStore::DMSession.new(:session_id => "1", :data => {:hello => 'world'}) - DMSessionStore::DMSession.stubs(:find_by_session_id).with("1").returns(nil) - old_session = DMSessionStore::DMSession.new(:session_id => "1") - old_session.stubs(:new_session).with().returns(true) - DMSessionStore::DMSession.stubs(:new).with(:session_id => "1", :data => {}).returns(@session) - @session_store = DMSessionStore.new(old_session) - end - - should "have the session" do - assert_equal @session, @session_store.model - end - - should "return the data from session" do - assert_equal({:hello => 'world'}, @session_store.restore) - end - - should "save the session" do - @session.expects(:save).with().returns(true) - assert_equal true, @session_store.update - end - - should "save and unreference the session" do - @session_store.expects(:update) - @session_store.close - assert_equal nil, @session_store.model - end + should "get a session" do + env = {} + session = stub(:data => 'data') + @session_store.expects(:find_session).with(1).returns(session) + assert_equal([1, 'data'], @session_store.send(:get_session, env, 1)) + assert_equal({'rack.session.record' => session}, env) + end - should "destroy and unreference the session" do - @session.expects(:destroy) - @session_store.delete - assert_equal nil, @session_store.model - end + should "set a session" do + env = {} + session = stub + session.expects(:data=).with({:color => 'yellow'}) + session.stubs(:save).returns(true) + @session_store.expects(:find_session).with(1).returns(session) + assert @session_store.send(:set_session, env, 1, {:color => 'yellow'}) + assert_equal({'rack.session.record' => session}, env) + end - should "log with DataMapper" do - DataMapper::Logger.expects(:new).with(STDERR, :fatal).returns('logger') - assert_equal 'logger', @session_store.send(:logger) - end + should "find a session" do + @session_klass.expects(:first).with(:session_id => 1).returns(nil) + @session_klass.expects(:new).with(:session_id => 1, :data => {}).returns('session') + assert_equal 'session', @session_store.send(:find_session, 1) end end end test/unit/dm_session_store_test.rb lib/dm_session_store/session_ext.rb 5cc7764837e4d2d990b97cb505fb6e87c887cf05 tpitale tpitale@gmail.com http://github.com/tpitale/dm_session_store/commit/1f6fd9990ac471835efe5bdab4f70c05b265be90 1f6fd9990ac471835efe5bdab4f70c05b265be90 2009-05-03T11:36:43-07:00 2009-05-03T11:34:52-07:00 major updates to work with Rails >= 2.3.0 updated readme and version to 0.2.0 6b0c7baf3d5bfd38f1788b2712c645bf3adc8ea2 tpitale tpitale@gmail.com