clearance 1.7.0 → 1.8.0

data/spec/support/generator_spec_helpers.rb

@@ -3,7 +3,7 @@ require "ammeter/rspec/generator/matchers.rb"
 require "ammeter/init"
 
 module GeneratorSpecHelpers
-  TEMPLATE_PATH = File.expand_path("../app_templates", __FILE__)
+  TEMPLATE_PATH = File.expand_path("../../app_templates", __FILE__)
 
   def provide_existing_routes_file
     copy_to_generator_root("config", "routes.rb")

data/spec/support/request_with_remember_token.rb

@@ -2,7 +2,7 @@ module RememberTokenHelpers
   def request_with_remember_token(remember_token)
     cookies = {
       'action_dispatch.cookies' => {
-        Clearance::Session::REMEMBER_TOKEN_COOKIE => remember_token
+        Clearance.configuration.cookie_name => remember_token
       }
     }
     env = { clearance: Clearance::Session.new(cookies) }

data/spec/user_spec.rb

@@ -0,0 +1,186 @@
+require "spec_helper"
+
+describe User do
+  it { is_expected.to have_db_index(:email) }
+  it { is_expected.to have_db_index(:remember_token) }
+  it { is_expected.to validate_presence_of(:email) }
+  it { is_expected.to validate_presence_of(:password) }
+  it { is_expected.to allow_value("foo@example.co.uk").for(:email) }
+  it { is_expected.to allow_value("foo@example.com").for(:email) }
+  it { is_expected.to allow_value("foo+bar@example.com").for(:email) }
+  it { is_expected.not_to allow_value("foo@").for(:email) }
+  it { is_expected.not_to allow_value("foo@example..com").for(:email) }
+  it { is_expected.not_to allow_value("foo@.example.com").for(:email) }
+  it { is_expected.not_to allow_value("foo").for(:email) }
+  it { is_expected.not_to allow_value("example.com").for(:email) }
+  it { is_expected.not_to allow_value("foo;@example.com").for(:email) }
+
+  describe "#email" do
+    it "stores email in down case and removes whitespace" do
+      user = create(:user, email: "Jo hn.Do e @exa mp le.c om")
+
+      expect(user.email).to eq "john.doe@example.com"
+    end
+
+    subject { create(:user) }
+    it { is_expected.to validate_uniqueness_of(:email) }
+  end
+
+  describe ".authenticate" do
+    it "is authenticated with correct email and password" do
+      user = create(:user)
+      password = user.password
+
+      expect(User.authenticate(user.email, password)).to eq(user)
+    end
+
+    it "is authenticated with correct uppercased email and correct password" do
+      user = create(:user)
+      password = user.password
+
+      expect(User.authenticate(user.email.upcase, password)).to eq(user)
+    end
+
+    it "is not authenticated with incorrect credentials" do
+      user = create(:user)
+
+      expect(User.authenticate(user.email, "bad_password")).to be_nil
+    end
+
+    it "is retrieved via a case-insensitive search" do
+      user = create(:user)
+
+      expect(User.find_by_normalized_email(user.email.upcase)).to eq(user)
+    end
+  end
+
+  describe ".reset_remember_token" do
+    context "when resetting authentication with reset_remember_token!" do
+      it "changes the remember token" do
+        old_token = "old_token"
+        user = create(:user, remember_token: old_token)
+
+        user.reset_remember_token!
+
+        expect(user.remember_token).not_to eq old_token
+      end
+    end
+  end
+
+  describe "#update_password" do
+    context "with a valid password" do
+      it "changes the encrypted password" do
+        user = create(:user, :with_forgotten_password)
+        old_encrypted_password = user.encrypted_password
+
+        user.update_password("new_password")
+
+        expect(user.encrypted_password).not_to eq old_encrypted_password
+      end
+
+      it "clears the confirmation token" do
+        user = create(:user, :with_forgotten_password)
+
+        user.update_password("new_password")
+
+        expect(user.confirmation_token).to be_nil
+      end
+    end
+
+    context "with blank password" do
+      it "does not change the encrypted password" do
+        user = create(:user, :with_forgotten_password)
+        old_encrypted_password = user.encrypted_password
+
+        user.update_password("")
+
+        expect(user.encrypted_password.to_s).to eq old_encrypted_password
+      end
+
+      it "does not clear the confirmation token" do
+        user = create(:user, :with_forgotten_password)
+
+        user.update_password("")
+
+        expect(user.confirmation_token).not_to be_nil
+      end
+    end
+  end
+
+  describe "before_create callbacks" do
+    describe "#generate_remember_token" do
+      it "does not generate same remember token for users with same password" do
+        allow(Time).to receive(:now).and_return(Time.now)
+        password = "secret"
+        first_user = create(:user, password: password)
+        second_user = create(:user, password: password)
+
+        expect(second_user.remember_token).not_to eq first_user.remember_token
+      end
+    end
+  end
+
+  describe "#forgot_password!" do
+    it "generates the confirmation token" do
+      user = create(:user, confirmation_token: nil)
+
+      user.forgot_password!
+
+      expect(user.confirmation_token).not_to be_nil
+    end
+  end
+
+  describe "a user with an optional email" do
+    subject { user }
+
+    it { is_expected.to allow_value(nil).for(:email) }
+    it { is_expected.to allow_value("").for(:email) }
+
+    def user
+      @user ||= User.new
+      allow(@user).to receive(:email_optional?).and_return(true)
+      @user
+    end
+  end
+
+  describe "user factory" do
+    it "should create a valid user with just an overridden password" do
+      expect(build(:user, password: "test")).to be_valid
+    end
+  end
+
+  describe "email address normalization" do
+    it "downcases the address and strips spaces" do
+      email = "Jo hn.Do e @exa mp le.c om"
+
+      expect(User.normalize_email(email)).to eq "john.doe@example.com"
+    end
+  end
+
+  describe "the password setter on a User" do
+    it "sets password to the plain-text password" do
+      password = "password"
+      subject.send(:password=, password)
+
+      expect(subject.password).to eq password
+    end
+
+    it "also sets encrypted_password" do
+      password = "password"
+      subject.send(:password=, password)
+
+      expect(subject.encrypted_password).to_not be_nil
+    end
+  end
+end
+
+describe UserWithOptionalPassword do
+  it { is_expected.to allow_value(nil).for(:password) }
+  it { is_expected.to allow_value("").for(:password) }
+
+  it "cannot authenticate with blank password" do
+    user = create(:user_with_optional_password)
+
+    expect(UserWithOptionalPassword.authenticate(user.email, "")).to be_nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -101,19 +101,15 @@ files:
 - app/views/sessions/new.html.erb
 - app/views/users/_form.html.erb
 - app/views/users/new.html.erb
+- bin/appraisal
+- bin/rake
+- bin/rspec
 - bin/setup
 - clearance.gemspec
 - config/locales/clearance.en.yml
 - config/routes.rb
-- cucumber.yml
 - db/migrate/20110111224543_create_clearance_users.rb
 - db/schema.rb
-- features/integration_with_rspec.feature
-- features/integration_with_test_unit.feature
-- features/step_definitions/configuration_steps.rb
-- features/step_definitions/gem_file_steps.rb
-- features/support/aruba.rb
-- features/support/env.rb
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails4.0.gemfile
 - gemfiles/rails4.1.gemfile
@@ -166,6 +162,14 @@ files:
 - lib/generators/clearance/specs/templates/support/features/clearance_helpers.rb
 - lib/generators/clearance/views/USAGE
 - lib/generators/clearance/views/views_generator.rb
+- spec/acceptance/clearance_installation_spec.rb
+- spec/app_templates/app/controllers/application_controller.rb
+- spec/app_templates/app/models/user.rb
+- spec/app_templates/config/routes.rb
+- spec/app_templates/testapp/Gemfile
+- spec/app_templates/testapp/app/controllers/home_controller.rb
+- spec/app_templates/testapp/config/initializers/action_mailer.rb
+- spec/app_templates/testapp/config/routes.rb
 - spec/clearance/back_door_spec.rb
 - spec/clearance/constraints/signed_in_spec.rb
 - spec/clearance/constraints/signed_out_spec.rb
@@ -183,6 +187,8 @@ files:
 - spec/controllers/sessions_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/user_with_optional_password.rb
 - spec/dummy/application.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/routes.rb
@@ -192,22 +198,20 @@ files:
 - spec/generators/clearance/specs/specs_generator_spec.rb
 - spec/generators/clearance/views/views_generator_spec.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/password_strategies/bcrypt_migration_from_sha1_spec.rb
+- spec/password_strategies/bcrypt_spec.rb
+- spec/password_strategies/blowfish_spec.rb
+- spec/password_strategies/password_strategies_spec.rb
+- spec/password_strategies/sha1_spec.rb
 - spec/routing/clearance_routes_spec.rb
 - spec/spec_helper.rb
-- spec/support/app_templates/app/controllers/application_controller.rb
-- spec/support/app_templates/app/models/user.rb
-- spec/support/app_templates/config/routes.rb
 - spec/support/clearance.rb
 - spec/support/cookies.rb
 - spec/support/fake_model_with_password_strategy.rb
+- spec/support/fake_model_without_password_strategy.rb
 - spec/support/generator_spec_helpers.rb
 - spec/support/request_with_remember_token.rb
+- spec/user_spec.rb
 homepage: http://github.com/thoughtbot/clearance
 licenses:
 - MIT
@@ -233,52 +237,4 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails authentication & authorization with email & password.
-test_files:
-- features/integration_with_rspec.feature
-- features/integration_with_test_unit.feature
-- features/step_definitions/configuration_steps.rb
-- features/step_definitions/gem_file_steps.rb
-- features/support/aruba.rb
-- features/support/env.rb
-- spec/clearance/back_door_spec.rb
-- spec/clearance/constraints/signed_in_spec.rb
-- spec/clearance/constraints/signed_out_spec.rb
-- spec/clearance/default_sign_in_guard_spec.rb
-- spec/clearance/rack_session_spec.rb
-- spec/clearance/session_spec.rb
-- spec/clearance/sign_in_guard_spec.rb
-- spec/clearance/testing/helpers_spec.rb
-- spec/clearance/token_spec.rb
-- spec/configuration_spec.rb
-- spec/controllers/apis_controller_spec.rb
-- spec/controllers/forgeries_controller_spec.rb
-- spec/controllers/passwords_controller_spec.rb
-- spec/controllers/permissions_controller_spec.rb
-- spec/controllers/sessions_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/application.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/routes.rb
-- spec/factories.rb
-- spec/generators/clearance/install/install_generator_spec.rb
-- spec/generators/clearance/routes/routes_generator_spec.rb
-- spec/generators/clearance/specs/specs_generator_spec.rb
-- spec/generators/clearance/views/views_generator_spec.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/routing/clearance_routes_spec.rb
-- spec/spec_helper.rb
-- spec/support/app_templates/app/controllers/application_controller.rb
-- spec/support/app_templates/app/models/user.rb
-- spec/support/app_templates/config/routes.rb
-- spec/support/clearance.rb
-- spec/support/cookies.rb
-- spec/support/fake_model_with_password_strategy.rb
-- spec/support/generator_spec_helpers.rb
-- spec/support/request_with_remember_token.rb
+test_files: []

data/cucumber.yml

@@ -1 +0,0 @@
-default: -r features

data/features/integration_with_rspec.feature

@@ -1,23 +0,0 @@
-Feature: generate rspec integration tests with application
-
-  Background:
-    Given I have a project with clearance and the following gems:
-      | gem                |
-      | capybara           |
-      | rspec-rails        |
-      | factory_girl_rails |
-      | database_cleaner   |
-      | test-unit          |
-
-  Scenario: generate a Rails app, run the generators, and run the tests
-    When I install dependencies
-    And I successfully run `bundle exec rails generate rspec:install`
-    And I successfully run `bundle exec rails generate clearance:specs`
-    And I successfully run `bundle exec rails generate clearance:install`
-    Then the output should contain "Next steps"
-    When I successfully run `bundle exec rake db:migrate`
-    And I successfully run `bundle exec rake db:test:prepare`
-    And I successfully run `bundle exec rspec`
-    Then the output should contain "Finished"
-    And the output should not contain "Failed examples"
-    And the output should not contain "Could not find generator"

data/features/integration_with_test_unit.feature

@@ -1,16 +0,0 @@
-Feature: integrate with test-unit
-
-  Background:
-    Given I have a project with clearance and the following gems:
-      | gem                |
-      | factory_girl_rails |
-      | cucumber-rails     |
-
-  Scenario: generate a Rails app, run the generators, and run the tests
-    When I install dependencies
-    And I successfully run `bundle exec rails generate clearance:install`
-    And I successfully run `bundle exec rake db:migrate`
-    And I successfully run `bundle exec rails generate controller posts index`
-    And I configure test-unit
-    And I successfully run `bundle exec rake`
-    Then the output should match /1 (tests|runs).+1 assertions/

data/features/step_definitions/configuration_steps.rb

@@ -1,153 +0,0 @@
-When /^I install dependencies$/ do
-  step "I successfully run `bundle install --local`"
-end
-
-When "I have a project with clearance and the following gems:" do |table|
-  step "I have a project with clearance"
-
-  table.rows.flatten.each do |gem|
-    step %Q{I add the "#{gem}" gem}
-  end
-end
-
-When "I have a project with clearance" do
-  Bundler.with_original_env do
-    step "I successfully run `bundle exec rails new testapp --skip-bundle --skip-javascript --skip-sprockets`"
-  end
-
-  step 'I cd to "testapp"'
-
-  unless Dummy.rails4?
-    step 'I remove the file "public/index.html"'
-  end
-
-  steps %Q{
-    And I remove the file "app/views/layouts/application.html.erb"
-    And I configure ActionMailer to use "localhost" as a host
-    And I configure a root route
-    And I remove the "turn" gem from this project
-    And I remove the "web-console" gem from this project
-    And I remove the "jbuilder" gem from this project
-    And I remove the "sdoc" gem from this project
-    And I remove the "byebug" gem from this project
-    And I remove the "debugger" gem from this project
-    And I remove the "spring" gem from this project
-    And I add the "clearance" gem from this project
-  }
-end
-
-When /^I configure ActionMailer to use "([^"]+)" as a host$/ do |host|
-  mailer_config = "config.action_mailer.default_url_options = { host: '#{host}' }"
-  path = 'config/application.rb'
-
-  in_current_dir do
-    contents = IO.read(path)
-    contents.sub!(/(class .* < Rails::Application)/, "\\1\n#{mailer_config}")
-    File.open(path, "w") { |file| file.write(contents) }
-  end
-end
-
-When /^I configure a root route$/ do
-  route = "root to: 'home#show'"
-  path = 'config/routes.rb'
-
-  in_current_dir do
-    contents = IO.read(path)
-    contents.sub!(/(\.routes\.draw do)/, "\\1\n#{route}\n")
-    File.open(path, 'w') { |file| file.write(contents) }
-  end
-
-  write_file('app/controllers/home_controller.rb', <<-CONTROLLER)
-  class HomeController < ApplicationController
-    def show
-      render text: '', layout: 'application'
-    end
-  end
-  CONTROLLER
-end
-
-When /^I configure test-unit$/ do
-  factories_path = File.join(
-    'lib', 'generators', 'clearance', 'specs', 'templates', 'factories',
-    'clearance.rb'
-  )
-  steps %Q{
-    When I append to "test/test_helper.rb" with:
-    """
-    require 'clearance/test_unit'
-    """
-    And I overwrite "test/#{controller_test_dir}/posts_controller_test.rb" with:
-    """
-    require 'test_helper'
-
-    class PostsControllerTest < ActionController::TestCase
-      test 'should get index' do
-        sign_in
-        get :index
-        assert_response :success
-      end
-    end
-    """
-    And I write to "test/factories.rb" with:
-    """
-    #{File.read(factories_path)}
-    """
-  }
-end
-
-When /^I create a simple user model$/ do
-  steps %Q{
-    When I successfully run `rails generate model user email:string name:string`
-    And I successfully run `bundle exec rake db:migrate`
-  }
-end
-
-When /^I add an existing user$/ do
-  command = %q{rails runner "User.create!(email: 'a@b.com', name: 'foo')"}
-
-  steps %Q{
-    When I successfully run `#{command}`
-  }
-end
-
-When /existing user should have a remember token$/ do
-  command = 'rails runner "exit(1) unless User.first.remember_token"'
-
-  steps %Q{
-    When I successfully run `#{command}`
-  }
-end
-
-When /^I create a migration with clearance fields$/ do
-  steps %Q{
-    When I write to "db/migrate/001_create_users.rb" with:
-      """
-      class CreateUsers < ActiveRecord::Migration
-        def self.up
-          create_table :users  do |t|
-            t.timestamps null: false
-            t.string :email, null: false
-            t.string :encrypted_password, limit: 128, null: false
-            t.string :confirmation_token, limit: 128
-            t.string :remember_token, limit: 128, null: false
-          end
-
-          add_index :users, :email
-          add_index :users, :remember_token
-        end
-
-        def self.down
-          drop_table :users
-        end
-      end
-      """
-  }
-end
-
-def controller_test_dir
-  if Dummy.rails4?
-    'controllers'
-  else
-    'functional'
-  end
-end