clearance 1.0.0.rc1 → 1.0.0.rc2

data/Appraisals

@@ -1,4 +1,4 @@
-['3.0.15', '3.1.6', '3.2.6'].each do |rails_version|
+['3.0.17', '3.1.8', '3.2.8'].each do |rails_version|
   appraise "#{rails_version}" do
     gem 'rails', rails_version
   end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.0.0.rc1)
+    clearance (1.0.0.rc2)
       bcrypt-ruby
       diesel (= 0.1.5)
       rails (>= 3.0)
@@ -36,7 +36,7 @@ GEM
     activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.3.1)
+    addressable (2.3.2)
     appraisal (0.4.1)
       bundler
       rake
@@ -166,7 +166,7 @@ DEPENDENCIES
   appraisal (= 0.4.1)
   aruba (= 0.4.11)
   bourne (= 1.1.2)
-  bundler (= 1.1.3)
+  bundler (~> 1.2.0)
   capybara (= 1.1.2)
   clearance!
   cucumber-rails (= 1.1.1)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008-2011 thoughtbot, inc.
+Copyright (c) 2009-2012 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

@@ -7,8 +7,7 @@ New for 1.0.0:
 * A revamped, more descriptive README.
 * More extension points in more controllers.
 * The email, encrypted_password, and remember_token fields of the users
-  table cannot be NULL.
-* We do not support adding Clearance after-the-fact.
+  table are NOT NULL in the default migration.
 * We support Test::Unit.
 * Drop Rails plugin support.
 * Add SignedIn and SignedOut routing constraints.

data/README.md

@@ -1,41 +1,47 @@
-Clearance [![Build Status](https://secure.travis-ci.org/thoughtbot/clearance.png)](http://travis-ci.org/thoughtbot/clearance?branch=master)
+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)
+
 Rails authentication & authorization with email & password.
 
-Clearance was extracted out of [Airbrake](http://airbrakeapp.com/). It is intended to be small, simple, well-tested, and easy to override defaults.
+Clearance was extracted out of [Airbrake](http://airbrakeapp.com/).
+It is intended to be small, simple, well-tested, and easy to override defaults.
 
-Use [Github Issues](http://github.com/thoughtbot/clearance/issues) for help.
+Use [Github Issues](/thoughtbot/clearance/issues) for help.
 
-Read [CONTRIBUTING.md](https://github.com/thoughtbot/clearance/blob/master/config/routes.rb) to contribute.
+Read [CONTRIBUTING.md](/thoughtbot/clearance/blob/master/CONTRIBUTING.md) to contribute.
 
 Install
 -------
 
-Clearance is a Rails engine for Rails 3 on Ruby 1.9.2. It is currently
-tested against Rails 3.0.12, 3.1.4, and 3.2.3.
+Clearance is a Rails engine tested against
+[Rails 3.x](/thoughtbot/clearance/blob/master/Appraisals) on Ruby 1.9.x.
 
 Include the gem in your Gemfile:
 
-    gem 'clearance'
+    gem 'clearance', '1.0.0.rc2'
+
+Bundle:
+
+    bundle --binstubs
 
-Make sure the development database exists, then run the generator:
+Make sure the development database exists. Then, run the generator:
 
     rails generate clearance:install
 
-This:
+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
 
-Follow the instructions that are output from the generator.
+Then, follow the instructions output from the generator.
 
-Use the [0.8.x](https://github.com/thoughtbot/clearance/tree/v0.8.8)
-series of Clearance if you have a Rails 2 app.
+Use the [0.8.x](/thoughtbot/clearance/tree/v0.8.8) series for Rails 2 apps.
 
-Use version [0.16.3](http://rubygems.org/gems/clearance/versions/0.16.3)
-for Ruby 1.8.7.
+Use [0.16.3](http://rubygems.org/gems/clearance/versions/0.16.3) for Ruby 1.8.7.
 
 Configure
 ---------
@@ -52,49 +58,49 @@ Override any of the defaults in `config/initializers/clearance.rb`:
 Use
 ---
 
-Use `authorize` and `current_user` in controllers:
-
-    class ArticlesController < ApplicationController
-      before_filter :authorize
-
-      def index
-        current_user.articles
-      end
-    end
-
-Use `signed_in?` and `signed_out?` in controllers, views, or helpers. For example,
-you might want this in a layout:
+Use `current_user`, `signed_in?`, and `signed_out?` in controllers, views, and
+helpers. For example:
 
     - if signed_in?
       = current_user.email
-      = link_to 'Sign out', sign_out_path, :method => :delete
+      = link_to 'Sign out', sign_out_path, method: :delete
     - else
       = link_to 'Sign in', sign_in_path
 
-If you want to authenticate a user elsewhere than sessions/new, like in an API:
+To authenticate a user elsewhere than `sessions/new` (like in an API):
 
     User.authenticate 'email@example.com', 'password'
 
-When a user resets their password, Clearance delivers them an email on. Therefore,
-you should change the default email address in `config/initializers/clearance.rb`:
+When a user resets their password, Clearance delivers them an email. So, you
+should change the `mailer_sender` default, used in the email's "from" header:
 
     Clearance.configure do |config|
       config.mailer_sender = 'reply@example.com'
     end
 
-You can authorize users at the route level:
+Use `authorize` to control access in controllers:
+
+    class ArticlesController < ApplicationController
+      before_filter :authorize
+
+      def index
+        current_user.articles
+      end
+    end
+
+Or, you can authorize users in `config/routes.rb`:
 
     Blog::Application.routes.draw do
       constraints Clearance::Constraints::SignedIn.new { |user| user.admin? } do
-        root :to => 'admin'
+        root to: 'admin'
       end
 
       constraints Clearance::Constraints::SignedIn.new do
-        root :to => 'dashboard'
+        root to: 'dashboard'
       end
 
       constraints Clearance::Constraints::SignedOut.new do
-        root :to => 'marketing'
+        root to: 'marketing'
       end
     end
 
@@ -118,16 +124,18 @@ Rack applications can interact with it:
 Overriding routes
 -----------------
 
-See [config/routes.rb](https://github.com/thoughtbot/clearance/blob/master/config/routes.rb) for the default behavior.
+See [config/routes.rb](/thoughtbot/clearance/blob/master/config/routes.rb) for
+the default behavior.
 
 To override a Clearance route, redefine it:
 
-    resource :session, :controller => 'sessions'
+    resource :session, controller: 'sessions'
 
 Overriding controllers
 ----------------------
 
-See [app/controllers/clearance](https://github.com/thoughtbot/clearance/tree/master/app/controllers/clearance) for the default behavior.
+See [app/controllers/clearance](/thoughtbot/clearance/tree/master/app/controllers/clearance)
+for the default behavior.
 
 To override a Clearance controller, subclass it:
 
@@ -177,8 +185,8 @@ Override them like any other translation.
 Overriding views
 ----------------
 
-See [app/views](https://github.com/thoughtbot/clearance/tree/master/app/views)
-for the default behavior.
+See [app/views](/thoughtbot/clearance/tree/master/app/views) for the default
+behavior.
 
 To override a view, create your own:
 
@@ -198,30 +206,31 @@ There is a shortcut to copy all Clearance views into your app:
 Overriding the model
 --------------------
 
-See [lib/clearance/user.rb](https://github.com/thoughtbot/clearance/tree/master/lib/clearance/user.rb)
+See [lib/clearance/user.rb](/thoughtbot/clearance/tree/master/lib/clearance/user.rb)
 for the default behavior.
 
 To override the model, redefine public methods:
 
-    self.authenticate(email, password)
-    forgot_password!
-    reset_remember_token!
-    update_password(new_password)
+    .authenticate(email, password)
+    #forgot_password!
+    #reset_remember_token!
+    #update_password(new_password)
 
 Or, redefine private methods:
 
-    downcase_email
-    email_optional?
-    generate_confirmation_token
-    generate_remember_token
-    password_optional?
+    #downcase_email
+    #email_optional?
+    #generate_confirmation_token
+    #generate_remember_token
+    #password_optional?
 
 Overriding the password strategy
 --------------------------------
 
 By default, Clearance uses BCrypt encryption of the user's password.
 
-See [lib/clearance/password_strategies/bcrypt.rb](https://github.com/thoughtbot/clearance/blob/master/lib/clearance/password_strategies/bcrypt.rb) for the default behavior.
+See [lib/clearance/password_strategies/bcrypt.rb](/thoughtbot/clearance/blob/master/lib/clearance/password_strategies/bcrypt.rb)
+for the default behavior.
 
 Change your password strategy in `config/initializers/clearance.rb:`
 
@@ -242,11 +251,11 @@ Switching password strategies may cause your existing users to not be able to si
 
 If you have an existing app that used the old `SHA1` strategy and you
 want to stay with SHA1, use
-[Clearance::PasswordStrategies::SHA1](https://github.com/thoughtbot/clearance/blob/master/lib/clearance/password_strategies/sha1.rb).
+[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 switch to BCrypt transparently, use
-[Clearance::PasswordStrategies::BCryptMigrationFromSHA1](https://github.com/thoughtbot/clearance/blob/master/lib/clearance/password_strategies/bcrypt_migration_from_sha1.rb).
+[Clearance::PasswordStrategies::BCryptMigrationFromSHA1](/thoughtbot/clearance/blob/master/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:
@@ -294,9 +303,9 @@ Edit your Gemfile to include:
 
     gem 'factory_girl_rails'
 
-Edit config/enviroments/test.rb to include the following:
+Edit `config/enviroments/test.rb` to include the following:
 
-    config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+    config.action_mailer.default_url_options = { host: 'localhost:3000' }
 
 Then run your tests!
 
@@ -345,20 +354,21 @@ Example:
 You may want to customize the tests:
 
     it { should deny_access  }
-    it { should deny_access(:flash => 'Denied access.')  }
-    it { should deny_access(:redirect => sign_in_url)  }
+    it { should deny_access(flash: 'Denied access.')  }
+    it { should deny_access(redirect: sign_in_url)  }
 
 Credits
 -------
 
 ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
 
-Clearance is maintained by [thoughtbot, inc](http://thoughtbot.com/community).
-Thank you to all [the contributors](https://github.com/thoughtbot/clearance/contributors)!
+Clearance is maintained by [thoughtbot, inc](http://thoughtbot.com/community)
+and [contributors](/thoughtbot/clearance/contributors) like you. Thank you!
 
 License
 -------
 
-Clearance is copyright © 2009-2012 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+Clearance is copyright © 2009-2012 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.

data/clearance.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'appraisal', '0.4.1'
   s.add_development_dependency 'aruba', '0.4.11'
   s.add_development_dependency 'bourne', '1.1.2'
-  s.add_development_dependency 'bundler', '1.1.3'
+  s.add_development_dependency 'bundler', '~> 1.2.0'
   s.add_development_dependency 'capybara', '1.1.2'
   s.add_development_dependency 'cucumber-rails', '1.1.1'
   s.add_development_dependency 'database_cleaner', '0.8.0'

data/gemfiles/{3.0.15.gemfile → 3.0.17.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.15"
+gem "rails", "3.0.17"
 
 gemspec :path=>"../"

data/gemfiles/{3.0.15.gemfile.lock → 3.0.17.gemfile.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: /home/mike/thoughtbot/clearance
+  remote: /Users/croaky/dev/clearance
   specs:
-    clearance (1.0.0.rc1)
+    clearance (1.0.0.rc2)
       bcrypt-ruby
       diesel (= 0.1.5)
       rails (>= 3.0)
@@ -10,12 +10,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.15)
-      actionpack (= 3.0.15)
+    actionmailer (3.0.17)
+      actionpack (= 3.0.17)
       mail (~> 2.2.19)
-    actionpack (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
+    actionpack (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -23,20 +23,20 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.15)
-      activesupport (= 3.0.15)
+    activemodel (3.0.17)
+      activesupport (= 3.0.17)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
+    activerecord (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.15)
-      activemodel (= 3.0.15)
-      activesupport (= 3.0.15)
-    activesupport (3.0.15)
-    addressable (2.3.1)
+    activeresource (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+    activesupport (3.0.17)
+    addressable (2.3.2)
     appraisal (0.4.1)
       bundler
       rake
@@ -57,7 +57,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.4)
+    childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
     cucumber (1.2.1)
       builder (>= 2.1.2)
@@ -79,12 +79,12 @@ GEM
     factory_girl_rails (3.5.0)
       factory_girl (~> 3.5.0)
       railties (>= 3.0.0)
-    ffi (1.1.0)
-    gherkin (2.11.1)
+    ffi (1.1.5)
+    gherkin (2.11.2)
       json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.7.3)
-    libwebsocket (0.1.4)
+    json (1.7.5)
+    libwebsocket (0.1.5)
       addressable
     mail (2.2.19)
       activesupport (>= 2.3.6)
@@ -103,17 +103,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.15)
-      actionmailer (= 3.0.15)
-      actionpack (= 3.0.15)
-      activerecord (= 3.0.15)
-      activeresource (= 3.0.15)
-      activesupport (= 3.0.15)
+    rails (3.0.17)
+      actionmailer (= 3.0.17)
+      actionpack (= 3.0.17)
+      activerecord (= 3.0.17)
+      activeresource (= 3.0.17)
+      activesupport (= 3.0.17)
       bundler (~> 1.0)
-      railties (= 3.0.15)
-    railties (3.0.15)
-      actionpack (= 3.0.15)
-      activesupport (= 3.0.15)
+      railties (= 3.0.17)
+    railties (3.0.17)
+      actionpack (= 3.0.17)
+      activesupport (= 3.0.17)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
@@ -125,9 +125,9 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    rspec-mocks (2.11.2)
     rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -158,13 +158,13 @@ DEPENDENCIES
   appraisal (= 0.4.1)
   aruba (= 0.4.11)
   bourne (= 1.1.2)
-  bundler (= 1.1.3)
+  bundler (~> 1.2.0)
   capybara (= 1.1.2)
   clearance!
   cucumber-rails (= 1.1.1)
   database_cleaner (= 0.8.0)
   factory_girl_rails (= 3.5.0)
-  rails (= 3.0.15)
+  rails (= 3.0.17)
   rspec-rails (= 2.11.0)
   shoulda-matchers (= 1.2.0)
   sqlite3 (= 1.3.6)

data/gemfiles/{3.2.6.gemfile → 3.1.8.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.2.6"
+gem "rails", "3.1.8"
 
 gemspec :path=>"../"

data/gemfiles/{3.1.6.gemfile.lock → 3.1.8.gemfile.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: /home/mike/thoughtbot/clearance
+  remote: /Users/croaky/dev/clearance
   specs:
-    clearance (1.0.0.rc1)
+    clearance (1.0.0.rc2)
       bcrypt-ruby
       diesel (= 0.1.5)
       rails (>= 3.0)
@@ -9,12 +9,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.6)
-      actionpack (= 3.1.6)
+    actionmailer (3.1.8)
+      actionpack (= 3.1.8)
       mail (~> 2.3.3)
-    actionpack (3.1.6)
-      activemodel (= 3.1.6)
-      activesupport (= 3.1.6)
+    actionpack (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -23,21 +23,21 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.4)
-    activemodel (3.1.6)
-      activesupport (= 3.1.6)
+    activemodel (3.1.8)
+      activesupport (= 3.1.8)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.6)
-      activemodel (= 3.1.6)
-      activesupport (= 3.1.6)
+    activerecord (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.6)
-      activemodel (= 3.1.6)
-      activesupport (= 3.1.6)
-    activesupport (3.1.6)
+    activeresource (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+    activesupport (3.1.8)
       multi_json (>= 1.0, < 1.3)
-    addressable (2.3.1)
+    addressable (2.3.2)
     appraisal (0.4.1)
       bundler
       rake
@@ -50,7 +50,7 @@ GEM
     bcrypt-ruby (3.0.1)
     bourne (1.1.2)
       mocha (= 0.10.5)
-    builder (3.0.0)
+    builder (3.0.3)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -58,7 +58,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.4)
+    childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
     cucumber (1.2.1)
       builder (>= 2.1.2)
@@ -79,13 +79,13 @@ GEM
     factory_girl_rails (3.5.0)
       factory_girl (~> 3.5.0)
       railties (>= 3.0.0)
-    ffi (1.1.0)
-    gherkin (2.11.1)
+    ffi (1.1.5)
+    gherkin (2.11.2)
       json (>= 1.4.6)
     hike (1.2.1)
-    i18n (0.6.0)
-    json (1.7.3)
-    libwebsocket (0.1.4)
+    i18n (0.6.1)
+    json (1.7.5)
+    libwebsocket (0.1.5)
       addressable
     mail (2.3.3)
       i18n (>= 0.4.0)
@@ -107,17 +107,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.6)
-      actionmailer (= 3.1.6)
-      actionpack (= 3.1.6)
-      activerecord (= 3.1.6)
-      activeresource (= 3.1.6)
-      activesupport (= 3.1.6)
+    rails (3.1.8)
+      actionmailer (= 3.1.8)
+      actionpack (= 3.1.8)
+      activerecord (= 3.1.8)
+      activeresource (= 3.1.8)
+      activesupport (= 3.1.8)
       bundler (~> 1.0)
-      railties (= 3.1.6)
-    railties (3.1.6)
-      actionpack (= 3.1.6)
-      activesupport (= 3.1.6)
+      railties (= 3.1.8)
+    railties (3.1.8)
+      actionpack (= 3.1.8)
+      activesupport (= 3.1.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -130,9 +130,9 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    rspec-mocks (2.11.2)
     rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -168,13 +168,13 @@ DEPENDENCIES
   appraisal (= 0.4.1)
   aruba (= 0.4.11)
   bourne (= 1.1.2)
-  bundler (= 1.1.3)
+  bundler (~> 1.2.0)
   capybara (= 1.1.2)
   clearance!
   cucumber-rails (= 1.1.1)
   database_cleaner (= 0.8.0)
   factory_girl_rails (= 3.5.0)
-  rails (= 3.1.6)
+  rails (= 3.1.8)
   rspec-rails (= 2.11.0)
   shoulda-matchers (= 1.2.0)
   sqlite3 (= 1.3.6)

data/gemfiles/{3.1.6.gemfile → 3.2.8.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.1.6"
+gem "rails", "3.2.8"
 
 gemspec :path=>"../"

data/gemfiles/{3.2.6.gemfile.lock → 3.2.8.gemfile.lock}

@@ -1,7 +1,7 @@
 PATH
-  remote: /home/mike/thoughtbot/clearance
+  remote: /Users/croaky/dev/clearance
   specs:
-    clearance (1.0.0.rc1)
+    clearance (1.0.0.rc2)
       bcrypt-ruby
       diesel (= 0.1.5)
       rails (>= 3.0)
@@ -9,34 +9,34 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
       mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.3.1)
+    addressable (2.3.2)
     appraisal (0.4.1)
       bundler
       rake
@@ -49,7 +49,7 @@ GEM
     bcrypt-ruby (3.0.1)
     bourne (1.1.2)
       mocha (= 0.10.5)
-    builder (3.0.0)
+    builder (3.0.3)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -57,7 +57,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.4)
+    childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
     cucumber (1.2.1)
       builder (>= 2.1.2)
@@ -78,14 +78,14 @@ GEM
     factory_girl_rails (3.5.0)
       factory_girl (~> 3.5.0)
       railties (>= 3.0.0)
-    ffi (1.1.0)
-    gherkin (2.11.1)
+    ffi (1.1.5)
+    gherkin (2.11.2)
       json (>= 1.4.6)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.3)
-    libwebsocket (0.1.4)
+    json (1.7.5)
+    libwebsocket (0.1.5)
       addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -105,17 +105,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.2.6)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -128,9 +128,9 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    rspec-mocks (2.11.2)
     rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -149,7 +149,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    thor (0.15.4)
+    thor (0.16.0)
     tilt (1.3.3)
     timecop (0.3.5)
     treetop (1.4.10)
@@ -166,13 +166,13 @@ DEPENDENCIES
   appraisal (= 0.4.1)
   aruba (= 0.4.11)
   bourne (= 1.1.2)
-  bundler (= 1.1.3)
+  bundler (~> 1.2.0)
   capybara (= 1.1.2)
   clearance!
   cucumber-rails (= 1.1.1)
   database_cleaner (= 0.8.0)
   factory_girl_rails (= 3.5.0)
-  rails (= 3.2.6)
+  rails (= 3.2.8)
   rspec-rails (= 2.11.0)
   shoulda-matchers (= 1.2.0)
   sqlite3 (= 1.3.6)

data/lib/clearance/password_strategies/bcrypt_migration_from_sha1.rb

@@ -26,13 +26,18 @@ module Clearance
       end
 
       def password=(new_password)
+        @password = new_password
         BCryptUser.new(self).password = new_password
       end
 
       private
 
       def authenticated_with_bcrypt?(password)
-        BCryptUser.new(self).authenticated? password
+        begin
+          BCryptUser.new(self).authenticated? password
+        rescue ::BCrypt::Errors::InvalidHash
+          false
+        end
       end
 
       def authenticated_with_sha1?(password)

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0.rc2'
 end

data/spec/models/bcrypt_migration_from_sha1_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Clearance::PasswordStrategies::BCryptMigrationFromSHA1 do
   subject do
     Class.new do
+      attr_reader :password
       attr_accessor :encrypted_password
       attr_accessor :salt
       include Clearance::PasswordStrategies::BCryptMigrationFromSHA1
@@ -28,6 +29,11 @@ describe Clearance::PasswordStrategies::BCryptMigrationFromSHA1 do
     it 'encrypts with BCrypt' do
       BCrypt::Password.should have_received(:create).with(password)
     end
+
+    it 'sets the pasword on the subject' do
+      subject.password.should be_present
+    end
+
   end
 
   describe '#authenticated?' do
@@ -49,6 +55,12 @@ describe Clearance::PasswordStrategies::BCryptMigrationFromSHA1 do
         subject.authenticated? password
         subject.encrypted_password.should_not == sha1_hash
       end
+
+      it 'does not raise a BCrypt error for invalid passwords' do
+        lambda {
+          subject.authenticated? 'bad' + password
+        }.should_not raise_error(BCrypt::Errors::InvalidHash)
+      end
     end
 
     context 'with a BCrypt-encrypted password' do
@@ -68,4 +80,5 @@ describe Clearance::PasswordStrategies::BCryptMigrationFromSHA1 do
       end
     end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -18,11 +18,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &17307160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -30,21 +30,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17307160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: diesel
-  requirement: &17306160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *17306160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17299600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -52,139 +62,204 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17299600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &17296840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *17296840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &17295840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: *17295840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.11
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &17294500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *17294500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17293220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *17293220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &17292640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *17292640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &17291720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *17291720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &17291020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *17291020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &17290420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *17290420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &17289660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *17289660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &17289100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *17289100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &17288340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.3.6
   type: :development
   prerelease: false
-  version_requirements: *17288340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &17286940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *17286940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 description: Rails authentication & authorization with email & password.
 email: support@thoughtbot.com
 executables: []
@@ -233,12 +308,12 @@ files:
 - features/support/aruba.rb
 - features/support/clearance.rb
 - features/support/env.rb
-- gemfiles/3.0.15.gemfile
-- gemfiles/3.0.15.gemfile.lock
-- gemfiles/3.1.6.gemfile
-- gemfiles/3.1.6.gemfile.lock
-- gemfiles/3.2.6.gemfile
-- gemfiles/3.2.6.gemfile.lock
+- gemfiles/3.0.17.gemfile
+- gemfiles/3.0.17.gemfile.lock
+- gemfiles/3.1.8.gemfile
+- gemfiles/3.1.8.gemfile.lock
+- gemfiles/3.2.8.gemfile
+- gemfiles/3.2.8.gemfile.lock
 - lib/clearance.rb
 - lib/clearance/authentication.rb
 - lib/clearance/configuration.rb
@@ -311,8 +386,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails authentication & authorization with email & password.
-test_files: []
+test_files:
+- features/engine/visitor_resets_password.feature
+- features/engine/visitor_signs_in.feature
+- features/engine/visitor_signs_out.feature
+- features/engine/visitor_signs_up.feature
+- features/integration.feature
+- features/integration_with_test_unit.feature
+- features/step_definitions/configuration_steps.rb
+- features/step_definitions/engine/clearance_steps.rb
+- features/support/aruba.rb
+- features/support/clearance.rb
+- features/support/env.rb
+- spec/clearance/constraints/signed_in_spec.rb
+- spec/clearance/constraints/signed_out_spec.rb
+- spec/clearance/rack_session_spec.rb
+- spec/clearance/session_spec.rb
+- spec/configuration_spec.rb
+- spec/controllers/denies_controller_spec.rb
+- spec/controllers/flashes_controller_spec.rb
+- spec/controllers/forgeries_controller_spec.rb
+- spec/controllers/passwords_controller_spec.rb
+- spec/controllers/sessions_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/factories.rb
+- spec/mailers/clearance_mailer_spec.rb
+- spec/models/bcrypt_migration_from_sha1_spec.rb
+- spec/models/bcrypt_spec.rb
+- spec/models/blowfish_spec.rb
+- spec/models/password_strategies_spec.rb
+- spec/models/sha1_spec.rb
+- spec/models/user_spec.rb
+- spec/spec_helper.rb
+- spec/support/clearance.rb
+- spec/support/cookies.rb
+- spec/support/request_with_remember_token.rb