nifty-generators 0.4.0 → 0.4.1

data/rails_generators/nifty_authentication/nifty_authentication_generator.rb

@@ -1,14 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + "/lib/insert_commands.rb")
 class NiftyAuthenticationGenerator < Rails::Generator::Base
   attr_accessor :user_name, :session_name
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
-    
+
     @user_name = @args[0] || 'user'
     @session_name = @args[1] || (options[:authlogic] ? @user_name + '_session' : 'session')
   end
-  
+
   def manifest
     record do |m|
       m.directory "app/models"
@@ -16,30 +16,30 @@ class NiftyAuthenticationGenerator < Rails::Generator::Base
       m.directory "app/helpers"
       m.directory "app/views"
       m.directory "lib"
-      
+
       m.directory "app/views/#{user_plural_name}"
       m.template "user.rb", "app/models/#{user_singular_name}.rb"
       m.template "authlogic_session.rb", "app/models/#{session_singular_name}.rb" if options[:authlogic]
       m.template "users_controller.rb", "app/controllers/#{user_plural_name}_controller.rb"
       m.template "users_helper.rb", "app/helpers/#{user_plural_name}_helper.rb"
       m.template "views/#{view_language}/signup.html.#{view_language}", "app/views/#{user_plural_name}/new.html.#{view_language}"
-      
+
       m.directory "app/views/#{session_plural_name}"
       m.template "sessions_controller.rb", "app/controllers/#{session_plural_name}_controller.rb"
       m.template "sessions_helper.rb", "app/helpers/#{session_plural_name}_helper.rb"
       m.template "views/#{view_language}/login.html.#{view_language}", "app/views/#{session_plural_name}/new.html.#{view_language}"
-      
+
       m.template "authentication.rb", "lib/authentication.rb"
       m.migration_template "migration.rb", "db/migrate", :migration_file_name => "create_#{user_plural_name}"
-      
+
       m.route_resources user_plural_name
       m.route_resources session_plural_name
       m.route_name :login, 'login', :controller => session_plural_name, :action => 'new'
       m.route_name :logout, 'logout', :controller => session_plural_name, :action => 'destroy'
       m.route_name :signup, 'signup', :controller => user_plural_name, :action => 'new'
-      
+
       m.insert_into "app/controllers/#{application_controller_name}.rb", 'include Authentication'
-      
+
       if test_framework == :rspec
         m.directory "spec"
         m.directory "spec/fixtures"
@@ -61,11 +61,11 @@ class NiftyAuthenticationGenerator < Rails::Generator::Base
       end
     end
   end
-  
+
   def user_singular_name
     user_name.underscore
   end
-  
+
   def user_plural_name
     user_singular_name.pluralize
   end
@@ -73,15 +73,15 @@ class NiftyAuthenticationGenerator < Rails::Generator::Base
   def user_class_name
     user_name.camelize
   end
-  
+
   def user_plural_class_name
     user_plural_name.camelize
   end
-  
+
   def session_singular_name
     session_name.underscore
   end
-  
+
   def session_plural_name
     session_singular_name.pluralize
   end
@@ -89,25 +89,25 @@ class NiftyAuthenticationGenerator < Rails::Generator::Base
   def session_class_name
     session_name.camelize
   end
-  
+
   def session_plural_class_name
     session_plural_name.camelize
   end
-  
+
   def application_controller_name
     Rails.version >= '2.3.0' ? 'application_controller' : 'application'
   end
 
 protected
-  
+
   def view_language
     options[:haml] ? 'haml' : 'erb'
   end
-  
+
   def test_framework
     options[:test_framework] ||= File.exist?(destination_path("spec")) ? :rspec : :testunit
   end
-  
+
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
@@ -117,7 +117,7 @@ protected
     opt.on("--haml", "Generate HAML views instead of ERB.") { |v| options[:haml] = true }
     opt.on("--authlogic", "Use Authlogic for authentication.") { |v| options[:authlogic] = true }
   end
-  
+
   def banner
     <<-EOS
 Creates user model and controllers to handle registration and authentication.

data/rails_generators/nifty_authentication/templates/authentication.rb

@@ -1,7 +1,7 @@
 # This module is included in your application controller which makes
 # several methods available to all controllers and views. Here's a
 # common example you might add to your application layout file.
-# 
+#
 #   <%% if logged_in? %>
 #     Welcome <%%=h current_<%= user_singular_name %>.username %>! Not you?
 #     <%%= link_to "Log out", logout_path %>
@@ -9,17 +9,17 @@
 #     <%%= link_to "Sign up", signup_path %> or
 #     <%%= link_to "log in", login_path %>.
 #   <%% end %>
-# 
+#
 # You can also restrict unregistered users from accessing a controller using
 # a before filter. For example.
-# 
+#
 #   before_filter :login_required, :except => [:index, :show]
 module Authentication
   def self.included(controller)
     controller.send :helper_method, :current_<%= user_singular_name %>, :logged_in?, :redirect_to_target_or_default
     controller.filter_parameter_logging :password
   end
-  
+
 <%- if options[:authlogic] -%>
   def current_<%= session_singular_name %>
     return @current_<%= session_singular_name %> if defined?(@current_<%= session_singular_name %>)
@@ -35,11 +35,11 @@ module Authentication
     @current_<%= user_singular_name %> ||= <%= user_class_name %>.find(session[:<%= user_singular_name %>_id]) if session[:<%= user_singular_name %>_id]
   end
 <%- end -%>
-  
+
   def logged_in?
     current_<%= user_singular_name %>
   end
-  
+
   def login_required
     unless logged_in?
       flash[:error] = "You must first log in or sign up before accessing this page."
@@ -47,14 +47,14 @@ module Authentication
       redirect_to login_url
     end
   end
-  
+
   def redirect_to_target_or_default(default)
     redirect_to(session[:return_to] || default)
     session[:return_to] = nil
   end
-  
+
   private
-  
+
   def store_target_location
     session[:return_to] = request.request_uri
   end

data/rails_generators/nifty_authentication/templates/migration.rb

@@ -13,7 +13,7 @@ class Create<%= user_plural_class_name %> < ActiveRecord::Migration
       t.timestamps
     end
   end
-  
+
   def self.down
     drop_table :<%= user_plural_name %>
   end

data/rails_generators/nifty_authentication/templates/sessions_controller.rb

@@ -3,7 +3,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
   def new
     @<%= session_singular_name %> = <%= session_class_name %>.new
   end
-  
+
   def create
     @<%= session_singular_name %> = <%= session_class_name %>.new(params[:<%= session_singular_name %>])
     if @<%= session_singular_name %>.save
@@ -13,7 +13,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
       render :action => 'new'
     end
   end
-  
+
   def destroy
     @<%= session_singular_name %> = <%= session_class_name %>.find
     @<%= session_singular_name %>.destroy
@@ -23,7 +23,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
 <%- else -%>
   def new
   end
-  
+
   def create
     <%= user_singular_name %> = <%= user_class_name %>.authenticate(params[:login], params[:password])
     if <%= user_singular_name %>
@@ -35,7 +35,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
       render :action => 'new'
     end
   end
-  
+
   def destroy
     session[:<%= user_singular_name %>_id] = nil
     flash[:notice] = "You have been logged out."

data/rails_generators/nifty_authentication/templates/tests/rspec/sessions_controller.rb

@@ -1,21 +1,21 @@
 require File.dirname(__FILE__) + '/../spec_helper'
- 
+
 describe <%= session_plural_class_name %>Controller do
   fixtures :all
   integrate_views
-  
+
   it "new action should render new template" do
     get :new
     response.should render_template(:new)
   end
-  
+
 <%- if options[:authlogic] -%>
   it "create action should render new template when authentication is invalid" do
     post :create, :<%= session_singular_name %> => { :username => "foo", :password => "badpassword" }
     response.should render_template(:new)
     <%= session_class_name %>.find.should be_nil
   end
-  
+
   it "create action should redirect when authentication is valid" do
     post :create, :<%= session_singular_name %> => { :username => "foo", :password => "secret" }
     response.should redirect_to(root_url)
@@ -28,7 +28,7 @@ describe <%= session_plural_class_name %>Controller do
     response.should render_template(:new)
     session['<%= user_singular_name %>_id'].should be_nil
   end
-  
+
   it "create action should redirect when authentication is valid" do
     <%= user_class_name %>.stubs(:authenticate).returns(<%= user_class_name %>.first)
     post :create

data/rails_generators/nifty_authentication/templates/tests/rspec/user.rb

@@ -9,72 +9,72 @@ describe <%= user_class_name %> do
     attributes[:password_confirmation] ||= attributes[:password]
     <%= user_class_name %>.new(attributes)
   end
-  
+
   before(:each) do
     <%= user_class_name %>.delete_all
   end
-  
+
   it "should be valid" do
     new_<%= user_singular_name %>.should be_valid
   end
-  
+
   it "should require username" do
     new_<%= user_singular_name %>(:username => '').should have(1).error_on(:username)
   end
-  
+
   it "should require password" do
     new_<%= user_singular_name %>(:password => '').should have(1).error_on(:password)
   end
-  
+
   it "should require well formed email" do
     new_<%= user_singular_name %>(:email => 'foo@bar@example.com').should have(1).error_on(:email)
   end
-  
+
   it "should validate uniqueness of email" do
     new_<%= user_singular_name %>(:email => 'bar@example.com').save!
     new_<%= user_singular_name %>(:email => 'bar@example.com').should have(1).error_on(:email)
   end
-  
+
   it "should validate uniqueness of username" do
     new_<%= user_singular_name %>(:username => 'uniquename').save!
     new_<%= user_singular_name %>(:username => 'uniquename').should have(1).error_on(:username)
   end
-  
+
   it "should not allow odd characters in username" do
     new_<%= user_singular_name %>(:username => 'odd ^&(@)').should have(1).error_on(:username)
   end
-  
+
   it "should validate password is longer than 3 characters" do
     new_<%= user_singular_name %>(:password => 'bad').should have(1).error_on(:password)
   end
-  
+
   it "should require matching password confirmation" do
     new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').should have(1).error_on(:password)
   end
-  
+
   it "should generate password hash and salt on create" do
     <%= user_singular_name %> = new_<%= user_singular_name %>
     <%= user_singular_name %>.save!
     <%= user_singular_name %>.password_hash.should_not be_nil
     <%= user_singular_name %>.password_salt.should_not be_nil
   end
-  
+
   it "should authenticate by username" do
     <%= user_singular_name %> = new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret')
     <%= user_singular_name %>.save!
     <%= user_class_name %>.authenticate('foobar', 'secret').should == <%= user_singular_name %>
   end
-  
+
   it "should authenticate by email" do
     <%= user_singular_name %> = new_<%= user_singular_name %>(:email => 'foo@bar.com', :password => 'secret')
     <%= user_singular_name %>.save!
     <%= user_class_name %>.authenticate('foo@bar.com', 'secret').should == <%= user_singular_name %>
   end
-  
+
   it "should not authenticate bad username" do
     <%= user_class_name %>.authenticate('nonexisting', 'secret').should be_nil
   end
-  
+
   it "should not authenticate bad password" do
     new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!
     <%= user_class_name %>.authenticate('foobar', 'badpassword').should be_nil

data/rails_generators/nifty_authentication/templates/tests/rspec/users_controller.rb

@@ -1,20 +1,20 @@
 require File.dirname(__FILE__) + '/../spec_helper'
- 
+
 describe <%= user_plural_class_name %>Controller do
   fixtures :all
   integrate_views
-  
+
   it "new action should render new template" do
     get :new
     response.should render_template(:new)
   end
-  
+
   it "create action should render new template when model is invalid" do
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
     post :create
     response.should render_template(:new)
   end
-  
+
   it "create action should redirect when model is valid" do
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create

data/rails_generators/nifty_authentication/templates/tests/shoulda/sessions_controller.rb

@@ -7,7 +7,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
       assert_template 'new'
     end
   end
-  
+
   context "create action" do
   <%- if options[:authlogic] -%>
     should "render new template when authentication is invalid" do
@@ -15,7 +15,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
       assert_template 'new'
       assert_nil <%= session_class_name %>.find
     end
-    
+
     should "redirect when authentication is valid" do
       post :create, :<%= session_singular_name %> => { :username => "foo", :password => "secret" }
       assert_redirected_to root_url
@@ -28,7 +28,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
       assert_template 'new'
       assert_nil session['<%= user_singular_name %>_id']
     end
-    
+
     should "redirect when authentication is valid" do
       <%= user_class_name %>.stubs(:authenticate).returns(<%= user_class_name %>.first)
       post :create

data/rails_generators/nifty_authentication/templates/tests/shoulda/user.rb

@@ -11,72 +11,72 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
     <%= user_singular_name %>.valid? # run validations
     <%= user_singular_name %>
   end
-  
+
   def setup
     <%= user_class_name %>.delete_all
   end
-  
+
   should "be valid" do
     assert new_<%= user_singular_name %>.valid?
   end
-  
+
   should "require username" do
     assert new_<%= user_singular_name %>(:username => '').errors.on(:username)
   end
-  
+
   should "require password" do
     assert new_<%= user_singular_name %>(:password => '').errors.on(:password)
   end
-  
+
   should "require well formed email" do
     assert new_<%= user_singular_name %>(:email => 'foo@bar@example.com').errors.on(:email)
   end
-  
+
   should "validate uniqueness of email" do
     new_<%= user_singular_name %>(:email => 'bar@example.com').save!
     assert new_<%= user_singular_name %>(:email => 'bar@example.com').errors.on(:email)
   end
-  
+
   should "validate uniqueness of username" do
     new_<%= user_singular_name %>(:username => 'uniquename').save!
     assert new_<%= user_singular_name %>(:username => 'uniquename').errors.on(:username)
   end
-  
+
   should "not allow odd characters in username" do
     assert new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors.on(:username)
   end
-  
+
   should "validate password is longer than 3 characters" do
     assert new_<%= user_singular_name %>(:password => 'bad').errors.on(:password)
   end
-  
+
   should "require matching password confirmation" do
     assert new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').errors.on(:password)
   end
-  
+
   should "generate password hash and salt on create" do
     <%= user_singular_name %> = new_<%= user_singular_name %>
     <%= user_singular_name %>.save!
     assert <%= user_singular_name %>.password_hash
     assert <%= user_singular_name %>.password_salt
   end
-  
+
   should "authenticate by username" do
     <%= user_singular_name %> = new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret')
     <%= user_singular_name %>.save!
     assert_equal <%= user_singular_name %>, <%= user_class_name %>.authenticate('foobar', 'secret')
   end
-  
+
   should "authenticate by email" do
     <%= user_singular_name %> = new_<%= user_singular_name %>(:email => 'foo@bar.com', :password => 'secret')
     <%= user_singular_name %>.save!
     assert_equal <%= user_singular_name %>, <%= user_class_name %>.authenticate('foo@bar.com', 'secret')
   end
-  
+
   should "not authenticate bad username" do
     assert_nil <%= user_class_name %>.authenticate('nonexisting', 'secret')
   end
-  
+
   should "not authenticate bad password" do
     new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save!
     assert_nil <%= user_class_name %>.authenticate('foobar', 'badpassword')