clearance 1.0.0.rc7 → 1.0.0.rc8

data/spec/controllers/users_controller_spec.rb

@@ -30,7 +30,9 @@ describe Clearance::UsersController do
         post :create, :user => user_attributes
       end
 
-      it { should assign_to(:user) }
+      it 'assigns a user' do
+        assigns(:user).should be
+      end
 
       it 'should create a new user' do
         User.count.should == @old_user_count + 1
@@ -48,7 +50,9 @@ describe Clearance::UsersController do
         post :create, :user => user_attributes
       end
 
-      it { should assign_to(:user) }
+      it 'assigns a user' do
+        assigns(:user).should be
+      end
 
       it 'should create a new user' do
         User.count.should == @old_user_count + 1

data/spec/factories.rb

@@ -6,5 +6,10 @@ FactoryGirl.define do
   factory :user do
     email
     password 'password'
+
+    factory :user_with_optional_password, class: 'UserWithOptionalPassword' do
+      password nil
+      encrypted_password ''
+    end
   end
 end

data/spec/models/user_spec.rb

@@ -42,7 +42,7 @@ describe User do
       @user.should be_authenticated(@password)
     end
 
-    it 'is authenticated with incorrect credentials' do
+    it 'is not authenticated with incorrect credentials' do
       User.authenticate(@user.email, 'bad_password').should be_nil
       @user.should_not be_authenticated('bad password')
     end
@@ -126,7 +126,7 @@ describe User do
           end
 
           it 'does not change encrypted password' do
-            @user.encrypted_password.should == @old_encrypted_password
+            @user.encrypted_password.to_s.should == @old_encrypted_password
           end
 
           it 'does not clear confirmation token' do
@@ -154,23 +154,6 @@ describe User do
     it { should allow_value('').for(:email) }
   end
 
-  describe 'a user with an optional password' do
-    before do
-      @user = User.new
-
-      class << @user
-        def password_optional?
-          true
-        end
-      end
-    end
-
-    subject { @user }
-
-    it { should allow_value(nil).for(:password) }
-    it { should allow_value('').for(:password) }
-  end
-
   describe 'user factory' do
     it 'should create a valid user with just an overridden password' do
       build(:user, :password => 'test').should be_valid
@@ -198,3 +181,14 @@ describe User do
     end
   end
 end
+
+describe UserWithOptionalPassword do
+  it { should allow_value(nil).for(:password) }
+  it { should allow_value('').for(:password) }
+
+  it 'cannot authenticate with blank password' do
+    user = create(:user_with_optional_password)
+
+    UserWithOptionalPassword.authenticate(user.email, '').should be_nil
+  end
+end

data/spec/support/clearance.rb

@@ -1,6 +1,7 @@
 require 'clearance'
 
 Clearance.configure do |config|
+  # need an empty block to initialize the configuration object
 end
 
 class ApplicationController < ActionController::Base
@@ -11,6 +12,14 @@ class User < ActiveRecord::Base
   include Clearance::User
 end
 
+class UserWithOptionalPassword < User
+  private
+
+  def password_optional?
+    true
+  end
+end
+
 module Clearance
   module Test
     module Redirects

metadata

@@ -1,248 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc7
+  version: 1.0.0.rc8
 platform: ruby
 authors:
 - Dan Croak
+- Eugene Bolshakov
 - Mike Burns
-- Jason Morrison
 - Joe Ferris
-- Eugene Bolshakov
 - Nick Quaranto
 - Josh Nichols
+- Matt Jankowski
+- Josh Clayton
+- Gabe Berke-Williams
+- Greg Lazarev
 - Mike Breen
-- Jon Yurek
-- Chad Pytel
+- Prem Sichanugrist
+- Harlow Ward
+- Ryan McGeary
+- Derek Prior
+- Jason Morrison
+- Galen Frechette
+- Josh Steiner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: email_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.11
-- !ruby/object:Gem::Dependency
-  name: bourne
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: cucumber-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.12.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.12.2
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '3.1'
 description: Rails authentication & authorization with email & password.
 email: support@thoughtbot.com
 executables: []
@@ -288,14 +114,6 @@ files:
 - features/step_definitions/gem_file_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
-- gemfiles/3.0.20.gemfile
-- gemfiles/3.0.20.gemfile.lock
-- gemfiles/3.1.11.gemfile
-- gemfiles/3.1.11.gemfile.lock
-- gemfiles/3.2.12.gemfile
-- gemfiles/3.2.12.gemfile.lock
-- gemfiles/3.2.13.rc2.gemfile
-- gemfiles/3.2.13.rc2.gemfile.lock
 - lib/clearance.rb
 - lib/clearance/authentication.rb
 - lib/clearance/authorization.rb
@@ -310,7 +128,6 @@ files:
 - lib/clearance/password_strategies/bcrypt.rb
 - lib/clearance/password_strategies/bcrypt_migration_from_sha1.rb
 - lib/clearance/password_strategies/blowfish.rb
-- lib/clearance/password_strategies/fake.rb
 - lib/clearance/password_strategies/sha1.rb
 - lib/clearance/rack_session.rb
 - lib/clearance/session.rb
@@ -333,17 +150,16 @@ files:
 - lib/generators/clearance/specs/USAGE
 - lib/generators/clearance/specs/specs_generator.rb
 - lib/generators/clearance/specs/templates/factories/clearance.rb
-- lib/generators/clearance/specs/templates/integration/clearance/user_signs_out_spec.rb
-- lib/generators/clearance/specs/templates/integration/clearance/visitor_resets_password_spec.rb
-- lib/generators/clearance/specs/templates/integration/clearance/visitor_signs_in_spec.rb
-- lib/generators/clearance/specs/templates/integration/clearance/visitor_signs_up_spec.rb
-- lib/generators/clearance/specs/templates/integration/clearance/visitor_updates_password_spec.rb
+- lib/generators/clearance/specs/templates/features/clearance/user_signs_out_spec.rb
+- lib/generators/clearance/specs/templates/features/clearance/visitor_resets_password_spec.rb
+- lib/generators/clearance/specs/templates/features/clearance/visitor_signs_in_spec.rb
+- lib/generators/clearance/specs/templates/features/clearance/visitor_signs_up_spec.rb
+- lib/generators/clearance/specs/templates/features/clearance/visitor_updates_password_spec.rb
 - lib/generators/clearance/specs/templates/support/action_mailer.rb
 - lib/generators/clearance/specs/templates/support/clearance.rb
 - lib/generators/clearance/specs/templates/support/factory_girl.rb
-- lib/generators/clearance/specs/templates/support/integration.rb
-- lib/generators/clearance/specs/templates/support/integration/action_mailer_helpers.rb
-- lib/generators/clearance/specs/templates/support/integration/clearance_helpers.rb
+- lib/generators/clearance/specs/templates/support/features.rb
+- lib/generators/clearance/specs/templates/support/features/clearance_helpers.rb
 - lib/generators/clearance/views/USAGE
 - lib/generators/clearance/views/views_generator.rb
 - spec/clearance/back_door_spec.rb
@@ -352,6 +168,7 @@ files:
 - spec/clearance/rack_session_spec.rb
 - spec/clearance/session_spec.rb
 - spec/configuration_spec.rb
+- spec/controllers/apis_controller_spec.rb
 - spec/controllers/denies_controller_spec.rb
 - spec/controllers/flashes_controller_spec.rb
 - spec/controllers/forgeries_controller_spec.rb
@@ -381,17 +198,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Rails authentication & authorization with email & password.
@@ -409,6 +226,7 @@ test_files:
 - spec/clearance/rack_session_spec.rb
 - spec/clearance/session_spec.rb
 - spec/configuration_spec.rb
+- spec/controllers/apis_controller_spec.rb
 - spec/controllers/denies_controller_spec.rb
 - spec/controllers/flashes_controller_spec.rb
 - spec/controllers/forgeries_controller_spec.rb