thoughtbot-clearance 0.3.3 → 0.3.4

data/Rakefile

@@ -3,14 +3,16 @@ require 'rake/testtask'
 require 'date'
 
 test_files_pattern = 'test/rails_root/test/{unit,functional,other}/**/*_test.rb'
-Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.pattern = test_files_pattern
-  t.verbose = false
+namespace :test do
+  Rake::TestTask.new(:all => 'generator:tests') do |t|
+    t.libs << 'lib'
+    t.pattern = test_files_pattern
+    t.verbose = false
+  end
 end
 
 desc "Run the test suite"
-task :default => :test
+task :default => 'test:all'
 
 spec = Gem::Specification.new do |s|
   s.name = "clearance"
@@ -23,28 +25,10 @@ spec = Gem::Specification.new do |s|
 end
 
 namespace :generator do
-  task :templates do
-    app_files = FileList["test/rails_root/app/{controllers,models,views}/**/*"]
-    app_files.reject! { |file| file.include?("test/rails_root/app/views/layouts") }
-    test_files = FileList["test/rails_root/test/{functional,unit}/**/*"]
-    test_files += ["test/rails_root/test/factories.rb"]
-    files = test_files + app_files
-    templates_path = "generators/clearance/templates"
-    system `rm -rf #{templates_path}`
-    system `mkdir #{templates_path}`
-    ["app", "app/controllers", "app/models", "app/views",
-     "test", "test/functional", "test/unit"].each do |directory|
-      system `mkdir #{templates_path}/#{directory}`
-    end
-    files.each do |file|
-      template = "generators/clearance/templates/#{file.gsub("test/rails_root/", "")}"
-      if File.directory?(file)
-        system `rm -rf #{template}`
-        system `mkdir #{template}`
-      else
-        system `rm #{template}` if File.exists?(template)
-        system `cp #{file} #{template}`
-      end
-    end
+  desc "Run the generator on the tests"
+  task :tests do
+    system "mkdir -p test/rails_root/vendor/plugins/clearance"
+    system "cp -R generators test/rails_root/vendor/plugins/clearance"
+    system "cd test/rails_root; ./script/generate clearance"
   end
 end

data/generators/clearance/clearance_generator.rb

@@ -12,7 +12,7 @@ class ClearanceGenerator < Rails::Generator::Base
       
       m.directory File.join("app", "models")
       ["app/models/user.rb",
-       "app/models/user_mailer.rb"].each do |file|
+       "app/models/clearance_mailer.rb"].each do |file|
         m.file file, file
       end
       
@@ -34,8 +34,8 @@ class ClearanceGenerator < Rails::Generator::Base
       end
       
       m.directory File.join("app", "views", "user_mailer")
-      ["app/views/user_mailer/change_password.html.erb",
-       "app/views/user_mailer/confirmation.html.erb"].each do |file|
+      ["app/views/clearance_mailer/change_password.html.erb",
+       "app/views/clearance_mailer/confirmation.html.erb"].each do |file|
         m.file file, file
       end
       
@@ -55,7 +55,7 @@ class ClearanceGenerator < Rails::Generator::Base
       end
       
       m.directory File.join("test", "unit")
-      ["test/unit/user_mailer_test.rb",
+      ["test/unit/clearance_mailer_test.rb",
        "test/unit/user_test.rb"].each do |file|
         m.file file, file
       end

data/lib/clearance.rb

@@ -4,12 +4,12 @@ require 'clearance/app/controllers/passwords_controller'
 require 'clearance/app/controllers/sessions_controller'
 require 'clearance/app/controllers/users_controller'
 require 'clearance/app/models/user'
-require 'clearance/app/models/user_mailer'
+require 'clearance/app/models/clearance_mailer'
 require 'clearance/test/functional/confirmations_controller_test'
 require 'clearance/test/functional/sessions_controller_test'
 require 'clearance/test/functional/users_controller_test'
 require 'clearance/test/functional/passwords_controller_test'
 require 'clearance/test/test_helper'
 require 'clearance/test/unit/user_test'
-require 'clearance/test/unit/user_mailer_test'
+require 'clearance/test/unit/clearance_mailer_test'
 require 'clearance/version'

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

@@ -27,7 +27,7 @@ module Clearance
 
         module ProtectedInstanceMethods
           def authenticate
-            deny_access unless self.current_user
+            deny_access unless logged_in?
           end
 
           def user_from_session
@@ -39,13 +39,15 @@ module Clearance
             user && user.remember_token? ? user : nil
           end
 
-          def login(user)
-            create_session_for(user)
-            @current_user = user
+          # Level of indirection so you can easily override this method
+          # but also call #login .
+          def log_user_in(user)
+            login(user)
           end
 
-          def create_session_for(user)
+          def login(user)
             session[:user_id] = user.id if user
+            @current_user = user
           end
 
           def redirect_back_or(default)
@@ -62,7 +64,7 @@ module Clearance
           end
 
           def deny_access(flash_message = nil, opts = {})
-            opts[:redirect] ||= root_url
+            opts[:redirect] ||= new_session_path
             store_location
             flash[:error] = flash_message if flash_message
             redirect_to opts[:redirect]
@@ -71,6 +73,10 @@ module Clearance
           def user_model
             User
           end
+
+          def mailer_model
+            ClearanceMailer
+          end
         end
       end
     end

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

@@ -25,7 +25,7 @@ module Clearance
               flash.now[:warning] = 'Unknown email'
               render :action => :new
             else
-              UserMailer.deliver_change_password user
+              ClearanceMailer.deliver_change_password user
               redirect_to url_after_create
             end
           end

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

@@ -18,8 +18,20 @@ module Clearance
     
         module InstanceMethods
           def create
-            remember_me = params[:session][:remember_me] if params[:session]
-            login_via_password(params[:session][:email], params[:session][:password], remember_me)
+            @user = user_model.authenticate(params[:session][:email], params[:session][:password])
+            if @user.nil?
+              login_failure
+            else
+              if @user.confirmed?
+                remember_me = params[:session][:remember_me] if params[:session]
+                remember(@user) if remember_me == '1'
+                log_user_in(@user)
+                login_successful
+              else
+                mailer_model.deliver_confirmation(@user)
+                deny_access('Account not confirmed. Confirmation email sent.')
+              end
+            end
           end
 
           def destroy
@@ -31,17 +43,6 @@ module Clearance
         end
 
         module PrivateInstanceMethods
-          def login_via_password(email, password, remember_me)
-            user = user_model.authenticate(email, password)
-            if login(user)
-              create_session_for(user)
-              remember(user) if remember_me == '1'
-              login_successful
-            else
-              login_failure
-            end
-          end
-      
           def login_successful
             flash[:notice] = 'Logged in successfully'
             redirect_back_or url_after_create

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

@@ -24,7 +24,7 @@ module Clearance
           def create
             @user = user_model.new params[:user]
             if @user.save
-              UserMailer.deliver_confirmation @user
+              ClearanceMailer.deliver_confirmation @user
               flash[:notice] = "You will receive an email within the next few minutes. It contains instructions for you to confirm your account."
               redirect_to url_after_create
             else

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

@@ -5,22 +5,45 @@ module Clearance
     
         def self.included(base)
           base.class_eval do
-            context "Given a user" do
-              setup { @user = Factory :user }
+            should_filter_params :password
+
+            context "on GET to /sessions/new" do
+              setup { get :new }
+        
+              should_respond_with :success
+              should_render_template :new
+              should_not_set_the_flash
+              should_have_form :action => "session_path",
+                :fields => { "session[email]" => :text,
+                  "session[password]" => :password,
+                  "session[remember_me]" => :checkbox }
+            end
 
-              should_filter_params :password
+            context "Given an unconfirmed user" do
+              setup do
+                @user = Factory(:user, :confirmed => false)
+              end
 
-              context "on GET to /sessions/new" do
-                setup { get :new }
-          
-                should_respond_with :success
-                should_render_template :new
-                should_not_set_the_flash
-                should_have_form :action => "session_path",
-                  :fields => { "session[email]" => :text,
-                    "session[password]" => :password,
-                    "session[remember_me]" => :checkbox }
+              context "a POST to #create with good credentials" do
+                setup do
+                  ActionMailer::Base.deliveries.clear
+                  post :create, :session => {
+                                  :email => @user.email,
+                                  :password => @user.password
+                  }
+                end
+
+                should_deny_access(:flash => /confirm/i)
+
+                should "send the confirmation email" do
+                  assert_not_nil email = ActionMailer::Base.deliveries[0]
+                  assert_match /account confirmation/i, email.subject
+                end
               end
+            end
+
+            context "Given a confirmed user" do
+              setup { @user = Factory(:user, :confirmed => true) }
 
               context "a POST to #create with good credentials" do
                 setup do

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

@@ -49,15 +49,20 @@ module Clearance
             end
 
             logged_in_user_context do
+              context "GET to new" do
+                setup { get :new }
+                should_redirect_to 'root_url'
+              end
 
-              should_deny_access_on "get :new"
-              should_deny_access_on "post :create, :user => {}" 
-              should_filter_params :password
+              context "POST to create" do
+                setup { post :create, :user => {} }
+                should_redirect_to 'root_url'
+              end
 
+              should_filter_params :password
             end
           end
         end
-
       end
     end
   end

data/lib/clearance/test/test_helper.rb

@@ -23,16 +23,20 @@ module Clearance
     
       module ClassMethods
         def should_deny_access_on(command, opts = {})
-          opts[:redirect] ||= "root_url"
 
           context "on #{command}" do
             setup { eval command }
-            should_redirect_to opts[:redirect]
-            if opts[:flash]
-              should_set_the_flash_to opts[:flash]
-            else
-              should_not_set_the_flash
-            end
+            should_deny_access(opts)
+          end
+        end
+
+        def should_deny_access(opts = {})
+          opts[:redirect] ||= "new_session_path"
+          should_redirect_to opts[:redirect]
+          if opts[:flash]
+            should_set_the_flash_to opts[:flash]
+          else
+            should_not_set_the_flash
           end
         end
       

data/test/rails_root/config/routes.rb

@@ -2,12 +2,15 @@ ActionController::Routing::Routes.draw do |map|
 
   map.resources :users
   map.resource :session
+  map.resource :session_mailer_override
   
   map.resources :users, :has_one => :password
   map.resources :users, :has_one => :confirmation
 
   map.resources :passwords
+
+  map.resource :account
  
-  map.root :controller => 'sessions', :action => 'new'
+  map.root :controller => 'users', :action => 'new'
 
-end
+end

metadata

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

data/generators/clearance/templates/app/models/user_mailer.rb

@@ -1,7 +0,0 @@
-class UserMailer < ActionMailer::Base
-  
-  default_url_options[:host] = HOST
-  
-  include Clearance::App::Models::UserMailer
-
-end

data/generators/clearance/templates/app/views/user_mailer/change_password.html.erb

@@ -1,6 +0,0 @@
-Someone, hopefully you, has requested that we send you a link to change your password.
-
-Here's the link:
-<%= edit_user_password_url @user, :email => @user.email, :password => @user.crypted_password %>
-
-If you didn't request this, no need to freak out, your password hasn't been changed.  You can just ignore this email.

data/generators/clearance/templates/app/views/user_mailer/confirmation.html.erb

@@ -1 +0,0 @@
-<%= new_user_confirmation_url :user_id => @user, :salt => @user.salt %>

data/generators/clearance/templates/test/unit/user_mailer_test.rb

@@ -1,6 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class UserMailerTest < ActionMailer::TestCase
-  tests UserMailer
-  include Clearance::Test::Unit::UserMailerTest
-end

data/lib/clearance/app/models/user_mailer.rb

@@ -1,33 +0,0 @@
-module Clearance
-  module App
-    module Models
-      module UserMailer
-    
-        def self.included(base)
-          base.class_eval do
-        
-            include InstanceMethods
-        
-          end
-        end
-    
-        module InstanceMethods
-          def change_password(user)
-            from       DO_NOT_REPLY
-            recipients user.email
-            subject    "[#{PROJECT_NAME.humanize}] Change your password"
-            body       :user => user
-          end
-        
-          def confirmation(user)
-            recipients user.email
-            from       DO_NOT_REPLY
-            subject   "[#{PROJECT_NAME.humanize}] Email confirmation"
-            body      :user => user
-          end
-        end
-        
-      end
-    end
-  end
-end

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

@@ -1,63 +0,0 @@
-module Clearance
-  module Test
-    module Unit
-      module UserMailerTest
-  
-        def self.included(base)
-          base.class_eval do
-            context "A change password email" do
-              setup do
-                @user = Factory :user
-                @email = UserMailer.create_change_password @user
-              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 edit the user's password" do
-                host = ActionMailer::Base.default_url_options[:host]
-                regexp = %r{http://#{host}/users/#{@user.id}/password/edit\?email=#{@user.email.gsub("@", "%40")}&password=#{@user.crypted_password}}
-                assert_match regexp, @email.body
-              end
-
-              should "be sent to the user" do
-                assert_equal [@user.email], @email.to
-              end
-
-              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
-        end
-
-      end
-    end  
-  end
-end

data/test/rails_root/app/models/user_mailer.rb

@@ -1,7 +0,0 @@
-class UserMailer < ActionMailer::Base
-  
-  default_url_options[:host] = HOST
-  
-  include Clearance::App::Models::UserMailer
-
-end

data/test/rails_root/app/views/user_mailer/change_password.html.erb

@@ -1,6 +0,0 @@
-Someone, hopefully you, has requested that we send you a link to change your password.
-
-Here's the link:
-<%= edit_user_password_url @user, :email => @user.email, :password => @user.crypted_password %>
-
-If you didn't request this, no need to freak out, your password hasn't been changed.  You can just ignore this email.

data/test/rails_root/app/views/user_mailer/confirmation.html.erb

@@ -1 +0,0 @@
-<%= new_user_confirmation_url :user_id => @user, :salt => @user.salt %>

data/test/rails_root/test/unit/user_mailer_test.rb

@@ -1,6 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class UserMailerTest < ActionMailer::TestCase
-  tests UserMailer
-  include Clearance::Test::Unit::UserMailerTest
-end