thoughtbot-clearance 0.2.9 → 0.3.0

data/TODO.textile

@@ -1,15 +1,14 @@
 (highest priority first)
 
-# change url_after_creates to be a class method or use after_filter
 # activation code (like restful-auth) instead of salt?
 # remove dependency on root_url?
-# users#show doesn't exist, but confirmations create redirects there
 # should_have_form should be pulled into shoulda
 # generator should print out instructions to include modules existing files
 # check to make sure attr_accessible doesn't override and w/ attr_protected
 # move shoulda macros in test_helper to shoulda_macros folder
 # add shoulda and factory girl dependencies to gemspec
 # refactor Mailer default_url_options[:host] to something cleaner
+# application controller uses protected, all other controllers use private
 
 ideas to steal from merb-auth:
 

data/lib/clearance/app/controllers/confirmations_controller.rb

@@ -23,7 +23,7 @@ module Clearance
             @user = User.find_by_id_and_salt(params[:user_id], params[:salt])
             @user.confirm!
             session[:user_id] = @user.id
-            redirect_to user_path(@user)
+            redirect_to url_after_create
           end
         end
     
@@ -34,6 +34,10 @@ module Clearance
               render :nothing => true, :status => :not_found
             end
           end
+          
+          def url_after_create
+            root_url
+          end
         end
     
       end

data/lib/clearance/app/controllers/passwords_controller.rb

@@ -7,7 +7,9 @@ module Clearance
           base.class_eval do
             before_filter :existing_user?, :only => [:edit, :update]
             filter_parameter_logging :password, :password_confirmation
+            
             include InstanceMethods
+            
           private
             include PrivateInstanceMethods
           end
@@ -24,7 +26,7 @@ module Clearance
               render :action => :new
             else
               UserMailer.deliver_change_password user
-              redirect_to new_session_url
+              redirect_to url_after_create
             end
           end
 
@@ -53,6 +55,10 @@ module Clearance
               render :nothing => true, :status => :not_found
             end
           end
+          
+          def url_after_create
+            new_session_url
+          end
         end
 
       end

data/lib/clearance/app/controllers/sessions_controller.rb

@@ -11,8 +11,8 @@ module Clearance
         
             include InstanceMethods
         
-          protected
-            include ProtectedInstanceMethods
+          private
+            include PrivateInstanceMethods
           end
         end
     
@@ -30,7 +30,7 @@ module Clearance
           end
         end
 
-        module ProtectedInstanceMethods
+        module PrivateInstanceMethods
           def login_via_password(email, password, remember_me)
             user = user_model.authenticate(email, password)
             if login(user)

data/lib/clearance/test/functional/confirmations_controller_test.rb

@@ -56,7 +56,7 @@ module Clearance
                   assert_equal @user.id, session[:user_id]
                 end
 
-                should_redirect_to "user_path(@user)"
+                should_redirect_to "@controller.send(:url_after_create)"
               end
 
               context "without the User with the given id's salt" do

data/lib/clearance/test/functional/passwords_controller_test.rb

@@ -28,10 +28,10 @@ module Clearance
                   end
 
                   should 'send an email to the user to edit their password' do
-                    assert @email.subject =~ /request to change your password/i
+                    assert @email.subject =~ /change your password/i
                   end
 
-                  should_redirect_to "new_session_path"
+                  should_redirect_to "@controller.send(:url_after_create)"
                 end
 
                 context 'with a non-existing email address' do
@@ -86,9 +86,7 @@ module Clearance
 
                 context "with an existing user's id but not password" do
                   setup do
-                    get(:edit,
-                        :user_id => @user.id,
-                        :password => '')
+                    get :edit, :user_id => @user.id, :password => ''
                   end
 
                   should_respond_with :not_found
@@ -102,9 +100,7 @@ module Clearance
               context 'A PUT to #update' do
                 context "with an existing user's id but not password" do
                   setup do
-                    put(:update,
-                        :user_id => @user.id,
-                        :password => '')
+                    put :update, :user_id => @user.id, :password => ''
                   end
 
                   should "not update the user's password" do

data/lib/clearance/test/functional/sessions_controller_test.rb

@@ -51,7 +51,7 @@ module Clearance
                 end
 
                 should_set_the_flash_to /success/i
-                should_redirect_to '@controller.send(:url_after_create)'
+                should_redirect_to "@controller.send(:url_after_create)"
                 should_return_from_session :user_id, "@user.id"
                 
                 should 'set the cookie' do

data/lib/clearance/test/unit/user_mailer_test.rb

@@ -11,8 +11,8 @@ module Clearance
                 @email = UserMailer.create_change_password @user
               end
 
-              should "set its from address to 'donotreply@example.com'" do
-                assert_equal 'donotreply@example.com', @email.from[0]
+              should "set its from address to DO_NOT_REPLY" do
+                assert_equal DO_NOT_REPLY, @email.from[0]
               end
 
               should "contain a link to edit the user's password" do
@@ -25,8 +25,33 @@ module Clearance
                 assert_equal [@user.email], @email.to
               end
 
-              should "have a subject of '[YOUR APP] Request to change your password'" do
-                assert_equal "[YOUR APP] Request to change your password", @email.subject
+              should "have a subject of '[PROJECT_NAME] Change your password'" do
+                assert_equal @email.subject, "[#{PROJECT_NAME.humanize}] Change your password"
+              end
+            end
+            
+            context "A confirmation email" do
+              setup do
+                @user = Factory :user
+                @email = UserMailer.create_confirmation @user
+              end
+
+              should 'set its recipient to the given user' do
+                assert_equal @user.email, @email.to[0]
+              end
+
+              should 'set its subject' do
+                assert_equal "[#{PROJECT_NAME.humanize}] Email confirmation", @email.subject
+              end
+
+              should 'set its from address to DO_NOT_REPLY' do
+                assert_equal DO_NOT_REPLY, @email.from[0]
+              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\?salt=#{@user.salt}}
+                assert_match regexp, @email.body
               end
             end
           end

data/lib/clearance/version.rb

@@ -1,7 +1,7 @@
-  module Clearance
-    module Version
-      MAJOR = 0
-      MINOR = 2
-      PATCH = 9
-    end
+module Clearance
+  module Version
+    MAJOR = 0
+    MINOR = 3
+    PATCH = 0
   end
+end

data/test/rails_root/config/environment.rb

@@ -13,5 +13,4 @@ Rails::Initializer.run do |config|
   config.gem 'thoughtbot-shoulda', :lib => 'shoulda', :source => 'http://gems.github.com'
 end
 
-
-
+DO_NOT_REPLY = "donotreply@example.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors: 
 - thoughtbot, inc.