clearance 1.6.0 → 1.6.1

data/spec/models/bcrypt_migration_from_sha1_spec.rb

@@ -1,85 +1,115 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Clearance::PasswordStrategies::BCryptMigrationFromSHA1 do
-  subject do
-    fake_model_with_password_strategy(
-      Clearance::PasswordStrategies::BCryptMigrationFromSHA1
-    )
-  end
+  describe "#password=" do
+    it "encrypts the password into a BCrypt-encrypted encrypted_password" do
+      stub_bcrypt_password
 
-  describe '#password=' do
-    let(:salt) { 'salt' }
-    let(:password) { 'password' }
-    let(:encrypted_password) { double("encrypted password") }
+      expect(model_instance.encrypted_password).to eq encrypted_password
+    end
 
-    before do
-      subject.salt = salt
-      digestable = "--#{salt}--#{password}--"
-      subject.encrypted_password = Digest::SHA1.hexdigest(digestable)
-      allow(BCrypt::Password).to receive(:create).and_return(encrypted_password)
-      subject.password = password
+    it "encrypts with BCrypt" do
+      stub_bcrypt_password
+
+      expect(BCrypt::Password).to have_received(:create).
+        with(password, anything)
     end
 
-    it 'encrypts the password into a BCrypt-encrypted encrypted_password' do
-      expect(subject.encrypted_password).to eq encrypted_password
+    it "sets the pasword on the subject" do
+      stub_bcrypt_password
+
+      expect(model_instance.password).to be_present
     end
 
-    it 'encrypts with BCrypt' do
-      have_received_password = have_received(:create).with(password, anything)
-      expect(BCrypt::Password).to have_received_password
+    def stub_bcrypt_password
+      model_instance.salt = salt
+      digestable = "--#{salt}--#{password}--"
+      model_instance.encrypted_password = Digest::SHA1.hexdigest(digestable)
+      allow(BCrypt::Password).to receive(:create).and_return(encrypted_password)
+      model_instance.password = password
     end
 
-    it 'sets the pasword on the subject' do
-      expect(subject.password).to be_present
+    def encrypted_password
+      @encrypted_password ||= double("encrypted password")
     end
   end
 
-  describe '#authenticated?' do
-    let(:password) { 'password' }
-    let(:salt) { 'salt' }
-    let(:sha1_hash) { Digest::SHA1.hexdigest("--#{salt}--#{password}--") }
+  describe "#authenticated?" do
+    context "with a SHA1-encrypted password" do
+      it "is authenticated" do
+        model_instance.salt = salt
+        model_instance.encrypted_password = sha1_hash
+        allow(model_instance).to receive(:save)
 
-    context 'with a SHA1-encrypted password' do
-      before do
-        subject.salt = salt
-        subject.encrypted_password = sha1_hash
-        allow(subject).to receive(:save).and_return(true)
+        expect(model_instance).to be_authenticated(password)
       end
 
-      it 'is authenticated' do
-        expect(subject).to be_authenticated(password)
+      it "changes the hash into a BCrypt-encrypted one" do
+        model_instance.salt = salt
+        model_instance.encrypted_password = sha1_hash
+        allow(model_instance).to receive(:save)
+
+        model_instance.authenticated? password
+
+        expect(model_instance.encrypted_password).not_to eq sha1_hash
       end
 
-      it 'changes the hash into a BCrypt-encrypted one' do
-        subject.authenticated? password
-        expect(subject.encrypted_password).not_to eq sha1_hash
+      it "does not raise a BCrypt error for invalid passwords" do
+        model_instance.salt = salt
+        model_instance.encrypted_password = sha1_hash
+
+        expect do
+          model_instance.authenticated? "bad" + password
+        end.not_to raise_error
       end
 
-      it 'does not raise a BCrypt error for invalid passwords' do
-        expect { subject.authenticated? 'bad' + password }.not_to raise_error
+      it "saves the subject to database" do
+        model_instance.salt = salt
+        model_instance.encrypted_password = sha1_hash
+        allow(model_instance).to receive(:save)
+
+        model_instance.authenticated? password
+
+        expect(model_instance).to have_received(:save)
       end
 
-      it 'saves the subject to database' do
-        subject.authenticated? password
-        expect(subject).to have_received(:save)
+      def sha1_hash
+        Digest::SHA1.hexdigest("--#{salt}--#{password}--")
       end
     end
 
-    context 'with a BCrypt-encrypted password' do
-      let(:bcrypt_hash) { ::BCrypt::Password.create(password) }
+    context "with a BCrypt-encrypted password" do
+      it "is authenticated" do
+        model_instance.encrypted_password = bcrypt_hash
 
-      before do
-        subject.encrypted_password = bcrypt_hash
+        expect(model_instance).to be_authenticated(password)
       end
 
-      it 'is authenticated' do
-        expect(subject).to be_authenticated(password)
+      it "does not change the hash" do
+        model_instance.encrypted_password = bcrypt_hash
+
+        model_instance.authenticated? password
+
+        expect(model_instance.encrypted_password.to_s).to eq bcrypt_hash.to_s
       end
 
-      it 'does not change the hash' do
-        subject.authenticated? password
-        expect(subject.encrypted_password.to_s).to eq bcrypt_hash.to_s
+      def bcrypt_hash
+        @bcrypt_hash ||= ::BCrypt::Password.create(password)
       end
     end
   end
+
+  def model_instance
+    @model_instance ||= fake_model_with_password_strategy(
+      Clearance::PasswordStrategies::BCryptMigrationFromSHA1
+    )
+  end
+
+  def salt
+    "salt"
+  end
+
+  def password
+    "password"
+  end
 end

data/spec/models/password_strategies_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Clearance::User do
   subject do
     class UniquenessValidator < ActiveModel::Validator
+      undef validate
+
       def validate(record)
       end
     end

data/spec/spec_helper.rb

@@ -1,29 +1,23 @@
-ENV['RAILS_ENV'] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 
-PROJECT_ROOT = File.expand_path('../..', __FILE__)
-$LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
+require "rails/all"
+require "dummy/application"
 
-require 'rails/all'
-require 'rails/test_help'
+require "clearance/rspec"
+require "factory_girl_rails"
+require "rspec/rails"
+require "shoulda-matchers"
+require "timecop"
 
-Bundler.require
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
-require 'clearance/testing/application'
-require 'rspec/rails'
-require 'factory_girl_rails'
-require 'shoulda-matchers'
-require 'clearance/rspec'
-require 'timecop'
-
-Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
-
-Clearance::Testing::Application.initialize!
+Dummy::Application.initialize!
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
-  config.use_transactional_fixtures = true
-  config.order = :random
   config.infer_spec_type_from_file_location!
+  config.order = :random
+  config.use_transactional_fixtures = true
 
   config.expect_with :rspec do |expectations|
     expectations.syntax = :expect

data/spec/support/app_templates/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/spec/support/app_templates/app/models/user.rb

@@ -0,0 +1,5 @@
+class User < ActiveRecord::Base
+  def previously_existed?
+    true
+  end
+end

data/spec/support/app_templates/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  root to: "application#show"
+end

data/spec/support/cookies.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define :set_cookie do |name, expected_value, expected_expires_at|
-  failure_message_for_should do
+  failure_message do
     "Expected #{expectation} got #{result}"
   end
 

data/spec/support/generator_spec_helpers.rb

@@ -0,0 +1,40 @@
+require "ammeter/rspec/generator/example.rb"
+require "ammeter/rspec/generator/matchers.rb"
+require "ammeter/init"
+
+module GeneratorSpecHelpers
+  TEMPLATE_PATH = File.expand_path("../app_templates", __FILE__)
+
+  def provide_existing_routes_file
+    copy_to_generator_root("config", "routes.rb")
+  end
+
+  def provide_existing_application_controller
+    copy_to_generator_root("app/controllers", "application_controller.rb")
+  end
+
+  def provide_existing_user_class
+    copy_to_generator_root("app/models", "user.rb")
+    allow(File).to receive(:exist?).and_call_original
+    allow(File).to receive(:exist?).with("app/models/user.rb").and_return(true)
+  end
+
+  private
+
+  def copy_to_generator_root(destination, template)
+    template_file = File.join(TEMPLATE_PATH, destination, template)
+    destination = File.join(destination_root, destination)
+
+    FileUtils.mkdir_p(destination)
+    FileUtils.cp(template_file, destination)
+  end
+end
+
+RSpec.configure do |config|
+  config.include GeneratorSpecHelpers
+
+  config.before(:example, :generator) do
+    destination File.expand_path("../../../tmp", __FILE__)
+    prepare_destination
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -78,7 +78,6 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - Appraisals
 - CONTRIBUTING.md
@@ -109,14 +108,16 @@ files:
 - cucumber.yml
 - db/migrate/20110111224543_create_clearance_users.rb
 - db/schema.rb
-- features/add_migrations_to_project.feature
-- features/copy_routes_to_host_application.feature
 - 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
+- gemfiles/rails4.2.gemfile
 - lib/clearance.rb
 - lib/clearance/authentication.rb
 - lib/clearance/authorization.rb
@@ -140,11 +141,6 @@ files:
 - lib/clearance/sign_in_guard.rb
 - lib/clearance/test_unit.rb
 - lib/clearance/testing.rb
-- lib/clearance/testing/app/controllers/application_controller.rb
-- lib/clearance/testing/application.rb
-- lib/clearance/testing/assertion_error.rb
-- lib/clearance/testing/config/database.yml
-- lib/clearance/testing/config/routes.rb
 - lib/clearance/testing/deny_access_matcher.rb
 - lib/clearance/testing/helpers.rb
 - lib/clearance/token.rb
@@ -186,7 +182,15 @@ files:
 - 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
@@ -196,9 +200,13 @@ files:
 - 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
 homepage: http://github.com/thoughtbot/clearance
 licenses:
@@ -221,13 +229,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails authentication & authorization with email & password.
 test_files:
-- features/add_migrations_to_project.feature
-- features/copy_routes_to_host_application.feature
 - features/integration_with_rspec.feature
 - features/integration_with_test_unit.feature
 - features/step_definitions/configuration_steps.rb
@@ -250,7 +256,15 @@ test_files:
 - 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
@@ -260,7 +274,11 @@ test_files:
 - 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

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/features/add_migrations_to_project.feature

@@ -1,36 +0,0 @@
-Feature: add migrations to the project
-
-  Background:
-    Given I have a project with clearance
-
-  Scenario: Users table does not exist
-    When I install dependencies
-    And I successfully run `bundle exec rails generate clearance:install`
-    And I successfully run `ls db/migrate`
-    Then the output should contain:
-      """
-      create_users.rb
-      """
-
-  Scenario: Users table without clearance fields exists in the database
-    When I install dependencies
-    And I create a simple user model
-    And I add an existing user
-    And I successfully run `bundle exec rails generate clearance:install`
-    And I successfully run `bundle exec rake db:migrate`
-    Then the output should contain:
-      """
-      add_clearance_to_users.rb
-      """
-    And the existing user should have a remember token
-
-  Scenario: Users table with clearance fields exists in the database
-    When I install dependencies
-    And I create a migration with clearance fields
-    And I successfully run `bundle exec rake db:migrate`
-    And I successfully run `bundle exec rails generate clearance:install`
-    And I successfully run `ls db/migrate`
-    Then the output should not contain:
-      """
-      add_clearance_to_users.rb
-      """