mongo_session_store-rails3 3.0.3 → 3.0.4

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -20,7 +20,28 @@ gemspec
 group :development, :test do
   gem 'rake'
   gem 'mongo_mapper', '>= 0.10.1'
-  gem 'mongoid',      '>= 2.2.5'
+
+  # 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 'mongo',         MONGO_VERS
   gem 'bson_ext',      MONGO_VERS
   

data/Rakefile

@@ -5,6 +5,8 @@ def run_with_output(command)
   puts "Running: #{command}"
   
   Process.wait( fork { exec command } )
+
+  $?.success?
 end
 
 def set_rails_version(rails_vers)
@@ -27,14 +29,28 @@ task :test_all do
   
   orms = ['mongo_mapper', 'mongoid', 'mongo']
 
+  @failed_suites = []
+
   @rails_versions.each do |rails_version|
 
     set_rails_version(rails_version)
   
     orms.each do |orm|
-      run_with_output "export MONGO_SESSION_STORE_ORM=#{orm}; bundle exec rspec spec"
+      unless run_with_output "export MONGO_SESSION_STORE_ORM=#{orm}; bundle exec rspec spec"
+        @failed_suites << "Rails #{rails_version} / #{orm}"
+      end
     end
+  end
 
+  if @failed_suites.any?
+    puts "\033[0;31mFailed:"
+    puts @failed_suites.join("\n")
+    print "\033[0m"
+    exit(1)
+  else
+    print "\033[0;32mAll passed! Success! "
+    "Yahoooo!!!".chars.each { |c| sleep 0.4; print c; STDOUT.flush }
+    puts "\033[0m"
   end
 end
 

data/lib/mongo_session_store-rails3.rb

@@ -3,6 +3,8 @@ require 'securerandom'
 $:.unshift File.dirname(__FILE__)
 
 module MongoSessionStore
+  autoload :VERSION,          'mongo_session_store/version'
+
   def self.collection_name=(name)
     @collection_name = name
     
@@ -27,6 +29,6 @@ module MongoSessionStore
   self.collection_name = "sessions"
 end
 
-autoload :MongoMapperStore,'mongo_session_store/mongo_mapper_store'
-autoload :MongoidStore, 'mongo_session_store/mongoid_store'
-autoload :MongoStore, 'mongo_session_store/mongo_store'
+autoload :MongoMapperStore, 'mongo_session_store/mongo_mapper_store'
+autoload :MongoidStore,     'mongo_session_store/mongoid_store'
+autoload :MongoStore,       'mongo_session_store/mongo_store'

data/lib/mongo_session_store/mongoid_store.rb

@@ -10,7 +10,12 @@ module ActionDispatch
         include Mongoid::Timestamps
         self.collection_name = MongoSessionStore.collection_name
 
-        identity :type => String
+        if respond_to?(:identity)
+          # pre-Mongoid 3
+          identity :type => String
+        else
+          field :_id, :type => String
+        end
 
         field :data, :type => BSON::Binary, :default => BSON::Binary.new(Marshal.dump({}))
       end

data/lib/mongo_session_store/version.rb

@@ -0,0 +1,3 @@
+module MongoSessionStore
+  VERSION = "3.0.4"
+end

data/mongo_session_store-rails3.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path('../lib/mongo_session_store/version', __FILE__)
+
 Gem::Specification.new do |s|
   s.name = "mongo_session_store-rails3"
-  s.version = `cat VERSION`.strip
+  s.version = MongoSessionStore::VERSION
 
   s.authors          = ["Brian Hempel", "Nicolas M\303\251rouze", "Tony Pitale", "Chris Brickley"]
   s.email            = ["plasticchicken@gmail.com"]

data/spec/rails_3.1_app/app/models/user.rb

@@ -5,4 +5,40 @@ class User
   devise :database_authenticatable, :registerable, :validatable
          #:recoverable, :rememberable, :trackable, :validatable
 
+  # see https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0-migration-schema-style
+
+  ## Database authenticatable
+  field :email,              :type => String, :null => false
+  field :encrypted_password, :type => String, :null => false
+
+  ## Recoverable
+  # field :reset_password_token,   :type => String
+  # field :reset_password_sent_at, :type => Time
+
+  ## Rememberable
+  # field :remember_created_at, :type => Time
+
+  ## Trackable
+  # field :sign_in_count,      :type => Integer
+  # field :current_sign_in_at, :type => Time
+  # field :last_sign_in_at,    :type => Time
+  # field :current_sign_in_ip, :type => String
+  # field :last_sign_in_ip,    :type => String
+
+  ## Encryptable
+  # field :password_salt, :type => String
+
+  ## Confirmable
+  # field :confirmation_token,   :type => String
+  # field :confirmed_at,         :type => Time
+  # field :confirmation_sent_at, :type => Time
+  # field :unconfirmed_email,    :type => String # Only if using reconfirmable
+
+  ## Lockable
+  # field :failed_attempts, :type => Integer # Only if lock strategy is :failed_attempts
+  # field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
+  # field :locked_at,       :type => Time
+
+  # Token authenticatable
+  # field :authentication_token, :type => String
 end

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

@@ -1,6 +1,9 @@
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # 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"

data/spec/rails_3.1_app/config/locales/devise.en.yml

@@ -34,7 +34,9 @@ en:
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
     registrations:
       signed_up: 'Welcome! You have signed up successfully.'
-      inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
       updated: 'You updated your account successfully.'
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
     unlocks:

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

@@ -5,4 +5,40 @@ class User
   devise :database_authenticatable, :registerable, :validatable
          #:recoverable, :rememberable, :trackable, :validatable
 
+  # see https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0-migration-schema-style
+
+  ## Database authenticatable
+  field :email,              :type => String, :null => false
+  field :encrypted_password, :type => String, :null => false
+
+  ## Recoverable
+  # field :reset_password_token,   :type => String
+  # field :reset_password_sent_at, :type => Time
+
+  ## Rememberable
+  # field :remember_created_at, :type => Time
+
+  ## Trackable
+  # field :sign_in_count,      :type => Integer
+  # field :current_sign_in_at, :type => Time
+  # field :last_sign_in_at,    :type => Time
+  # field :current_sign_in_ip, :type => String
+  # field :last_sign_in_ip,    :type => String
+
+  ## Encryptable
+  # field :password_salt, :type => String
+
+  ## Confirmable
+  # field :confirmation_token,   :type => String
+  # field :confirmed_at,         :type => Time
+  # field :confirmation_sent_at, :type => Time
+  # field :unconfirmed_email,    :type => String # Only if using reconfirmable
+
+  ## Lockable
+  # field :failed_attempts, :type => Integer # Only if lock strategy is :failed_attempts
+  # field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
+  # field :locked_at,       :type => Time
+
+  # Token authenticatable
+  # field :authentication_token, :type => String
 end

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

@@ -1,6 +1,9 @@
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # 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"

data/spec/rails_3.2_app/config/locales/devise.en.yml

@@ -34,7 +34,9 @@ en:
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
     registrations:
       signed_up: 'Welcome! You have signed up successfully.'
-      inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
       updated: 'You updated your account successfully.'
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
     unlocks:

data/spec/spec_helper.rb

@@ -30,4 +30,11 @@ RSpec.configure do |config|
   end
 end
 
-puts "Testing #{ENV["MONGO_SESSION_STORE_ORM"]}_store on Rails #{Rails.version}..."
+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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_session_store-rails3
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - Brian Hempel
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 Z
+date: 2012-02-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
@@ -60,15 +60,16 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
-- VERSION
 - lib/mongo_session_store-rails3.rb
 - lib/mongo_session_store/mongo_mapper_store.rb
 - lib/mongo_session_store/mongo_store.rb
 - lib/mongo_session_store/mongo_store_base.rb
 - lib/mongo_session_store/mongoid_store.rb
+- lib/mongo_session_store/version.rb
 - mongo_session_store-rails3.gemspec
 - perf/benchmark.rb
 - spec/integration_with_devise_spec.rb

data/VERSION

@@ -1 +0,0 @@
-3.0.3