dancroak-clearance 0.1 → 0.1.1

data/README.textile

@@ -47,9 +47,12 @@ In app/controllers/users_controller.rb:
 
 h2. Routes
 
-    map.login  '/login',  :controller => 'sessions', :action => 'new'
-    map.logout '/logout', :controller => 'sessions', :action => 'destroy'
-    map.resource :session
+    map.root # :controller => 'sessions'
+    map.with_options :controller => 'sessions'  do |m|
+	    m.login  '/login',  :action => 'new'
+	    m.logout '/logout', :action => 'destroy'
+	  end
+	  map.resource :sessions
 
 h2. Tests
 
@@ -76,3 +79,4 @@ h2. Authors
 * thoughtbot, inc.
 * Dan Croak
 * Josh Nichols
+* Mike Breen

data/clearance.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = "clearance"
-  s.version = "0.1"
-  s.date = "2008-09-06"
+  s.version = "0.1.1"
+  s.date = "2008-09-10"
   s.summary = "Simple, complete Rails authentication."
   s.email = "dcroak@thoughtbot.com"
   s.homepage = "http://github.com/dancroak/clearance"
   s.description = "Simple, complete Rails authentication scheme."
-  s.authors = ["thoughtbot, inc.", "Dan Croak", "Josh Nichols"]
+  s.authors = ["thoughtbot, inc.", "Dan Croak", "Josh Nichols", "Mike Breen"]
   s.files = ["README.textile", "clearance.gemspec", "lib/clearance.rb", "lib/clearance/application_controller.rb", "lib/clearance/model.rb", "lib/clearance/sessions_controller.rb", "lib/clearance/sessions_controller_test.rb", "lib/clearance/test_helper.rb", "lib/clearance/unit_test.rb", "lib/clearance/users_controller.rb", "lib/clearance/users_controller_test.rb"]
 end

data/lib/clearance/application_controller.rb

@@ -3,12 +3,12 @@ module Clearance
     
     def self.included(base)
       base.class_eval do
-        attr_accessor :current_user
         helper_method :current_user
+        helper_method :logged_in?
         
         include InstanceMethods
 
-      protected
+     protected
         include ProtectedInstanceMethods
       end
     end
@@ -17,15 +17,19 @@ module Clearance
       def current_user
         @current_user ||= (user_from_session || user_from_cookie)
       end
+      
+      def logged_in?
+        ! current_user.nil?
+      end
     end
 
     module ProtectedInstanceMethods
       def authenticate
-        deny_access if current_user.nil?
+        deny_access if self.current_user.nil?
       end
 
       def user_from_session
-        User.find_by_id(session[:user_id])
+        User.find_by_id session[:user_id]
       end
 
       def user_from_cookie
@@ -46,6 +50,10 @@ module Clearance
         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 store_location
         session[:return_to] = request.request_uri

data/lib/clearance/sessions_controller_test.rb

@@ -42,7 +42,6 @@ module Clearance
             should_set_the_flash_to /bad/i
             should_render_template :new
           end
-
         end
 
         context "While logged out" do
@@ -73,8 +72,8 @@ module Clearance
             end
 
             should 'delete the remember me token in users table' do
-              assert_nil @current_user.reload.remember_token
-              assert_nil @current_user.reload.remember_token_expires_at
+              assert_nil @user.reload.remember_token
+              assert_nil @user.reload.remember_token_expires_at
             end
           end
         end

data/lib/clearance/test_helper.rb

@@ -22,7 +22,7 @@ module Clearance
     
     module ClassMethods
       def should_deny_access_on(command, opts = {})
-        opts[:redirect] ||= "login_url"
+        opts[:redirect] ||= "root_url"
 
         context "on #{command}" do
           setup { eval command }
@@ -50,9 +50,7 @@ module Clearance
       def should_have_user_form
         should "have the user form" do
           assert_select "form" do
-            %w(name email openid_url).each do |field|
-              assert_select "input[type=text][name=?]", "user[#{field}]"
-            end
+            assert_select "input[type=text][name=?]", "user[email]"
             %w(password password_confirmation).each do |field|
               assert_select "input[type=password][name=?]", "user[#{field}]"
             end
@@ -60,11 +58,11 @@ module Clearance
         end
       end
 
-      def logged_in_user_context(user_name = nil, &blk)
+      def logged_in_user_context(&blk)
         context "When logged in as a user" do
           setup do
-            user = user_name ? instance_variable_get("@#{user_name}") : Factory(:user)
-            assert @current_user = login_as(user)
+            @user = Factory :user
+            login_as @user
           end
           merge_block(&blk)
         end

data/lib/clearance/users_controller.rb

@@ -4,14 +4,63 @@ module Clearance
     def self.included(base)
       base.class_eval do
         before_filter :authenticate
+        before_filter :redirect_to_root, :only => [:new, :create], :if => :logged_in?
         before_filter :ensure_user_is_accessing_self, :only => [:edit, :update, :show]
 
         filter_parameter_logging :password
+        
+        include InstanceMethods
+        
       private
         include PrivateInstanceMethods
       end
     end
 
+    module InstanceMethods
+      def index
+      end
+      
+      def new
+        @user = User.new
+      end
+      
+      def show
+        @user = User.find params[:id]
+      end
+      
+      def create
+        @user = User.new params[:user]
+        if @user.save
+          current_user = @user
+          flash[:notice] = "User created and logged in."
+          redirect_back_or root_url
+        else
+          render :action => "new"
+        end
+      end
+
+      def edit
+        @user = User.find params[:id]
+      end
+      
+      def update
+        @user = User.find params[:id]
+        
+        if @user.update_attributes params[:user]
+          flash[:notice] = "User updated."
+          redirect_back_or root_url
+        else
+          render :action => "edit"
+        end
+      end
+
+      def destroy
+        @user = User.find params[:id]
+        @user.destroy
+        redirect_to root_url
+      end
+    end
+
     module PrivateInstanceMethods
       def ensure_user_is_accessing_self
         deny_access 'You cannot edit that user.' unless current_user.id.to_i == params[:id].to_i

data/lib/clearance/users_controller_test.rb

@@ -5,16 +5,20 @@ module Clearance
       base.class_eval do
         logged_in_user_context do
 
-          should_deny_access_on "get :index"
           should_deny_access_on "get :new"
           should_deny_access_on "post :create, :user => {}" 
           should_filter :password
 
-          context "dealing with their own account" do
+          context "viewing their account" do
             context "on GET to /users/:id/show" do
               setup { get :show, :id => @user.to_param }
-              should_redirect_to "edit_user_url(@user)"
+              should_respond_with :success
+              should_render_template :show
               should_not_set_the_flash
+              
+              should 'assign to @user' do
+                assert_equal @user, assigns(:user)
+              end
             end
 
             should_deny_access_on "delete :destroy, :id => @user.to_param"
@@ -33,7 +37,7 @@ module Clearance
               setup do
                 put :update, 
                   :id => @user.to_param, 
-                  :user => {:email => "none@example.com"}
+                  :user => { :email => "none@example.com" }
               end
               should_set_the_flash_to /updated/i
               should_redirect_to "root_url"
@@ -56,13 +60,12 @@ module Clearance
 
           context "dealing with another user's account" do
             setup do
-              @target_user = Factory(:user, :account => @user.account) 
-              assert_equal @user.account, @target_user.account
+              @user = Factory :user
             end
 
-            should_deny_access_on "get :show, :id => @target_user.to_param",                :flash => /cannot edit/i
-            should_deny_access_on "get :edit, :id => @target_user.to_param",                :flash => /cannot edit/i
-            should_deny_access_on "put :update, :id => @target_user.to_param, :user => {}", :flash => /cannot edit/i
+            should_deny_access_on "get :show, :id => @user.to_param",                :flash => /cannot edit/i
+            should_deny_access_on "get :edit, :id => @user.to_param",                :flash => /cannot edit/i
+            should_deny_access_on "put :update, :id => @user.to_param, :user => {}", :flash => /cannot edit/i
           end
         end
       end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: dancroak-clearance
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - thoughtbot, inc.
 - Dan Croak
 - Josh Nichols
+- Mike Breen
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-09-06 00:00:00 -07:00
+date: 2008-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: []