mongo_session_store-rails3 4.1.0 → 4.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0cfa82736ec25e1cf342ef21455b2fba8e6a49e2
+  data.tar.gz: 5aae0a100f3ba92e18995e9bdc685d8797354a50
+SHA512:
+  metadata.gz: 45dd7a838b89375851da0886be0499ba69b9bc4706fc6bd1a335336303c439900266b3a3a688277ca2a443cbebc2cfd8ad7247eb32cf3f462f65b4fafedc827c
+  data.tar.gz: 7f06e483bf1db8967507e3c35c79859995b10f63763183c2df4894c08e67adafacc371ecfd07da52fd0d64c80e4c6ec348987b88832649430e06dbeadc790db8

data/.gitignore

@@ -5,4 +5,6 @@
 Gemfile.lock
 Gemfile_Rails_*.lock
 *.gem
-.rvmrc
+.rvmrc
+*.swo
+*.swp

data/.travis.yml

@@ -3,6 +3,7 @@ script: "rake"
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
   - ruby-head
   - rbx-19mode
   - jruby-19mode

data/Gemfile

@@ -22,10 +22,12 @@ group :development, :test do
   end
 
   if !ENV['MONGO_SESSION_STORE_ORM'] || ENV['MONGO_SESSION_STORE_ORM'] == 'mongoid'
-    gem 'mongoid', '~> 3.0', :platforms => [:ruby_19, :jruby]
+    gem 'mongoid', '~> 3.0', :platforms => [:ruby_19, :jruby, :ruby_20]
   end
 
-  gem 'mongo',         MONGO_VERS
+  if !ENV['MONGO_SESSION_STORE_ORM'] || ENV['MONGO_SESSION_STORE_ORM'] == 'mongo'
+    gem 'mongo',         MONGO_VERS
+  end
   gem 'bson_ext',      MONGO_VERS, :platforms => :ruby
 
   gem 'system_timer', :platforms => :ruby_18
@@ -46,4 +48,4 @@ group :development, :test do
 
   gem 'rspec-rails', '2.12.0'
   gem 'devise'
-end
+end

data/README.md

@@ -4,7 +4,7 @@
 
 MongoSessionStore is a collection of Rails-compatible session stores for MongoMapper and Mongoid, but also included is a generic Mongo store that works with any (or no!) Mongo ODM.
 
-MongoSessionStore is tested [on Travis CI](https://travis-ci.org/brianhempel/mongo_session_store) against Ruby 1.8.7, 1.9.3, and JRuby. As of this writing, it also works on Rubinius in 1.9 mode and on Ruby 2.0.0.
+MongoSessionStore is tested [on Travis CI](https://travis-ci.org/brianhempel/mongo_session_store) against Ruby 1.8.7, 1.9.3, 2.0.0, and JRuby. As of this writing, it also works on Rubinius in 1.9.
 
 If this gem doesn't work for you, you might next try [mongo_sessions](https://github.com/biilmann/mongo_sessions).
 

data/lib/mongo_session_store-rails3.rb

@@ -32,6 +32,19 @@ module MongoSessionStore
   self.collection_name = "sessions"
 end
 
-require 'mongo_session_store/mongo_mapper_store'
-require 'mongo_session_store/mongoid_store'
-require 'mongo_session_store/mongo_store'
+# we don't use autoloading because of thread concerns
+# hence, this mess
+load_errors = []
+
+%w(mongo_mapper_store mongoid_store mongo_store).each do |store_name|
+  begin
+    require "mongo_session_store/#{store_name}"
+  rescue LoadError => e
+    load_errors << e
+  end
+end
+
+if load_errors.count == 3
+  message = "Could not load any session store!\n" + load_errors.map(&:message).join("\n")
+  raise LoadError, message
+end

data/lib/mongo_session_store/mongo_mapper_store.rb

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

data/lib/mongo_session_store/mongo_store.rb

@@ -6,23 +6,23 @@ module ActionDispatch
     class MongoStore < MongoStoreBase
       class Session
         attr_accessor :_id, :data, :created_at, :updated_at
-        
+
         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"] if options["data"]
           new(options)
         end
-        
+
         def destroy
           collection.remove :_id => _id
         end
-        
+
         def save
           @created_at ||= Time.now
           @updated_at   = Time.now
@@ -34,19 +34,19 @@ module ActionDispatch
             :updated_at => @updated_at
           )
         end
-        
+
         def data=(stuff)
           @data = stuff.to_s
         end
-        
+
         def self.where(query = {})
           collection.find(query).map { |doc| load(doc) }
         end
-        
+
         def self.last
           where.last
         end
-        
+
         def self.database
           if @database
             @database
@@ -58,19 +58,19 @@ module ActionDispatch
             raise "MongoStore needs a database, e.g. MongoStore::Session.database = Mongo::Connection.new.db('my_app_development')"
           end
         end
-        
+
         def self.database=(database)
           @database = database
         end
-        
+
         def self.collection
           @collection ||= database[MongoSessionStore.collection_name]
         end
-        
+
         def self.reset_collection
           @collection = nil
         end
-        
+
         def collection
           self.class.collection
         end

data/lib/mongo_session_store/mongo_store_base.rb

@@ -12,12 +12,12 @@ module ActionDispatch
       def self.session_class
         self::Session
       end
-            
+
       private
         def session_class
           self.class.session_class
         end
-      
+
         def generate_sid
           # 20 random bytes in url-safe base64
           SecureRandom.base64(20).gsub('=','').gsub('+','-').gsub('/','_')
@@ -38,7 +38,7 @@ module ActionDispatch
           # However, ActionPack seems to want a session id instead.
           record.save ? sid : false
         end
-        
+
         def find_session(id)
           session_class.where(:_id => id).first || session_class.new(:_id => id)
         end
@@ -55,7 +55,7 @@ module ActionDispatch
           destroy(env)
           generate_sid unless options[:drop]
         end
-        
+
         def destroy(env)
           if sid = current_session_id(env)
             get_session_model(env, sid).destroy

data/lib/mongo_session_store/mongoid_store.rb

@@ -1,33 +1,29 @@
-begin
-  require 'mongoid'
-  require 'mongo_session_store/mongo_store_base'
+require 'mongoid'
+require 'mongo_session_store/mongo_store_base'
 
-  module ActionDispatch
-    module Session
-      class MongoidStore < MongoStoreBase
+module ActionDispatch
+  module Session
+    class MongoidStore < MongoStoreBase
 
-        class Session
-          include Mongoid::Document
-          include Mongoid::Timestamps
+      class Session
+        include Mongoid::Document
+        include Mongoid::Timestamps
 
-          store_in :collection => MongoSessionStore.collection_name
+        store_in :collection => MongoSessionStore.collection_name
 
-          field :_id, :type => String
+        field :_id, :type => String
 
-          field :data, :type => Moped::BSON::Binary, :default => Moped::BSON::Binary.new(:generic, Marshal.dump({}))
+        field :data, :type => Moped::BSON::Binary, :default => Moped::BSON::Binary.new(:generic, Marshal.dump({}))
 
-          attr_accessible :_id, :data
-        end
+        attr_accessible :_id, :data
+      end
 
-        private
-        def pack(data)
-          Moped::BSON::Binary.new(:generic, Marshal.dump(data))
-        end
+      private
+      def pack(data)
+        Moped::BSON::Binary.new(:generic, Marshal.dump(data))
       end
     end
   end
-
-  MongoidStore = ActionDispatch::Session::MongoidStore
-
-rescue LoadError
 end
+
+MongoidStore = ActionDispatch::Session::MongoidStore

data/lib/mongo_session_store/version.rb

@@ -1,3 +1,3 @@
 module MongoSessionStore
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/spec/integration_with_devise_spec.rb

@@ -74,16 +74,16 @@ describe Devise::SessionsController do
   
   it "stores the session in the sessions collection" do
     collection = db["sessions"]
-    collection.count.should == 0
+    collection.find.count.should == 0
     create_user
-    collection.count.should == 1
+    collection.find.count.should == 1
   end
   
   it "allows renaming of the collection that stores the sessions" do
     collection = db["dance_parties"]
-    collection.count.should == 0
+    collection.find.count.should == 0
     MongoSessionStore.collection_name = "dance_parties"
     create_user
-    collection.count.should == 1    
+    collection.find.count.should == 1
   end
-end
+end

data/spec/spec_helper.rb

@@ -12,7 +12,13 @@ require "rails_#{rails_version}_app/config/environment"
 require 'rspec/rails'
 
 def db
-  Mongo::Connection.new[database_name]
+  if defined?(Mongoid)
+    MongoidStore::Session.mongo_session
+  elsif defined?(MongoMapper)
+    MongoMapper.database
+  elsif defined?(Mongo)
+    Mongo::Connection.new[database_name]
+  end
 end
 
 def database_name
@@ -31,8 +37,6 @@ RSpec.configure do |config|
   end
 
   config.before :each do
-    drop_collections_in(MongoidStore::Session.mongo_session) if defined?(Mongoid)
-    drop_collections_in(MongoMapper.database) if defined?(MongoMapper)
     drop_collections_in(db)
     User.delete_all
   end

metadata

@@ -1,50 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongo_session_store-rails3
-version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: 
-  segments: 
-  - 4
-  - 1
-  - 0
-  version: 4.1.0
+version: !ruby/object:Gem::Version
+  version: 4.1.1
 platform: ruby
-authors: 
+authors:
 - Brian Hempel
-- "Nicolas M\xC3\xA9rouze"
+- Nicolas Mérouze
 - Tony Pitale
 - Chris Brickley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: 
-email: 
+email:
 - plasticchicken@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -175,38 +164,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/brianhempel/mongo_session_store
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails 3.1 and 3.2 compatible.
-test_files: 
+specification_version: 4
+summary: Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails 3.1
+  and 3.2 compatible.
+test_files:
 - perf/benchmark.rb
 - spec/integration_with_devise_spec.rb
 - spec/rails_3.1_app/.gitignore