mongo_session_store 1.0.1 → 1.1.0

data/{README.rdoc → README.md}

@@ -1,28 +1,40 @@
-= MongoSessionStore
+# MongoSessionStore
 
-== Description
+## Description
 
-This is a fork of the DataMapper session store, modified to work with MongoDB 
-and MongoMapper plugin. This plugin is still a work in progress...
+This is a fork of the DataMapper session store, modified to work with MongoMapper and Mongoid.
 
-== Installation
+## Installation
 
-  TBD
+    gem install mongo_session_store
 
-== Usage
+## Usage with MongoMapper
 
-1. Clone/submodule to vendor/plugins/mongo_session_store
-2. In the session_store initializer:
+In config/environment.rb:
 
- require 'mongo_session_store'
- ActionController::Base.session_store = MongoMapper::SessionStore
+    config.gem "mongo_mapper"
+    config.gem "mongo_session_store", :lib => "mongo_session_store/mongo_mapper"
 
-Obviously, for this to work, you must already have MongoMapper installed.
+In the session_store initializer:
 
-== License
+    ActionController::Base.session_store = :mongo_mapper_store
 
-Copyright (c) 2009 Chris Brickley
+## Usage with Mongoid
+
+In config/environment.rb:
+
+    config.gem "mongoid"
+    config.gem "mongo_session_store"
+
+In the session_store initializer:
 
+    require "mongo_session_store/mongoid"
+    ActionController::Base.session_store = :mongoid_store
+
+## License
+
+Copyright (c) 2010 Nicolas Mérouze
+Copyright (c) 2009 Chris Brickley
 Copyright (c) 2009 Tony Pitale
 
 Permission is hereby granted, free of charge, to any person

data/lib/mongo_session_store.rb

@@ -1,3 +1 @@
-$:.unshift File.dirname(__FILE__)
-
-require 'mongo_session_store/session_store'
+$:.unshift File.dirname(__FILE__)

data/lib/mongo_session_store/mongo_mapper.rb

@@ -0,0 +1,56 @@
+require 'mongo_mapper'
+
+module ActionController
+  module Session
+    class MongoMapperStore < AbstractStore
+      
+      class Session
+        include MongoMapper::Document
+        key :data, String, :default => [Marshal.dump({})].pack("m*")
+        timestamps!
+
+        MongoMapper.ensure_indexes!
+      end
+
+      # The class used for session storage.
+      cattr_accessor :session_class
+      self.session_class = Session
+
+      SESSION_RECORD_KEY = 'rack.session.record'.freeze
+
+      private
+        def generate_sid
+          Mongo::ObjectID.new
+        end
+
+        def get_session(env, sid)
+          sid ||= generate_sid
+          session = find_session(sid)
+          env[SESSION_RECORD_KEY] = session
+          [sid, unpack(session.data)]
+        end
+
+        def set_session(env, sid, session_data)
+          record = env[SESSION_RECORD_KEY] ||= find_session(sid)
+          record.data = pack(session_data)
+          #per rack spec: Should return true or false dependant on whether or not the session was saved or not.
+          record.save ? true : false
+        end
+
+        def find_session(id)
+          @@session_class.find(id) ||
+            @@session_class.new(:id=>id)
+        end
+
+        def pack(data)
+          [Marshal.dump(data)].pack("m*")
+        end
+
+        def unpack(packed)
+          return nil unless packed
+          Marshal.load(packed.unpack("m*").first)
+        end
+      
+    end
+  end
+end

data/lib/mongo_session_store/mongoid.rb

@@ -0,0 +1,56 @@
+require 'mongoid'
+
+module ActionController
+  module Session
+    class MongoidStore < AbstractStore
+      
+      class Session
+        include Mongoid::Document
+        include Mongoid::Timestamps
+
+        field :data, :type => String, :default => [Marshal.dump({})].pack("m*")
+        index :updated_at
+      end
+
+      # The class used for session storage.
+      cattr_accessor :session_class
+      self.session_class = Session
+
+      SESSION_RECORD_KEY = 'rack.session.record'.freeze
+
+      private
+        def generate_sid
+          Mongo::ObjectID.new
+        end
+
+        def get_session(env, sid)
+          sid ||= generate_sid
+          session = find_session(sid)
+          env[SESSION_RECORD_KEY] = session
+          [sid, unpack(session.data)]
+        end
+
+        def set_session(env, sid, session_data)
+          record = env[SESSION_RECORD_KEY] ||= find_session(sid)
+          record.data = pack(session_data)
+          #per rack spec: Should return true or false dependant on whether or not the session was saved or not.
+          record.save ? true : false
+        end
+
+        def find_session(id)
+          @@session_class.find(id) ||
+            @@session_class.new(:id=>id)
+        end
+
+        def pack(data)
+          [Marshal.dump(data)].pack("m*")
+        end
+
+        def unpack(packed)
+          return nil unless packed
+          Marshal.load(packed.unpack("m*").first)
+        end
+      
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_session_store
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Nicolas M\xC3\xA9rouze"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +26,24 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongo_mapper
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.6.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
 description: 
 email: nicolas.merouze@gmail.com
 executables: []
@@ -41,17 +51,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 files: 
-- .gitignore
-- README.rdoc
-- Rakefile
-- VERSION
+- README.md
 - lib/mongo_session_store.rb
-- lib/mongo_session_store/session_store.rb
-- mongo_session_store.gemspec
-- test/test_helper.rb
-- test/unit/dm_session_store_test.rb
+- lib/mongo_session_store/mongo_mapper.rb
+- lib/mongo_session_store/mongoid.rb
 has_rdoc: true
 homepage: http://github.com/nmerouze/mongo_session_store
 licenses: []
@@ -79,7 +84,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Rails session store class implemented for MongoMapper
-test_files: 
-- test/test_helper.rb
-- test/unit/dm_session_store_test.rb
+summary: Rails session store class implemented for MongoMapper and Mongoid
+test_files: []
+

data/.gitignore

@@ -1,4 +0,0 @@
-.DS_Store
-/pkg
-/doc
-/coverage

data/Rakefile

@@ -1,19 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'spec/rake/spectask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "mongo_session_store"
-    gem.summary = %Q{Rails session store class implemented for MongoMapper}
-    gem.email = "nicolas.merouze@gmail.com"
-    gem.homepage = "http://github.com/nmerouze/mongo_session_store"
-    gem.authors = ["Nicolas Mérouze", "Tony Pitale", "Chris Brickley"]
-    
-    gem.add_dependency('actionpack',  '~> 2.3')
-    gem.add_dependency('mongo_mapper', '~> 0.6.1')
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end

data/VERSION

@@ -1 +0,0 @@
-1.0.1

data/lib/mongo_session_store/session_store.rb

@@ -1,54 +0,0 @@
-require 'mongo_mapper'
-
-module MongoMapper
-  class SessionStore < ActionController::Session::AbstractStore
-    
-    class Session
-      include MongoMapper::Document
-      key :data, String, :default => [Marshal.dump({})].pack("m*")
-      timestamps!
-      
-      MongoMapper.ensure_indexes!
-    end
-    
-    # The class used for session storage.
-    cattr_accessor :session_class
-    self.session_class = Session
-
-    SESSION_RECORD_KEY = 'rack.session.record'.freeze
-
-    private
-      def generate_sid
-        Mongo::ObjectID.new
-      end
-      
-      def get_session(env, sid)
-        sid ||= generate_sid
-        session = find_session(sid)
-        env[SESSION_RECORD_KEY] = session
-        [sid, unpack(session.data)]
-      end
-    
-      def set_session(env, sid, session_data)
-        record = env[SESSION_RECORD_KEY] ||= find_session(sid)
-        record.data = pack(session_data)
-        #per rack spec: Should return true or false dependant on whether or not the session was saved or not.
-        record.save ? true : false
-      end
-    
-      def find_session(id)
-        @@session_class.find(id) ||
-          @@session_class.new(:id=>id)
-      end
-    
-      def pack(data)
-        [Marshal.dump(data)].pack("m*")
-      end
-
-      def unpack(packed)
-        return nil unless packed
-        Marshal.load(packed.unpack("m*").first)
-      end
-      
-  end
-end

data/mongo_session_store.gemspec

@@ -1,54 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{mongo_session_store}
-  s.version = "1.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nicolas M\303\251rouze", "Tony Pitale", "Chris Brickley"]
-  s.date = %q{2010-01-22}
-  s.email = %q{nicolas.merouze@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/mongo_session_store.rb",
-     "lib/mongo_session_store/session_store.rb",
-     "mongo_session_store.gemspec",
-     "test/test_helper.rb",
-     "test/unit/dm_session_store_test.rb"
-  ]
-  s.homepage = %q{http://github.com/nmerouze/mongo_session_store}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Rails session store class implemented for MongoMapper}
-  s.test_files = [
-    "test/test_helper.rb",
-     "test/unit/dm_session_store_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<actionpack>, ["~> 2.3"])
-      s.add_runtime_dependency(%q<mongo_mapper>, ["~> 0.6.1"])
-    else
-      s.add_dependency(%q<actionpack>, ["~> 2.3"])
-      s.add_dependency(%q<mongo_mapper>, ["~> 0.6.1"])
-    end
-  else
-    s.add_dependency(%q<actionpack>, ["~> 2.3"])
-    s.add_dependency(%q<mongo_mapper>, ["~> 0.6.1"])
-  end
-end
-

data/test/test_helper.rb

@@ -1,10 +0,0 @@
-# http://sneaq.net/textmate-wtf
-$:.reject! { |e| e.include? 'TextMate' }
-
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
-require 'action_controller' # version >= 2.3.0
-
-require File.dirname(__FILE__) + '/../lib/dm_session_store'

data/test/unit/dm_session_store_test.rb

@@ -1,36 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
-
-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
-
-      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 "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 "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
-end