Add Users#index and Users#show pages

Jared Pace
1 parent 31e67669
Showing 10 changed files with 136 additions and 5 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/users_controller.rb
app/models/user.rb
app/views/shared/_navigation.html.haml
app/views/users/index.html.haml
app/views/users/show.html.haml
config/routes.rb
spec/controllers/users_controller_spec.rb
spec/factories/user_factories.rb
spec/support/macros.rb
@@ -3,4 +3,10 @@ class ApplicationController &lt; ActionController::Base
  
   before_filter :authenticate_user!
  
+  protected
+  
+    def authenticate_admin!
+      redirect_to(root_path) and return(false) unless user_signed_in? && current_user.admin?
+    end
+  
 end
@@ -0,0 +1,29 @@
+class UsersController < ApplicationController
+  respond_to :html
+  
+  before_filter :authenticate_admin!
+  
+  def index
+    @users = User.paginate(:page => params[:page])
+  end
+  
+  def show
+    @user = User.find(params[:id])
+  end
+  
+  def new
+  end
+  
+  def edit
+  end
+  
+  def create
+  end
+  
+  def update
+  end
+  
+  def destroy
+  end
+  
+end
 class User
   include Mongoid::Document
+  include Mongoid::Timestamps
  
   devise :database_authenticatable,
          :recoverable, :rememberable, :trackable,
@@ -7,6 +8,7 @@ class User
  
   field :name
   field :admin, :type => Boolean, :default => false
+  key :name
  
   validates_presence_of :name
  
 #nav-bar
   %ul
     //%li= link_to 'Dashboard', admin_dashboard_path, :class => active_if_here(:dashboards)
-    %li.apps{:class => active_if_here(:apps)}= link_to 'Apps',  apps_path
-    %li.errs{:class => active_if_here(:errs)}= link_to 'Errs',    errs_path
+    %li.apps{:class => active_if_here(:apps)}= link_to 'Apps', apps_path
+    %li.errs{:class => active_if_here(:errs)}= link_to 'Errs', errs_path
+    %li.users{:class => active_if_here(:users)}= link_to 'Users', users_path
   %div.clear
 \ No newline at end of file
@@ -0,0 +1,16 @@
+- content_for :title, 'Users'
+
+%table
+  %thead
+    %tr
+      %th Name
+      %th.main Email
+      %th Admin?
+  %tbody
+    - @users.each do |user|
+      %tr
+        %td.nowrap= link_to user.name, user_path(user)
+        %td= user.email
+        %td= user.admin? ? 'Y' : 'N'
+= will_paginate @users, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;'
+      
 \ No newline at end of file
@@ -0,0 +1,12 @@
+- content_for :title, @user.name
+
+%table
+  %tr
+    %th Email
+    %td.main= @user.email
+  %tr
+    %th Admin?
+    %td= @user.admin? ? 'Y' : 'N'
+  %tr
+    %th Created
+    %td= @user.created_at.to_s(:micro)
 \ No newline at end of file
@@ -6,13 +6,14 @@ Errbit::Application.routes.draw do
   match '/notifier_api/v2/notices' => 'notices#create'
   match '/deploys.txt' => 'deploys#create'
  
+  resources :notices, :only => [:show]
+  resources :deploys, :only => [:show]
+  resources :users
   resources :errs,    :only => [:index] do
     collection do
       get :all
     end
   end
-  resources :notices, :only => [:show]
-  resources :deploys, :only => [:show]
  
   resources :apps do
     resources :errs do
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe UsersController do
+  
+  it_requires_authentication
+  it_requires_admin
+  
+  context 'Signed in as an admin' do
+    before do
+      sign_in Factory(:admin)
+    end
+
+    context "GET /users" do
+      it 'paginates all users' do
+        users = 3.times.inject(WillPaginate::Collection.new(1,30)) {|page,_| page << Factory.build(:user)}
+        User.should_receive(:paginate).and_return(users)
+        get :index
+        assigns(:users).should == users
+      end
+    end
+    
+    context "GET /users/:id" do
+      it 'finds the user' do
+        user = Factory(:user)
+        get :show, :id => user.id
+        assigns(:user).should == user
+      end
+    end
+  end
+end
@@ -5,4 +5,8 @@ Factory.define :user do |u|
   u.email                 { Factory.next :user_email }
   u.password              'password'
   u.password_confirmation 'password'
+end
+
+Factory.define :admin, :parent => :user do |a|
+  a.admin true
 end
 \ No newline at end of file
@@ -13,7 +13,7 @@ def it_requires_authentication(options = {})
   }
   options.reverse_merge!(default_options)
  
-  context 'when logged out' do
+  context 'when signed out' do
     before do
       sign_out :user
     end
@@ -25,4 +25,34 @@ def it_requires_authentication(options = {})
       end
     end
   end
+end
+
+def it_requires_admin(options = {})
+  default_options = {
+    :for => {
+      :index    => :get,
+      :show     => :get,
+      :new      => :get,
+      :create   => :post,
+      :edit     => :get,
+      :update   => :put,
+      :destroy  => :delete
+    },
+    :params => {:id => 'dummyid'}
+  }
+  options.reverse_merge!(default_options)
+  
+  context 'when signed in as a regular user' do
+    before do
+      sign_out :user
+      sign_in Factory(:user)
+    end
+    
+    options[:for].each do |action, method|
+      it "#{method.to_s.upcase} #{action} redirects to the root path" do
+        send(method, action, options[:params])
+        response.should redirect_to(root_path)
+      end
+    end
+  end
 end
 \ No newline at end of file
...	...	@@ -3,4 +3,10 @@ class ApplicationController < ActionController::Base
3	3
4	4	before_filter :authenticate_user!
5	5
	6	+ protected
	7	+
	8	+ def authenticate_admin!
	9	+ redirect_to(root_path) and return(false) unless user_signed_in? && current_user.admin?
	10	+ end
	11	+
6	12	end
...	...
...	...	@@ -0,0 +1,29 @@
	1	+class UsersController < ApplicationController
	2	+ respond_to :html
	3	+
	4	+ before_filter :authenticate_admin!
	5	+
	6	+ def index
	7	+ @users = User.paginate(:page => params[:page])
	8	+ end
	9	+
	10	+ def show
	11	+ @user = User.find(params[:id])
	12	+ end
	13	+
	14	+ def new
	15	+ end
	16	+
	17	+ def edit
	18	+ end
	19	+
	20	+ def create
	21	+ end
	22	+
	23	+ def update
	24	+ end
	25	+
	26	+ def destroy
	27	+ end
	28	+
	29	+end
...	...
1	1	class User
2	2	include Mongoid::Document
	3	+ include Mongoid::Timestamps
3	4
4	5	devise :database_authenticatable,
5	6	:recoverable, :rememberable, :trackable,
...	...	@@ -7,6 +8,7 @@ class User
7	8
8	9	field :name
9	10	field :admin, :type => Boolean, :default => false
	11	+ key :name
10	12
11	13	validates_presence_of :name
12	14
...	...
1	1	#nav-bar
2	2	%ul
3	3	//%li= link_to 'Dashboard', admin_dashboard_path, :class => active_if_here(:dashboards)
4		- %li.apps{:class => active_if_here(:apps)}= link_to 'Apps', apps_path
5		- %li.errs{:class => active_if_here(:errs)}= link_to 'Errs', errs_path
	4	+ %li.apps{:class => active_if_here(:apps)}= link_to 'Apps', apps_path
	5	+ %li.errs{:class => active_if_here(:errs)}= link_to 'Errs', errs_path
	6	+ %li.users{:class => active_if_here(:users)}= link_to 'Users', users_path
6	7	%div.clear
7	8	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,16 @@
	1	+- content_for :title, 'Users'
	2	+
	3	+%table
	4	+ %thead
	5	+ %tr
	6	+ %th Name
	7	+ %th.main Email
	8	+ %th Admin?
	9	+ %tbody
	10	+ - @users.each do \|user\|
	11	+ %tr
	12	+ %td.nowrap= link_to user.name, user_path(user)
	13	+ %td= user.email
	14	+ %td= user.admin? ? 'Y' : 'N'
	15	+= will_paginate @users, :previous_label => '« Previous', :next_label => 'Next »'
	16	+
0	17	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,12 @@
	1	+- content_for :title, @user.name
	2	+
	3	+%table
	4	+ %tr
	5	+ %th Email
	6	+ %td.main= @user.email
	7	+ %tr
	8	+ %th Admin?
	9	+ %td= @user.admin? ? 'Y' : 'N'
	10	+ %tr
	11	+ %th Created
	12	+ %td= @user.created_at.to_s(:micro)
0	13	\ No newline at end of file
...	...
...	...	@@ -6,13 +6,14 @@ Errbit::Application.routes.draw do
6	6	match '/notifier_api/v2/notices' => 'notices#create'
7	7	match '/deploys.txt' => 'deploys#create'
8	8
	9	+ resources :notices, :only => [:show]
	10	+ resources :deploys, :only => [:show]
	11	+ resources :users
9	12	resources :errs, :only => [:index] do
10	13	collection do
11	14	get :all
12	15	end
13	16	end
14		- resources :notices, :only => [:show]
15		- resources :deploys, :only => [:show]
16	17
17	18	resources :apps do
18	19	resources :errs do
...	...
...	...	@@ -0,0 +1,30 @@
	1	+require 'spec_helper'
	2	+
	3	+describe UsersController do
	4	+
	5	+ it_requires_authentication
	6	+ it_requires_admin
	7	+
	8	+ context 'Signed in as an admin' do
	9	+ before do
	10	+ sign_in Factory(:admin)
	11	+ end
	12	+
	13	+ context "GET /users" do
	14	+ it 'paginates all users' do
	15	+ users = 3.times.inject(WillPaginate::Collection.new(1,30)) {\|page,_\| page << Factory.build(:user)}
	16	+ User.should_receive(:paginate).and_return(users)
	17	+ get :index
	18	+ assigns(:users).should == users
	19	+ end
	20	+ end
	21	+
	22	+ context "GET /users/:id" do
	23	+ it 'finds the user' do
	24	+ user = Factory(:user)
	25	+ get :show, :id => user.id
	26	+ assigns(:user).should == user
	27	+ end
	28	+ end
	29	+ end
	30	+end
...	...
...	...	@@ -5,4 +5,8 @@ Factory.define :user do \|u\|
5	5	u.email { Factory.next :user_email }
6	6	u.password 'password'
7	7	u.password_confirmation 'password'
	8	+end
	9	+
	10	+Factory.define :admin, :parent => :user do \|a\|
	11	+ a.admin true
8	12	end
9	13	\ No newline at end of file
...	...
...	...	@@ -13,7 +13,7 @@ def it_requires_authentication(options = {})
13	13	}
14	14	options.reverse_merge!(default_options)
15	15
16		- context 'when logged out' do
	16	+ context 'when signed out' do
17	17	before do
18	18	sign_out :user
19	19	end
...	...	@@ -25,4 +25,34 @@ def it_requires_authentication(options = {})
25	25	end
26	26	end
27	27	end
	28	+end
	29	+
	30	+def it_requires_admin(options = {})
	31	+ default_options = {
	32	+ :for => {
	33	+ :index => :get,
	34	+ :show => :get,
	35	+ :new => :get,
	36	+ :create => :post,
	37	+ :edit => :get,
	38	+ :update => :put,
	39	+ :destroy => :delete
	40	+ },
	41	+ :params => {:id => 'dummyid'}
	42	+ }
	43	+ options.reverse_merge!(default_options)
	44	+
	45	+ context 'when signed in as a regular user' do
	46	+ before do
	47	+ sign_out :user
	48	+ sign_in Factory(:user)
	49	+ end
	50	+
	51	+ options[:for].each do \|action, method\|
	52	+ it "#{method.to_s.upcase} #{action} redirects to the root path" do
	53	+ send(method, action, options[:params])
	54	+ response.should redirect_to(root_path)
	55	+ end
	56	+ end
	57	+ end
28	58	end
29	59	\ No newline at end of file
...	...