Renamed from UserSessions to Session controller.

authlogic.rb

@@ -55,7 +55,7 @@
 
 # Get controllers
 controller "application_controller.rb"
-controller "user_sessions_controller.rb"
+controller "sessions_controller.rb"
 controller "users_controller.rb"
 controller "password_resets_controller.rb"
 controller 'home_controller.rb'
@@ -65,7 +65,7 @@
 view "users", "edit.html.#{templating_engine}"
 view 'users', "_semantic_form.html.#{templating_engine}"
 view "users", "show.html.#{templating_engine}"
-view "user_sessions", "new.html.#{templating_engine}"
+view "sessions", "new.html.#{templating_engine}"
 view "user_mailer", "activation.text.html.#{templating_engine}"
 view "user_mailer", "reset_password_instructions.text.html.#{templating_engine}"
 view "user_mailer", "signup_notification.text.html.#{templating_engine}"
@@ -116,7 +116,7 @@
   spec 'models/user_spec.rb'
   spec 'models/user_mailer_spec.rb'
   spec 'controllers/users_controller_spec.rb'
-  spec 'controllers/user_sessions_controller_spec.rb'
+  spec 'controllers/sessions_controller_spec.rb'
   spec 'controllers/password_resets_controller_spec.rb'
   spec 'helpers/layout_helper_spec.rb'
   spec "helpers/#{templating_engine}_helper_spec.rb"

base/app/controllers/application_controller.rb

@@ -27,7 +27,7 @@ def require_user
       # No redirect if requested page is /logout
       store_location if !(request.request_uri =~ /\/logout$/)
       flash[:error] = t :require_user
-      redirect_to new_user_session_url
+      redirect_to login_path
       return false
     end
   end

base/app/controllers/user_sessions_controller.rb → base/app/controllers/sessions_controller.rb

@@ -1,20 +1,20 @@
-class UserSessionsController < ApplicationController
+class SessionsController < ApplicationController
   layout 'single_column'
 
   before_filter :require_no_user, :only => [:new, :create]
   before_filter :require_user, :only => :destroy
 
   def new
-    @user_session = UserSession.new
+    @session = UserSession.new
   end
 
   def create
-    @user_session = UserSession.new(params[:user_session])
-    if @user_session.save
+    @session = UserSession.new(params[:user_session])
+    if @session.save
       flash[:notice] = t :login_successful
       redirect_back_or_default account_url
     else
-      message = @user_session.errors.on(:base) ? @user_session.errors.on(:base) : t(:login_unsuccessful)
+      message = @session.errors.on(:base) ? @session.errors.on(:base) : t(:login_unsuccessful)
       flash.now[:error] = message
       render :new
     end

base/app/views/user_sessions/new.html.erb → base/app/views/sessions/new.html.erb

@@ -1,9 +1,9 @@
 <% title t '.title' -%>
 
-<div id="user_sessions-new" class="block">
+<div id="sessions-new" class="block">
   <h2><%= yield :title %></h2>
   <div class="content form">
-    <% semantic_form_for @user_session, :url => user_session_path do |f| -%>
+    <% semantic_form_for @session, :url => session_path do |f| -%>
       <% f.inputs do -%>
         <%= f.input :login, :required => false%>
         <%= f.input :password, :required => false%>

base/app/views/user_sessions/new.html.haml → base/app/views/sessions/new.html.haml

@@ -1,9 +1,9 @@
 - title t '.title'
 
-#user_sessions-new.block
+#sessions-new.block
   %h2= yield :title
   .content.form
-    - semantic_form_for @user_session, :url => user_session_path do |f|
+    - semantic_form_for @session, :url => session_path do |f|
       - f.inputs do
         = f.input :login, :required => false
         = f.input :password, :required => false

base/config/locales/views/user_sessions/en.yml → base/config/locales/views/sessions/en.yml

@@ -2,7 +2,7 @@ en:
   login_successful: 'Login successful!'
   login_unsuccessful: 'Incorrect login or password'
   logout_successful: 'Logout successful!'
-  user_sessions:
+  sessions:
     new:
       title: 'Login'
       lost_password: 'Lost password?'

base/config/locales/views/user_sessions/es.yml → base/config/locales/views/sessions/es.yml

@@ -2,7 +2,7 @@ es:
   login_successful: 'Inicio de sesión exitoso!'
   login_unsuccessful: 'Indentificador y/o contraseña incorrecta.'
   logout_successful: 'Salida exitosa!'
-  user_sessions:
+  sessions:
     new:
       title: 'Ingreso'
       lost_password: '¿Olvido su contraseña?'

base/config/routes.rb

@@ -1,10 +1,10 @@
 ActionController::Routing::Routes.draw do |map|
   map.root :controller => "home", :action => "index"
-  map.login '/login', :controller => "user_sessions", :action => "new"
-  map.logout '/logout', :controller => "user_sessions", :action => "destroy"
+  map.login '/login', :controller => "sessions", :action => "new"
+  map.logout '/logout', :controller => "sessions", :action => "destroy"
 
   map.resource :account, :controller => "users", :member => { :confirm => :get }
-  map.resource :user_session, :users
+  map.resource :session, :users
   map.resources :users
   map.resource :password_reset
 end

base/spec/controllers/user_sessions_controller_spec.rb → base/spec/controllers/sessions_controller_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper' )
 
-describe UserSessionsController do
+describe SessionsController do
 
   describe "new:" do
 
@@ -11,7 +11,7 @@
       UserSession.should_receive(:new).and_return(mock_user_session)
 
       get :new
-      should assign_to(:user_session, :with => mock_user_session)
+      should assign_to(:session, :with => mock_user_session)
     end
 
     it "should render login form" do
@@ -38,17 +38,17 @@
       it "should create a session" do
         mock_user_session.should_receive(:save).and_return(true)
 
-        post :create, :user_session => {}
-        should assign_to(:user_session, :with => mock_user_session)
+        post :create, :session => {}
+        should assign_to(:session, :with => mock_user_session)
       end
 
       it "should redirect to account page" do
-        post :create, :user_session => {}
+        post :create, :session => {}
         should redirect_to(account_url)
       end
 
       it "should be successful" do
-        post :create, :user_session => {}
+        post :create, :session => {}
         should set_the_flash(:to => "Login successful!")
       end
 
@@ -63,14 +63,14 @@
       end
 
       it "should re-render login form" do
-        post :create, :user_session => {}
+        post :create, :session => {}
         should render_template(:new)
       end
 
       it "should not be successful" do
         mock_user_session.should_receive(:save).and_return(false)
 
-        post :create, :user_session => {}
+        post :create, :session => {}
         should_not set_the_flash(:to => 'Login successful!')
       end
 
@@ -93,16 +93,16 @@
       it "should destroy the session" do
         mock_user_session.should_receive(:destroy)
 
-        post :destroy
+        delete :destroy
       end
 
       it "should redirect to login page" do
-        post :destroy
+        delete :destroy
         should redirect_to(login_url)
       end
 
       it "should be successful" do
-        post :destroy
+        delete :destroy
         should set_the_flash(:to => 'Logout successful!')
       end
 

base/spec/spec_helpers/controller_spec_helper.rb

@@ -47,7 +47,7 @@ def get_action
 
       it "should redirect to login page with logged out user" do
         get get_action
-        should redirect_to(new_user_session_url)
+        should redirect_to(login_path)
       end
 
       it "should have /must be logged in/ in the flash with logged out user" do