devise_token_auth 0.2.0 → 1.0.0.rc1

data/test/dummy/app/models/scoped_user.rb

@@ -3,7 +3,7 @@
 class ScopedUser < ActiveRecord::Base
   # Include default devise modules.
   devise :database_authenticatable, :registerable,
-          :recoverable, :rememberable, :trackable, :validatable,
-          :confirmable, :omniauthable
+         :recoverable, :rememberable, :trackable, :validatable,
+         :confirmable, :omniauthable
   include DeviseTokenAuth::Concerns::User
 end

data/test/dummy/app/models/unregisterable_user.rb

@@ -3,7 +3,7 @@
 class UnregisterableUser < ActiveRecord::Base
   # Include default devise modules.
   devise :database_authenticatable,
-          :recoverable, :trackable, :validatable,
-          :confirmable, :omniauthable
+         :recoverable, :trackable, :validatable,
+         :confirmable, :omniauthable
   include DeviseTokenAuth::Concerns::User
 end

data/test/dummy/app/models/user.rb

@@ -8,7 +8,7 @@ class User < ActiveRecord::Base
 
   def ensure_correct_favorite_color
 
-    if favorite_color and favorite_color != ""
+    if favorite_color && (favorite_color != '')
       unless ApplicationHelper::COLOR_NAMES.any?{ |s| s.casecmp(favorite_color)==0 }
         matches = ApplicationHelper::COLOR_SEARCH.search(favorite_color)
         closest_match = matches.last[:string]

data/test/dummy/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
@@ -9,8 +11,8 @@ use Rack::Cors do
   allow do
     origins '*'
     resource '*',
-      :headers => :any,
-      :expose => ['access-token', 'expiry', 'token-type', 'uid', 'client'],
-      :methods => [:get, :post, :options, :delete, :put]
+             headers: :any,
+             expose: ['access-token', 'expiry', 'token-type', 'uid', 'client'],
+             methods: %i[get post options delete put]
   end
 end

data/test/dummy/config/application.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require 'rack/cors'
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "devise_token_auth"
+require 'devise_token_auth'
 
 module Dummy
   class Application < Rails::Application

data/test/dummy/config/boot.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/test/dummy/config/environment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/test/dummy/config/environments/development.rb

@@ -19,9 +19,9 @@ Rails.application.configure do
   config.action_mailer.raise_delivery_errors = true
 
   # use mailcatcher for development
-  config.action_mailer.default_url_options = { :host => 'devise-token-auth.dev' }
+  config.action_mailer.default_url_options = { host: 'devise-token-auth.dev' }
   config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = { :address => 'localhost', :port => 1025 }
+  config.action_mailer.smtp_settings = { address: 'localhost', port: 1025 }
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
@@ -42,5 +42,5 @@ Rails.application.configure do
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  OmniAuth.config.full_host = "http://devise-token-auth.dev"
+  OmniAuth.config.full_host = 'http://devise-token-auth.dev'
 end

data/test/dummy/config/environments/test.rb

@@ -37,7 +37,7 @@ Rails.application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  config.action_mailer.default_url_options = { :host => 'localhost' }
+  config.action_mailer.default_url_options = { host: 'localhost' }
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr

data/test/dummy/config/initializers/omniauth.rb

@@ -5,6 +5,6 @@ Rails.application.config.middleware.use OmniAuth::Builder do |b|
   provider :facebook,      ENV['FACEBOOK_KEY'], ENV['FACEBOOK_SECRET']
   provider :google_oauth2, ENV['GOOGLE_KEY'],   ENV['GOOGLE_SECRET']
   provider :developer,
-    :fields => [:first_name, :last_name],
-    :uid_field => :last_name
+           fields: [:first_name, :last_name],
+           uid_field: :last_name
 end

data/test/dummy/config/routes.rb

@@ -10,25 +10,7 @@ Rails.application.routes.draw do
 
   # define :mangs as the second devise mapping. routes using this class will
   # need to be defined within a devise_scope as shown below
-  mount_devise_token_auth_for "Mang", at: 'mangs'
-
-  mount_devise_token_auth_for 'EvilUser', at: 'evil_user_auth', controllers: {
-    confirmations:      'overrides/confirmations',
-    passwords:          'overrides/passwords',
-    omniauth_callbacks: 'overrides/omniauth_callbacks',
-    registrations:      'overrides/registrations',
-    sessions:           'overrides/sessions',
-    token_validations:  'overrides/token_validations'
-  }
-
-  mount_devise_token_auth_for 'NiceUser', at: 'nice_user_auth', controllers: {
-    registrations: 'custom/registrations',
-    confirmations: 'custom/confirmations',
-    passwords: 'custom/passwords',
-    sessions: 'custom/sessions',
-    token_validations: 'custom/token_validations',
-    omniauth_callbacks: 'custom/omniauth_callbacks'
-  }
+  mount_devise_token_auth_for 'Mang', at: 'mangs'
 
   mount_devise_token_auth_for 'OnlyEmailUser', at: 'only_email_auth', skip: [:omniauth_callbacks]
 
@@ -47,22 +29,21 @@ Rails.application.routes.draw do
 
   # test namespacing with not created devise mapping
   namespace :api_v2, defaults: { format: :json } do
-    mount_devise_token_auth_for "ScopedUser",
-      at:          "auth",
-      controllers: {
-        omniauth_callbacks: "api_v2/omniauth_callbacks",
-        sessions:           "api_v2/sessions",
-        registrations:      "api_v2/registrations",
-        confirmations:      "api_v2/confirmations",
-        passwords:          "api_v2/passwords"
-      }
+    mount_devise_token_auth_for 'ScopedUser',
+                                at:          'auth',
+                                controllers: {
+                                  omniauth_callbacks: 'api_v2/omniauth_callbacks',
+                                  sessions:           'api_v2/sessions',
+                                  registrations:      'api_v2/registrations',
+                                  confirmations:      'api_v2/confirmations',
+                                  passwords:          'api_v2/passwords'
+                                }
   end
 
   # this route will authorize visitors using the User class
   get 'demo/members_only', to: 'demo_user#members_only'
   get 'demo/members_only_remove_token', to: 'demo_user#members_only_remove_token'
 
-
   # routes within this block will authorize visitors using the Mang class
   get 'demo/members_only_mang', to: 'demo_mang#members_only'
 

data/test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb

@@ -7,19 +7,19 @@ class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[4.2]
     create_table(:users) do |t|
       ## Database authenticatable
       t.string :email
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
       t.string   :reset_password_redirect_url
-      t.boolean  :allow_password_change, :default => false
+      t.boolean  :allow_password_change, default: false
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
+      t.integer  :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -43,7 +43,7 @@ class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[4.2]
 
       ## unique oauth id
       t.string :provider
-      t.string :uid, :null => false, :default => ""
+      t.string :uid, null: false, default: ''
 
       ## Tokens
       if json_supported_database?
@@ -56,10 +56,10 @@ class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[4.2]
     end
 
     add_index :users, :email
-    add_index :users, [:uid, :provider],     :unique => true
-    add_index :users, :reset_password_token, :unique => true
-    add_index :users, :confirmation_token,   :unique => true
-    add_index :users, :nickname,             :unique => true
+    add_index :users, [:uid, :provider],     unique: true
+    add_index :users, :reset_password_token, unique: true
+    add_index :users, :confirmation_token,   unique: true
+    add_index :users, :nickname,             unique: true
     # add_index :users, :unlock_token,         :unique => true
   end
 end

data/test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb

@@ -7,19 +7,19 @@ class DeviseTokenAuthCreateMangs < ActiveRecord::Migration[4.2]
     create_table(:mangs) do |t|
       ## Database authenticatable
       t.string :email
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
       t.string   :reset_password_redirect_url
-      t.boolean  :allow_password_change, :default => false
+      t.boolean  :allow_password_change, default: false
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
+      t.integer  :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -43,7 +43,7 @@ class DeviseTokenAuthCreateMangs < ActiveRecord::Migration[4.2]
 
       ## unique oauth id
       t.string :provider
-      t.string :uid, :null => false, :default => ""
+      t.string :uid, null: false, default: ''
 
       ## Tokens
       if json_supported_database?
@@ -56,9 +56,9 @@ class DeviseTokenAuthCreateMangs < ActiveRecord::Migration[4.2]
     end
 
     add_index :mangs, :email
-    add_index :mangs, [:uid, :provider],     :unique => true
-    add_index :mangs, :reset_password_token, :unique => true
-    add_index :mangs, :confirmation_token,   :unique => true
+    add_index :mangs, [:uid, :provider],     unique: true
+    add_index :mangs, :reset_password_token, unique: true
+    add_index :mangs, :confirmation_token,   unique: true
     # add_index :mangs, :unlock_token,         :unique => true
   end
 end

data/test/dummy/db/migrate/20141222035835_devise_token_auth_create_only_email_users.rb

@@ -6,11 +6,11 @@ class DeviseTokenAuthCreateOnlyEmailUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:only_email_users) do |t|
       ## Required
-      t.string :provider, :null => false
-      t.string :uid, :null => false, :default => ""
+      t.string :provider, null: false
+      t.string :uid, null: false, default: ''
 
       ## Database authenticatable
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
       #t.string   :reset_password_token
@@ -54,7 +54,7 @@ class DeviseTokenAuthCreateOnlyEmailUsers < ActiveRecord::Migration[4.2]
     end
 
     add_index :only_email_users, :email
-    add_index :only_email_users, [:uid, :provider],     :unique => true
+    add_index :only_email_users, [:uid, :provider],     unique: true
     #add_index :only_email_users, :reset_password_token, :unique => true
     # add_index :only_email_users, :confirmation_token,   :unique => true
     # add_index :only_email_users, :unlock_token,         :unique => true

data/test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb

@@ -6,22 +6,22 @@ class DeviseTokenAuthCreateUnregisterableUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:unregisterable_users) do |t|
       ## Required
-      t.string :provider, :null => false
-      t.string :uid, :null => false, :default => ""
+      t.string :provider, null: false
+      t.string :uid, null: false, default: ''
 
       ## Database authenticatable
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
-      t.boolean  :allow_password_change, :default => false
+      t.boolean  :allow_password_change, default: false
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
+      t.integer  :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -55,8 +55,8 @@ class DeviseTokenAuthCreateUnregisterableUsers < ActiveRecord::Migration[4.2]
     end
 
     add_index :unregisterable_users, :email
-    add_index :unregisterable_users, [:uid, :provider],     :unique => true
-    add_index :unregisterable_users, :reset_password_token, :unique => true
+    add_index :unregisterable_users, [:uid, :provider],     unique: true
+    add_index :unregisterable_users, :reset_password_token, unique: true
     # add_index :unregisterable_users, :confirmation_token,   :unique => true
     # add_index :unregisterable_users, :unlock_token,         :unique => true
   end

data/test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.rb

@@ -6,22 +6,22 @@ class DeviseTokenAuthCreateUnconfirmableUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:unconfirmable_users) do |t|
       ## Required
-      t.string :provider, :null => false
-      t.string :uid, :null => false, :default => ""
+      t.string :provider, null: false
+      t.string :uid, null: false, default: ''
 
       ## Database authenticatable
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
-      t.boolean  :allow_password_change, :default => false
+      t.boolean  :allow_password_change, default: false
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
+      t.integer  :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -55,8 +55,8 @@ class DeviseTokenAuthCreateUnconfirmableUsers < ActiveRecord::Migration[4.2]
     end
 
     add_index :unconfirmable_users, :email
-    add_index :unconfirmable_users, [:uid, :provider],     :unique => true
-    add_index :unconfirmable_users, :reset_password_token, :unique => true
+    add_index :unconfirmable_users, [:uid, :provider],     unique: true
+    add_index :unconfirmable_users, :reset_password_token, unique: true
     # add_index :nice_users, :confirmation_token,   :unique => true
     # add_index :nice_users, :unlock_token,         :unique => true
   end

data/test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb

@@ -6,22 +6,22 @@ class DeviseTokenAuthCreateScopedUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:scoped_users) do |t|
       ## Required
-      t.string :provider, :null => false
-      t.string :uid, :null => false, :default => ""
+      t.string :provider, null: false
+      t.string :uid, null: false, default: ''
 
       ## Database authenticatable
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
-      t.boolean  :allow_password_change, :default => false
+      t.boolean  :allow_password_change, default: false
 
       ## Rememberable
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
+      t.integer  :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
@@ -55,8 +55,8 @@ class DeviseTokenAuthCreateScopedUsers < ActiveRecord::Migration[4.2]
     end
 
     add_index :scoped_users, :email
-    add_index :scoped_users, [:uid, :provider],     :unique => true
-    add_index :scoped_users, :reset_password_token, :unique => true
+    add_index :scoped_users, [:uid, :provider],     unique: true
+    add_index :scoped_users, :reset_password_token, unique: true
     # add_index :scoped_users, :confirmation_token,   :unique => true
     # add_index :scoped_users, :unlock_token,         :unique => true
   end

data/test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb

@@ -6,11 +6,11 @@ class DeviseTokenAuthCreateLockableUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:lockable_users) do |t|
       ## Required
-      t.string :provider, :null => false
-      t.string :uid, :null => false, :default => ""
+      t.string :provider, null: false
+      t.string :uid, null: false, default: ''
 
       ## Database authenticatable
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
       # t.string   :reset_password_token
@@ -34,7 +34,7 @@ class DeviseTokenAuthCreateLockableUsers < ActiveRecord::Migration[4.2]
       # t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable
-      t.integer  :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts
+      t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
       t.string   :unlock_token # Only if unlock strategy is :email or :both
       t.datetime :locked_at
 
@@ -55,9 +55,9 @@ class DeviseTokenAuthCreateLockableUsers < ActiveRecord::Migration[4.2]
     end
 
     add_index :lockable_users, :email
-    add_index :lockable_users, [:uid, :provider],     :unique => true
+    add_index :lockable_users, [:uid, :provider],     unique: true
     # add_index :lockable_users, :reset_password_token, :unique => true
     # add_index :lockable_users, :confirmation_token,   :unique => true
-    add_index :lockable_users, :unlock_token,         :unique => true
+    add_index :lockable_users, :unlock_token,         unique: true
   end
 end