mongo_session_store-rails4 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a58fece6febdaa9105032259072e87620fa636
-  data.tar.gz: e87b45191c8cbca485a31b1390677b0b07fb0fe9
+  metadata.gz: 281b4f7e0d7ab3e7f406f6ac88a3a0c198c6e0fe
+  data.tar.gz: 626f581c73c25cabd8fb7de5e16216d19ac3c53a
 SHA512:
-  metadata.gz: 3a032212829604c3ff2f42037b0ee14a9f172bc6d76390a3752965ff94a2d4a6f51a4669d658a3594a01941ca0ddb0f1e44be4dce68c767b6ee7f124786d166c
-  data.tar.gz: 8ecec66bc81b715c61a5e95e419d86739080355613ef964abd661711802cbb3c6bec26cb77ddc8158495d3a6cd25262c3528d563fbf1017d0c8ea49ceef7f300
+  metadata.gz: 56f257c4daf81557871e4ad70e5cf571bcf25bf674d00b510d2ddafb2bb7f524c02d02d0b7b8270f9565e1ab519af2d0af215b824172424700e05bb2c1b58b73
+  data.tar.gz: 6b8957999bf31806567e8aad4fd5aa8451a3b52eaf818c6945e204686669887e1dec9861b68762ecd53abd9b271549144b034395d23b2e9cb27873fa3c019c8f

data/.travis.yml

@@ -3,7 +3,8 @@ script: "rake"
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.5
+  - "2.2"
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -13,5 +14,8 @@ matrix:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx-2.2.9
-services:
-  - mongodb
+before_script:
+  - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.0.1.tgz -O /tmp/mongodb.tgz
+  - tar -xvf /tmp/mongodb.tgz
+  - mkdir /tmp/data
+  - ${PWD}/mongodb-linux-x86_64-3.0.1/bin/mongod --dbpath /tmp/data --bind_ip 127.0.0.1 &> /dev/null &

data/Gemfile

@@ -8,33 +8,35 @@ RAILS_VERS = case ENV['RAILS_VERS']
              when '4.0'
                '~>4.0.5'
              when '4.1'
-               '~>4.1.2.rc2'
+               '~>4.1.9'
+             when '4.2'
+               '~>4.2.0'
              when nil
                nil
              else
-               raise "Invalid RAILS_VERS.  Available versions are 3.2 and 4.0."
+               raise "Invalid RAILS_VERS.  Available versions are 3.1, 3.2, 4.0, 4.1, and 4.2."
              end
 
 gemspec :name => 'mongo_session_store-rails4'
 
 group :development, :test do
   gem 'rake'
-  if ENV['MONGO_SESSION_STORE_ORM'] == 'mongo_mapper'
-    gem 'mongo_mapper', '>= 0.13.0.beta2'
-  end
 
-  if ENV['MONGO_SESSION_STORE_ORM'] == 'mongoid'
+  case ENV['MONGO_SESSION_STORE_ORM']
+  when 'mongo_mapper'
+    gem 'mongo_mapper', '>= 0.13.1'
+  when 'mongoid'
     if ENV['RAILS_VERS'] =~ /^4\.\d/
-      gem 'mongoid', '>= 4.0.0.beta1'
+      gem 'mongoid', '>= 4.0.2'
     elsif ENV['RAILS_VERS'] =~ /^3\.2\d/
       gem 'mongoid', '>= 3.1.0'
     else
       gem 'mongoid', '>= 3.0.0'
     end
-  end
-
-  if ENV['MONGO_SESSION_STORE_ORM'] == 'mongo'
+  when 'mongo'
     gem 'mongo'
+  else
+    gem 'mongo' # So rake test_all can wait for Mongo to start
   end
 
   gem 'pry'
@@ -48,8 +50,13 @@ group :development, :test do
   else
     gem 'sqlite3' # for devise User storage
   end
-  RAILS_VERS ? gem('rails', RAILS_VERS) : gem('rails')
-  gem 'minitest' if ENV['RAILS_VERS'] == '4.1'
+
+  if RAILS_VERS
+    gem 'rails', RAILS_VERS
+  else
+    gem 'rails'
+  end
+  gem 'test-unit'
 
   gem 'rspec-rails', '2.12.0'
   gem 'devise'

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.9.3, 2.0.0, 2.1.2, 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.5, 2.2.0, and JRuby with Rails 3.1 through 4.2.
 
 Mongoid users: This gem is compatible with both Mongoid 3 and 4.
 
@@ -14,7 +14,7 @@ See the [Changelog](#changelog) if you need support for an older version of Ruby
 
 ## Usage
 
-MongoSessionStore is compatible with Rails 3.1 through 4.1.
+MongoSessionStore is compatible with Rails 3.1 through 4.2.
 
 In your Gemfile:
 
@@ -37,7 +37,7 @@ 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')
+MongoStore::Session.database = Mongo::Client.new(['127.0.0.1:27017'], database: \"my_app_development\")
 ```
 
 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:
@@ -61,6 +61,8 @@ MongoStore::Session.where('updated_at' => { '$gt' => 2.days.ago })
 
 ## Changelog
 
+6.0.0 supports the Mongo Ruby Driver 2.0 for the generic MongoStore. The other stores are unchanged. Tests added for Rails 4.2. Tests against MongoDB 3.0.1 on Travis CI.
+
 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.
@@ -87,7 +89,7 @@ To run the tests for a specific store (examples):
 To see a list of all options for running tests, run
 
     rake -T
-    
+
 ## Previous contributors
 
 MongoSessionStore started as a fork of the DataMapper session store, modified to work with MongoMapper and Mongoid.  Much thanks to all the previous contributors:

data/Rakefile

@@ -20,15 +20,31 @@ def set_versions(rails_vers, orm)
   success
 end
 
-@rails_versions = ['3.1', '3.2', '4.0', '4.1']
+@rails_versions = ['3.1', '3.2', '4.0', '4.1', '4.2']
 @orms = ['mongo_mapper', 'mongoid', 'mongo']
 
 task :default => :test_all
 
-desc 'Test each session store against Rails 3.1, 3.2, 4.0, and 4.1'
+desc 'Test each session store against Rails 3.1, 3.2, 4.0, 4.1, and 4.2'
 task :test_all do
   # inspired by http://pivotallabs.com/users/jdean/blog/articles/1728-testing-your-gem-against-multiple-rubies-and-rails-versions-with-rvm
 
+  # Wait for mongod to start on Travis.
+  # From the Mongo Ruby Driver gem.
+  if ENV['TRAVIS']
+    require 'mongo'
+    client = Mongo::Client.new(['127.0.0.1:27017'])
+    begin
+      puts "Waiting for MongoDB..."
+      client.command(Mongo::Server::Monitor::STATUS)
+    rescue Mongo::ServerSelector::NoServerAvailable => e
+      sleep(2)
+      # 1 Retry
+      puts "Waiting for MongoDB..."
+      client.cluster.scan!
+      client.command(Mongo::ServerSelector::NoServerAvailable)
+    end
+  end
 
   @failed_suites = []
 

data/lib/mongo_session_store/mongo_store.rb

@@ -9,7 +9,7 @@ module ActionDispatch
 
         def initialize(options = {})
           @_id        = options[:_id]
-          @data       = options[:data] || BSON::Binary.new(Marshal.dump({}))
+          @data       = options[:data] || BSON::Binary.new(Marshal.dump({}), :generic)
           @created_at = options[:created_at]
           @updated_at = options[:updated_at]
         end
@@ -19,20 +19,25 @@ module ActionDispatch
           new(options)
         end
 
+        def scope
+          collection.find(:_id => _id)
+        end
+
         def destroy
-          collection.remove :_id => _id
+          scope.delete_one
         end
 
         def save
           @created_at ||= Time.now
           @updated_at   = Time.now
-          
-          collection.save(
-            :_id        => @_id,
-            :data       => BSON::Binary.new(@data),
+
+          attributes = {
+            :data       => BSON::Binary.new(@data, :generic),
             :created_at => @created_at,
             :updated_at => @updated_at
-          )
+          }
+
+          scope.replace_one(attributes, upsert: true)
         end
 
         def data=(stuff)
@@ -51,7 +56,7 @@ module ActionDispatch
           if @database
             @database
           else
-            raise "MongoStore needs a database, e.g. MongoStore::Session.database = Mongo::Connection.new.db('my_app_development')"
+            raise "MongoStore needs a database, e.g. MongoStore::Session.database = Mongo::Client.new(['127.0.0.1:27017'], database: \"my_app_development\")"
           end
         end
 

data/lib/mongo_session_store/mongo_store_base.rb

@@ -72,7 +72,8 @@ module ActionDispatch
 
         def unpack(packed)
           return nil unless packed
-          Marshal.load(StringIO.new(packed.to_s))
+          data = packed.respond_to?(:data) ? packed.data : packed.to_s
+          Marshal.load(StringIO.new(data))
         end
 
     end

data/lib/mongo_session_store/version.rb

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

data/mongo_session_store-rails3.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features,perf}/*`.split("\n")
   s.homepage         = "http://github.com/brianhempel/mongo_session_store"
+  s.license          = "MIT"
   s.require_paths    = ["lib"]
   s.rubygems_version = "1.3.7"
   s.summary          = "Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails 3.1, 3.2, 4.0, and 4.1 compatible."

data/mongo_session_store-rails4.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features,perf}/*`.split("\n")
   s.homepage         = "http://github.com/brianhempel/mongo_session_store"
+  s.license          = "MIT"
   s.require_paths    = ["lib"]
   s.rubygems_version = "1.3.7"
   s.summary          = "Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails 3.1, 3.2, 4.0, and 4.1 compatible."

data/spec/rails_3.1_app/config/initializers/session_store.rb

@@ -5,5 +5,5 @@
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rails generate session_migration")
-MongoStore::Session.database = Mongo::Connection.new.db("rails31_app_#{Rails.env}") if ENV['MONGO_SESSION_STORE_ORM'] == "mongo"
+MongoStore::Session.database = Mongo::Client.new(['127.0.0.1:27017'], database: "rails31_app_#{Rails.env}") if ENV['MONGO_SESSION_STORE_ORM'] == "mongo"
 Rails31App::Application.config.session_store :"#{ENV['MONGO_SESSION_STORE_ORM']}_store"

data/spec/rails_3.2_app/config/initializers/session_store.rb

@@ -5,5 +5,5 @@
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rails generate session_migration")
-MongoStore::Session.database = Mongo::Connection.new.db("rails32_app_#{Rails.env}") if ENV['MONGO_SESSION_STORE_ORM'] == "mongo"
+MongoStore::Session.database = Mongo::Client.new(['127.0.0.1:27017'], database: "rails32_app_#{Rails.env}") if ENV['MONGO_SESSION_STORE_ORM'] == "mongo"
 Rails32App::Application.config.session_store :"#{ENV['MONGO_SESSION_STORE_ORM']}_store"

data/spec/rails_4.0_app/config/initializers/session_store.rb

@@ -1,5 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
 # Rails40App::Application.config.session_store :cookie_store, key: '_rails_4_0_app_session'
-MongoStore::Session.database = Mongo::Connection.new.db("rails40_app_#{Rails.env}") if ENV['MONGO_SESSION_STORE_ORM'] == "mongo"
+MongoStore::Session.database = Mongo::Client.new(['127.0.0.1:27017'], database: "rails40_app_#{Rails.env}") if ENV['MONGO_SESSION_STORE_ORM'] == "mongo"
 Rails40App::Application.config.session_store :"#{ENV['MONGO_SESSION_STORE_ORM']}_store"

data/spec/rails_4.1_app/config/initializers/session_store.rb

@@ -1,5 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
 # Rails.application.config.session_store :cookie_store, key: '_rails_41_app_session'
-MongoStore::Session.database = Mongo::Connection.new.db("rails41_app_#{Rails.env}") if ENV['MONGO_SESSION_STORE_ORM'] == "mongo"
+MongoStore::Session.database = Mongo::Client.new(['127.0.0.1:27017'], database: "rails41_app_#{Rails.env}") if ENV['MONGO_SESSION_STORE_ORM'] == "mongo"
 Rails.application.config.session_store :"#{ENV['MONGO_SESSION_STORE_ORM']}_store"

data/spec/rails_4.2_app/.gitignore

@@ -0,0 +1,17 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+/tmp

data/spec/rails_4.2_app/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/spec/rails_4.2_app/app/assets/javascripts/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/spec/rails_4.2_app/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/spec/rails_4.2_app/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/spec/rails_4.2_app/app/controllers/home_controller.rb

@@ -0,0 +1,4 @@
+class HomeController < ApplicationController
+  def index
+  end
+end

data/spec/rails_4.2_app/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/rails_4.2_app/app/models/user.rb

@@ -0,0 +1,5 @@
+class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable
+end

data/spec/rails_4.2_app/app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
+
+  <div><%= f.submit "Resend confirmation instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/spec/rails_4.2_app/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>

data/spec/rails_4.2_app/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

data/spec/rails_4.2_app/app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>

data/spec/rails_4.2_app/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,16 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <div><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password, :autofocus => true %></div>
+
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></div>
+
+  <div><%= f.submit "Change my password" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/spec/rails_4.2_app/app/views/devise/passwords/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Forgot your password?</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
+
+  <div><%= f.submit "Send me reset password instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>