mongo_session_store-rails3 3.0.6 → 4.0.0

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+script: "rake"
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - ruby-head
+  - rbx-19mode
+  - jruby-19mode
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: rbx-19mode
+    - rvm: ruby-head
+services:
+  - mongodb

data/Gemfile

@@ -1,10 +1,8 @@
 source :rubygems
 
-MONGO_VERS = '1.5.2' unless defined? MONGO_VERS
+MONGO_VERS = '1.8.0' unless defined? MONGO_VERS
 
 RAILS_VERS = case ENV['RAILS_VERS']
-             when '3.0'
-               '~>3.0.0'
              when '3.1'
                '~>3.1.0'
              when '3.2'
@@ -12,7 +10,7 @@ RAILS_VERS = case ENV['RAILS_VERS']
              when nil
                nil
              else
-               raise "Invalid RAILS_VERS.  Available versions are 3.0, 3.1, and 3.2."
+               raise "Invalid RAILS_VERS.  Available versions are 3.1, and 3.2."
              end
 
 gemspec
@@ -24,35 +22,16 @@ group :development, :test do
   end
 
   if !ENV['MONGO_SESSION_STORE_ORM'] || ENV['MONGO_SESSION_STORE_ORM'] == 'mongoid'
-    # this is hack-tastic :{
-    # ENV['RAILS_VERS'] is only provided when we run
-    # bundle update, but not when running the specs proper
-    # we need an older version of mongoid for Rails 3.0
-    # and bundler won't cherry-pick a matching gem version
-    # out of a git repo like it will out of the rubygems repo
-    if ENV['RAILS_VERS'] == '3.0' || RUBY_VERSION[0..2] == "1.8"
-      # bundle updating for Rails 3.0
-      # OR we're still on Ruby 1.8
-      gem 'mongoid',      '>= 2.2.5'
-    elsif ENV['RAILS_VERS']
-      # bundle updating for Rails 3.1 or 3.2 on Ruby 1.9
-      gem 'mongoid',      '>= 2.2.5', :git => 'git://github.com/mongoid/mongoid.git'
-    elsif File.read('Gemfile.lock') =~ /^    rails \(3.0.\d+\)/
-      # we're running tests on Rails 3.0 on Ruby 1.9
-      gem 'mongoid',      '>= 2.2.5'
-    else
-      # we're running tests on Rails 3.1 or 3.2 on Ruby 1.9
-      gem 'mongoid',      '>= 2.2.5', :git => 'git://github.com/mongoid/mongoid.git'
-    end
+    gem 'mongoid', '~> 3.0', :platforms => [:ruby_19, :jruby]
   end
 
   gem 'mongo',         MONGO_VERS
-  gem 'bson_ext',      MONGO_VERS
-  
+  gem 'bson_ext',      MONGO_VERS, :platforms => :ruby
+
   gem 'system_timer', :platforms => :ruby_18
   gem 'rbx-require-relative', '0.0.5', :platforms => :ruby_18
-  gem 'ruby-debug',   :platforms => :ruby_18
-  gem 'ruby-debug19', :platforms => :ruby_19
+  gem 'ruby-debug',   :platforms => :ruby_18 unless ENV['TRAVIS']
+  gem 'debugger',     :platforms => :ruby_19 unless ENV['TRAVIS']
 
   if RUBY_PLATFORM == 'java'
     gem 'jdbc-sqlite3'

data/README.md

@@ -1,12 +1,14 @@
-# MongoSessionStore
+# MongoSessionStore [![Build Status](https://travis-ci.org/brianhempel/mongo_session_store.png?branch=master)](https://travis-ci.org/brianhempel/mongo_session_store)
 
 ## 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.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.
+
 ## Usage
 
-MongoSessionStore is compatible with Rails 3.0, 3.1, and 3.2.
+MongoSessionStore is compatible with Rails 3.1 and 3.2. (Use [version 3.0.6](https://rubygems.org/gems/mongo_session_store-rails3/versions/3.0.6) if you need Rails 3.0 support.)
 
 In your Gemfile:
 
@@ -50,6 +52,8 @@ MongoidStore::Session.where(:updated_at.gt => 2.days.ago)
 MongoStore::Session.where('updated_at' => { '$gt' => 2.days.ago })
 ```
 
+Note that Mongoid 2 is no longer supported. Use [version 3.0.6](https://rubygems.org/gems/mongo_session_store-rails3/versions/3.0.6) if you use Mongoid and cannot upgrade to Mongoid 3.
+
 ## Performance
 
 The following is the benchmark run with bson_ext installed.  Without bson_ext, speeds are about 10x slower.  The benchmark saves 2000 sessions (~12kb each) and then finds/reloads each one.
@@ -85,7 +89,6 @@ To run all the tests:
 
 To switch to the Gemfile.lock for a certain Rails version:
 
-    rake use_rails_30
     rake use_rails_31
     rake use_rails_32
 

data/Rakefile

@@ -3,10 +3,7 @@ require 'rake'
 
 def run_with_output(command)
   puts "Running: #{command}"
-  
-  Process.wait( fork { exec command } )
-
-  $?.success?
+  system(command)
 end
 
 def set_rails_version(rails_vers)
@@ -19,15 +16,16 @@ def set_rails_version(rails_vers)
   end
 end
 
-@rails_versions = ['3.0', '3.1', '3.2']
+@rails_versions = ['3.1', '3.2']
 
 task :default => :test_all
 
-desc 'Test each session store against Rails 3.0 and Rails 3.1'
+desc 'Test each session store against Rails 3.1 and Rails 3.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
-  
+
   orms = ['mongo_mapper', 'mongoid', 'mongo']
+  orms.delete('mongoid') if RUBY_VERSION < "1.9"
 
   @failed_suites = []
 

data/lib/mongo_session_store-rails3.rb

@@ -17,7 +17,8 @@ module MongoSessionStore
     end
 
     if defined?(MongoidStore::Session)
-      MongoidStore::Session.store_in(name)
+
+      MongoidStore::Session.store_in :collection => MongoSessionStore.collection_name
     end
 
     @collection_name

data/lib/mongo_session_store/mongoid_store.rb

@@ -9,23 +9,19 @@ begin
         class Session
           include Mongoid::Document
           include Mongoid::Timestamps
-          self.collection_name = MongoSessionStore.collection_name
 
-          attr_accessible :_id, :data
+          store_in :collection => MongoSessionStore.collection_name
+
+          field :_id, :type => String
 
-          if respond_to?(:identity)
-            # pre-Mongoid 3
-            identity :type => String
-          else
-            field :_id, :type => String
-          end
+          field :data, :type => Moped::BSON::Binary, :default => Moped::BSON::Binary.new(:generic, Marshal.dump({}))
 
-          field :data, :type => BSON::Binary, :default => BSON::Binary.new(Marshal.dump({}))
+          attr_accessible :_id, :data
         end
 
         private
         def pack(data)
-          BSON::Binary.new(Marshal.dump(data))
+          Moped::BSON::Binary.new(:generic, Marshal.dump(data))
         end
       end
     end

data/lib/mongo_session_store/version.rb

@@ -1,3 +1,3 @@
 module MongoSessionStore
-  VERSION = "3.0.6"
+  VERSION = "4.0.0"
 end

data/mongo_session_store-rails3.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.homepage         = "http://github.com/brianhempel/mongo_session_store"
   s.require_paths    = ["lib"]
   s.rubygems_version = "1.3.7"
-  s.summary          = "Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails 3.0, 3.1, and 3.2 compatible."
+  s.summary          = "Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails 3.1 and 3.2 compatible."
 
   s.add_dependency "mongo"
-  s.add_dependency "actionpack", ">= 3.0"  
+  s.add_dependency "actionpack", ">= 3.1"
 end

data/spec/integration_with_devise_spec.rb

@@ -39,9 +39,11 @@ describe Devise::SessionsController do
   end
   
   it "allows user creation" do
+    User.count.should == 0
     create_user
     response.status.should == 302
     get response.redirect_url
+    User.count.should == 1
     response.body.squish.should =~ /You are logged in as person@example.com/
     response.body.squish.should =~ /You have signed up successfully/
   end

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

@@ -2,8 +2,6 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
 
-  Devise.apply_schema = false
-
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in DeviseMailer.
   config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
@@ -91,10 +89,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

data/spec/rails_3.1_app/config/mongoid.yml

@@ -1,20 +1,13 @@
 development:
-  host: localhost
-  database: rails31_app_development
+  sessions:
+    default:
+      database: rails31_app_development
+      hosts:
+        - localhost:27017
 
 test:
-  host: localhost
-  database: rails31_app_test
-
-# set these environment variables on your prod server
-production:
-  host: <%= ENV['MONGOID_HOST'] %>
-  port: <%= ENV['MONGOID_PORT'] %>
-  username: <%= ENV['MONGOID_USERNAME'] %>
-  password: <%= ENV['MONGOID_PASSWORD'] %>
-  database: <%= ENV['MONGOID_DATABASE'] %>
-  # slaves:
-  #   - host: slave1.local
-  #     port: 27018
-  #   - host: slave2.local
-  #     port: 27019
+  sessions:
+    default:
+      database: rails31_app_test
+      hosts:
+        - localhost:27017

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

@@ -2,8 +2,6 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
 
-  Devise.apply_schema = false
-
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in DeviseMailer.
   config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
@@ -91,10 +89,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

data/spec/rails_3.2_app/config/mongoid.yml

@@ -1,20 +1,13 @@
 development:
-  host: localhost
-  database: rails32_app_development
+  sessions:
+    default:
+      database: rails32_app_development
+      hosts:
+        - localhost:27017
 
 test:
-  host: localhost
-  database: rails32_app_test
-
-# set these environment variables on your prod server
-production:
-  host: <%= ENV['MONGOID_HOST'] %>
-  port: <%= ENV['MONGOID_PORT'] %>
-  username: <%= ENV['MONGOID_USERNAME'] %>
-  password: <%= ENV['MONGOID_PASSWORD'] %>
-  database: <%= ENV['MONGOID_DATABASE'] %>
-  # slaves:
-  #   - host: slave1.local
-  #     port: 27018
-  #   - host: slave2.local
-  #     port: 27019
+  sessions:
+    default:
+      database: rails32_app_test
+      hosts:
+        - localhost:27017

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 ENV["MONGO_SESSION_STORE_ORM"] ||= "mongo_mapper"
 ENV["RAILS_ENV"] = "test"
 
+require 'bundler/setup'
 $:.unshift File.dirname(__FILE__)
 
 require 'rails'
@@ -30,7 +31,7 @@ RSpec.configure do |config|
   end
 
   config.before :each do
-    drop_collections_in(Mongoid.database) if defined?(Mongoid)
+    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

metadata

@@ -1,66 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongo_session_store-rails3
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 4.0.0
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 6
-  version: 3.0.6
 platform: ruby
-authors: 
+authors:
 - Brian Hempel
-- "Nicolas M\xC3\xA9rouze"
+- Nicolas Mérouze
 - Tony Pitale
 - Chris Brickley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongo
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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
 - Gemfile
 - README.md
 - Rakefile
@@ -73,58 +68,6 @@ files:
 - mongo_session_store-rails3.gemspec
 - perf/benchmark.rb
 - spec/integration_with_devise_spec.rb
-- spec/rails_3.0_app/.gitignore
-- spec/rails_3.0_app/README
-- spec/rails_3.0_app/Rakefile
-- spec/rails_3.0_app/app/controllers/application_controller.rb
-- spec/rails_3.0_app/app/controllers/home_controller.rb
-- spec/rails_3.0_app/app/helpers/application_helper.rb
-- spec/rails_3.0_app/app/models/user.rb
-- spec/rails_3.0_app/app/views/devise/confirmations/new.html.erb
-- spec/rails_3.0_app/app/views/devise/mailer/confirmation_instructions.html.erb
-- spec/rails_3.0_app/app/views/devise/mailer/reset_password_instructions.html.erb
-- spec/rails_3.0_app/app/views/devise/mailer/unlock_instructions.html.erb
-- spec/rails_3.0_app/app/views/devise/passwords/edit.html.erb
-- spec/rails_3.0_app/app/views/devise/passwords/new.html.erb
-- spec/rails_3.0_app/app/views/devise/registrations/edit.html.erb
-- spec/rails_3.0_app/app/views/devise/registrations/new.html.erb
-- spec/rails_3.0_app/app/views/devise/sessions/new.html.erb
-- spec/rails_3.0_app/app/views/devise/shared/_links.erb
-- spec/rails_3.0_app/app/views/devise/unlocks/new.html.erb
-- spec/rails_3.0_app/app/views/home/index.html.erb
-- spec/rails_3.0_app/app/views/layouts/application.html.erb
-- spec/rails_3.0_app/config.ru
-- spec/rails_3.0_app/config/application.rb
-- spec/rails_3.0_app/config/boot.rb
-- spec/rails_3.0_app/config/database.yml
-- spec/rails_3.0_app/config/environment.rb
-- spec/rails_3.0_app/config/environments/development.rb
-- spec/rails_3.0_app/config/environments/production.rb
-- spec/rails_3.0_app/config/environments/test.rb
-- spec/rails_3.0_app/config/initializers/backtrace_silencers.rb
-- spec/rails_3.0_app/config/initializers/devise.rb
-- spec/rails_3.0_app/config/initializers/inflections.rb
-- spec/rails_3.0_app/config/initializers/mime_types.rb
-- spec/rails_3.0_app/config/initializers/secret_token.rb
-- spec/rails_3.0_app/config/initializers/session_store.rb
-- spec/rails_3.0_app/config/locales/devise.en.yml
-- spec/rails_3.0_app/config/locales/en.yml
-- spec/rails_3.0_app/config/mongo.yml
-- spec/rails_3.0_app/config/mongoid.yml
-- spec/rails_3.0_app/config/routes.rb
-- spec/rails_3.0_app/db/migrate/20120222195914_create_users_table.rb
-- spec/rails_3.0_app/db/schema.rb
-- spec/rails_3.0_app/lib/tasks/.gitkeep
-- spec/rails_3.0_app/public/404.html
-- spec/rails_3.0_app/public/422.html
-- spec/rails_3.0_app/public/500.html
-- spec/rails_3.0_app/public/favicon.ico
-- spec/rails_3.0_app/public/javascripts/.gitkeep
-- spec/rails_3.0_app/public/javascripts/application.js
-- spec/rails_3.0_app/public/robots.txt
-- spec/rails_3.0_app/public/stylesheets/.gitkeep
-- spec/rails_3.0_app/script/rails
-- spec/rails_3.0_app/vendor/plugins/.gitkeep
 - spec/rails_3.1_app/.gitignore
 - spec/rails_3.1_app/README
 - spec/rails_3.1_app/Rakefile
@@ -240,92 +183,32 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/brianhempel/mongo_session_store
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Rails session stores for MongoMapper, Mongoid, or any other ODM. Rails 3.0, 3.1, and 3.2 compatible.
-test_files: 
+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.0_app/.gitignore
-- spec/rails_3.0_app/README
-- spec/rails_3.0_app/Rakefile
-- spec/rails_3.0_app/app/controllers/application_controller.rb
-- spec/rails_3.0_app/app/controllers/home_controller.rb
-- spec/rails_3.0_app/app/helpers/application_helper.rb
-- spec/rails_3.0_app/app/models/user.rb
-- spec/rails_3.0_app/app/views/devise/confirmations/new.html.erb
-- spec/rails_3.0_app/app/views/devise/mailer/confirmation_instructions.html.erb
-- spec/rails_3.0_app/app/views/devise/mailer/reset_password_instructions.html.erb
-- spec/rails_3.0_app/app/views/devise/mailer/unlock_instructions.html.erb
-- spec/rails_3.0_app/app/views/devise/passwords/edit.html.erb
-- spec/rails_3.0_app/app/views/devise/passwords/new.html.erb
-- spec/rails_3.0_app/app/views/devise/registrations/edit.html.erb
-- spec/rails_3.0_app/app/views/devise/registrations/new.html.erb
-- spec/rails_3.0_app/app/views/devise/sessions/new.html.erb
-- spec/rails_3.0_app/app/views/devise/shared/_links.erb
-- spec/rails_3.0_app/app/views/devise/unlocks/new.html.erb
-- spec/rails_3.0_app/app/views/home/index.html.erb
-- spec/rails_3.0_app/app/views/layouts/application.html.erb
-- spec/rails_3.0_app/config.ru
-- spec/rails_3.0_app/config/application.rb
-- spec/rails_3.0_app/config/boot.rb
-- spec/rails_3.0_app/config/database.yml
-- spec/rails_3.0_app/config/environment.rb
-- spec/rails_3.0_app/config/environments/development.rb
-- spec/rails_3.0_app/config/environments/production.rb
-- spec/rails_3.0_app/config/environments/test.rb
-- spec/rails_3.0_app/config/initializers/backtrace_silencers.rb
-- spec/rails_3.0_app/config/initializers/devise.rb
-- spec/rails_3.0_app/config/initializers/inflections.rb
-- spec/rails_3.0_app/config/initializers/mime_types.rb
-- spec/rails_3.0_app/config/initializers/secret_token.rb
-- spec/rails_3.0_app/config/initializers/session_store.rb
-- spec/rails_3.0_app/config/locales/devise.en.yml
-- spec/rails_3.0_app/config/locales/en.yml
-- spec/rails_3.0_app/config/mongo.yml
-- spec/rails_3.0_app/config/mongoid.yml
-- spec/rails_3.0_app/config/routes.rb
-- spec/rails_3.0_app/db/migrate/20120222195914_create_users_table.rb
-- spec/rails_3.0_app/db/schema.rb
-- spec/rails_3.0_app/lib/tasks/.gitkeep
-- spec/rails_3.0_app/public/404.html
-- spec/rails_3.0_app/public/422.html
-- spec/rails_3.0_app/public/500.html
-- spec/rails_3.0_app/public/favicon.ico
-- spec/rails_3.0_app/public/javascripts/.gitkeep
-- spec/rails_3.0_app/public/javascripts/application.js
-- spec/rails_3.0_app/public/robots.txt
-- spec/rails_3.0_app/public/stylesheets/.gitkeep
-- spec/rails_3.0_app/script/rails
-- spec/rails_3.0_app/vendor/plugins/.gitkeep
 - spec/rails_3.1_app/.gitignore
 - spec/rails_3.1_app/README
 - spec/rails_3.1_app/Rakefile