mongo_session_store-rails3 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 978d92ad561316e9b239b0fad9d24b40f60e1177
-  data.tar.gz: c7544b18a3b886640cf398e8ce972eaa1634b586
+  metadata.gz: c6fb0f3be1ee193468f59e8ceae96d70165c2806
+  data.tar.gz: 57a0d903010ed76a33967e2c8a218c4af890f5e5
 SHA512:
-  metadata.gz: 270987e7655190e6c605ffe5a72554faf38a1139e8033c95dfcff15719ada252b93ba3e2cacf37d995837f4fa7370478e1a178b93ad2b4a0b455759f4d9a1607
-  data.tar.gz: 5356afb1a2a500fa6a25bf1e96201635b97e66ca0c32ad6f22d0208737cf5b2508f694ae4d6e2c59db3195cc790d094753c524915f75c36891e5b42145d41163
+  metadata.gz: d7024e9286c693e8e68bb8c70818dc85fa3ea56ce9fb62c6789e1c1c63ef82fe41ae41135c9cdb5f209616ac95e7adccd61070bbf5dd0392acb6b5874c7cdf14
+  data.tar.gz: eb4441fbbae34d749b8602a5c44e7bb74beeae362460ac20a86a4b34a772aba508f3694be37356a27cb55b42763efc9fb2dfee199616502eb931b96328cb0f74

data/.travis.yml

@@ -3,15 +3,15 @@ script: "rake"
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.2
   - ruby-head
   - jruby-19mode
   - jruby-head
-  - rbx
+  - rbx-2.2.9
 matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
-    - rvm: rbx
+    - rvm: rbx-2.2.9
 services:
   - mongodb

data/Gemfile

@@ -2,13 +2,13 @@ source 'https://rubygems.org'
 
 RAILS_VERS = case ENV['RAILS_VERS']
              when '3.1'
-               '~>3.1'
+               '~>3.1.12'
              when '3.2'
-               '~>3.2'
+               '~>3.2.18'
              when '4.0'
-               '~>4.0'
+               '~>4.0.5'
              when '4.1'
-               '~>4.1.0.rc1'
+               '~>4.1.2.rc2'
              when nil
                nil
              else
@@ -24,10 +24,12 @@ group :development, :test do
   end
 
   if ENV['MONGO_SESSION_STORE_ORM'] == 'mongoid'
-    if ENV['RAILS_VERS'] =~ /4\.\d/
+    if ENV['RAILS_VERS'] =~ /^4\.\d/
       gem 'mongoid', '>= 4.0.0.beta1'
-    else
+    elsif ENV['RAILS_VERS'] =~ /^3\.2\d/
       gem 'mongoid', '>= 3.1.0'
+    else
+      gem 'mongoid', '>= 3.0.0'
     end
   end
 
@@ -35,7 +37,7 @@ group :development, :test do
     gem 'mongo'
   end
 
-  gem 'debugger', :platforms => [:ruby_19, :ruby_20, :ruby_21] unless ENV['TRAVIS']
+  gem 'pry'
 
   if RUBY_PLATFORM == 'java'
     gem 'jdbc-sqlite3'

data/README.md

@@ -1,10 +1,10 @@
-# MongoSessionStore [![Build Status](https://travis-ci.org/brianhempel/mongo_session_store.png?branch=master)](https://travis-ci.org/brianhempel/mongo_session_store)
+# MongoSessionStore [![Build Status](https://travis-ci.org/brianhempel/mongo_session_store.png?branch=master)](https://travis-ci.org/brianhempel/mongo_session_store) [![Gem Version](https://badge.fury.io/rb/mongo_session_store-rails4.svg)](http://badge.fury.io/rb/mongo_session_store-rails4)
 
 ## Description
 
 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.9.3, 2.0.0, 2.1.1, and JRuby with Rails 3.1 through 4.1.
+MongoSessionStore is tested [on Travis CI](https://travis-ci.org/brianhempel/mongo_session_store) against Ruby 1.9.3, 2.0.0, 2.1.2, and JRuby with Rails 3.1 through 4.1.
 
 Mongoid users: This gem is compatible with both Mongoid 3 and 4.
 
@@ -61,6 +61,8 @@ MongoStore::Session.where('updated_at' => { '$gt' => 2.days.ago })
 
 ## Changelog
 
+5.1.0 generates a new session ID when a session is not found. Previously, when a session ID is provided in the request but the session was not found (because for example, it was removed from Mongo by a sweeper job) a new session with the provided ID would be created. This would cause a write error if two simultaneous requests both create a session with the same ID and both try to insert a new document with that ID.
+
 5.0.1 suppresses a warning from Mongoid 4 when setting the _id field type to String.
 
 5.0.0 introduces Rails 4.0 and 4.1 support and Mongoid 4 support alongside the existing Rails 3.1, 3.2, and Mongoid 3 support. Ruby 1.8.7 support is dropped. The database is no longer set automatically for the MongoStore when MongoMapper or Mongoid is present. You have to set the database manually whenever you choose to use the vanilla MongoStore.

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'bundler'
-Bundler::GemHelper.install_tasks :name => 'mongo_session_store-rails3'
+Bundler::GemHelper.install_tasks :name => 'mongo_session_store-rails4'
 
 def run_with_output(command)
   puts "Running: #{command}"

data/lib/mongo_session_store/mongo_store_base.rb

@@ -1,7 +1,9 @@
+require 'action_dispatch/middleware/session/abstract_store'
+
 module ActionDispatch
   module Session
     class MongoStoreBase < AbstractStore
-      
+
       SESSION_RECORD_KEY = 'rack.session.record'.freeze
       begin
         ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
@@ -24,31 +26,31 @@ module ActionDispatch
         end
 
         def get_session(env, sid)
-          sid ||= generate_sid
-          session = find_session(sid)
-          env[SESSION_RECORD_KEY] = session
-          [sid, unpack(session.data)]
+          sid, record = find_or_initialize_session(sid)
+          env[SESSION_RECORD_KEY] = record
+          [sid, unpack(record.data)]
         end
 
         def set_session(env, sid, session_data, options = {})
-          record = get_session_model(env, sid)
+          id, record = get_session_record(env, sid)
           record.data = pack(session_data)
           # 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
+          record.save ? id : false
         end
 
-        def find_session(id)
-          session_class.where(:_id => id).first || session_class.new(:_id => id)
+        def find_or_initialize_session(id)
+          session = (id && session_class.where(:_id => id).first) || session_class.new(:_id => generate_sid)
+          [session._id, session]
         end
 
-        def get_session_model(env, sid)
-          if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
-            env[SESSION_RECORD_KEY] = find_session(sid)
-          else
-            env[SESSION_RECORD_KEY] ||= find_session(sid)
+        def get_session_record(env, sid)
+          if env[ENV_SESSION_OPTIONS_KEY][:id].nil? || !env[SESSION_RECORD_KEY]
+            sid, env[SESSION_RECORD_KEY] = find_or_initialize_session(sid)
           end
+
+          [sid, env[SESSION_RECORD_KEY]]
         end
 
         def destroy_session(env, session_id, options)
@@ -58,7 +60,8 @@ module ActionDispatch
 
         def destroy(env)
           if sid = current_session_id(env)
-            get_session_model(env, sid).destroy
+            _, record = get_session_record(env, sid)
+            record.destroy
             env[SESSION_RECORD_KEY] = nil
           end
         end
@@ -74,4 +77,4 @@ module ActionDispatch
 
     end
   end
-end
+end

data/lib/mongo_session_store/version.rb

@@ -1,3 +1,3 @@
 module MongoSessionStore
-  VERSION = "5.0.1"
+  VERSION = "5.1.0"
 end

data/spec/integration_with_devise_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Devise::SessionsController do
   def create_user

data/spec/mongo_store_base_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'securerandom'
+require 'ostruct'
+require 'mongo_session_store/mongo_store_base'
+
+describe ActionDispatch::Session::MongoStoreBase do
+  ENV_SESSION_OPTIONS_KEY = ActionDispatch::Session::MongoStoreBase::ENV_SESSION_OPTIONS_KEY
+  SESSION_RECORD_KEY      = ActionDispatch::Session::MongoStoreBase::SESSION_RECORD_KEY
+
+  Session = ActionDispatch::Session::MongoStoreBase::Session = Class.new(OpenStruct)
+
+  before do
+    @app   = nil
+    @store = ActionDispatch::Session::MongoStoreBase.new(@app)
+    @env   = {}
+  end
+
+  describe "#get_session" do
+    it "generates a new session id if given a nil session id" do
+      Session.stub(where: [])
+
+      sid, session_data = @store.send(:get_session, @env, nil)
+
+      sid.should_not                        == nil
+      session_data.should                   == nil
+      @env[SESSION_RECORD_KEY].class.should == Session
+      @env[SESSION_RECORD_KEY]._id.should   == sid
+    end
+
+    it "generates a new session id if session is not found" do
+      old_sid = SecureRandom.hex
+      Session.stub(where: [])
+
+      sid, session_data = @store.send(:get_session, @env, old_sid)
+
+      sid.should_not                        == old_sid
+      session_data.should                   == nil
+      @env[SESSION_RECORD_KEY].class.should == Session
+      @env[SESSION_RECORD_KEY]._id.should   == sid
+    end
+  end
+end

data/spec/rails_helper.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'rails'
+
+rails_version = Rails.version[/^\d\.\d/]
+require "rails_#{rails_version}_app/config/environment"
+
+require 'rspec/rails'
+
+def db
+  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
+  Rails.application.class.to_s.underscore.sub(/\/.*/, '') + "_" + Rails.env
+end
+
+def drop_collections_in(database)
+  database.collections.select { |c| c.name !~ /^system/ }.each(&:drop)
+end
+
+RSpec.configure do |config|
+  config.before :all do
+    unless User.table_exists?
+      load Rails.root.join('db', 'schema.rb')
+    end
+  end
+
+  config.before :each do
+    drop_collections_in(db)
+    User.delete_all
+  end
+end
+
+puts "Testing #{ENV["MONGO_SESSION_STORE_ORM"]}_store on Rails #{Rails.version}..."
+
+case ENV["MONGO_SESSION_STORE_ORM"]
+when "mongo_mapper"
+  puts "MongoMapper version: #{MongoMapper::Version}"
+when "mongoid"
+  puts "Mongoid version: #{Mongoid::VERSION}"
+end

data/spec/spec_helper.rb

@@ -3,50 +3,3 @@ ENV["RAILS_ENV"] = "test"
 
 require 'bundler/setup'
 $:.unshift File.dirname(__FILE__)
-
-require 'rails'
-
-rails_version = Rails.version[/^\d\.\d/]
-require "rails_#{rails_version}_app/config/environment"
-
-require 'rspec/rails'
-
-def db
-  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
-  Rails.application.class.to_s.underscore.sub(/\/.*/, '') + "_" + Rails.env
-end
-
-def drop_collections_in(database)
-  database.collections.select { |c| c.name !~ /^system/ }.each(&:drop)
-end
-
-RSpec.configure do |config|
-  config.before :all do
-    unless User.table_exists?
-      load Rails.root.join('db', 'schema.rb')
-    end
-  end
-
-  config.before :each do
-    drop_collections_in(db)
-    User.delete_all
-  end
-end
-
-puts "Testing #{ENV["MONGO_SESSION_STORE_ORM"]}_store on Rails #{Rails.version}..."
-
-case ENV["MONGO_SESSION_STORE_ORM"]
-when "mongo_mapper"
-  puts "MongoMapper version: #{MongoMapper::Version}"
-when "mongoid"
-  puts "Mongoid version: #{Mongoid::VERSION}"
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_session_store-rails3
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Brian Hempel
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -53,6 +53,7 @@ files:
 - mongo_session_store-rails4.gemspec
 - perf/benchmark.rb
 - spec/integration_with_devise_spec.rb
+- spec/mongo_store_base_spec.rb
 - spec/rails_3.1_app/.gitignore
 - spec/rails_3.1_app/README
 - spec/rails_3.1_app/Rakefile
@@ -289,6 +290,7 @@ files:
 - spec/rails_4.1_app/public/500.html
 - spec/rails_4.1_app/public/favicon.ico
 - spec/rails_4.1_app/public/robots.txt
+- spec/rails_helper.rb
 - spec/spec_helper.rb
 homepage: http://github.com/brianhempel/mongo_session_store
 licenses: []
@@ -309,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails 3.1,
@@ -317,6 +319,7 @@ summary: Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails
 test_files:
 - perf/benchmark.rb
 - spec/integration_with_devise_spec.rb
+- spec/mongo_store_base_spec.rb
 - spec/rails_3.1_app/.gitignore
 - spec/rails_3.1_app/README
 - spec/rails_3.1_app/Rakefile
@@ -553,4 +556,5 @@ test_files:
 - spec/rails_4.1_app/public/500.html
 - spec/rails_4.1_app/public/favicon.ico
 - spec/rails_4.1_app/public/robots.txt
+- spec/rails_helper.rb
 - spec/spec_helper.rb