thoughtbot-clearance 0.2.5 → 0.2.6

data/README.textile

@@ -50,15 +50,10 @@ This will create:
     test/unit/user_mailer_test.rb
     test/unit/user_test.rb
 
-If you already have some of these files created, the generator will:
-
-# NOT overwrite your files
-# print out instructions to include Clearance modules in those files manually
-
 For example: 
 
     app/models/user.rb already exists. Add this line to it:
-    include Clearance::Models::User
+    include Clearance::App::Models::User
 
 h2. Tests
 
@@ -79,7 +74,7 @@ In test/test_helper.rb:
     class Test::Unit::TestCase
       self.use_transactional_fixtures = true
       self.use_instantiated_fixtures  = false
-      include Clearance::TestHelper
+      include Clearance::Test::TestHelper
     end
 
 h2. Controllers
@@ -89,7 +84,7 @@ In app/controllers/application_controller.rb:
     class ApplicationController < ActionController::Base
       helper :all
       protect_from_forgery
-      include Clearance::ApplicationController
+      include Clearance::App::Controllers::ApplicationController
     end
 
 h2. Migration
@@ -112,14 +107,11 @@ h2. Routes
     ActionController::Routing::Routes.draw do |map|
       
       map.resources :users
-      map.resource :session
-      
-      map.resources :users, :has_one => :password
-      map.resources :users, :has_one => :confirmation
-      
-      map.resources :passwords
-      
-      map.root :controller => 'sessions', :action => 'new'
+		  map.resource :session
+		  map.resources :users, :has_one => :password
+		  map.resources :users, :has_one => :confirmation
+		  map.resources :passwords
+		  map.root :controller => 'sessions', :action => 'new'
       
     end
 

data/Rakefile

@@ -1,23 +1,18 @@
 require 'rake'
 require 'rake/testtask'
 require 'date'
-require 'lib/clearance/version'
-begin
-  require 'jeweler'
-rescue LoadError 
-end
-
+ 
 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
 end
-
+ 
 desc "Run the test suite"
 task :default => :test
-
-Jeweler.gemspec = Gem::Specification.new do |s|
+ 
+spec = Gem::Specification.new do |s|
   s.name = "clearance"
   s.summary = "Simple, complete Rails authentication."
   s.email = "dcroak@thoughtbot.com"
@@ -27,6 +22,13 @@ Jeweler.gemspec = Gem::Specification.new do |s|
   s.files = FileList["[A-Z]*", "{generators,lib,test}/**/*"]
 end
  
+begin
+  require 'jeweler'
+  Jeweler.gemspec = spec
+rescue LoadError 
+  puts "Jeweler not available. sudo gem install technicalpickles-jeweler --source=http://gems.github.com"
+end
+ 
 namespace :generator do
   task :templates do
     app_files = FileList["test/rails_root/app/{controllers,models,views}/**/*"]
@@ -52,4 +54,4 @@ namespace :generator do
       end
     end
   end
-end
+end

data/TODO.textile

@@ -1,14 +1,17 @@
-(this is in order of highest priority first)
+(highest priority first)
 
-# force email confirmation by default
-# sessions controller test is missing some tests
+# activation code instead of salt?
+# users#show doesn't exist, but confirmations create redirects there
+# sessions controller test is missing remember_me tests
 # mailers should not hardcode example.com as from address
+# 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
 
-ideas stolen from merb-auth:
+ideas to steal from merb-auth:
 
 # store current_user on the session, not controller
 # respond with 401 Unauthorized when request requires authentication 

data/generators/clearance/templates/app/controllers/application.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
   helper :all
   protect_from_forgery
-  include Clearance::ApplicationController
+  include Clearance::App::Controllers::ApplicationController
 end

data/generators/clearance/templates/app/controllers/confirmations_controller.rb

@@ -1,3 +1,3 @@
 class ConfirmationsController < ApplicationController
-  include Clearance::ConfirmationsController
+  include Clearance::App::Controllers::ConfirmationsController
 end

data/generators/clearance/templates/app/controllers/passwords_controller.rb

@@ -1,3 +1,3 @@
 class PasswordsController < ApplicationController
-  include Clearance::PasswordsController
+  include Clearance::App::Controllers::PasswordsController
 end

data/generators/clearance/templates/app/controllers/sessions_controller.rb

@@ -1,3 +1,3 @@
 class SessionsController < ApplicationController
-  include Clearance::SessionsController
+  include Clearance::App::Controllers::SessionsController
 end

data/generators/clearance/templates/app/controllers/users_controller.rb

@@ -1,3 +1,3 @@
 class UsersController < ApplicationController
-  include Clearance::UsersController
+  include Clearance::App::Controllers::UsersController
 end

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

@@ -1,3 +1,3 @@
 class User < ActiveRecord::Base
-  include Clearance::Models::User
+  include Clearance::App::Models::User
 end

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

@@ -2,6 +2,6 @@ class UserMailer < ActionMailer::Base
   
   default_url_options[:host] = HOST
   
-  include Clearance::Mailers::User
+  include Clearance::App::Models::UserMailer
 
 end

data/generators/clearance/templates/test/functional/confirmations_controller_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ConfirmationsControllerTest < ActionController::TestCase
-  include Clearance::ConfirmationsControllerTest
+  include Clearance::Test::Functional::ConfirmationsControllerTest
 end

data/generators/clearance/templates/test/functional/passwords_controller_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class PasswordsControllerTest < ActionController::TestCase
-  include Clearance::PasswordsControllerTest
+  include Clearance::Test::Functional::PasswordsControllerTest
 end

data/generators/clearance/templates/test/functional/sessions_controller_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SessionsControllerTest < ActionController::TestCase
-  include Clearance::SessionsControllerTest
+  include Clearance::Test::Functional::SessionsControllerTest
 end

data/generators/clearance/templates/test/functional/users_controller_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class UsersControllerTest < ActionController::TestCase
-  include Clearance::UsersControllerTest
+  include Clearance::Test::Functional::UsersControllerTest
 end

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

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

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

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class UserTest < Test::Unit::TestCase
-  include Clearance::UserTest
+  include Clearance::Test::Unit::UserTest
 end

data/lib/clearance.rb

@@ -5,11 +5,11 @@ 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/test/functionals/confirmations_controller_test'
-require 'clearance/test/functionals/sessions_controller_test'
-require 'clearance/test/functionals/users_controller_test'
-require 'clearance/test/functionals/passwords_controller_test'
+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/units/user_test'
-require 'clearance/test/units/user_mailer_test'
+require 'clearance/test/unit/user_test'
+require 'clearance/test/unit/user_mailer_test'
 require 'clearance/version'

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

@@ -1,73 +1,77 @@
 module Clearance
-  module ApplicationController
+  module App
+    module Controllers
+      module ApplicationController
     
-    def self.included(base)
-      base.class_eval do
-        helper_method :current_user
-        helper_method :logged_in?
+        def self.included(base)
+          base.class_eval do
+            helper_method :current_user
+            helper_method :logged_in?
         
-        include InstanceMethods
+            include InstanceMethods
 
-     protected
-        include ProtectedInstanceMethods
-      end
-    end
+         protected
+            include ProtectedInstanceMethods
+          end
+        end
     
-    module InstanceMethods
-      def current_user
-        @current_user ||= (user_from_session || user_from_cookie)
-      end
+        module InstanceMethods
+          def current_user
+            @current_user ||= (user_from_session || user_from_cookie)
+          end
       
-      def logged_in?
-        ! current_user.nil?
-      end
-    end
+          def logged_in?
+            ! current_user.nil?
+          end
+        end
 
-    module ProtectedInstanceMethods
-      def authenticate
-        deny_access unless self.current_user
-      end
+        module ProtectedInstanceMethods
+          def authenticate
+            deny_access unless self.current_user
+          end
 
-      def user_from_session
-        user_model.find_by_id session[:user_id]
-      end
+          def user_from_session
+            user_model.find_by_id session[:user_id]
+          end
 
-      def user_from_cookie
-        user = user_model.find_by_remember_token(cookies[:auth_token]) if cookies[:auth_token]
-        user && user.remember_token? ? user : nil
-      end
+          def user_from_cookie
+            user = user_model.find_by_remember_token(cookies[:auth_token]) if cookies[:auth_token]
+            user && user.remember_token? ? user : nil
+          end
 
-      def login(user)
-        create_session_for(user)
-        @current_user = user
-      end
+          def login(user)
+            create_session_for(user)
+            @current_user = user
+          end
 
-      def create_session_for(user)
-        session[:user_id] = user.id if user
-      end
+          def create_session_for(user)
+            session[:user_id] = user.id if user
+          end
 
-      def redirect_back_or(default)
-        session[:return_to] ? redirect_to(session[:return_to]) : redirect_to(default)
-        session[:return_to] = nil
-      end
+          def redirect_back_or(default)
+            session[:return_to] ? redirect_to(session[:return_to]) : redirect_to(default)
+            session[:return_to] = nil
+          end
       
-      def redirect_to_root
-        redirect_to root_url
-      end
+          def redirect_to_root
+            redirect_to root_url
+          end
 
-      def store_location
-        session[:return_to] = request.request_uri
-      end
+          def store_location
+            session[:return_to] = request.request_uri
+          end
 
-      def deny_access(flash_message = nil, opts = {})
-        opts[:redirect] ||= new_session_url
-        store_location
-        flash[:error] = flash_message if flash_message
-        redirect_to opts[:redirect]
-      end
+          def deny_access(flash_message = nil, opts = {})
+            opts[:redirect] ||= new_session_url
+            store_location
+            flash[:error] = flash_message if flash_message
+            redirect_to opts[:redirect]
+          end
       
-      def user_model
-        User
+          def user_model
+            User
+          end
+        end
       end
     end
   end

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

@@ -1,38 +1,42 @@
 module Clearance
-  module ConfirmationsController
+  module App
+    module Controllers
+      module ConfirmationsController
     
-    def self.included(base)
-      base.class_eval do
-        before_filter :existing_user?, :only => [:new, :create]
+        def self.included(base)
+          base.class_eval do
+            before_filter :existing_user?, :only => [:new, :create]
         
-        include InstanceMethods
+            include InstanceMethods
         
-      private
-        include PrivateInstanceMethods
-      end
-    end
+          private
+            include PrivateInstanceMethods
+          end
+        end
     
-    module InstanceMethods
-      def new
-        @user = User.find_by_id_and_salt(params[:user_id], params[:salt])
-      end
+        module InstanceMethods
+          def new
+            @user = User.find_by_id_and_salt(params[:user_id], params[:salt])
+          end
 
-      def create
-        @user = User.find_by_id_and_salt(params[:user_id], params[:salt])
-        @user.confirm!
-        session[:user_id] = @user.id
-        redirect_to user_path(@user)
-      end
-    end
+          def create
+            @user = User.find_by_id_and_salt(params[:user_id], params[:salt])
+            @user.confirm!
+            session[:user_id] = @user.id
+            redirect_to user_path(@user)
+          end
+        end
     
-    module PrivateInstanceMethods
-      def existing_user?
-        user = User.find_by_id_and_salt(params[:user_id], params[:salt])
-        if user.nil?
-          render :nothing => true, :status => :not_found
+        module PrivateInstanceMethods
+          def existing_user?
+            user = User.find_by_id_and_salt(params[:user_id], params[:salt])
+            if user.nil?
+              render :nothing => true, :status => :not_found
+            end
+          end
         end
+    
       end
     end
-    
   end
 end

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

@@ -1,57 +1,61 @@
 module Clearance
-  module PasswordsController
+  module App
+    module Controllers
+      module PasswordsController
 
-    def self.included(base)
-      base.class_eval do
-        before_filter :existing_user?, :only => [:edit, :update]
-        filter_parameter_logging :password, :password_confirmation
-        include InstanceMethods
-      private
-        include PrivateInstanceMethods
-      end
-    end
+        def self.included(base)
+          base.class_eval do
+            before_filter :existing_user?, :only => [:edit, :update]
+            filter_parameter_logging :password, :password_confirmation
+            include InstanceMethods
+          private
+            include PrivateInstanceMethods
+          end
+        end
 
-    module InstanceMethods
-      def new
-      end
+        module InstanceMethods
+          def new
+          end
 
-      def create
-        user = User.find_by_email params[:password][:email]
-        if user.nil?
-          flash.now[:warning] = 'Unknown email'
-          render :action => :new
-        else
-          UserMailer.deliver_change_password user
-          redirect_to new_session_url
-        end
-      end
+          def create
+            user = User.find_by_email params[:password][:email]
+            if user.nil?
+              flash.now[:warning] = 'Unknown email'
+              render :action => :new
+            else
+              UserMailer.deliver_change_password user
+              redirect_to new_session_url
+            end
+          end
 
-      def edit
-        @user = User.find_by_email_and_crypted_password(params[:email],
-                                                        params[:password])
-      end
+          def edit
+            @user = User.find_by_email_and_crypted_password(params[:email],
+                                                            params[:password])
+          end
 
-      def update
-        @user = User.find_by_email_and_crypted_password(params[:email],
-                                                        params[:password])
-        if @user.update_attributes params[:user]
-          session[:user_id] = @user.id
-          redirect_to @user
-        else
-          render :action => :edit
+          def update
+            @user = User.find_by_email_and_crypted_password(params[:email],
+                                                            params[:password])
+            if @user.update_attributes params[:user]
+              session[:user_id] = @user.id
+              redirect_to @user
+            else
+              render :action => :edit
+            end
+          end
         end
-      end
-    end
 
-    module PrivateInstanceMethods
-      def existing_user?
-        user = User.find_by_email_and_crypted_password(params[:email],
-                                                       params[:password])
-        if user.nil?
-          render :nothing => true, :status => :not_found
+        module PrivateInstanceMethods
+          def existing_user?
+            user = User.find_by_email_and_crypted_password(params[:email],
+                                                           params[:password])
+            if user.nil?
+              render :nothing => true, :status => :not_found
+            end
+          end
         end
+
       end
     end
-
   end
 end