clearance 1.0.0.rc4 → 1.0.0.rc6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWQxMTkxOTgyMzhhZWEzNzFmNTI3YTMzNDdiY2M1NGZiYmU1NDA3Yg==
+  data.tar.gz: !binary |-
+    NDA1ZDM3MmQ3NGE2ZDc1NDcyNmQ1NGI4ZGU4OWM0YzEyZmViOTA5OQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDgxNmZlMDliYTNmMjM3MzIzNWYwMzM1YWUzMGQ2YzMzZDA1OWViYzIyNWI5
+    OGI2MzU1MjVjNWM0ZjhhYTc0YTQ3MDBmZmZhZDE4MDZlZTI4ZjM1ZTlhZWRi
+    ZmJhZjZiZDBkODZiZTNhZTU2ODNjNDFlYTg5ZWNlODMxZDhmMjU=
+  data.tar.gz: !binary |-
+    YzRlNWQwZjQ4NDYzOGYyODU3MWFjZjQ2NmMyNGRhYzZhMGU3YzQ5M2UxOGZj
+    MTFiZjM1ZDc2N2VkNDlkN2EwYTEzODdhMzZlYjg2NzVjYTc4M2ZmYTNmNGRh
+    ZWUyMDQ1ZjE3NTY3OTdlOThmNjI0N2JkZTZmYmZiZTJjZDllMGU=

data/.travis.yml

@@ -2,14 +2,25 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
 before_install:
   - gem update --system
+  - gem update bundler
 before_script:
   - "bundle exec rake db:migrate"
 gemfile:
-  - gemfiles/3.0.12.gemfile
-  - gemfiles/3.1.4.gemfile
-  - gemfiles/3.2.3.gemfile
+  - gemfiles/3.0.20.gemfile
+  - gemfiles/3.1.11.gemfile
+  - gemfiles/3.2.12.gemfile
+  - gemfiles/3.2.13.rc2.gemfile
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/3.0.20.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/3.1.11.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/3.2.12.gemfile
 branches:
   only:
     - master

data/Appraisals

@@ -1,4 +1,10 @@
-['3.0.17', '3.1.8', '3.2.8'].each do |rails_version|
+if RUBY_VERSION >= '2.0'
+  rails_versions = ['3.2.13.rc2']
+else
+  rails_versions = ['3.0.20', '3.1.11', '3.2.12']
+end
+
+rails_versions.each do |rails_version|
   appraise "#{rails_version}" do
     gem 'rails', rails_version
   end

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    clearance (1.0.0.rc4)
+    clearance (1.0.0.rc5)
       bcrypt-ruby
+      email_validator
       rails (>= 3.0)
 
 GEM
@@ -46,9 +47,9 @@ GEM
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
     bcrypt-ruby (3.0.1)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    builder (3.0.0)
+    bourne (1.3.0)
+      mocha (= 0.13.0)
+    builder (3.0.4)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -69,6 +70,8 @@ GEM
       nokogiri (>= 1.5.0)
     database_cleaner (0.8.0)
     diff-lcs (1.1.3)
+    email_validator (1.3.0)
+      activemodel
     erubis (2.7.0)
     factory_girl (3.5.0)
       activesupport (>= 3.0.0)
@@ -79,9 +82,9 @@ GEM
     gherkin (2.11.1)
       json (>= 1.4.6)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.3)
+    json (1.7.6)
     libwebsocket (0.1.4)
       addressable
     mail (2.4.4)
@@ -90,17 +93,18 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.19)
-    mocha (0.10.5)
+    mocha (0.13.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
+    multi_json (1.5.0)
     nokogiri (1.5.5)
     polyglot (0.3.3)
-    rack (1.4.1)
+    psych (1.3.4)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.6)
       actionmailer (= 3.2.6)
@@ -117,22 +121,24 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.1)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    rspec-rails (2.11.0)
+    rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     rubyzip (0.9.9)
     selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
@@ -146,13 +152,13 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    thor (0.15.4)
+    thor (0.17.0)
     tilt (1.3.3)
     timecop (0.3.5)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -162,14 +168,15 @@ PLATFORMS
 DEPENDENCIES
   appraisal (= 0.4.1)
   aruba (= 0.4.11)
-  bourne (= 1.1.2)
-  bundler (~> 1.2.0)
+  bourne (= 1.3.0)
+  bundler (~> 1.1)
   capybara (= 1.1.2)
   clearance!
   cucumber-rails (= 1.1.1)
   database_cleaner (= 0.8.0)
   factory_girl_rails (= 3.5.0)
-  rspec-rails (= 2.11.0)
+  psych (~> 1.3.4)
+  rspec-rails (= 2.12.2)
   shoulda-matchers (= 1.2.0)
   sqlite3 (= 1.3.6)
   timecop (= 0.3.5)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2012 thoughtbot, inc.
+Copyright (c) 2009-2013 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,24 +1,27 @@
 New for 1.0.0:
 
 * Change default password strategy to BCrypt.
-* Provide BCryptMigrationFromSHA1 password strategy to help people migrate from
+* Speed up test suites using `::BCrypt::Engine::MIN_COST`.
+* Speed up integration suites with `Clearance::BackDoor`.
+* Replace email regular expression with `EmailValidator` gem.
+* Provide `BCryptMigrationFromSHA1` password strategy to help people migrate from
   SHA1 (the old default password strategy) to BCrypt (the new default).
 * Require > Ruby 1.9.
-* A revamped, more descriptive README.
 * More extension points in more controllers.
-* The email, encrypted_password, and remember_token fields of the users
-  table are NOT NULL in the default migration.
-* We support Test::Unit.
-* Drop Rails plugin support.
-* Add SignedIn and SignedOut routing constraints.
+* The `email`, `encrypted_password`, and `remember_token` fields of the users
+  table are `NOT NULL` in the default migration.
+* Add `SignedIn` and `SignedOut` routing constraints.
 * Add a fake password strategy, which is useful when writing tests.
-* Remove deprecated methods on User: remember_me!, generate_random_code,
-  password_required?.
 * Improve security when changing password.
 * Replace Cucumber feature generator with RSpec + Capybara.
 * Remove Diesel dependency.
+* Remove deprecated methods on User: `remember_me!`, `generate_random_code`,
+  `password_required?`.
 * Add locales support.
-* PasswordsController `params[:user]` has changed to `params[:password_reset]` to avoid locale conflicts
+* `PasswordsController` `params[:user]` has changed to `params[:password_reset]`
+  to avoid locale conflicts.
+* Prepare for Rails 4.
+* Prepare for Ruby 2.
 
 New for 0.16.2:
 

data/README.md

@@ -1,27 +1,30 @@
 Clearance
 =========
 
-[![Build Status](https://secure.travis-ci.org/thoughtbot/clearance.png)](http://travis-ci.org/thoughtbot/clearance?branch=master)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/thoughtbot/clearance)
+[![Build
+Status](https://secure.travis-ci.org/thoughtbot/clearance.png)](http://travis-ci.org/thoughtbot/clearance?branch=master)
+[![Code
+Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/thoughtbot/clearance)
+[![Dependency Status](https://gemnasium.com/thoughtbot/clearance.png)](https://gemnasium.com/thoughtbot/clearance)
 
 Rails authentication with email & password.
 
-Clearance was extracted out of [Airbrake](http://airbrake.io/).
-It is intended to be small, simple, well-tested, and easy to override defaults.
+Clearance was extracted out of [Airbrake](http://airbrake.io/). It is intended
+to be small, simple, well-tested, with easy to override defaults.
 
-Use [Github Issues](/thoughtbot/clearance/issues) for help.
+Use [Github Issues](https://github.com/thoughtbot/clearance/issues) for help.
 
-Read [CONTRIBUTING.md](/thoughtbot/clearance/blob/master/CONTRIBUTING.md) to contribute.
+Read [CONTRIBUTING.md](/CONTRIBUTING.md) to contribute.
 
 Install
 -------
 
-Clearance is a Rails engine tested against
-[Rails 3.x](/thoughtbot/clearance/blob/master/Appraisals) on Ruby 1.9.x.
+Clearance is a Rails engine tested against [Rails 3.x](/Appraisals) on Ruby
+1.9.x.
 
 Include the gem in your Gemfile:
 
-    gem 'clearance', '1.0.0.rc2'
+    gem 'clearance', '1.0.0.rc6'
 
 Bundle:
 
@@ -33,13 +36,15 @@ Make sure the development database exists. Then, run the generator:
 
 The generator:
 
-* inserts Clearance::User into your User model
-* inserts Clearance::Authentication into your ApplicationController
-* creates a migration that either creates a users table or adds only missing columns
+* inserts `Clearance::User` into your `User` model
+* inserts `Clearance::Controller` into your `ApplicationController`
+* creates a migration that either creates a users table or adds only missing
+  columns
 
 Then, follow the instructions output from the generator.
 
-Use the [0.8.x](/thoughtbot/clearance/tree/v0.8.8) series for Rails 2 apps.
+Use Clearance [0.8.8](https://github.com/thoughtbot/clearance/tree/v0.8.8)
+series for Rails 2 apps.
 
 Use [0.16.3](http://rubygems.org/gems/clearance/versions/0.16.3) for Ruby 1.8.7.
 
@@ -124,8 +129,7 @@ Rack applications can interact with it:
 Overriding routes
 -----------------
 
-See [config/routes.rb](/thoughtbot/clearance/blob/master/config/routes.rb) for
-the default behavior.
+See [config/routes.rb](/config/routes.rb) for the default behavior.
 
 To override a Clearance route, redefine it:
 
@@ -134,8 +138,8 @@ To override a Clearance route, redefine it:
 Overriding controllers
 ----------------------
 
-See [app/controllers/clearance](/thoughtbot/clearance/tree/master/app/controllers/clearance)
-for the default behavior.
+See [app/controllers/clearance](/app/controllers/clearance) for the default
+behavior.
 
 To override a Clearance controller, subclass it:
 
@@ -152,8 +156,8 @@ Then, override public methods:
     sessions#create
     sessions#destroy
     sessions#new
-    users#new
     users#create
+    users#new
 
 Or, override private methods:
 
@@ -161,9 +165,9 @@ Or, override private methods:
     passwords#find_user_for_create
     passwords#find_user_for_edit
     passwords#find_user_for_update
-    passwords#flash_failure_when_forbidden
     passwords#flash_failure_after_create
     passwords#flash_failure_after_update
+    passwords#flash_failure_when_forbidden
     passwords#forbid_missing_token
     passwords#forbid_non_existent_user
     passwords#url_after_create
@@ -182,11 +186,13 @@ All flash messages and email subject lines are stored in
 [i18n translations](http://guides.rubyonrails.org/i18n.html).
 Override them like any other translation.
 
+See [config/locales/clearance.en.yml](/config/locales/clearance.en.yml) for the
+default behavior.
+
 Overriding views
 ----------------
 
-See [app/views](/thoughtbot/clearance/tree/master/app/views) for the default
-behavior.
+See [app/views](/app/views) for the default behavior.
 
 To override a view, create your own:
 
@@ -206,8 +212,7 @@ There is a shortcut to copy all Clearance views into your app:
 Overriding the model
 --------------------
 
-See [lib/clearance/user.rb](/thoughtbot/clearance/tree/master/lib/clearance/user.rb)
-for the default behavior.
+See [lib/clearance/user.rb](/lib/clearance/user.rb) for the default behavior.
 
 To override the model, redefine public methods:
 
@@ -218,10 +223,10 @@ To override the model, redefine public methods:
 
 Or, redefine private methods:
 
-    #downcase_email
     #email_optional?
     #generate_confirmation_token
     #generate_remember_token
+    #normalize_email
     #password_optional?
 
 Overriding the password strategy
@@ -229,7 +234,8 @@ Overriding the password strategy
 
 By default, Clearance uses BCrypt encryption of the user's password.
 
-See [lib/clearance/password_strategies/bcrypt.rb](/thoughtbot/clearance/blob/master/lib/clearance/password_strategies/bcrypt.rb)
+See
+[lib/clearance/password_strategies/bcrypt.rb](/lib/clearance/password_strategies/bcrypt.rb)
 for the default behavior.
 
 Change your password strategy in `config/initializers/clearance.rb:`
@@ -249,20 +255,20 @@ The previous default password strategy was SHA1.
 
 Switching password strategies may cause your existing users to not be able to sign in.
 
-If you have an existing app that used the old `SHA1` strategy and you
-want to stay with SHA1, use
-[Clearance::PasswordStrategies::SHA1](/thoughtbot/clearance/blob/master/lib/clearance/password_strategies/sha1.rb).
+If you have an existing app that used the old `SHA1` strategy and you want to
+stay with SHA1, use
+[Clearance::PasswordStrategies::SHA1](/lib/clearance/password_strategies/sha1.rb).
 
-If you have an existing app that used the old `SHA1` strategy and you
-want to switch to BCrypt transparently, use
-[Clearance::PasswordStrategies::BCryptMigrationFromSHA1](/thoughtbot/clearance/blob/master/lib/clearance/password_strategies/bcrypt_migration_from_sha1.rb).
+If you have an existing app that used the old `SHA1` strategy and you want to
+switch to BCrypt transparently, use
+[Clearance::PasswordStrategies::BCryptMigrationFromSHA1](/lib/clearance/password_strategies/bcrypt_migration_from_sha1.rb).
 
 The SHA1 and Blowfish password strategies require an additional `salt` column in
 the `users` table. Run this migration before switching to SHA or Blowfish:
 
     class AddSaltToUsers < ActiveRecord::Migration
       def change
-        add_column :users, :salt, :string, :limit => 128
+        add_column :users, :salt, :string, limit: 128
       end
     end
 
@@ -286,10 +292,11 @@ Optional Integration tests
 Clearance's integration tests are dependent on:
 
 * Capybara
-* RSpec
 * Factory Girl
+* RSpec
 
-As your app evolves, you want to know that authentication still works. We include support for RSpec integration tests.
+As your app evolves, you want to know that authentication still works. We
+include support for RSpec integration tests.
 
 If you've installed [RSpec](https://github.com/rspec/rspec) in your app:
 
@@ -321,7 +328,7 @@ For example, in `spec/support/clearance.rb` or `test/test_helper.rb`:
 
     require 'clearance/testing'
 
-This will make `Clearance::Authentication` methods work in your controllers
+This will make `Clearance::Controller` methods work in your controllers
 during functional tests and provide access to helper methods like:
 
     sign_in
@@ -334,7 +341,7 @@ And matchers like:
 
 Example:
 
-    context 'a visitor' do
+    context 'a guest' do
       before do
         get :show
       end
@@ -368,7 +375,7 @@ and [contributors](/thoughtbot/clearance/contributors) like you. Thank you!
 License
 -------
 
-Clearance is copyright © 2009-2012 thoughtbot. It is free software, and may be
+Clearance is copyright © 2009-2013 thoughtbot. It is free software, and may be
 redistributed under the terms specified in the `LICENSE` file.
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.