devise 3.2.0 → 3.3.0

data/test/rails_app/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
   # Resources for testing
-  resources :users, :only => [:index] do
+  resources :users, only: [:index] do
     member do
       get :expire
       get :accept
@@ -9,96 +9,114 @@ Rails.application.routes.draw do
     end
 
     authenticate do
-      post :exhibit, :on => :member
+      post :exhibit, on: :member
     end
   end
 
-  resources :admins, :only => [:index] do
-    get :expire, :on => :member
+  resources :admins, only: [:index] do
+    get :expire, on: :member
   end
 
   # Users scope
-  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
+  devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
+
+  devise_for :user_on_main_apps,
+    class_name: 'UserOnMainApp',
+    router_name: :main_app,
+    module: :devise
+
+  devise_for :user_on_engines,
+    class_name: 'UserOnEngine',
+    router_name: :fake_engine,
+    module: :devise
 
   as :user do
-    get "/as/sign_in", :to => "devise/sessions#new"
+    get "/as/sign_in", to: "devise/sessions#new"
   end
 
-  get "/sign_in", :to => "devise/sessions#new"
+  get "/sign_in", to: "devise/sessions#new"
+
+  # Routes for custom controller testing
+  devise_for :user, only: [:registrations], controllers: { registrations: "custom/registrations" }, as: :custom, path: :custom
 
   # Admin scope
-  devise_for :admin, :path => "admin_area", :controllers => { :sessions => :"admins/sessions" }, :skip => :passwords
+  devise_for :admin, path: "admin_area", controllers: { sessions: :"admins/sessions" }, skip: :passwords
 
-  get "/admin_area/home", :to => "admins#index", :as => :admin_root
-  get "/anywhere", :to => "foo#bar", :as => :new_admin_password
+  get "/admin_area/home", to: "admins#index", as: :admin_root
+  get "/anywhere", to: "foo#bar", as: :new_admin_password
 
   authenticate(:admin) do
-    get "/private", :to => "home#private", :as => :private
+    get "/private", to: "home#private", as: :private
   end
 
   authenticate(:admin, lambda { |admin| admin.active? }) do
-    get "/private/active", :to => "home#private", :as => :private_active
+    get "/private/active", to: "home#private", as: :private_active
   end
 
   authenticated :admin do
-    get "/dashboard", :to => "home#admin_dashboard"
+    get "/dashboard", to: "home#admin_dashboard"
   end
 
   authenticated :admin, lambda { |admin| admin.active? } do
-    get "/dashboard/active", :to => "home#admin_dashboard"
+    get "/dashboard/active", to: "home#admin_dashboard"
   end
 
   authenticated do
-    get "/dashboard", :to => "home#user_dashboard"
+    get "/dashboard", to: "home#user_dashboard"
   end
 
   unauthenticated do
-    get "/join", :to => "home#join"
+    get "/join", to: "home#join"
   end
 
   # Routes for constraints testing
-  devise_for :headquarters_admin, :class_name => "Admin", :path => "headquarters", :constraints => {:host => /192\.168\.1\.\d\d\d/}
+  devise_for :headquarters_admin, class_name: "Admin", path: "headquarters", constraints: {host: /192\.168\.1\.\d\d\d/}
+
+  constraints(host: /192\.168\.1\.\d\d\d/) do
+    devise_for :homebase_admin, class_name: "Admin", path: "homebase"
+  end
 
-  constraints(:host => /192\.168\.1\.\d\d\d/) do
-    devise_for :homebase_admin, :class_name => "Admin", :path => "homebase"
+  scope(subdomain: 'sub') do
+    devise_for :subdomain_users, class_name: "User", only: [:sessions]
   end
 
-  devise_for :skip_admin, :class_name => "Admin", :skip => :all
+  devise_for :skip_admin, class_name: "Admin", skip: :all
 
   # Routes for format=false testing
-  devise_for :htmlonly_admin, :class_name => "Admin", :skip => [:confirmations, :unlocks], :path => "htmlonly_admin", :format => false, :skip_helpers => [:confirmations, :unlocks]
-  devise_for :htmlonly_users, :class_name => "User", :only => [:confirmations, :unlocks], :path => "htmlonly_users", :format => false, :skip_helpers => true
+  devise_for :htmlonly_admin, class_name: "Admin", skip: [:confirmations, :unlocks], path: "htmlonly_admin", format: false, skip_helpers: [:confirmations, :unlocks]
+  devise_for :htmlonly_users, class_name: "User", only: [:confirmations, :unlocks], path: "htmlonly_users", format: false, skip_helpers: true
 
   # Other routes for routing_test.rb
-  devise_for :reader, :class_name => "User", :only => :passwords
+  devise_for :reader, class_name: "User", only: :passwords
 
-  scope :host => "sub.example.com" do
-    devise_for :sub_admin, :class_name => "Admin"
+  scope host: "sub.example.com" do
+    devise_for :sub_admin, class_name: "Admin"
   end
 
-  namespace :publisher, :path_names => { :sign_in => "i_dont_care", :sign_out => "get_out" } do
-    devise_for :accounts, :class_name => "Admin", :path_names => { :sign_in => "get_in" }
+  namespace :publisher, path_names: { sign_in: "i_dont_care", sign_out: "get_out" } do
+    devise_for :accounts, class_name: "Admin", path_names: { sign_in: "get_in" }
   end
 
-  scope ":locale", :module => :invalid do
-    devise_for :accounts, :singular => "manager", :class_name => "Admin",
-      :path_names => {
-        :sign_in => "login", :sign_out => "logout",
-        :password => "secret", :confirmation => "verification",
-        :unlock => "unblock", :sign_up => "register",
-        :registration => "management", :cancel => "giveup"
-      }, :failure_app => lambda { |env| [404, {"Content-Type" => "text/plain"}, ["Oops, not found"]] }, :module => :devise
+  scope ":locale", module: :invalid do
+    devise_for :accounts, singular: "manager", class_name: "Admin",
+      path_names: {
+        sign_in: "login", sign_out: "logout",
+        password: "secret", confirmation: "verification",
+        unlock: "unblock", sign_up: "register",
+        registration: "management",
+        cancel: "giveup", edit: "edit/profile"
+      }, failure_app: lambda { |env| [404, {"Content-Type" => "text/plain"}, ["Oops, not found"]] }, module: :devise
   end
 
-  namespace :sign_out_via, :module => "devise" do
-    devise_for :deletes, :sign_out_via => :delete, :class_name => "Admin"
-    devise_for :posts, :sign_out_via => :post, :class_name => "Admin"
-    devise_for :delete_or_posts, :sign_out_via => [:delete, :post], :class_name => "Admin"
+  namespace :sign_out_via, module: "devise" do
+    devise_for :deletes, sign_out_via: :delete, class_name: "Admin"
+    devise_for :posts, sign_out_via: :post, class_name: "Admin"
+    devise_for :delete_or_posts, sign_out_via: [:delete, :post], class_name: "Admin"
   end
 
-  get "/set", :to => "home#set"
-  get "/unauthenticated", :to => "home#unauthenticated"
+  get "/set", to: "home#set"
+  get "/unauthenticated", to: "home#unauthenticated"
   get "/custom_strategy/new"
 
-  root :to => "home#index", :via => [:get, :post]
+  root to: "home#index", via: [:get, :post]
 end

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -5,8 +5,8 @@ class CreateTables < ActiveRecord::Migration
       t.string :facebook_token
 
       ## Database authenticatable
-      t.string :email,              :null => false, :default => ""
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
 
       ## Recoverable
       t.string   :reset_password_token
@@ -16,7 +16,7 @@ class CreateTables < ActiveRecord::Migration
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, :default => 0
+      t.integer  :sign_in_count, default: 0
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -29,7 +29,7 @@ class CreateTables < ActiveRecord::Migration
       # t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable
-      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      t.integer  :failed_attempts, default: 0 # Only if lock strategy is :failed_attempts
       t.string   :unlock_token # Only if unlock strategy is :email or :both
       t.datetime :locked_at
 
@@ -38,8 +38,8 @@ class CreateTables < ActiveRecord::Migration
 
     create_table :admins do |t|
       ## Database authenticatable
-      t.string :email,              :null => true
-      t.string :encrypted_password, :null => true
+      t.string :email,              null: true
+      t.string :encrypted_password, null: true
 
       ## Recoverable
       t.string   :reset_password_token
@@ -58,7 +58,7 @@ class CreateTables < ActiveRecord::Migration
       t.datetime :locked_at
 
       ## Attribute for testing route blocks
-      t.boolean :active, :default => false
+      t.boolean :active, default: false
 
       t.timestamps
     end

data/test/rails_app/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -8,40 +9,43 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100401102949) do
+ActiveRecord::Schema.define(version: 20100401102949) do
 
-  create_table "admins", :force => true do |t|
+  create_table "admins", force: true do |t|
     t.string   "email"
-    t.string   "encrypted_password",   :limit => 128
-    t.string   "password_salt"
-    t.string   "remember_token"
-    t.datetime "remember_created_at"
+    t.string   "encrypted_password"
     t.string   "reset_password_token"
-    t.integer  "failed_attempts",                     :default => 0
-    t.string   "unlock_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "unconfirmed_email"
     t.datetime "locked_at"
+    t.boolean  "active",                 default: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: true do |t|
     t.string   "username"
     t.string   "facebook_token"
-    t.string   "email",                               :default => "", :null => false
-    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
     t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                       :default => 0
+    t.integer  "sign_in_count",          default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.integer  "failed_attempts",                     :default => 0
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.integer  "failed_attempts",        default: 0
     t.string   "unlock_token"
     t.datetime "locked_at"
     t.datetime "created_at"

data/test/rails_app/lib/shared_admin.rb

@@ -4,11 +4,11 @@ module SharedAdmin
   included do
     devise :database_authenticatable, :registerable,
            :timeoutable, :recoverable, :lockable, :confirmable,
-           :unlock_strategy => :time, :lock_strategy => :none,
-           :allow_unconfirmed_access_for => 2.weeks, :reconfirmable => true
+           unlock_strategy: :time, lock_strategy: :none,
+           allow_unconfirmed_access_for: 2.weeks, reconfirmable: true
 
-    validates_length_of     :reset_password_token, :minimum => 3, :allow_blank => true
-    validates_uniqueness_of :email, :allow_blank => true, :if => :email_changed?
+    validates_length_of     :reset_password_token, minimum: 3, allow_blank: true
+    validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
   end
 
   def raw_confirmation_token

data/test/rails_app/lib/shared_user.rb

@@ -4,7 +4,7 @@ module SharedUser
   included do
     devise :database_authenticatable, :confirmable, :lockable, :recoverable,
            :registerable, :rememberable, :timeoutable,
-           :trackable, :validatable, :omniauthable
+           :trackable, :validatable, :omniauthable, password_length: 7..128
 
     attr_accessor :other_key
 

data/test/rails_app/lib/shared_user_without_omniauth.rb

@@ -0,0 +1,13 @@
+module SharedUserWithoutOmniauth
+  extend ActiveSupport::Concern
+
+  included do
+    devise :database_authenticatable, :confirmable, :lockable, :recoverable,
+      :registerable, :rememberable, :timeoutable,
+      :trackable, :validatable
+  end
+
+  def raw_confirmation_token
+    @raw_confirmation_token
+  end
+end