clearance 0.9.1 → 0.10.0

data/lib/rails/generators/clearance_templates/factories.rb

@@ -9,5 +9,5 @@ Factory.define :user do |user|
 end
 
 Factory.define :email_confirmed_user, :parent => :user do |user|
-  user.email_confirmed { true }
+  user.after_build { warn "[DEPRECATION] The :email_confirmed_user factory is deprecated, please use the :user factory instead." }
 end

data/lib/rails/generators/clearance_templates/migrations/create_users.rb

@@ -6,7 +6,6 @@ class ClearanceCreateUsers < ActiveRecord::Migration
       t.string   :salt,               :limit => 128
       t.string   :confirmation_token, :limit => 128
       t.string   :remember_token,     :limit => 128
-      t.boolean  :email_confirmed, :default => false, :null => false
       t.timestamps
     end
 

data/lib/rails/generators/clearance_templates/migrations/update_users.rb

@@ -7,8 +7,7 @@ class ClearanceUpdateUsers<%= schema_version_constant %> < ActiveRecord::Migrati
         [:encrypted_password, 't.string :encrypted_password, :limit => 128'],
         [:salt,               't.string :salt, :limit => 128'],
         [:confirmation_token, 't.string :confirmation_token, :limit => 128'],
-        [:remember_token,     't.string :remember_token, :limit => 128'],
-        [:email_confirmed,    't.boolean :email_confirmed, :default => false, :null => false']
+        [:remember_token,     't.string :remember_token, :limit => 128']
       ].delete_if {|c| existing_columns.include?(c.first.to_s)}
 -%>
     change_table(:users) do |t|

data/test/controllers/sessions_controller_test.rb

@@ -13,26 +13,9 @@ class SessionsControllerTest < ActionController::TestCase
     should_not set_the_flash
   end
 
-  context "on POST to #create with unconfirmed credentials" do
-    setup do
-      @user = Factory(:user)
-      ActionMailer::Base.deliveries.clear
-      post :create, :session => {
-                      :email    => @user.email,
-                      :password => @user.password }
-    end
-
-    should_deny_access(:flash => /User has not confirmed email. Confirmation email will be resent./i)
-
-    should "send the confirmation email" do
-      assert_not_nil email = ActionMailer::Base.deliveries[0]
-      assert_match /account confirmation/i, email.subject
-    end
-  end
-
   context "on POST to #create with good credentials" do
     setup do
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @user.update_attribute(:remember_token, "old-token")
       post :create, :session => {
                       :email    => @user.email,
@@ -58,7 +41,7 @@ class SessionsControllerTest < ActionController::TestCase
 
     setup do
       Clearance.configuration.cookie_expiration = lambda { custom_duration }
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @user.update_attribute(:remember_token, "old-token2")
       post :create, :session => {
                       :email    => @user.email,
@@ -77,7 +60,7 @@ class SessionsControllerTest < ActionController::TestCase
   context "on POST to #create with good credentials - cookie expiration set to nil (session cookie)" do
     setup do
       Clearance.configuration.cookie_expiration = lambda { nil }
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @user.update_attribute(:remember_token, "old-token3")
       post :create, :session => {
                       :email    => @user.email,
@@ -95,7 +78,7 @@ class SessionsControllerTest < ActionController::TestCase
 
   context "on POST to #create with good credentials and a session return url" do
     setup do
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @return_url = '/url_in_the_session'
       @request.session[:return_to] = @return_url
       post :create, :session => {
@@ -108,7 +91,7 @@ class SessionsControllerTest < ActionController::TestCase
 
   context "on POST to #create with good credentials and a request return url" do
     setup do
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @return_url = '/url_in_the_request'
       post :create, :session => {
                       :email     => @user.email,
@@ -121,7 +104,7 @@ class SessionsControllerTest < ActionController::TestCase
 
   context "on POST to #create with good credentials and a session return url and request return url" do
     setup do
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @return_url = '/url_in_the_session'
       @request.session[:return_to] = @return_url
       post :create, :session => {
@@ -133,22 +116,6 @@ class SessionsControllerTest < ActionController::TestCase
     should redirect_to("the return URL") { @return_url }
   end
 
-  context "on POST to #create with bad credentials" do
-    setup do
-      post :create, :session => {
-                      :email       => 'bad.email@example.com',
-                      :password    => "bad value" }
-    end
-
-    should set_the_flash.to(/bad/i)
-    should respond_with(:unauthorized)
-    should render_template(:new)
-
-    should "not be signed in" do
-      assert_nil cookies[:remember_token]
-    end
-  end
-
   context "on DELETE to #destroy given a signed out user" do
     setup do
       sign_out
@@ -160,7 +127,7 @@ class SessionsControllerTest < ActionController::TestCase
 
   context "on DELETE to #destroy with a cookie" do
     setup do
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @user.update_attribute(:remember_token, "old-token")
       @request.cookies["remember_token"] = "old-token"
       delete :destroy

data/test/controllers/users_controller_test.rb

@@ -41,16 +41,14 @@ class UsersControllerTest < ActionController::TestCase
         assert_equal @old_user_count + 1, User.count
       end
 
-      should have_sent_email.with_subject(/account confirmation/i)
-
-      should set_the_flash.to(/confirm/i)
+      should set_the_flash.to(/signed up/i)
       should_redirect_to_url_after_create
     end
   end
 
   context "A signed-in user" do
     setup do
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       sign_in_as @user
     end
 

data/test/models/clearance_mailer_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
 class ClearanceMailerTest < ActiveSupport::TestCase
-
   context "A change password email" do
     setup do
       @user  = Factory(:user)
+      @user.forgot_password!
       @email = ClearanceMailer.change_password @user
     end
 
@@ -26,30 +26,4 @@ class ClearanceMailerTest < ActiveSupport::TestCase
       assert_match /Change your password/, @email.subject
     end
   end
-
-  context "A confirmation email" do
-    setup do
-      @user  = Factory(:user)
-      @email = ClearanceMailer.confirmation @user
-    end
-
-    should "be from DO_NOT_REPLY" do
-      assert_match /#{@email.from[0]}/i, Clearance.configuration.mailer_sender
-    end
-
-    should "be sent to user" do
-      assert_match /#{@user.email}/i, @email.to.first
-    end
-
-    should "set its subject" do
-      assert_match /Account confirmation/, @email.subject
-    end
-
-    should "contain a link to confirm the user's account" do
-      host = ActionMailer::Base.default_url_options[:host]
-      regexp = %r{http://#{host}/users/#{@user.id}/confirmation/new\?token=#{@user.confirmation_token}}
-      assert_match regexp, @email.body
-    end
-  end
-
 end

data/test/models/user_test.rb

@@ -12,7 +12,11 @@ class UserTest < ActiveSupport::TestCase
   context "When signing up" do
     should validate_presence_of(:email)
     should validate_presence_of(:password)
+    should allow_value("foo@example.co.uk").for(:email)
     should allow_value("foo@example.com").for(:email)
+    should_not allow_value("foo@").for(:email)
+    should_not allow_value("foo@example..com").for(:email)
+    should_not allow_value("foo@.example.com").for(:email)
     should_not allow_value("foo").for(:email)
     should_not allow_value("example.com").for(:email)
 
@@ -34,10 +38,6 @@ class UserTest < ActiveSupport::TestCase
       assert_not_nil Factory(:user).salt
     end
 
-    should "initialize confirmation token" do
-      assert_not_nil Factory(:user).confirmation_token
-    end
-
     context "encrypt password" do
       setup do
         @salt = "salt"
@@ -59,17 +59,6 @@ class UserTest < ActiveSupport::TestCase
       user = Factory(:user, :email => "John.Doe@example.com")
       assert_equal "John.Doe@example.com", user.email
     end
-
-    should have_sent_email.with_subject(/account confirmation/i)
-  end
-
-  context "When signing up with email already confirmed" do
-    setup do
-      ActionMailer::Base.deliveries.clear
-      Factory(:user, :email_confirmed => true)
-    end
-
-    should_not have_sent_email
   end
 
   context "When multiple users have signed up" do
@@ -77,30 +66,6 @@ class UserTest < ActiveSupport::TestCase
     should validate_uniqueness_of(:email)
   end
 
-  # confirming email
-
-  context "A user without email confirmation" do
-    setup do
-      @user = Factory(:user)
-      assert ! @user.email_confirmed?
-    end
-
-    context "after #confirm_email!" do
-      setup do
-        assert @user.confirm_email!
-        @user.reload
-      end
-
-      should "have confirmed their email" do
-        assert @user.email_confirmed?
-      end
-
-      should "reset confirmation token" do
-        assert_nil @user.confirmation_token
-      end
-    end
-  end
-
   # authenticating
 
   context "A user" do
@@ -124,7 +89,7 @@ class UserTest < ActiveSupport::TestCase
 
   context "When resetting authentication with reset_remember_token!" do
     setup do
-      @user  = Factory(:email_confirmed_user)
+      @user  = Factory(:user)
       @user.remember_token = "old-token"
       @user.reset_remember_token!
     end
@@ -138,7 +103,7 @@ class UserTest < ActiveSupport::TestCase
 
   context "An email confirmed user" do
     setup do
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @old_encrypted_password = @user.encrypted_password
     end
 
@@ -157,10 +122,10 @@ class UserTest < ActiveSupport::TestCase
   should "not generate the same remember token for users with the same password at the same time" do
     Time.stubs(:now => Time.now)
     password    = 'secret'
-    first_user  = Factory(:email_confirmed_user,
+    first_user  = Factory(:user,
                           :password              => password,
                           :password_confirmation => password)
-    second_user = Factory(:email_confirmed_user,
+    second_user = Factory(:user,
                           :password              => password,
                           :password_confirmation => password)
 
@@ -169,11 +134,10 @@ class UserTest < ActiveSupport::TestCase
 
   # recovering forgotten password
 
-  context "An email confirmed user" do
+  context "An user" do
     setup do
-      @user = Factory(:email_confirmed_user)
+      @user = Factory(:user)
       @old_encrypted_password = @user.encrypted_password
-      @user.confirm_email!
     end
 
     context "who requests password reminder" do

data/test/rails_root/test/factories/clearance.rb

@@ -9,5 +9,5 @@ Factory.define :user do |user|
 end
 
 Factory.define :email_confirmed_user, :parent => :user do |user|
-  user.email_confirmed { true }
+  user.after_build { warn "[DEPRECATION] The :email_confirmed_user factory is deprecated, please use the :user factory instead." }
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clearance
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: false
+  hash: 55
+  prerelease: 
   segments: 
   - 0
-  - 9
-  - 1
-  version: 0.9.1
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Dan Croak
@@ -57,7 +57,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -67,6 +67,22 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  type: :development
+  version_requirements: *id003
 description: Rails authentication with email & password.
 email: support@thoughtbot.com
 executables: []
@@ -82,13 +98,11 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- app/controllers/clearance/confirmations_controller.rb
 - app/controllers/clearance/passwords_controller.rb
 - app/controllers/clearance/sessions_controller.rb
 - app/controllers/clearance/users_controller.rb
 - app/models/clearance_mailer.rb
 - app/views/clearance_mailer/change_password.html.erb
-- app/views/clearance_mailer/confirmation.html.erb
 - app/views/passwords/edit.html.erb
 - app/views/passwords/new.html.erb
 - app/views/sessions/new.html.erb
@@ -151,13 +165,7 @@ files:
 - spec/rails_root/config/initializers/session_store.rb
 - spec/rails_root/config/locales/en.yml
 - spec/rails_root/config/routes.rb
-- spec/rails_root/db/schema.rb
 - spec/rails_root/doc/README_FOR_APP
-- spec/rails_root/features/password_reset.feature
-- spec/rails_root/features/sign_in.feature
-- spec/rails_root/features/sign_out.feature
-- spec/rails_root/features/sign_up.feature
-- spec/rails_root/features/step_definitions/clearance_steps.rb
 - spec/rails_root/features/step_definitions/web_steps.rb
 - spec/rails_root/features/support/env.rb
 - spec/rails_root/features/support/paths.rb
@@ -185,7 +193,6 @@ files:
 - spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb
 - spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb
 - spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb
-- test/controllers/confirmations_controller_test.rb
 - test/controllers/passwords_controller_test.rb
 - test/controllers/sessions_controller_test.rb
 - test/controllers/users_controller_test.rb
@@ -280,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Rails authentication with email & password.
@@ -311,13 +318,7 @@ test_files:
 - spec/rails_root/config/initializers/session_store.rb
 - spec/rails_root/config/locales/en.yml
 - spec/rails_root/config/routes.rb
-- spec/rails_root/db/schema.rb
 - spec/rails_root/doc/README_FOR_APP
-- spec/rails_root/features/password_reset.feature
-- spec/rails_root/features/sign_in.feature
-- spec/rails_root/features/sign_out.feature
-- spec/rails_root/features/sign_up.feature
-- spec/rails_root/features/step_definitions/clearance_steps.rb
 - spec/rails_root/features/step_definitions/web_steps.rb
 - spec/rails_root/features/support/env.rb
 - spec/rails_root/features/support/paths.rb
@@ -345,7 +346,6 @@ test_files:
 - spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb
 - spec/rails_root/vendor/plugins/dynamic_form/test/dynamic_form_test.rb
 - spec/rails_root/vendor/plugins/dynamic_form/test/test_helper.rb
-- test/controllers/confirmations_controller_test.rb
 - test/controllers/passwords_controller_test.rb
 - test/controllers/sessions_controller_test.rb
 - test/controllers/users_controller_test.rb

data/app/controllers/clearance/confirmations_controller.rb

@@ -1,74 +0,0 @@
-class Clearance::ConfirmationsController < ApplicationController
-  unloadable
-
-  skip_before_filter :authenticate,                  :only => [:new, :create]
-  before_filter :redirect_signed_in_confirmed_user,  :only => [:new, :create]
-  before_filter :redirect_signed_out_confirmed_user, :only => [:new, :create]
-  before_filter :forbid_missing_token,               :only => [:new, :create]
-  before_filter :forbid_non_existent_user,           :only => [:new, :create]
-
-  def new
-    create
-  end
-
-  def create
-    @user = ::User.find_by_id_and_confirmation_token(
-                   params[:user_id], params[:token])
-    @user.confirm_email!
-
-    sign_in(@user)
-    flash_success_after_create
-    redirect_to(url_after_create)
-  end
-
-  private
-
-  def redirect_signed_in_confirmed_user
-    user = ::User.find_by_id(params[:user_id])
-    if user && user.email_confirmed? && current_user == user
-      flash_success_after_create
-      redirect_to(url_after_create)
-    end
-  end
-
-  def redirect_signed_out_confirmed_user
-    user = ::User.find_by_id(params[:user_id])
-    if user && user.email_confirmed? && signed_out?
-      flash_already_confirmed
-      redirect_to(url_already_confirmed)
-    end
-  end
-
-  def forbid_missing_token
-    if params[:token].blank?
-      raise ActionController::Forbidden, "missing token"
-    end
-  end
-
-  def forbid_non_existent_user
-    unless ::User.find_by_id_and_confirmation_token(
-                  params[:user_id], params[:token])
-      raise ActionController::Forbidden, "non-existent user"
-    end
-  end
-
-  def flash_success_after_create
-    flash[:success] = translate(:confirmed_email,
-      :scope   => [:clearance, :controllers, :confirmations],
-      :default => "Confirmed email and signed in.")
-  end
-
-  def flash_already_confirmed
-    flash[:success] = translate(:already_confirmed_email,
-      :scope   => [:clearance, :controllers, :confirmations],
-      :default => "Already confirmed email. Please sign in.")
-  end
-
-  def url_after_create
-    '/'
-  end
-
-  def url_already_confirmed
-    sign_in_url
-  end
-end