authpwn_rails 0.4.2 → 0.4.3

data/README.rdoc

@@ -6,7 +6,7 @@ User authentication for a Ruby on Rails 3 application. Works with Facebook.
 
 Scaffold user accounts, session controller views, and Facebook extensions.
     rails g authpwn_rails:users
-    rails g authpwn_rails:session_views
+    rails g authpwn_rails:session
     rails g authpwn_rails:facebook
     
 Wire authentication into your ApplicationController.

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/authpwn_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authpwn_rails}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
@@ -24,15 +24,13 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "app/controllers/session_controller.rb",
      "app/helpers/session_helper.rb",
      "authpwn_rails.gemspec",
-     "config/routes.rb",
      "lib/authpwn_rails.rb",
      "lib/authpwn_rails/engine.rb",
      "lib/authpwn_rails/facebook_extensions.rb",
      "lib/authpwn_rails/generators/facebook_generator.rb",
-     "lib/authpwn_rails/generators/session_views_generator.rb",
+     "lib/authpwn_rails/generators/session_generator.rb",
      "lib/authpwn_rails/generators/templates/001_create_users.rb",
      "lib/authpwn_rails/generators/templates/002_create_facebook_tokens.rb",
      "lib/authpwn_rails/generators/templates/facebook_token.rb",
@@ -40,6 +38,7 @@ Gem::Specification.new do |s|
      "lib/authpwn_rails/generators/templates/session/home.html.erb",
      "lib/authpwn_rails/generators/templates/session/new.html.erb",
      "lib/authpwn_rails/generators/templates/session/welcome.html.erb",
+     "lib/authpwn_rails/generators/templates/session_controller.rb",
      "lib/authpwn_rails/generators/templates/user.rb",
      "lib/authpwn_rails/generators/templates/users.yml",
      "lib/authpwn_rails/generators/user_generator.rb",

data/lib/authpwn_rails/engine.rb

@@ -15,11 +15,11 @@ class Engine < Rails::Engine
   # paths.config              = "config"
   # paths.config.initializers = "config/initializers"
   # paths.config.locales      = "config/locales"
-  paths.config.routes       = "config/routes.rb"
+  # paths.config.routes       = "config/routes.rb"
   
   generators do
     require 'authpwn_rails/generators/facebook_generator.rb'
-    require 'authpwn_rails/generators/session_views_generator.rb'
+    require 'authpwn_rails/generators/session_generator.rb'
     require 'authpwn_rails/generators/user_generator.rb'
   end
 end  # class AuthpwnRails::Engine

data/lib/authpwn_rails/generators/{session_views_generator.rb → session_generator.rb}

@@ -2,16 +2,20 @@
 module AuthpwnRails
 
 
-class SessionViewsGenerator < Rails::Generators::Base
+class SessionGenerator < Rails::Generators::Base
   source_root File.expand_path("../templates", __FILE__)
 
-  def create_session_views
+  def create_session
+    copy_file 'session_controller.rb',
+              File.join('app', 'controllers', 'session_controller.rb')    
     copy_file File.join('session', 'home.html.erb'),
               File.join('app', 'views', 'session', 'home.html.erb')
     copy_file File.join('session', 'new.html.erb'),
               File.join('app', 'views', 'session', 'new.html.erb')
     copy_file File.join('session', 'welcome.html.erb'),
               File.join('app', 'views', 'session', 'welcome.html.erb')
+
+    route "resource :session, :controller => 'session'"
   end
 end  # class AuthpwnRails::SessionViewsGenerator
 

data/lib/authpwn_rails/generators/templates/session_controller.rb

@@ -0,0 +1,22 @@
+# Manages logging in and out of the application.
+class SessionController < ApplicationController
+  authpwn_session_controller
+  
+  # Sets up the 'session/welcome' view. No user is logged in.
+  def welcome
+    # You can brag about some statistics.
+    @user_count = User.count
+  end
+  private :welcome
+
+  # Sets up the 'session/home' view. A user is logged in.
+  def home
+    # Pull information about the current user.
+    @user = current_user
+  end
+  private :home
+  
+  # You shouldn't extend the session controller, so you can benefit from future
+  # features, like Facebook / Twitter / OpenID integration. But, if you must,
+  # you can do it here.
+end

data/lib/authpwn_rails/session.rb

@@ -24,6 +24,15 @@ module ControllerClassMethods
     include ControllerInstanceMethods
     before_filter :authenticate_using_session, options   
   end
+  
+  # Turns the current controller into the session processing controller.
+  #
+  # Right now, this should be called from SessionController. The controller name
+  # is hardwired in other parts of the implementation.
+  def authpwn_session_controller
+    include SessionControllerInstanceMethods
+    authenticates_using_session
+  end
 end
 
 # Included in controllers that call authenticates_using_session.
@@ -48,8 +57,62 @@ module ControllerInstanceMethods
   private :authenticate_using_session  
 end
 
+# Included in controllers that call authenticates_using_session.
+module SessionControllerInstanceMethods
+  # GET /session/new
+  def new
+    @user = User.new
+    redirect_to session_url if current_user
+  end
+
+  # GET /session
+  def show
+    @user = current_user || User.new
+    if @user.new_record?
+      welcome
+      render :action => :welcome
+    else      
+      home
+      render :action => :home
+    end
+  end
+  
+  # POST /session
+  def create
+    @user = User.new params[:user]
+    self.current_user =
+        User.find_by_email_and_password @user.email, @user.password
+        
+    respond_to do |format|
+      if current_user
+        format.html { redirect_to session_url }
+      else
+        flash[:notice] = 'Invalid e-mail or password'
+        format.html { redirect_to session_url }
+      end
+    end
+  end
+
+  # DELETE /session
+  def destroy
+    self.current_user = nil
+    redirect_to session_url
+  end
+
+  # Hook for setting up the home view.
+  def home
+  end
+  private :home
+  
+  # Hook for setting up the welcome view.
+  def welcome
+  end
+  private :welcome
+end  # module Authpwn::Session::SessionControllerInstanceMethods
+
 ActionController::Base.send :include, ControllerMixin
 
+
 # :nodoc: add session modification
 class ActionController::TestCase
   # Sets the authenticated user in the test session.

data/test/helpers/routes.rb

@@ -5,6 +5,7 @@ class ActionController::TestCase
     @routes.draw do
       resource :cookie, :controller => 'cookie'
       resource :facebook, :controller => 'facebook'
+      # NOTE: this route should be kept in sync with the session template.
       resource :session, :controller => 'session'
       root :to => 'session#index'
     end

data/test/session_controller_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-require File.expand_path('../../app/controllers/session_controller', __FILE__)
+require 'authpwn_rails/generators/templates/session_controller.rb'
 
 class SessionControllerTest < ActionController::TestCase
   setup do
@@ -11,6 +11,8 @@ class SessionControllerTest < ActionController::TestCase
     get :show
     assert_template :welcome
     assert_nil assigns(:current_user)
+    assert_equal User.count, assigns(:user_count),
+                 'welcome controller method not called'
   end
   
   test "show renders home with a user" do
@@ -18,6 +20,7 @@ class SessionControllerTest < ActionController::TestCase
     get :show
     assert_template :home
     assert_equal @user, assigns(:current_user)
+    assert_equal @user, assigns(:user), 'home controller method not called'
   end
   
   test "new redirects homes with a user" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authpwn_rails
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Victor Costan
@@ -84,15 +84,13 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/controllers/session_controller.rb
 - app/helpers/session_helper.rb
 - authpwn_rails.gemspec
-- config/routes.rb
 - lib/authpwn_rails.rb
 - lib/authpwn_rails/engine.rb
 - lib/authpwn_rails/facebook_extensions.rb
 - lib/authpwn_rails/generators/facebook_generator.rb
-- lib/authpwn_rails/generators/session_views_generator.rb
+- lib/authpwn_rails/generators/session_generator.rb
 - lib/authpwn_rails/generators/templates/001_create_users.rb
 - lib/authpwn_rails/generators/templates/002_create_facebook_tokens.rb
 - lib/authpwn_rails/generators/templates/facebook_token.rb
@@ -100,6 +98,7 @@ files:
 - lib/authpwn_rails/generators/templates/session/home.html.erb
 - lib/authpwn_rails/generators/templates/session/new.html.erb
 - lib/authpwn_rails/generators/templates/session/welcome.html.erb
+- lib/authpwn_rails/generators/templates/session_controller.rb
 - lib/authpwn_rails/generators/templates/user.rb
 - lib/authpwn_rails/generators/templates/users.yml
 - lib/authpwn_rails/generators/user_generator.rb

data/app/controllers/session_controller.rb

@@ -1,42 +0,0 @@
-# Manages logging in and out of the application.
-class SessionController < ApplicationController
-  authenticates_using_session
-
-  # GET /session/new
-  def new
-    @user = User.new
-    redirect_to session_url if current_user
-  end
-
-  # GET /session
-  def show
-    @user = current_user || User.new
-    if @user.new_record?
-      render :action => :welcome
-    else
-      render :action => :home
-    end
-  end
-  
-  # POST /session
-  def create
-    @user = User.new params[:user]
-    self.current_user =
-        User.find_by_email_and_password @user.email, @user.password
-        
-    respond_to do |format|
-      if current_user
-        format.html { redirect_to session_url }
-      else
-        flash[:notice] = 'Invalid e-mail or password'
-        format.html { redirect_to session_url }
-      end
-    end
-  end
-
-  # DELETE /session
-  def destroy
-    self.current_user = nil
-    redirect_to session_url
-  end
-end

data/config/routes.rb

@@ -1,3 +0,0 @@
-Rails::Application.routes.draw do |map|
-  resource :session, :controller => 'session'
-end