nifty-generators 0.4.0 → 0.4.1

data/lib/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
-  
+  render_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/lib/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 "/"
@@ -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/lib/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[:username]
   end
-  
+
   should "require password" do
     assert new_<%= user_singular_name %>(:password => '').errors[:password]
   end
-  
+
   should "require well formed email" do
     assert new_<%= user_singular_name %>(:email => 'foo@bar@example.com').errors[: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[:email]
   end
-  
+
   should "validate uniqueness of username" do
     new_<%= user_singular_name %>(:username => 'uniquename').save!
     assert new_<%= user_singular_name %>(:username => 'uniquename').errors[:username]
   end
-  
+
   should "not allow odd characters in username" do
     assert new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors[:username]
   end
-  
+
   should "validate password is longer than 3 characters" do
     assert new_<%= user_singular_name %>(:password => 'bad').errors[:password]
   end
-  
+
   should "require matching password confirmation" do
     assert new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').errors[: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')

data/lib/generators/nifty/authentication/templates/tests/shoulda/users_controller.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

data/lib/generators/nifty/authentication/templates/tests/testunit/sessions_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 "/"
@@ -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

data/lib/generators/nifty/authentication/templates/tests/testunit/user.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[:username]
   end
-  
+
   def test_require_password
     assert new_<%= user_singular_name %>(:password => '').errors[:password]
   end
-  
+
   def test_require_well_formed_email
     assert new_<%= user_singular_name %>(:email => 'foo@bar@example.com').errors[: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[:email]
   end
-  
+
   def test_validate_uniqueness_of_username
     new_<%= user_singular_name %>(:username => 'uniquename').save!
     assert new_<%= user_singular_name %>(:username => 'uniquename').errors[:username]
   end
-  
+
   def test_validate_odd_characters_in_username
     assert new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors[:username]
   end
-  
+
   def test_validate_password_length
     assert new_<%= user_singular_name %>(:password => 'bad').errors[:password]
   end
-  
+
   def test_require_matching_password_confirmation
     assert new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').errors[: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!

data/lib/generators/nifty/authentication/templates/tests/testunit/users_controller.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

data/lib/generators/nifty/authentication/templates/user.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

data/lib/generators/nifty/authentication/templates/users_controller.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

data/lib/generators/nifty/config/USAGE

@@ -3,11 +3,11 @@ Description:
     directory and an initializer to load this config. The config has a
     separate section for each environment. This is a great place to put
     any config settings you don't want in your app.
-  
+
     The config is loaded into a constant called APP_CONFIG by default,
     this changes depending on the name you choose to pass the generator.
     Use this constant to access the config settings like this.
-  
+
     APP_CONFIG[:some_setting]
 
 

data/lib/generators/nifty/config/config_generator.rb

@@ -4,14 +4,14 @@ module Nifty
   module Generators
     class ConfigGenerator < Base
       argument :config_name, :type => :string, :default => 'app', :banner => 'config_name'
-      
+
       def create_config
         template "load_config.rb", "config/initializers/load_#{file_name}_config.rb"
         copy_file "config.yml", "config/#{file_name}_config.yml"
       end
-    
+
       private
-      
+
       def file_name
         config_name.underscore
       end

data/lib/generators/nifty/layout/USAGE

@@ -1,11 +1,11 @@
 Description:
   The nifty_layout generator creates a basic layout, stylesheet and
   helper which will give some structure to a starting Rails app.
-  
+
   The generator takes one argument which will be the name of the
 	layout and stylesheet files. If no argument is passed then it defaults
 	to "application".
-  
+
   The helper module includes some methods which can be called in any
   template or partial to set variables to be used in the layout, such as
   page title and javascript/stylesheet includes.

data/lib/generators/nifty/layout/layout_generator.rb

@@ -4,9 +4,9 @@ module Nifty
   module Generators
     class LayoutGenerator < Base
       argument :layout_name, :type => :string, :default => 'application', :banner => 'layout_name'
-    
+
       class_option :haml, :desc => 'Generate HAML for view, and SASS for stylesheet.', :type => :boolean
-    
+
       def create_layout
         if options.haml?
           template 'layout.html.haml', "app/views/layouts/#{file_name}.html.haml"
@@ -18,9 +18,9 @@ module Nifty
         copy_file 'layout_helper.rb', 'app/helpers/layout_helper.rb'
         copy_file 'error_messages_helper.rb', 'app/helpers/error_messages_helper.rb'
       end
-      
+
       private
-      
+
       def file_name
         layout_name.underscore
       end

data/lib/generators/nifty/layout/templates/error_messages_helper.rb

@@ -1,7 +1,7 @@
 module ErrorMessagesHelper
   # Render error messages for the given objects. The :message and :header_message options are allowed.
   def error_messages_for(*objects)
-    options = objects.extract_options! 
+    options = objects.extract_options!
     options[:header_message] ||= "Invalid Fields"
     options[:message] ||= "Correct the following errors and try again."
     messages = objects.compact.map { |o| o.errors.full_messages }.flatten
@@ -12,7 +12,7 @@ module ErrorMessagesHelper
       end
     end
   end
-  
+
   module FormBuilderAdditions
     def error_messages(options = {})
       @template.error_messages_for(@object, options)

data/lib/generators/nifty/layout/templates/layout.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%%= yield(:title) || "Untitled" %></title>
+    <title><%%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
     <%%= stylesheet_link_tag "<%= file_name %>" %>
     <%%= javascript_include_tag :defaults %>
     <%%= csrf_meta_tag %>