mongo_session_store 1.1.2 → 2.0.0.pre

data/README.md

@@ -6,32 +6,46 @@ This is a fork of the DataMapper session store, modified to work with MongoMappe
 
 ## Installation
 
+The current version is only compatible with Rails 3
+
     gem install mongo_session_store
 
+However if you want to use it with Rails 2.3.x, you just have to install the latest 1.x version
+
+    gem install mongo_session_store --version=1.1.2
+
 ## Usage with MongoMapper
 
-In config/environment.rb:
+In your Gemfile:
 
-    config.gem "mongo_mapper"
-    config.gem "mongo_session_store"
+    gem "mongo_mapper-rails3", :require => "mongo_mapper"
+    gem "mongo_session_store"
 
-In the session_store initializer:
+In the session_store initializer (config/initializers/session_store.rb):
 
     require "mongo_session_store/mongo_mapper"
     ActionController::Base.session_store = :mongo_mapper_store
 
 ## Usage with Mongoid
 
-In config/environment.rb:
+In your Gemfile:
 
-    config.gem "mongoid"
-    config.gem "mongo_session_store"
+    gem "mongoid"
+    gem "mongo_session_store"
 
-In the session_store initializer:
+In the session_store initializer (config/initializers/session_store.rb):
 
     require "mongo_session_store/mongoid"
     ActionController::Base.session_store = :mongoid_store
 
+## Contributors
+
+* Nicolas Mérouze
+* Chris Brickley
+* Tony Pitale
+* Nicola Racco
+* Matt Powell
+
 ## License
 
 Copyright (c) 2010 Nicolas Mérouze

data/lib/mongo_session_store/mongo_mapper.rb

@@ -1,6 +1,6 @@
 require 'mongo_mapper'
 
-module ActionController
+module ActionDispatch
   module Session
     class MongoMapperStore < AbstractStore
 
@@ -9,7 +9,7 @@ module ActionController
         key :data, String, :default => [Marshal.dump({})].pack("m*")
         timestamps!
 
-        ensure_index :updated_at
+        ensure_index :updated_at if MongoMapper.class_variables.include? '@@database'
       end
 
       # The class used for session storage.
@@ -20,7 +20,7 @@ module ActionController
 
       private
         def generate_sid
-          Mongo::ObjectID.new
+          BSON::ObjectID.new
         end
 
         def get_session(env, sid)
@@ -33,14 +33,16 @@ module ActionController
         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
+          # Rack spec dictates that set_session should return true or false
+          # depending on whether or not the session was saved or not.
+          # However, ActionPack seems to want a session id instead.
+          record.save ? sid : false
         end
 
         def find_session(id)
           @@session_class.find(id) ||
             @@session_class.new(:id=>id)
-        rescue Mongo::InvalidObjectID
+        rescue BSON::InvalidObjectID
           @@session_class.new(:id => generate_sid)
         end
 

data/lib/mongo_session_store/mongoid.rb

@@ -1,6 +1,6 @@
 require 'mongoid'
 
-module ActionController
+module ActionDispatch
   module Session
     class MongoidStore < AbstractStore
       
@@ -20,7 +20,7 @@ module ActionController
 
       private
         def generate_sid
-          Mongo::ObjectID.new
+          BSON::ObjectID.new
         end
 
         def get_session(env, sid)
@@ -33,13 +33,16 @@ module ActionController
         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
+          # Rack spec dictates that set_session should return true or false
+          # depending on whether or not the session was saved or not.
+          # However, ActionPack seems to want a session id instead.
+          record.save ? sid : false
         end
 
         def find_session(id)
-          @@session_class.find(id) ||
-            @@session_class.new(:id=>id)
+          id = BSON::ObjectID.from_string(id.to_s)
+          @@session_class.first(:conditions => { :_id => id }) ||
+            @@session_class.new(:id => id)
         end
 
         def pack(data)

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_session_store
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  prerelease: true
+  segments: 
+  - 2
+  - 0
+  - 0
+  - pre
+  version: 2.0.0.pre
 platform: ruby
 authors: 
 - "Nicolas M\xC3\xA9rouze"
@@ -11,39 +17,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 +01:00
+date: 2010-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.3"
-    version: 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mongo_mapper
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: mongo_mapper-rails3
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
-    version: 
+        segments: 
+        - 0
+        - 7
+        - 2
+        version: 0.7.2
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id003
 description: 
 email: nicolas.merouze@gmail.com
 executables: []
@@ -70,18 +86,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails session store class implemented for MongoMapper and Mongoid