sorcery 0.15.0 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eacf343e86db96ee2b99e31a647efbdca41cc859dd3aaa5d5300fcf80cb2f6f
-  data.tar.gz: 0ab8e2eb73204b108e52ec39c4622e654cf48fa2ec75159bd5a3686a2855156e
+  metadata.gz: e28e735926cc783f48b5f8708fcdba63b66d20c54acb46197a633c3a2c27ed9f
+  data.tar.gz: c48a71718894e02b6d556143d7019b64698d938faf3d82cc97362314e5d821eb
 SHA512:
-  metadata.gz: f4d4e09af8fd96f8c4a025a50c7d9d539ae584fac256f443a488063a91acffe2e1539a0a89b7aa4323116fdc6b9a6bb4e881072d91113e5f98be697e2296005b
-  data.tar.gz: b61da2da586d75af4f1f4df8046accfc7928428005ba3101e6c59fb30421c27b7e358b8b37f6e702c839a2002987e5b43af8c8de7adfd91e70ee8c749ebabf3d
+  metadata.gz: 94876b13d7838ab273e7cf01489914dfce2cdf9f27259f2f3dcb98d62dfe126b65daf3dde018c6423e4a6fbe9b526339c85dfa978dcdf61698ce77b42f722a4d
+  data.tar.gz: 4defd2381f95ab3b89c859430a68fe9c0bb5068d09276100c80996b196448c1289057b3f8059c2d1188199bd0ae3852c6bd5c33a0701c61cd27c1acd7b692ac1

data/.devcontainer/Dockerfile

@@ -0,0 +1,10 @@
+# Which Ruby version to use. You may need to use a more restrictive version,
+# e.g. `3.0`
+ARG VARIANT=3.0
+
+# Pull Microsoft's ruby devcontainer base image
+FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT}
+
+# Ensure we're running the latest bundler, as what ships with the Ruby image may
+# not be current, and bundler will auto-downgrade to match the Gemfile.lock
+RUN gem install bundler

data/.devcontainer/devcontainer.json

@@ -0,0 +1,29 @@
+{
+  "name": "Ruby",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+
+  // Configure tool-specific properties.
+  "customizations": {
+    // Configure properties specific to VS Code.
+    "vscode": {
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": [
+        "rebornix.Ruby"
+      ]
+    }
+  },
+
+  // Set the environment variables
+  // "runArgs": ["--env-file",".env"],
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  //   "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "bash .devcontainer/postcreate.sh",
+
+  // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "vscode"
+}

data/.devcontainer/postcreate.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+bundle config set path vendor/bundle
+bundle install --jobs=1

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: athix

data/.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-Please complete all sections.
+<!-- Please complete all sections. -->
 
 ### Configuration
 
@@ -9,12 +9,16 @@ Please complete all sections.
 
 ### Expected Behavior
 
-Tell us what should happen.
+<!-- Tell us what should happen. -->
 
 ### Actual Behavior
 
-Tell us what happens instead.
+<!-- Tell us what happens instead. -->
 
 ### Steps to Reproduce
 
-Please list all steps to reproduce the issue.
+<!-- Please list all steps to reproduce the issue. -->
+
+1.
+2.
+3.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+Please ensure your pull request includes the following:
+
+- [ ] Description of changes
+- [ ] Update to CHANGELOG.md with short description and link to pull request
+- [ ] Changes have related RSpec tests that ensure functionality does not break
+
+<!-- For the changelog, please add your entry to the HEAD section. Do not create a new release header. -->

data/.github/workflows/ruby.yml

@@ -0,0 +1,70 @@
+name: Test Suite
+
+# Run against all commits and pull requests.
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+  pull_request:
+
+jobs:
+  test_matrix:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0.0
+          # - 3.1
+
+        rails:
+          - '52'
+          - '60'
+          - '61'
+          # - '70'
+
+        exclude:
+          - ruby: 2.4
+            rails: '60'
+          - ruby: 2.4
+            rails: '61'
+          # - ruby: 2.4
+          #   rails: '70'
+          # - ruby: 2.5
+          #   rails: '70'
+          # - ruby: 2.6
+          #   rails: '70'
+          - ruby: 3.0.0
+            rails: '52'
+          # - ruby: 3.1
+          #   rails: '52'
+          # - ruby: 3.1
+          #   rails: '60'
+          # - ruby: 3.1
+          #   rails: '61'
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake spec
+
+  finish:
+    runs-on: ubuntu-latest
+    needs: [ test_matrix ]
+    steps:
+      - name: Wait for status checks
+        run: echo "All Green!"

data/.gitignore

@@ -10,6 +10,7 @@ doc
 
 # bundler
 .bundle
+vendor
 
 # jeweler generated
 pkg

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-12-18 16:18:24 -0800 using RuboCop version 0.78.0.
+# on 2021-04-04 05:00:11 UTC using RuboCop version 0.88.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,12 +13,12 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'sorcery.gemspec'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
-Layout/EmptyLineBetweenDefs:
-  Exclude:
-    - 'lib/sorcery/providers/line.rb'
+# Configuration parameters: IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
 
 # Offense count: 83
 # Cop supports --auto-correct.
@@ -29,6 +29,13 @@ Layout/EmptyLineBetweenDefs:
 Layout/HashAlignment:
   Enabled: false
 
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/sorcery/controller/submodules/external.rb'
+
 # Offense count: 2
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
@@ -58,15 +65,6 @@ Lint/SendWithMixinArgument:
     - 'lib/sorcery/engine.rb'
     - 'lib/sorcery/test_helpers/internal/rails.rb'
 
-# Offense count: 4
-# Configuration parameters: AllowComments.
-Lint/SuppressedException:
-  Exclude:
-    - 'lib/sorcery/controller.rb'
-    - 'lib/sorcery/model.rb'
-    - 'spec/rails_app/config/application.rb'
-    - 'spec/shared_examples/user_shared_examples.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
@@ -74,6 +72,20 @@ Lint/UnusedBlockArgument:
   Exclude:
     - 'spec/shared_examples/user_shared_examples.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/sorcery/adapters/active_record_adapter.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
+  Exclude:
+    - 'spec/rails_app/config.ru'
+
 # Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: annotated, template, unannotated
@@ -81,21 +93,13 @@ Style/FormatStringToken:
   Exclude:
     - 'lib/generators/sorcery/install_generator.rb'
 
-# Offense count: 121
+# Offense count: 125
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, never
+# SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 3
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/sorcery/controller/submodules/brute_force_protection.rb'
-    - 'lib/sorcery/controller/submodules/http_basic_auth.rb'
-    - 'lib/sorcery/controller/submodules/remember_me.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
@@ -105,11 +109,17 @@ Style/HashSyntax:
     - 'lib/sorcery/adapters/active_record_adapter.rb'
     - 'lib/sorcery/test_helpers/rails/integration.rb'
 
-# Offense count: 49
+# Offense count: 34
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MultilineIfModifier:
+  Exclude:
+    - 'lib/sorcery/providers/line.rb'
+
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/RedundantBegin:
@@ -137,6 +147,14 @@ Style/StringLiterals:
     - 'spec/controllers/controller_oauth2_spec.rb'
     - 'spec/sorcery_crypto_providers_spec.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, MinSize.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  Exclude:
+    - 'Rakefile'
+
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/UnpackFirst:

data/CHANGELOG.md

@@ -1,6 +1,48 @@
 # Changelog
 ## HEAD
 
+## 0.16.5
+
+* Raise ArgumentError when calling change_password! with blank password [#333](https://github.com/Sorcery/sorcery/pull/333)
+* Update auth_scheme to oauth2 v1 defaults per v2 breaking changes [#341](https://github.com/Sorcery/sorcery/pull/341)
+
+## 0.16.4
+
+* Adapt to open request protection strategy of rails 7.0 [#318](https://github.com/Sorcery/sorcery/pull/318)
+* Update OAuth2 gem to v2 per v1 deprecation [#323](https://github.com/Sorcery/sorcery/pull/323)
+* Fixed typo in error message [#310](https://github.com/Sorcery/sorcery/pull/310)
+
+## 0.16.3
+
+* Fix provider instantiation for plural provider names (eg. okta) [#305](https://github.com/Sorcery/sorcery/pull/305)
+
+## 0.16.2
+
+* Inline core migration index definition [#281](https://github.com/Sorcery/sorcery/pull/281)
+* Add missing remember_me attributes to config [#180](https://github.com/Sorcery/sorcery/pull/180)
+* Fix MongoID adapter breaking on save [#284](https://github.com/Sorcery/sorcery/pull/284)
+* Don't pass token to Slack in query params. Prevents 'invalid_auth' error [#287](https://github.com/Sorcery/sorcery/pull/287)
+* Fix valid_password? not using configured values when called alone [#293](https://github.com/Sorcery/sorcery/pull/293)
+
+## 0.16.1
+
+* Fix default table name being incorrect in migration generator [#274](https://github.com/Sorcery/sorcery/pull/274)
+* Update `oauth` dependency per CVE-2016-11086
+
+## 0.16.0
+
+* Add BattleNet Provider [#260](https://github.com/Sorcery/sorcery/pull/260)
+* Fix failing isolated tests [#249](https://github.com/Sorcery/sorcery/pull/249)
+* Support LINE login v2.1 [#251](https://github.com/Sorcery/sorcery/pull/251)
+* Update generators to better support namespaces [#237](https://github.com/Sorcery/sorcery/pull/237)
+* Add support for Rails 6 [#238](https://github.com/Sorcery/sorcery/pull/238)
+* Fix ruby 2.7 deprecation warnings [#241](https://github.com/Sorcery/sorcery/pull/241)
+* Use set to ensure unique arrays [#233](https://github.com/Sorcery/sorcery/pull/233)
+
+## 0.15.1
+
+* Update `oauth` dependency per CVE-2016-11086
+
 ## 0.15.0
 
 * Fix brute force vuln due to callbacks no being ran [#235](https://github.com/Sorcery/sorcery/pull/235)

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,14 @@
+# The Sorcery Community Code of Conduct
+
+This document provides a few simple community guidelines for a safe, respectful,
+productive, and collaborative place for any person who is willing to contribute
+to the Sorcery community. It applies to all "collaborative spaces", which are
+defined as community communications channels (such as mailing lists, submitted
+patches, commit comments, etc.).
+
+* Participants will be tolerant of opposing views.
+* Participants must ensure that their language and actions are free of personal
+  attacks and disparaging personal remarks.
+* When interpreting the words and actions of others, participants should always
+  assume good intentions.
+* Behaviour which can be reasonably considered harassment will not be tolerated.

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'pry'
-gem 'rails', '~> 5.2.0'
+gem 'rails'
 gem 'rails-controller-testing'
-gem 'sqlite3', '~> 1.3.6'
+gem 'sqlite3'
 
 gemspec

data/MAINTAINING.md

@@ -0,0 +1,64 @@
+# Maintaining Sorcery
+
+This will eventually be fleshed out so that anyone should be able to pick up and
+maintain Sorcery by following this guide. It will provide step-by-step guides
+for common tasks such as releasing new versions, as well as explain how to
+triage issues and keep the CHANGELOG up-to-date.
+
+## Table of Contents
+
+1. [Merging Pull Requests](#merging-pull-requests)
+1. [Versioning](#versioning)
+   1. [Version Naming](#version-naming)
+   1. [Releasing a New Version](#releasing-a-new-version)
+
+## Merging Pull Requests
+
+TODO
+
+## Versioning
+
+### Version Naming
+
+Sorcery uses semantic versioning which can be found at: https://semver.org/
+
+All versions of Sorcery should follow this format: `MAJOR.MINOR.PATCH`
+
+Where:
+
+* MAJOR - Includes backwards **incompatible** changes.
+* MINOR - Introduces new functionality but is fully backwards compatible.
+* PATCH - Fixes errors in existing functionality (must be backwards compatible).
+
+The changelog and git tags should use `vMAJOR.MINOR.PATCH` to indicate that the
+number represents a version of Sorcery. For example, `1.0.0` would become
+`v1.0.0`.
+
+### Releasing a New Version
+
+When it's time to release a new version, you'll want to ensure all the changes
+you need are on the master branch and that there is a passing build. Then follow
+this checklist and prepare a release commit:
+
+NOTE: `X.Y.Z` and `vX.Y.Z` are given as examples, and should be replaced with
+      whatever version you are releasing. See: [Version Naming](#version-naming)
+
+1. Update CHANGELOG.md
+   1. Check for any changes that have been included since the last release that
+      are not reflected in the changelog. Add any missing entries to the `HEAD`
+      section.
+   1. Check the changes in `HEAD` to determine what version increment is
+      appropriate. See [Version Naming](#version-naming) if unsure.
+   1. Replace `## HEAD` with `## vX.Y.Z` and create a new `## HEAD` section
+      above the latest version.
+1. Update Gem Version
+   1. Update `./lib/sorcery/version.rb` to 'X.Y.Z'
+1. Stage your changes and create a commit
+   1. `git add -A`
+   1. `git commit -m "Release vX.Y.Z"`
+1. TODO: Gem Release (WIP)
+   1. `cd <dir>`
+   1. `gem build`
+   1. `gem push <filename>`
+1. TODO: Version tagging
+   1. Release new version via github interface

data/README.md

@@ -2,10 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/sorcery.svg)](https://rubygems.org/gems/sorcery)
 [![Gem Downloads](https://img.shields.io/gem/dt/sorcery.svg)](https://rubygems.org/gems/sorcery)
-[![Build Status](https://travis-ci.org/Sorcery/sorcery.svg?branch=master)](https://travis-ci.org/Sorcery/sorcery)
-[![Code Climate](https://codeclimate.com/github/Sorcery/sorcery.svg)](https://codeclimate.com/github/Sorcery/sorcery)
-[![Inline docs](http://inch-ci.org/github/Sorcery/sorcery.svg?branch=master)](http://inch-ci.org/github/Sorcery/sorcery)
-[![Join the chat at https://gitter.im/Sorcery/sorcery](https://badges.gitter.im/join_chat.svg)](https://gitter.im/Sorcery/sorcery?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://github.com/Sorcery/sorcery/actions/workflows/ruby.yml/badge.svg?branch=master)](https://github.com/Sorcery/sorcery/actions/workflows/ruby.yml)
 
 Magical Authentication for Rails. Supports ActiveRecord, DataMapper, Mongoid and MongoMapper.
 
@@ -238,14 +235,14 @@ Feel free to ask questions using these contact details:
 
 **Current Maintainers:**
 
-- Chase Gilliam ([@Ch4s3](https://github.com/Ch4s3)) | [Email](mailto:chase.gilliam@gmail.com)
-- Josh Buker ([@athix](https://github.com/athix)) | [Email](mailto:jbuker@aeonsplice.com)
+- Josh Buker ([@athix](https://github.com/athix)) | [Email](mailto:crypto+sorcery@joshbuker.com?subject=Sorcery)
 
 **Past Maintainers:**
 
 - Noam Ben-Ari ([@NoamB](https://github.com/NoamB)) | [Email](mailto:nbenari@gmail.com) | [Twitter](https://twitter.com/nbenari)
 - Kir Shatrov ([@kirs](https://github.com/kirs)) | [Email](mailto:shatrov@me.com) | [Twitter](https://twitter.com/Kiiiir)
 - Grzegorz Witek ([@arnvald](https://github.com/arnvald)) | [Email](mailto:arnvald.to@gmail.com) | [Twitter](https://twitter.com/arnvald)
+- Chase Gilliam ([@Ch4s3](https://github.com/Ch4s3)) | [Email](mailto:chase.gilliam@gmail.com)
 
 ## License
 

data/Rakefile

@@ -1,6 +1,8 @@
 require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
-task default: :spec
+task default: [:rubocop, :spec]

data/SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+| Version   | Supported          |
+| --------- | ------------------ |
+| ~> 0.16.0 | :white_check_mark: |
+| ~> 0.15.0 | :white_check_mark: |
+| < 0.15.0  | :x:                |
+
+## Reporting a Vulnerability
+
+Email the current maintainer(s) with a description of the vulnerability. You
+should expect a response within 48 hours. If the vulnerability is accepted, a
+Github advisory will be created and eventually released with a CVE corresponding
+to the issue found.
+
+A list of the current maintainers can be found on the README under the contact
+section. See: [README.md](https://github.com/Sorcery/sorcery#contact)

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.2.0'
+gem 'rails-controller-testing'
+gem 'sqlite3', '~> 1.3.6'
+
+gemspec path: '..'

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.0.0'
+gem 'rails-controller-testing'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '..'

data/gemfiles/rails_61.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.1.0'
+gem 'rails-controller-testing'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '..'

data/gemfiles/rails_70.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.0.0'
+gem 'rails-controller-testing'
+gem 'sqlite3', '~> 1.4'
+
+gemspec path: '..'

data/lib/generators/sorcery/helpers.rb

@@ -12,6 +12,10 @@ module Sorcery
         options[:model] ? options[:model].classify : 'User'
       end
 
+      def tableized_model_class
+        options[:model] ? options[:model].gsub(/::/, '').tableize : 'users'
+      end
+
       def model_path
         @model_path ||= File.join('app', 'models', "#{file_path}.rb")
       end

data/lib/generators/sorcery/templates/initializer.rb

@@ -222,13 +222,25 @@ Rails.application.config.sorcery.configure do |config|
   # config.line.key = ""
   # config.line.secret = ""
   # config.line.callback_url = "http://mydomain.com:3000/oauth/callback?provider=line"
+  # config.line.scope = "profile"
+  # config.line.bot_prompt = "normal"
+  # config.line.user_info_mapping = {name: 'displayName'}
 
-  # For infromation about Discord API
+  
+  # For information about Discord API
   # https://discordapp.com/developers/docs/topics/oauth2
   # config.discord.key = "xxxxxx"
   # config.discord.secret = "xxxxxx"
   # config.discord.callback_url = "http://localhost:3000/oauth/callback?provider=discord"
   # config.discord.scope = "email guilds"
+
+  # For information about Battlenet API
+  # https://develop.battle.net/documentation/guides/using-oauth
+  # config.battlenet.site = "https://eu.battle.net/" #See Website for other Regional Domains
+  # config.battlenet.key = "xxxxxx"
+  # config.battlenet.secret = "xxxxxx"
+  # config.battlenet.callback_url = "http://localhost:3000/oauth/callback?provider=battlenet"
+  # config.battlenet.scope = "openid"
   # --- user config ---
   config.user_config do |user|
     # -- core --
@@ -294,6 +306,16 @@ Rails.application.config.sorcery.configure do |config|
     # user.subclasses_inherit_config =
 
     # -- remember_me --
+    # change default remember_me_token attribute.
+    # Default: `:remember_me_token`
+    #
+    # user.remember_me_token_attribute_name =
+
+    # change default remember_me_token_expires_at attribute.
+    # Default: `:remember_me_token_expires_at`
+    #
+    # user.remember_me_token_expires_at_attribute_name =
+
     # How long in seconds the session length will be
     # Default: `60 * 60 * 24 * 7`
     #

data/lib/generators/sorcery/templates/migration/activity_logging.rb

@@ -1,10 +1,10 @@
 class SorceryActivityLogging < <%= migration_class_name %>
   def change
-    add_column :<%= model_class_name.tableize %>, :last_login_at,     :datetime, default: nil
-    add_column :<%= model_class_name.tableize %>, :last_logout_at,    :datetime, default: nil
-    add_column :<%= model_class_name.tableize %>, :last_activity_at,  :datetime, default: nil
-    add_column :<%= model_class_name.tableize %>, :last_login_from_ip_address, :string, default: nil
+    add_column :<%= tableized_model_class %>, :last_login_at,     :datetime, default: nil
+    add_column :<%= tableized_model_class %>, :last_logout_at,    :datetime, default: nil
+    add_column :<%= tableized_model_class %>, :last_activity_at,  :datetime, default: nil
+    add_column :<%= tableized_model_class %>, :last_login_from_ip_address, :string, default: nil
 
-    add_index :<%= model_class_name.tableize %>, [:last_logout_at, :last_activity_at]
+    add_index :<%= tableized_model_class %>, [:last_logout_at, :last_activity_at]
   end
 end

data/lib/generators/sorcery/templates/migration/brute_force_protection.rb

@@ -1,9 +1,9 @@
 class SorceryBruteForceProtection < <%= migration_class_name %>
   def change
-    add_column :<%= model_class_name.tableize %>, :failed_logins_count, :integer, default: 0
-    add_column :<%= model_class_name.tableize %>, :lock_expires_at, :datetime, default: nil
-    add_column :<%= model_class_name.tableize %>, :unlock_token, :string, default: nil
+    add_column :<%= tableized_model_class %>, :failed_logins_count, :integer, default: 0
+    add_column :<%= tableized_model_class %>, :lock_expires_at, :datetime, default: nil
+    add_column :<%= tableized_model_class %>, :unlock_token, :string, default: nil
 
-    add_index :<%= model_class_name.tableize %>, :unlock_token
+    add_index :<%= tableized_model_class %>, :unlock_token
   end
 end

data/lib/generators/sorcery/templates/migration/core.rb

@@ -1,13 +1,11 @@
 class SorceryCore < <%= migration_class_name %>
   def change
-    create_table :<%= model_class_name.tableize %> do |t|
-      t.string :email,            null: false
+    create_table :<%= tableized_model_class %> do |t|
+      t.string :email,            null: false, index: { unique: true }
       t.string :crypted_password
       t.string :salt
 
       t.timestamps                null: false
     end
-
-    add_index :<%= model_class_name.tableize %>, :email, unique: true
   end
 end

data/lib/generators/sorcery/templates/migration/external.rb

@@ -1,7 +1,7 @@
 class SorceryExternal < <%= migration_class_name %>
   def change
     create_table :authentications do |t|
-      t.integer :<%= model_class_name.tableize.singularize %>_id, null: false
+      t.integer :<%= tableized_model_class.singularize %>_id, null: false
       t.string :provider, :uid, null: false
 
       t.timestamps              null: false