@@ -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 rails_generators/nifty_authentication/templates/authentication.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 rails_generators/nifty_authentication/templates/migration.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." rails_generators/nifty_authentication/templates/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 rails_generators/nifty_authentication/templates/tests/rspec/sessions_controller.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 rails_generators/nifty_authentication/templates/tests/rspec/user.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 rails_generators/nifty_authentication/templates/tests/rspec/users_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 rails_generators/nifty_authentication/templates/tests/shoulda/sessions_controller.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') rails_generators/nifty_authentication/templates/tests/shoulda/user.rb @@ -7,14 +7,14 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase assert_template 'new' end end - + context "create action" do should "render new template when model is invalid" do <%= user_class_name %>.any_instance.stubs(:valid?).returns(false) post :create assert_template 'new' end - + should "redirect when model is valid" do <%= user_class_name %>.any_instance.stubs(:valid?).returns(true) post :create rails_generators/nifty_authentication/templates/tests/shoulda/users_controller.rb @@ -5,14 +5,14 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas get :new assert_template 'new' end - + <%- if options[:authlogic] -%> def test_create_invalid post :create, :<%= session_singular_name %> => { :username => "foo", :password => "badpassword" } assert_template 'new' assert_nil <%= session_class_name %>.find end - + def test_create_valid post :create, :<%= session_singular_name %> => { :username => "foo", :password => "secret" } assert_redirected_to root_url @@ -25,7 +25,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas assert_template 'new' assert_nil session['<%= user_singular_name %>_id'] end - + def test_create_valid <%= user_class_name %>.stubs(:authenticate).returns(<%= user_class_name %>.first) post :create rails_generators/nifty_authentication/templates/tests/testunit/sessions_controller.rb @@ -11,74 +11,74 @@ 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 - + def test_valid assert new_<%= user_singular_name %>.valid? end - + def test_require_username assert new_<%= user_singular_name %>(:username => '').errors.on(:username) end - + def test_require_password assert new_<%= user_singular_name %>(:password => '').errors.on(:password) end - + def test_require_well_formed_email assert new_<%= user_singular_name %>(:email => 'foo@bar@example.com').errors.on(:email) end - + def test_validate_uniqueness_of_email new_<%= user_singular_name %>(:email => 'bar@example.com').save! assert new_<%= user_singular_name %>(:email => 'bar@example.com').errors.on(:email) end - + def test_validate_uniqueness_of_username new_<%= user_singular_name %>(:username => 'uniquename').save! assert new_<%= user_singular_name %>(:username => 'uniquename').errors.on(:username) end - + def test_validate_odd_characters_in_username assert new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors.on(:username) end - + def test_validate_password_length assert new_<%= user_singular_name %>(:password => 'bad').errors.on(:password) end - + def test_require_matching_password_confirmation assert new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').errors.on(:password) end - + def test_generate_password_hash_and_salt_on_create <%= user_singular_name %> = new_<%= user_singular_name %> <%= user_singular_name %>.save! assert <%= user_singular_name %>.password_hash assert <%= user_singular_name %>.password_salt end - + def test_authenticate_by_username <%= user_class_name %>.delete_all <%= 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 - + def test_authenticate_by_email <%= user_class_name %>.delete_all <%= 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 - + def test_authenticate_bad_username assert_nil <%= user_class_name %>.authenticate('nonexisting', 'secret') end - + def test_authenticate_bad_password <%= user_class_name %>.delete_all new_<%= user_singular_name %>(:username => 'foobar', :password => 'secret').save! rails_generators/nifty_authentication/templates/tests/testunit/user.rb @@ -5,13 +5,13 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase get :new assert_template 'new' end - + def test_create_invalid <%= user_class_name %>.any_instance.stubs(:valid?).returns(false) post :create assert_template 'new' end - + def test_create_valid <%= user_class_name %>.any_instance.stubs(:valid?).returns(true) post :create rails_generators/nifty_authentication/templates/tests/testunit/users_controller.rb @@ -4,10 +4,10 @@ class <%= user_class_name %> < ActiveRecord::Base <%- else -%> # new columns need to be added here to be writable through mass assignment attr_accessible :username, :email, :password, :password_confirmation - + attr_accessor :password before_save :prepare_password - + validates_presence_of :username validates_uniqueness_of :username, :email, :allow_blank => true validates_format_of :username, :with => /^[-\w\._@]+$/i, :allow_blank => true, :message => "should only contain letters, numbers, or .-_@" @@ -15,26 +15,26 @@ class <%= user_class_name %> < ActiveRecord::Base validates_presence_of :password, :on => :create validates_confirmation_of :password validates_length_of :password, :minimum => 4, :allow_blank => true - + # login can be either username or email address def self.authenticate(login, pass) <%= user_singular_name %> = find_by_username(login) || find_by_email(login) return <%= user_singular_name %> if <%= user_singular_name %> && <%= user_singular_name %>.matching_password?(pass) end - + def matching_password?(pass) self.password_hash == encrypt_password(pass) end - + private - + def prepare_password unless password.blank? self.password_salt = Digest::SHA1.hexdigest([Time.now, rand].join) self.password_hash = encrypt_password(password) end end - + def encrypt_password(pass) Digest::SHA1.hexdigest([pass, password_salt].join) end rails_generators/nifty_authentication/templates/user.rb @@ -2,7 +2,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController def new @<%= user_singular_name %> = <%= user_class_name %>.new end - + def create @<%= user_singular_name %> = <%= user_class_name %>.new(params[:<%= user_singular_name %>]) if @<%= user_singular_name %>.save rails_generators/nifty_authentication/templates/users_controller.rb @@ -7,15 +7,15 @@ module LayoutHelper @content_for_title = page_title.to_s @show_title = show_title end - + def show_title? @show_title end - + def stylesheet(*args) content_for(:head) { stylesheet_link_tag(*args) } end - + def javascript(*args) content_for(:head) { javascript_include_tag(*args) } end rails_generators/nifty_layout/templates/helper.rb @@ -11,11 +11,11 @@ <%%- flash.each do |name, msg| -%> <%%= content_tag :div, msg, :id => "flash_#{name}" %> <%%- end -%> - + <%%- if show_title? -%> <h1><%%=h yield(:title) %></h1> <%%- end -%> - + <%%= yield %> </div> </body> rails_generators/nifty_layout/templates/layout.html.erb @@ -1,19 +1,19 @@ !!! Strict %html{html_attrs} - + %head %title = h(yield(:title) || "Untitled") %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ = stylesheet_link_tag '<%= file_name %>' = yield(:head) - + %body #container - flash.each do |name, msg| = content_tag :div, msg, :id => "flash_#{name}" - + - if show_title? %h1=h yield(:title) - + = yield rails_generators/nifty_layout/templates/layout.html.haml @@ -128,7 +128,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base def controller_methods(dir_name) controller_actions.map do |action| read_template("#{dir_name}/#{action}.rb") - end.join(" \n").strip + end.join("\n").strip end def render_form rails_generators/nifty_scaffold/nifty_scaffold_generator.rb @@ -9,7 +9,7 @@ class Create<%= plural_class_name %> < ActiveRecord::Migration <%- end -%> end end - + def self.down drop_table :<%= plural_name %> end rails_generators/nifty_scaffold/templates/migration.rb @@ -3,7 +3,7 @@ post :create response.should render_template(:new) end - + it "create action should redirect when model is valid" do <%= class_name %>.any_instance.stubs(:valid?).returns(true) post :create rails_generators/nifty_scaffold/templates/tests/rspec/actions/create.rb @@ -3,7 +3,7 @@ put :update, :id => <%= class_name %>.first response.should render_template(:edit) end - + it "update action should redirect when model is valid" do <%= class_name %>.any_instance.stubs(:valid?).returns(true) put :update, :id => <%= class_name %>.first rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb @@ -1,8 +1,8 @@ require File.dirname(__FILE__) + '/../spec_helper' - + describe <%= plural_class_name %>Controller do fixtures :all integrate_views - + <%= controller_methods 'tests/rspec/actions' %> end rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb @@ -4,7 +4,7 @@ post :create assert_template 'new' end - + should "redirect when model is valid" do <%= class_name %>.any_instance.stubs(:valid?).returns(true) post :create rails_generators/nifty_scaffold/templates/tests/shoulda/actions/create.rb @@ -4,7 +4,7 @@ put :update, :id => <%= class_name %>.first assert_template 'edit' end - + should "redirect when model is valid" do <%= class_name %>.any_instance.stubs(:valid?).returns(true) put :update, :id => <%= class_name %>.first rails_generators/nifty_scaffold/templates/tests/shoulda/actions/update.rb @@ -3,7 +3,7 @@ post :create assert_template 'new' end - + def test_create_valid <%= class_name %>.any_instance.stubs(:valid?).returns(true) post :create rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb @@ -3,7 +3,7 @@ put :update, :id => <%= class_name %>.first assert_template 'edit' end - + def test_update_valid <%= class_name %>.any_instance.stubs(:valid?).returns(true) put :update, :id => <%= class_name %>.first rails_generators/nifty_scaffold/templates/tests/testunit/actions/update.rb 85091ab29e09546afcc22268a27b82fae28e85cc Jesus Lopez jesus@jesusla.com http://github.com/jlopez/nifty-generators/commit/5c1de0189d3b7f71c37729e14c90abe47be6773f 5c1de0189d3b7f71c37729e14c90abe47be6773f 2009-10-28T13:57:09-07:00 2009-10-27T16:15:36-07:00 Removed trailing whitespace from generated code f068c7bc36b065f387e2110c3ee4915738e84e94 Jesus Lopez jesus@jesusla.com