clearance 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b85f77997240efd1427372cbc15a24e658acffd
-  data.tar.gz: 5ca6fb26641354dbc90fb1415cc9b8a1a00c0f3e
+  metadata.gz: c0998695d86d391312a288b68a0721140249641b
+  data.tar.gz: 1995891a282666fee645519061cf0cd848aeff86
 SHA512:
-  metadata.gz: 98db9d506f81c47c7c4ca09a11d7e5bef8265460becde5e73959c342629b43f2d019a047d12cece15b8ffc31ba10ca20a0f15f5026ec4ccc41b7c056384afc6b
-  data.tar.gz: 6ef805fc817c6aedc195042aa15b473f16ed3b195fa180762e1365e7fd32dad57d957b8432617ef98fbbb72907d57584ad497e23a9bd948816d40f54f9667a22
+  metadata.gz: 9fca14ac8e1a9650c7acd431642331bbd0eb7365f1f03c070e83be7a7e2bddbb6cec28b7942cade5687b9a28aeb7a0d316e0a21087a71211724cdeaa034db7f1
+  data.tar.gz: c4097377a618028dba3656e1da534fa8d566dc5ea6107c94f45dc585bfaab77e8fa1cd9015a9c33fb43ac270fab2799d2c21e17b5e2e248fedc5fd9d47465442

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clearance (1.4.0)
+    clearance (1.4.1)
       bcrypt
       email_validator (~> 1.4)
       rails (>= 3.1)

data/NEWS.md

@@ -1,5 +1,9 @@
 Thank you to all the [contributors](https://github.com/thoughtbot/clearance/graphs/contributors)!
 
+New for 1.4.1 (September 5, 2014)
+* Prevent BCrypt strategy from raising an exception when `encypted_password`
+  is nil.
+
 New for 1.4.0 (July 18, 2014)
 * The sign out link in the default application layout has been replaced with a
   semantically correct sign out button. This also removes an unnecessary

data/lib/clearance/password_strategies/bcrypt.rb

@@ -6,7 +6,9 @@ module Clearance
       extend ActiveSupport::Concern
 
       def authenticated?(password)
-        ::BCrypt::Password.new(encrypted_password) == password
+        if encrypted_password.present?
+          ::BCrypt::Password.new(encrypted_password) == password
+        end
       end
 
       def password=(new_password)

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/lib/generators/clearance/install/templates/clearance.rb

@@ -1,3 +1,3 @@
 Clearance.configure do |config|
-  config.mailer_sender = 'reply@example.com'
+  config.mailer_sender = "reply@example.com"
 end

data/lib/generators/clearance/install/templates/db/migrate/add_clearance_to_users.rb

@@ -10,7 +10,7 @@ class AddClearanceToUsers < ActiveRecord::Migration
     <%= index %>
 <% end -%>
 
-    users = select_all('SELECT id FROM users WHERE remember_token IS NULL')
+    users = select_all("SELECT id FROM users WHERE remember_token IS NULL")
 
     users.each do |user|
       update <<-SQL
@@ -24,7 +24,7 @@ class AddClearanceToUsers < ActiveRecord::Migration
   def self.down
     change_table :users do |t|
 <% if config[:new_columns].any? -%>
-      t.remove <%= new_columns.keys.map { |column| ":#{column}" }.join(',') %>
+      t.remove <%= new_columns.keys.map { |column| ":#{column}" }.join(",") %>
 <% end -%>
     end
   end

data/lib/generators/clearance/install/templates/db/migrate/create_users.rb

@@ -1,5 +1,5 @@
 class CreateUsers < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :users  do |t|
       t.timestamps null: false
       t.string :email, null: false
@@ -11,8 +11,4 @@ class CreateUsers < ActiveRecord::Migration
     add_index :users, :email
     add_index :users, :remember_token
   end
-
-  def self.down
-    drop_table :users
-  end
 end

data/lib/generators/clearance/specs/templates/factories/clearance.rb

@@ -5,6 +5,6 @@ FactoryGirl.define do
 
   factory :user do
     email
-    password 'password'
+    password "password"
   end
 end

data/lib/generators/clearance/specs/templates/features/clearance/user_signs_out_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'User signs out' do
-  scenario 'signs out' do
-    user = signed_in_user
+feature "User signs out" do
+  scenario "signs out" do
+    sign_in
     sign_out
 
     user_should_be_signed_out

data/lib/generators/clearance/specs/templates/features/clearance/visitor_resets_password_spec.rb

@@ -1,23 +1,23 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Visitor resets password' do
-  scenario 'by navigating to the page' do
+feature "Visitor resets password" do
+  scenario "by navigating to the page" do
     visit sign_in_path
 
-    click_link I18n.t('sessions.form.forgot_password')
+    click_link I18n.t("sessions.form.forgot_password")
 
-    current_path.should eq new_password_path
+    expect(current_path).to eq new_password_path
   end
 
-  scenario 'with valid email' do
+  scenario "with valid email" do
     user = user_with_reset_password
 
     page_should_display_change_password_message
     reset_notification_should_be_sent_to user
   end
 
-  scenario 'with non-user account' do
-    reset_password_for 'unknown.email@example.com'
+  scenario "with non-user account" do
+    reset_password_for "unknown.email@example.com"
 
     page_should_display_change_password_message
     mailer_should_have_no_deliveries
@@ -26,16 +26,16 @@ feature 'Visitor resets password' do
   private
 
   def reset_notification_should_be_sent_to(user)
-    user.confirmation_token.should_not be_blank
-    mailer_should_have_delivery user.email, 'password', user.confirmation_token
+    expect(user.confirmation_token).not_to be_blank
+    mailer_should_have_delivery user.email, "password", user.confirmation_token
   end
 
   def page_should_display_change_password_message
-    page.should have_content I18n.t('passwords.create.description')
+    expect(page).to have_content I18n.t("passwords.create.description")
   end
 
   def mailer_should_have_delivery(recipient, subject, body)
-    ActionMailer::Base.deliveries.should_not be_empty
+    expect(ActionMailer::Base.deliveries).not_to be_empty
 
     message = ActionMailer::Base.deliveries.any? do |email|
       email.to == [recipient] &&
@@ -43,10 +43,10 @@ feature 'Visitor resets password' do
         email.body =~ /#{body}/
     end
 
-    message.should be
+    expect(message).to be
   end
 
   def mailer_should_have_no_deliveries
-    ActionMailer::Base.deliveries.should be_empty
+    expect(ActionMailer::Base.deliveries).to be_empty
   end
 end

data/lib/generators/clearance/specs/templates/features/clearance/visitor_signs_in_spec.rb

@@ -1,30 +1,30 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Visitor signs in' do
-  scenario 'with valid email and password' do
-    create_user 'user@example.com', 'password'
-    sign_in_with 'user@example.com', 'password'
+feature "Visitor signs in" do
+  scenario "with valid email and password" do
+    create_user "user@example.com", "password"
+    sign_in_with "user@example.com", "password"
 
     user_should_be_signed_in
   end
 
-  scenario 'with valid mixed-case email and password ' do
-    create_user 'user.name@example.com', 'password'
-    sign_in_with 'User.Name@example.com', 'password'
+  scenario "with valid mixed-case email and password " do
+    create_user "user.name@example.com", "password"
+    sign_in_with "User.Name@example.com", "password"
 
     user_should_be_signed_in
   end
 
-  scenario 'tries with invalid password' do
-    create_user 'user@example.com', 'password'
-    sign_in_with 'user@example.com', 'wrong_password'
+  scenario "tries with invalid password" do
+    create_user "user@example.com", "password"
+    sign_in_with "user@example.com", "wrong_password"
 
     page_should_display_sign_in_error
     user_should_be_signed_out
   end
 
-  scenario 'tries with invalid email' do
-    sign_in_with 'unknown.email@example.com', 'password'
+  scenario "tries with invalid email" do
+    sign_in_with "unknown.email@example.com", "password"
 
     page_should_display_sign_in_error
     user_should_be_signed_out
@@ -37,8 +37,8 @@ feature 'Visitor signs in' do
   end
 
   def page_should_display_sign_in_error
-    page.body.should include(
-      I18n.t('flashes.failure_after_create', sign_up_path: sign_up_path)
+    expect(page.body).to include(
+      I18n.t("flashes.failure_after_create", sign_up_path: sign_up_path)
     )
   end
 end

data/lib/generators/clearance/specs/templates/features/clearance/visitor_signs_up_spec.rb

@@ -1,28 +1,28 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Visitor signs up' do
-  scenario 'by navigating to the page' do
+feature "Visitor signs up" do
+  scenario "by navigating to the page" do
     visit sign_in_path
 
-    click_link I18n.t('sessions.form.sign_up')
+    click_link I18n.t("sessions.form.sign_up")
 
-    current_path.should eq sign_up_path
+    expect(current_path).to eq sign_up_path
   end
 
-  scenario 'with valid email and password' do
-    sign_up_with 'valid@example.com', 'password'
+  scenario "with valid email and password" do
+    sign_up_with "valid@example.com", "password"
 
     user_should_be_signed_in
   end
 
-  scenario 'tries with invalid email' do
-    sign_up_with 'invalid_email', 'password'
+  scenario "tries with invalid email" do
+    sign_up_with "invalid_email", "password"
 
     user_should_be_signed_out
   end
 
-  scenario 'tries with blank password' do
-    sign_up_with 'valid@example.com', ''
+  scenario "tries with blank password" do
+    sign_up_with "valid@example.com", ""
 
     user_should_be_signed_out
   end

data/lib/generators/clearance/specs/templates/features/clearance/visitor_updates_password_spec.rb

@@ -1,28 +1,28 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Visitor updates password' do
-  scenario 'with valid password' do
+feature "Visitor updates password" do
+  scenario "with valid password" do
     user = user_with_reset_password
-    update_password user, 'newpassword'
+    update_password user, "newpassword"
 
     user_should_be_signed_in
   end
 
-  scenario 'signs in with new password' do
+  scenario "signs in with new password" do
     user = user_with_reset_password
-    update_password user, 'newpassword'
+    update_password user, "newpassword"
     sign_out
-    sign_in_with user.email, 'newpassword'
+    sign_in_with user.email, "newpassword"
 
     user_should_be_signed_in
   end
 
-  scenario 'tries with a blank password' do
+  scenario "tries with a blank password" do
     user = user_with_reset_password
     visit_password_reset_page_for user
-    change_password_to ''
+    change_password_to ""
 
-    page.should have_content I18n.t('flashes.failure_after_update')
+    expect(page).to have_content I18n.t("flashes.failure_after_update")
     user_should_be_signed_out
   end
 
@@ -41,7 +41,7 @@ feature 'Visitor updates password' do
   end
 
   def change_password_to(password)
-    fill_in 'password_reset_password', with: password
-    click_button I18n.t('helpers.submit.password_reset.submit')
+    fill_in "password_reset_password", with: password
+    click_button I18n.t("helpers.submit.password_reset.submit")
   end
 end

data/lib/generators/clearance/specs/templates/support/action_mailer.rb

@@ -1,3 +1,3 @@
 RSpec.configure do |config|
   config.before(:each) { ActionMailer::Base.deliveries.clear }
-end
+end

data/lib/generators/clearance/specs/templates/support/clearance.rb

@@ -1 +1 @@
-require 'clearance/rspec'
+require "clearance/rspec"

data/lib/generators/clearance/specs/templates/support/factory_girl.rb

@@ -1,5 +1,5 @@
-require 'factory_girl_rails'
+require "factory_girl_rails"
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
-end
+end

data/lib/generators/clearance/specs/templates/support/features.rb

@@ -1,4 +1,4 @@
-Dir[Rails.root.join('spec/support/features/*.rb')].each { |f| require f }
+Dir[Rails.root.join("spec/support/features/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.include Features::ClearanceHelpers, type: :feature

data/lib/generators/clearance/specs/templates/support/features/clearance_helpers.rb

@@ -1,37 +1,42 @@
 module Features
   module ClearanceHelpers
-    def sign_up_with(email, password)
-      visit sign_up_path
-      fill_in 'user_email', with: email
-      fill_in 'user_password', with: password
-      click_button I18n.t('helpers.submit.user.create')
+    def reset_password_for(email)
+      visit new_password_path
+      fill_in "password_email", with: email
+      click_button I18n.t("helpers.submit.password.submit")
+    end
+
+    def sign_in
+      password = "password"
+      user = create(:user, password: password)
+      sign_in_with user.email, password
     end
 
     def sign_in_with(email, password)
       visit sign_in_path
-      fill_in 'session_email', with: email
-      fill_in 'session_password', with: password
-      click_button I18n.t('helpers.submit.session.submit')
+      fill_in "session_email", with: email
+      fill_in "session_password", with: password
+      click_button I18n.t("helpers.submit.session.submit")
     end
 
-    def signed_in_user
-      password = 'password'
-      user = create(:user, password: password)
-      sign_in_with user.email, password
-      user
+    def sign_out
+      click_button I18n.t("layouts.application.sign_out")
     end
 
-    def user_should_be_signed_in
-      visit root_path
-      page.should have_button I18n.t('layouts.application.sign_out')
+    def sign_up_with(email, password)
+      visit sign_up_path
+      fill_in "user_email", with: email
+      fill_in "user_password", with: password
+      click_button I18n.t("helpers.submit.user.create")
     end
 
-    def sign_out
-      click_button I18n.t('layouts.application.sign_out')
+    def user_should_be_signed_in
+      visit root_path
+      expect(page).to have_button I18n.t("layouts.application.sign_out")
     end
 
     def user_should_be_signed_out
-      page.should have_content I18n.t('layouts.application.sign_in')
+      expect(page).to have_content I18n.t("layouts.application.sign_in")
     end
 
     def user_with_reset_password
@@ -40,10 +45,5 @@ module Features
       user.reload
     end
 
-    def reset_password_for(email)
-      visit new_password_path
-      fill_in 'password_email', with: email
-      click_button I18n.t('helpers.submit.password.submit')
-    end
   end
 end

data/spec/models/bcrypt_spec.rb

@@ -41,14 +41,25 @@ describe Clearance::PasswordStrategies::BCrypt do
   end
 
   describe '#authenticated?' do
-    let(:password) { 'password' }
 
     before do
       subject.password = password
     end
 
-    it 'is authenticated with BCrypt' do
-      subject.should be_authenticated(password)
+    context 'given a password' do
+      let(:password) { 'password' }
+
+      it 'is authenticated with BCrypt' do
+        subject.should be_authenticated(password)
+      end
+    end
+
+    context 'given no password' do
+      let(:password) { nil }
+
+      it 'is not authenticated' do
+        subject.should_not be_authenticated(password)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt