hashrocket-clearance 0.4.2 → 0.4.3

data/lib/clearance.rb

@@ -8,6 +8,7 @@ require 'clearance/app/models/user'
 require 'clearance/app/models/clearance_mailer'
 require 'clearance/app/models/clearance_facebook_mailer'
 require 'clearance/spec/controllers/sessions_controller_spec'
+require 'clearance/spec/controllers/passwords_controller_spec'
 require 'clearance/spec/models/user_spec'
 require 'clearance/test/functional/confirmations_controller_test'
 require 'clearance/test/functional/sessions_controller_test'

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

@@ -22,15 +22,26 @@ module Clearance
               flash.now[:error] = 'Unknown email'
               render :action => :new
             else
-              user.generate_reset_password_code
-              ClearanceMailer.deliver_forgot_password user
-              redirect_to url_after_create
+              if user.facebook_user?
+                flash.now[:error] = 'This is a Facebook account, please visit facebook.com to recover your password.'
+                render :action => :new
+              else
+                if user.confirmed?
+                  user.generate_reset_password_code
+                  ClearanceMailer.deliver_forgot_password user
+                  redirect_to url_after_create
+                else
+                  flash.now[:error] = 'Sorry, this account is not active.'
+                  render :action => :new
+                end
+              end
             end
           end
 
           def update
             if @user.reset_password(params)
               session[:user_id] = @user.id
+              flash[:success] = "Your password has been updated."
               redirect_to url_after_update
             else
               flash.now[:error] = 'Password not changed.'

data/lib/clearance/spec/controllers/passwords_controller_spec.rb

@@ -0,0 +1,53 @@
+module Clearance
+  module Spec
+    module Controllers
+      module PasswordsController
+        def self.included(base)
+          base.class_eval do
+            include ActionController::UrlWriter
+            
+            describe "#create when called for a facebook user" do
+              before(:each) do
+                @user = stub(:facebook_user? => true, :generate_reset_password_code => nil)
+                User.stubs(:find_by_email).returns(@user)
+                ClearanceMailer.stubs(:deliver_forgot_password)
+              end
+              
+              it "should assign an error message" do
+                @controller.instance_eval{flash.stubs(:sweep)}
+                post :create
+                flash.now[:error].should be
+              end
+              
+              it "should render the new template" do
+                post :create
+                response.should render_template('new')
+              end
+            end
+            
+            describe "#create when called for a normal user that is unconfirmed" do
+              before(:each) do
+                @user = stub(:facebook_user? => false, :confirmed? => false, :generate_reset_password_code => nil)
+                User.stubs(:find_by_email).returns(@user)
+                ClearanceMailer.stubs(:deliver_forgot_password)
+              end
+              
+              it "should assign an error message" do
+                @controller.instance_eval{flash.stubs(:sweep)}
+                post :create
+                flash.now[:error].should be
+              end
+              
+              it "should render the new template" do
+                post :create
+                response.should render_template('new')
+              end
+            end
+            
+          end
+        end
+      end
+    end
+  end
+end
+            

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

@@ -12,7 +12,7 @@ module Clearance
             should_route :put, '/passwords/:id', :action => 'update', :id => 'reset_password_code'
 
             context 'with a user' do
-              setup { @user = Factory :user }
+              setup { @user = Factory :user, :confirmed => true }
 
               context 'A GET to #new' do
                 setup { get :new }

data/lib/clearance/version.rb

@@ -2,6 +2,6 @@
     module Version
       MAJOR = 0
       MINOR = 4
-      PATCH = 2
+      PATCH = 3
     end
   end

data/test/rails_root/spec/controllers/passwords_controller_spec.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe PasswordsController do
+  include Clearance::Spec::Controllers::PasswordsController
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hashrocket-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -95,6 +95,7 @@ files:
 - lib/clearance/app/models/user.rb
 - lib/clearance/spec
 - lib/clearance/spec/controllers
+- lib/clearance/spec/controllers/passwords_controller_spec.rb
 - lib/clearance/spec/controllers/sessions_controller_spec.rb
 - lib/clearance/spec/models
 - lib/clearance/spec/models/user_spec.rb
@@ -223,6 +224,7 @@ files:
 - test/rails_root/script/spec_server
 - test/rails_root/spec
 - test/rails_root/spec/controllers
+- test/rails_root/spec/controllers/passwords_controller_spec.rb
 - test/rails_root/spec/controllers/session_controller_spec.rb
 - test/rails_root/spec/models
 - test/rails_root/spec/models/user_spec.rb