mongo_session_store-rails3 3.0.1 → 3.0.2

data/README.md

@@ -10,37 +10,45 @@ MongoSessionStore is compatible with Rails 3.0 and 3.1
 
 In your Gemfile:
 
-    gem "mongo_mapper"
-    gem "mongo_session_store-rails3"
+```ruby
+gem "mongo_mapper" # or "Mongoid," or another Mongo ODM, or nothing
+gem "mongo_session_store-rails3"
+```
 
 In the session_store initializer (config/initializers/session_store.rb):
 
-    # MongoMapper
-    MyApp::Application.config.session_store = :mongo_mapper_store
-    
-    # Mongoid
-    MyApp::Application.config.session_store = :mongoid_store
-    
-    # anything else
-    MyApp::Application.config.session_store = :mongo_store
-    ActionDispatch::Session:MongoStore::Session.database = Mongo::Connection.new.db('my_app_development')
+```ruby
+# MongoMapper
+MyApp::Application.config.session_store = :mongo_mapper_store
+
+# Mongoid
+MyApp::Application.config.session_store = :mongoid_store
+
+# anything else
+MyApp::Application.config.session_store = :mongo_store
+MongoStore::Session.database = Mongo::Connection.new.db('my_app_development')
+```
 
 Note: If you choose to use the :mongo_store you only need to set its database if you aren't using MongoMapper or Mongoid in your project.
 
 By default, the sessions will be stored in the "sessions" collection in MongoDB.  If you want to use a different collection, you can set that in the initializer:
 
-    MongoSessionStore.collection_name = "client_sessions"
+```ruby
+MongoSessionStore.collection_name = "client_sessions"
+```
 
-If for some reason you want to query your sessions:
+And if for some reason you want to query your sessions:
 
-    # MongoMapper
-    ActionDispatch::Session:MongoMapperStore::Session.where(:updated_at.gt => 2.days.ago)
+```ruby
+# MongoMapper
+MongoMapperStore::Session.where(:updated_at.gt => 2.days.ago)
 
-    # Mongoid
-    ActionDispatch::Session:MongoidStore::Session.where(:updated_at.gt => 2.days.ago)
-    
-    # Plain old Mongo
-    ActionDispatch::Session:MongoStore::Session.where('updated_at' => { '$gt' => 2.days.ago })
+# Mongoid
+MongoidStore::Session.where(:updated_at.gt => 2.days.ago)
+
+# Plain old Mongo
+MongoStore::Session.where('updated_at' => { '$gt' => 2.days.ago })
+```
 
 ## Performance
 

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/lib/mongo_session_store-rails3.rb

@@ -6,16 +6,16 @@ module MongoSessionStore
   def self.collection_name=(name)
     @collection_name = name
     
-    if defined?(ActionDispatch::Session::MongoStore::Session)
-      ActionDispatch::Session::MongoStore::Session.reset_collection
+    if defined?(MongoStore::Session)
+      MongoStore::Session.reset_collection
     end
 
-    if defined?(ActionDispatch::Session::MongoMapperStore::Session)
-      ActionDispatch::Session::MongoMapperStore::Session.set_collection_name(name)
+    if defined?(MongoMapperStore::Session)
+      MongoMapperStore::Session.set_collection_name(name)
     end
 
-    if defined?(ActionDispatch::Session::MongoidStore::Session)
-      ActionDispatch::Session::MongoidStore::Session.store_in(name)
+    if defined?(MongoidStore::Session)
+      MongoidStore::Session.store_in(name)
     end
   end
 

data/lib/mongo_session_store/mongo_mapper_store.rb

@@ -5,16 +5,22 @@ begin
   module ActionDispatch
     module Session
       class MongoMapperStore < MongoStoreBase
+        
         class Session
           include MongoMapper::Document
           set_collection_name MongoSessionStore.collection_name
-          key :_id, String
+          
+          key :_id,  String
           key :data, Binary, :default => Marshal.dump({})
+          
           timestamps!
         end
+        
       end
     end
   end
 
+  MongoMapperStore = ActionDispatch::Session::MongoMapperStore
+
 rescue LoadError
 end

data/lib/mongo_session_store/mongo_store.rb

@@ -7,15 +7,15 @@ module ActionDispatch
       class Session
         attr_accessor :_id, :data, :created_at, :updated_at
         
-        def initialize(options={})
+        def initialize(options = {})
           @_id        = options[:_id]
           @data       = options[:data] || BSON::Binary.new(Marshal.dump({}))
           @created_at = options[:created_at]
           @updated_at = options[:updated_at]
         end
         
-        def self.load(options={})
-          options[:data] = options["data"].to_s if options["data"]
+        def self.load(options = {})
+          options[:data] = options["data"] if options["data"]
           new(options)
         end
         
@@ -55,7 +55,7 @@ module ActionDispatch
           elsif defined?(Mongoid)
             Mongoid.database
           else
-            raise "MongoStore needs a database, e.g. #{name.to_s}.database = Mongo::Connection.new.db('my_app_development')"
+            raise "MongoStore needs a database, e.g. MongoStore::Session.database = Mongo::Connection.new.db('my_app_development')"
           end
         end
         
@@ -78,3 +78,5 @@ module ActionDispatch
     end
   end
 end
+
+MongoStore = ActionDispatch::Session::MongoStore

data/lib/mongo_session_store/mongoid_store.rb

@@ -20,15 +20,12 @@ begin
           def pack(data)
             BSON::Binary.new(Marshal.dump(data))
           end
-
-          def unpack(packed)
-            return nil unless packed
-            Marshal.load(StringIO.new(packed.to_s))
-          end
       
       end
     end
   end
+  
+  MongoidStore = ActionDispatch::Session::MongoidStore
 
 rescue LoadError
 end

data/perf/benchmark.rb

@@ -5,7 +5,7 @@ require 'bundler/setup'
 Bundler.require(:development)
 
 require 'action_dispatch'
-require File.join(File.dirname(__FILE__),'..','lib','mongo_session_store')
+require File.join(File.dirname(__FILE__),'..','lib','mongo_session_store-rails3')
 
 MongoMapper.database = "test_session_stores"
 Mongoid.database = Mongo::Connection.new.db("test_session_stores")
@@ -79,9 +79,9 @@ def benchmark_store(store)
   puts "          Index sizes: #{stats['indexSizes'].inspect}"
 end
 
-mongo_mapper_store = ActionDispatch::Session::MongoMapperStore.new(nil)
-mongoid_store = ActionDispatch::Session::MongoidStore.new(nil)
-mongo_store = ActionDispatch::Session::MongoStore.new(nil)
+mongo_mapper_store = MongoMapperStore.new(nil)
+mongoid_store = MongoidStore.new(nil)
+mongo_store = MongoStore.new(nil)
 
 puts "MongoMapperStore..."
 benchmark_store(mongo_mapper_store)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_session_store-rails3
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Brian Hempel
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 -04:00
+date: 2011-07-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency