thoughtbot-clearance 0.1.5 → 0.1.6

data/README.textile

@@ -51,47 +51,21 @@ In test/test_helper.rb:
 
 In test/unit/user_test.rb: 
 
-    require File.dirname(__FILE__) + '/../test_helper'
-    
     class UserTest < Test::Unit::TestCase
       include Clearance::UserTest
     end
 
 In test/functional/sessions_controller_test.rb: 
 
-  require File.dirname(__FILE__) + '/../test_helper'
-
-  class SessionsControllerTest < ActionController::TestCase
-    include Clearance::SessionsControllerTest
-    
-    private
-    
-    def url_after_create
-      root_url # the default
+    class SessionsControllerTest < ActionController::TestCase
+      include Clearance::SessionsControllerTest
     end
-    
-    def url_after_destroy
-      login_url # the default
-    end
-  end
 
 In test/functional/users_controller_test.rb: 
 
-  require File.dirname(__FILE__) + '/../test_helper'
-
-  class UsersControllerTest < ActionController::TestCase
-    include Clearance::UsersControllerTest
-    
-    private
-    
-    def url_after_create
-      root_url # the default
-    end
-    
-    def url_after_update
-      root_url # the default
+    class UsersControllerTest < ActionController::TestCase
+      include Clearance::UsersControllerTest
     end
-  end
 
 h2. Schema
 
@@ -130,12 +104,32 @@ In app/controllers/sessions_controller.rb:
 
     class SessionsController < ApplicationController
       include Clearance::SessionsController
+
+      private
+      
+      def url_after_create
+        root_url # the default
+      end
+      
+      def url_after_destroy
+        login_url # the default
+      end
     end
 
 In app/controllers/users_controller.rb:
 
     class UsersController < ApplicationController
       include Clearance::UsersController
+    
+      private
+      
+      def url_after_create
+        root_url # the default
+      end
+      
+      def url_after_update
+        root_url # the default
+      end
     end
 
 h2. Routes

data/clearance.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "clearance"
-  s.version = "0.1.5"
-  s.date = "2008-09-24"
+  s.version = "0.1.6"
+  s.date = "2008-09-26"
   s.summary = "Simple, complete Rails authentication."
   s.email = "dcroak@thoughtbot.com"
   s.homepage = "http://github.com/thoughtbot/clearance"

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

@@ -3,10 +3,8 @@ module Clearance
 
     def self.included(base)
       base.class_eval do
-        before_filter :authenticate, :except => [:new, :create]
         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
@@ -17,16 +15,8 @@ module Clearance
     end
 
     module InstanceMethods
-      def index
-        @users = User.find :all
-      end
-      
       def new
-        @user = User.new
-      end
-      
-      def show
-        @user = User.find params[:id]
+        @user = User.new(params[:user])
       end
       
       def create
@@ -39,42 +29,12 @@ module Clearance
           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
-        return if current_user and current_user.respond_to?(:admin?) and current_user.admin?
-        deny_access('You cannot edit that user.', :redirect => root_url) unless current_user.id.to_i == params[:id].to_i
-      end
-
       def url_after_create
         root_url
       end
-
-      def url_after_update
-        root_url
-      end
     end
 
   end

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

@@ -44,10 +44,9 @@ module Clearance
             should_set_the_flash_to /bad/i
             should_render_template :new
             #should_return_from_session(:user_id, 'nil')
-            should "return the correct value from the session for key :user_id" do
+            should "return nil from the session for key :user_id" do
               instantiate_variables_from_assigns do
-                expected_value = @user.id
-                assert_equal expected_value, session[:user_id], "Expected #{expected_value.inspect} but was #{session[:user_id]}"
+                assert_nil session[:user_id], "Expected nil but was #{session[:user_id]}"
               end
             end
           end

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

@@ -15,6 +15,18 @@ module Clearance
               :fields => { :email => :text,
                 :password => :password,
                 :password_confirmation => :password }
+
+            context "with params" do
+              setup do
+                @email = 'a@example.com'
+                get :new, :user => {:email => @email}
+              end
+
+              should_assign_to :user
+              should "set the @user's params" do
+                assert_equal @email, assigns(:user).email
+              end
+            end
           end
 
           context "on POST to /users" do
@@ -32,11 +44,6 @@ module Clearance
             should_change 'User.count', :by => 1
           end
 
-          should_deny_access_on "get :edit, :id => 1", :redirect => "login_url"
-          should_deny_access_on "put :update, :id => 1", :redirect => "login_url"
-          should_deny_access_on "get :show, :id => 1", :redirect => "login_url"
-          should_deny_access_on "delete :destroy, :id => 1", :redirect => "login_url"
-
         end
 
         logged_in_user_context do
@@ -45,66 +52,6 @@ module Clearance
           should_deny_access_on "post :create, :user => {}" 
           should_filter :password
 
-          context "viewing their account" do
-            context "on GET to /users/:id/show" do
-              setup { get :show, :id => @user.to_param }
-              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"
-
-            context "on GET to /users/:id/edit" do
-              setup { get :edit, :id => @user.to_param }
-
-              should_respond_with :success
-              should_render_template :edit
-              should_not_set_the_flash
-              should_assign_to :user
-              should_have_form :action => "user_path(@user)",
-                :method => :put,
-                :fields => { :email => :text,
-                  :password => :password,
-                  :password_confirmation => :password }
-            end
-
-            context "on PUT to /users/:id" do
-              setup do
-                put :update, 
-                  :id => @user.to_param, 
-                  :user => { :email => "none@example.com" }
-              end
-              should_set_the_flash_to /updated/i
-              should_redirect_to "@controller.send(:url_after_update)"
-              should_assign_to :user
-              should "update the user's attributes" do
-                assert_equal "none@example.com", assigns(:user).email
-              end
-            end
-
-            context "on PUT to /users/:id with invalid attributes" do
-              setup { put :update, :id => @user.to_param, :user => {:email => ''} }
-              should_not_set_the_flash
-              should_assign_to :user
-              should_render_template 'edit'
-              should "display errors" do
-                assert_select '#errorExplanation'
-              end
-            end
-          end
-
-          context "trying to access another user's account" do
-            setup { @user = Factory :user }
-
-            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
     end

data/lib/clearance/test/units/user_test.rb

@@ -35,10 +35,10 @@ module Clearance
         
         context 'A user' do
           setup do
-            @password = 'sekrit'
+            @password = 'mysekrit'
             @salt = 'salt'
             User.any_instance.stubs(:initialize_salt)
-            @user = Factory(:user, :password => @password, :salt => @salt)
+            @user = Factory(:user, :password => @password, :password_confirmation => @password, :salt => @salt)
           end
           
           should "require password validation on update" do
@@ -52,7 +52,7 @@ module Clearance
           context 'authenticating a user' do
             context 'with good credentials' do
               setup do
-                @result = User.authenticate @user.email, 'sekrit'
+                @result = User.authenticate @user.email, @password
               end
 
               should 'return true' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-24 00:00:00 -07:00
+date: 2008-09-26 00:00:00 -07:00
 default_executable: 
 dependencies: []