Upgrade devise to 2.2.2, closes #141

jaredmoody · jaredmoody · commit a2eb88ce6f3c · 2013-01-20T18:58:56.000-08:00
diff --git a/Gemfile b/Gemfile
@@ -13,30 +13,27 @@ gem 'bson_ext'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', "  ~> 3.1.0"
+  gem 'sass-rails',   "~> 3.1.0"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'
 end
 
-gem 'jnunemaker-validatable', '>= 1.8.4' # Required by mm-devise
-gem 'devise',                 '>= 1.2'
-gem 'mm-devise',              '>= 1.2'
+gem "devise",     "~> 2.2.2"
+gem 'mm-devise',  '~> 2.0'
 gem 'cancan'
 
 gem 'inherited_resources'
-gem 'simple_form', :git => "https://github.com/bitzesty/bootstrap_form.git"
-gem "semantic_menu", :git => "git://github.com/michaek/semantic_menu.git"
+gem 'simple_form',    git: "https://github.com/bitzesty/bootstrap_form.git"
+gem "semantic_menu",  git: "git://github.com/michaek/semantic_menu.git"
 
 gem 'will_paginate'    # Pagination
 gem 'rdiscount'   # Markdown
 
-
 group :development do
   # Use unicorn as the web server
   gem 'unicorn'
 end
 
-
 group :development, :test do
   gem 'fabrication'
   gem 'rspec-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -79,10 +79,11 @@ GEM
       cucumber (>= 1.1.3)
       nokogiri (>= 1.5.0)
     database_cleaner (0.7.1)
-    devise (1.5.3)
+    devise (2.2.2)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.3.0)
@@ -107,8 +108,6 @@ GEM
     inherited_resources (1.3.0)
       has_scope (~> 0.5.0)
       responders (~> 0.6.0)
-    jnunemaker-validatable (1.8.4)
-      activesupport (>= 2.3.4)
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
@@ -125,7 +124,7 @@ GEM
       redcarpet
     method_source (0.7.0)
     mime-types (1.19)
-    mm-devise (1.3)
+    mm-devise (2.0)
       devise (>= 1.2)
       mongo_mapper (>= 0.9.0)
     mocha (0.10.3)
@@ -138,7 +137,7 @@ GEM
       plucky (~> 0.4.0)
     multi_json (1.0.4)
     nokogiri (1.5.0)
-    orm_adapter (0.0.6)
+    orm_adapter (0.4.0)
     pg (0.12.2)
     plucky (0.4.4)
       mongo (~> 1.5)
@@ -147,7 +146,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7)
       slop (>= 2.4.3, < 3)
-    rack (1.3.8)
+    rack (1.3.9)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -223,7 +222,7 @@ GEM
       kgio (~> 2.4)
       rack
       raindrops (~> 0.6)
-    warden (1.1.0)
+    warden (1.2.1)
       rack (>= 1.0)
     will_paginate (3.0.2)
     xpath (0.1.4)
@@ -238,17 +237,16 @@ DEPENDENCIES
   coffee-rails (~> 3.1.0)
   cucumber-rails
   database_cleaner
-  devise (>= 1.2)
+  devise (~> 2.2.2)
   fabrication
   faker
   hackety_hack-lessons (~> 1.1)
   haml-rails
   inherited_resources
-  jnunemaker-validatable (>= 1.8.4)
   jquery-rails
   json
   launchy
-  mm-devise (>= 1.2)
+  mm-devise (~> 2.0)
   mocha
   mongo_mapper
   pg
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -11,6 +11,24 @@ class User
   key :moderator, Boolean
   key :blog_poster, Boolean
 
+  ## Database authenticatable
+  key :email,              :type => String, :null => false
+  key :encrypted_password, :type => String, :null => false
+
+  ## Recoverable
+  key :reset_password_token,   :type => String
+  key :reset_password_sent_at, :type => Time
+
+  ## Rememberable
+  key :remember_created_at, :type => Time
+
+  ## Trackable
+  key :sign_in_count,      :type => Integer
+  key :current_sign_in_at, :type => Time
+  key :last_sign_in_at,    :type => Time
+  key :current_sign_in_ip, :type => String
+  key :last_sign_in_ip,    :type => String
+
   many :questions
   many :answers
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -73,7 +73,7 @@
   # You can use this to let your user access some features of your application
   # without confirming the account, but blocking it after a certain period
   # (ie 2 days).
-  # config.confirm_within = 2.days
+  # config.allow_unconfirmed_access_for = 2.days
 
   # Defines which key will be used when confirming an account
   # config.confirmation_keys = [ :email ]
@@ -82,16 +82,9 @@
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks
 
-  # If true, a valid remember token can be re-used between multiple browsers.
-  # config.remember_across_browsers = true
-
   # 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 = {}
@@ -153,10 +146,6 @@
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
 
-  # If true, authentication through token does not store user in session and needs
-  # to be supplied on each request. Useful if you are using the token as API token.
-  # config.stateless_token = false
-
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
@@ -17,6 +17,7 @@ en:
       unauthenticated: 'You need to sign in or sign up before continuing.'
       unconfirmed: 'You have to confirm your account before continuing.'
       locked: 'Your account is locked.'
+      not_found_in_database: 'Invalid email or password.'
       invalid: 'Invalid email or password.'
       invalid_token: 'Invalid authentication token.'
       timeout: 'Your session expired, please sign in again to continue.'
@@ -33,10 +34,9 @@ en:
       send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
       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}.'
-      updated: 'You updated your account successfully.'
-      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+      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.'
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account was successfully unlocked. You are now signed in.'
diff --git a/config/routes.rb b/config/routes.rb
@@ -31,7 +31,8 @@
 
   resources :programs, :only => [:index, :show]
 
-  devise_for :users do
+  devise_for :users
+  devise_scope :user do
     get "login" => "devise/sessions#new", :as => "login"
     get "logout" => "devise/sessions#destroy", :as => "logout"
   end
