nifty-generators-improved 0.5

data/lib/generators/nifty/authentication/templates/tests/shoulda/users_controller.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+
+class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
+  context "new action" do
+    should "render new template" do
+      get :new
+      assert_template 'new'
+    end
+  end
+
+  context "create action" do
+    should "render new template when <%= user_singular_name %> is invalid" do
+      <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
+      post :create
+      assert_template 'new'
+    end
+
+    should "redirect when <%= user_singular_name %> is valid" do
+      <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
+      post :create
+      assert_redirected_to root_url
+    <%- unless options[:authlogic] -%>
+      assert_equal assigns['<%= user_singular_name %>'].id, session['<%= user_singular_name %>_id']
+    <%- end -%>
+    end
+  end
+
+  context "edit action" do
+    should "redirect when not logged in" do
+      get :edit, :id => "ignored"
+      assert_redirected_to login_url
+    end
+
+    should "render edit template" do
+      @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
+      get :edit, :id => "ignored"
+      assert_template 'edit'
+    end
+  end
+
+  context "update action" do
+    should "redirect when not logged in" do
+      put :update, :id => "ignored"
+      assert_redirected_to login_url
+    end
+
+    should "render edit template when <%= user_singular_name %> is invalid" do
+      @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
+      <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
+      put :update, :id => "ignored"
+      assert_template 'edit'
+    end
+
+    should "redirect when <%= user_singular_name %> is valid" do
+      @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
+      <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
+      put :update, :id => "ignored"
+      assert_redirected_to root_url
+    end
+  end
+end

data/lib/generators/nifty/authentication/templates/tests/testunit/sessions_controller.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+class <%= session_plural_class_name %>ControllerTest < ActionController::TestCase
+  def test_new
+    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
+    assert_equal <%= user_plural_name %>(:foo), <%= session_class_name %>.find.<%= user_singular_name %>
+  end
+<%- else -%>
+  def test_create_invalid
+    <%= user_class_name %>.stubs(:authenticate).returns(nil)
+    post :create
+    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
+    assert_redirected_to root_url
+    assert_equal <%= user_class_name %>.first.id, session['<%= user_singular_name %>_id']
+  end
+<%- end -%>
+end

data/lib/generators/nifty/authentication/templates/tests/testunit/user.rb

@@ -0,0 +1,88 @@
+require 'test_helper'
+
+class <%= user_class_name %>Test < ActiveSupport::TestCase
+<%- unless options[:authlogic] -%>
+  def new_<%= user_singular_name %>(attributes = {})
+    attributes[:username] ||= 'foo'
+    attributes[:email] ||= 'foo@example.com'
+    attributes[:password] ||= 'abc123'
+    attributes[:password_confirmation] ||= attributes[:password]
+    <%= user_singular_name %> = <%= user_class_name %>.new(attributes)
+    <%= 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_equal ["can't be blank"], new_<%= user_singular_name %>(:username => '').errors[:username]
+  end
+
+  def test_require_password
+    assert_equal ["can't be blank"], new_<%= user_singular_name %>(:password => '').errors[:password]
+  end
+
+  def test_require_well_formed_email
+    assert_equal ["is invalid"], 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_equal ["has already been taken"], 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_equal ["has already been taken"], new_<%= user_singular_name %>(:username => 'uniquename').errors[:username]
+  end
+
+  def test_validate_odd_characters_in_username
+    assert_equal ["should only contain letters, numbers, or .-_@"], new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors[:username]
+  end
+
+  def test_validate_password_length
+    assert_equal ["is too short (minimum is 4 characters)"], new_<%= user_singular_name %>(:password => 'bad').errors[:password]
+  end
+
+  def test_require_matching_password_confirmation
+    assert_equal ["doesn't match confirmation"], 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!
+    assert_nil <%= user_class_name %>.authenticate('foobar', 'badpassword')
+  end
+<%- end -%>
+end

data/lib/generators/nifty/authentication/templates/tests/testunit/users_controller.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+
+class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
+  def test_new
+    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
+    assert_redirected_to root_url
+  <%- unless options[:authlogic] -%>
+    assert_equal assigns['<%= user_singular_name %>'].id, session['<%= user_singular_name %>_id']
+  <%- end -%>
+  end
+
+  def test_edit_without_user
+    get :edit, :id => "ignored"
+    assert_redirected_to login_url
+  end
+
+  def test_edit
+    @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
+    get :edit, :id => "ignored"
+    assert_template 'edit'
+  end
+
+  def test_update_without_user
+    put :update, :id => "ignored"
+    assert_redirected_to login_url
+  end
+
+  def test_update_invalid
+    @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
+    <%= user_class_name %>.any_instance.stubs(:valid?).returns(false)
+    put :update, :id => "ignored"
+    assert_template 'edit'
+  end
+
+  def test_update_valid
+    @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
+    <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
+    put :update, :id => "ignored"
+    assert_redirected_to root_url
+  end
+end

data/lib/generators/nifty/authentication/templates/user.rb

@@ -0,0 +1,38 @@
+class <%= user_class_name %> < ActiveRecord::Base
+<%- if options[:authlogic] -%>
+  acts_as_authentic
+<%- 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 .-_@"
+  validates_format_of :email, :with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
+  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 %>.password_hash == <%= user_singular_name %>.encrypt_password(pass)
+  end
+
+  def encrypt_password(pass)
+    BCrypt::Engine.hash_secret(pass, password_salt)
+  end
+
+  private
+
+  def prepare_password
+    unless password.blank?
+      self.password_salt = BCrypt::Engine.generate_salt
+      self.password_hash = encrypt_password(password)
+    end
+  end
+<%- end -%>
+end

data/lib/generators/nifty/authentication/templates/users_controller.rb

@@ -0,0 +1,32 @@
+class <%= user_plural_class_name %>Controller < ApplicationController
+  before_filter :login_required, :except => [:new, :create]
+
+  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
+    <%- unless options[:authlogic] -%>
+      session[:<%= user_singular_name %>_id] = @<%= user_singular_name %>.id
+    <%- end -%>
+      redirect_to root_url, :notice => "Thank you for signing up! You are now logged in."
+    else
+      render :new
+    end
+  end
+
+  def edit
+    @<%= user_singular_name %> = current_<%= user_singular_name %>
+  end
+
+  def update
+    @<%= user_singular_name %> = current_<%= user_singular_name %>
+    if @<%= user_singular_name %>.update_attributes(params[:<%= user_singular_name %>])
+      redirect_to root_url, :notice => "Your profile has been updated."
+    else
+      render :edit
+    end
+  end
+end

data/lib/generators/nifty/authentication/templates/users_helper.rb

@@ -0,0 +1,2 @@
+module <%= user_plural_class_name %>Helper
+end

data/lib/generators/nifty/authentication/templates/views/erb/_form.html.erb

@@ -0,0 +1,20 @@
+<%%= form_for @<%= user_singular_name %> do |f| %>
+  <%%= f.error_messages %>
+  <div class="field">
+    <%%= f.label :username %>
+    <%%= f.text_field :username %>
+  </div>
+  <div class="field">
+    <%%= f.label :email, "Email Address" %>
+    <%%= f.text_field :email %>
+  </div>
+  <div class="field">
+    <%%= f.label :password %>
+    <%%= f.password_field :password %>
+  </div>
+  <div class="field">
+    <%%= f.label :password_confirmation, "Confirm Password" %>
+    <%%= f.password_field :password_confirmation %>
+  </div>
+  <div class="actions"><%%= f.submit (@<%= user_singular_name %>.new_record? ? "Sign up" : "Update") %></div>
+<%% end %>

data/lib/generators/nifty/authentication/templates/views/erb/edit.html.erb

@@ -0,0 +1,3 @@
+<%% title "Update Profile" %>
+
+<%%= render "form" %>

data/lib/generators/nifty/authentication/templates/views/erb/login.html.erb

@@ -0,0 +1,30 @@
+<%% title "Log in" %>
+
+<p>Don't have an account? <%%= link_to "Sign up!", signup_path %></p>
+
+<%- if options[:authlogic] -%>
+<%%= form_for @<%= session_singular_name %> do |f| %>
+  <%%= f.error_messages %>
+  <div class="field">
+    <%%= f.label :username %>
+    <%%= f.text_field :username %>
+  </div>
+  <div class="field">
+    <%%= f.label :password %>
+    <%%= f.password_field :password %>
+  </div>
+  <div class="actions"><%%= f.submit "Log in" %></div>
+<%% end %>
+<%- else -%>
+<%%= form_tag <%= session_plural_name %>_path do %>
+  <div class="field">
+    <%%= label_tag :login, "Username or Email Address" %>
+    <%%= text_field_tag :login, params[:login] %>
+  </div>
+  <div class="field">
+    <%%= label_tag :password %>
+    <%%= password_field_tag :password %>
+  </div>
+  <div class="actions"><%%= submit_tag "Log in" %></div>
+<%% end %>
+<%- end -%>

data/lib/generators/nifty/authentication/templates/views/erb/signup.html.erb

@@ -0,0 +1,5 @@
+<%% title "Sign up" %>
+
+<p>Already have an account? <%%= link_to "Log in", login_path %>.</p>
+
+<%%= render "form" %>

data/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml

@@ -0,0 +1,16 @@
+= form_for @<%= user_singular_name %> do |f|
+  = f.error_messages
+  .field
+    = f.label :username
+    = f.text_field :username
+  .field
+    = f.label :email, "Email Address"
+    = f.text_field :email
+  .field
+    = f.label :password
+    = f.password_field :password
+  .field
+    = f.label :password_confirmation, "Confirm Password"
+    = f.password_field :password_confirmation
+  .actions
+    = f.submit (@<%= user_singular_name %>.new_record? ? "Sign up" : "Update")

data/lib/generators/nifty/authentication/templates/views/haml/edit.html.haml

@@ -0,0 +1,3 @@
+- title "Sign up"
+
+= render "form"

data/lib/generators/nifty/authentication/templates/views/haml/login.html.haml

@@ -0,0 +1,26 @@
+- title "Log in"
+
+%p== Don't have an account? #{link_to "Sign up!", signup_path}
+
+<%- if options[:authlogic] -%>
+= form_for @<%= session_singular_name %> do |f|
+  = f.error_messages
+  .field
+    = f.label :username
+    = f.text_field :username
+  .field
+    = f.label :password
+    = f.password_field :password
+  .actions
+    = f.submit "Log in"
+<%- else -%>
+- form_tag <%= session_plural_name %>_path do
+  .field
+    = label_tag :login, "Username or Email Address"
+    = text_field_tag :login, params[:login]
+  .field
+    = label_tag :password
+    = password_field_tag :password
+  .actions
+    = submit_tag "Log in"
+<%- end -%>

data/lib/generators/nifty/authentication/templates/views/haml/signup.html.haml

@@ -0,0 +1,5 @@
+- title "Sign up"
+
+%p== Already have an account? #{link_to "Log in", login_path}.
+
+= render "form"

data/lib/generators/nifty/config/USAGE

@@ -0,0 +1,23 @@
+Description:
+    The nifty_config generator creates YAML file in your config
+    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]
+
+
+Examples:
+    rails generate nifty:config
+
+        Config:      config/app_config.yml
+        Initializer: config/initializers/load_app_config.rb
+
+    rails generate nifty:config passwords
+
+        Config:      config/passwords_config.yml
+        Initializer: config/initializers/load_passwords_config.rb