nifty-generators 0.4.4 → 0.4.5

data/CHANGELOG

@@ -1,3 +1,18 @@
+0.4.5 (February 14, 2011)
+
+* fixing user validation tests in nifty:authentication (thanks apocalyptiq) - issue #87
+
+* fixing form generation when only new action exists for nifty scaffold (thanks gouravtiwari) - issue #83
+
+* fixing spacing issue in nifty:scaffold model
+
+* fixing instance instance variable in haml form for nifty:scaffold - issue #81
+
+* improving redirect implementation in nifty authentication
+
+* adding i18n to error_messages_for in nifty:layout (thanks nhocki)
+
+
 0.4.4 (January 17, 2011)
 
 * adding namespaces to nifty:scaffold (thanks DouglasMeyer) - issue #63

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nifty-generators (0.4.3)
+    nifty-generators (0.4.4)
 
 GEM
   remote: http://rubygems.org/

data/features/nifty_authentication.feature

@@ -5,7 +5,8 @@ Feature: Nifty Authentication Generator
 
   Scenario: Generate default authentication
     Given a new Rails app
-    When I run "rails g nifty:authentication"
+    When I insert "root :to => 'users#new'" into "config/routes.rb" after line 1
+    And I run "rails g nifty:authentication"
     Then I should see the following files
       | app/models/user.rb                          |
       | app/controllers/users_controller.rb         |
@@ -37,7 +38,8 @@ Feature: Nifty Authentication Generator
 
   Scenario: Generate named authentication
     Given a new Rails app
-    When I run "rails g nifty:authentication Account CurrentSession"
+    When I insert "root :to => 'accounts#new'" into "config/routes.rb" after line 1
+    And I run "rails g nifty:authentication Account CurrentSession"
     Then I should see the following files
       | app/models/account.rb                               |
       | app/controllers/accounts_controller.rb              |
@@ -64,7 +66,8 @@ Feature: Nifty Authentication Generator
 
   Scenario: Generate named authentication with rspec
     Given a new Rails app
-    When I run "rails g nifty:authentication Account CurrentSession --rspec"
+    When I insert "root :to => 'accounts#new'" into "config/routes.rb" after line 1
+    And I run "rails g nifty:authentication Account CurrentSession --rspec"
     Then I should see the following files
       | spec/models/account_spec.rb                          |
       | spec/controllers/accounts_controller_spec.rb         |

data/features/nifty_scaffold.feature

@@ -72,3 +72,9 @@ Feature: Nifty Scaffold Generator
     And I run "rake db:migrate"
     And I should successfully run "rails g nifty:scaffold Admin::User -f --namespace_model"
     Then I should successfully run "rake test"
+
+  Scenario: Given scaffold with a new and index action
+    Given a new Rails app
+    When I run "rails g nifty:scaffold Project name:string index new"
+    Then I should see "class Project" in file "app/models/project.rb"
+    And I should see "<%= form_for @project do |f| %>" in file "app/views/projects/new.html.erb"

data/features/step_definitions/common_steps.rb

@@ -15,6 +15,14 @@ When /^I replace "([^\"]*)" with "([^\"]*)" in file "([^\"]*)"$/ do |old_content
   File.open(path, 'w') { |f| f.write(content) }
 end
 
+When /^I insert "([^\"]*)" into "([^\"]*)" after line (\d+)$/ do |content, short_path, after_line|
+  path = File.join(@current_directory, short_path)
+  File.should exist(path)
+  lines = File.read(path).split("\n")
+  lines[after_line.to_i, 0] = content
+  File.open(path, 'w') { |f| f.write(lines.join("\n")) }
+end
+
 Then /^I should see file "([^\"]*)"$/ do |path|
   File.should exist(File.join(@current_directory, path))
 end

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

@@ -42,14 +42,13 @@ module ControllerAuthentication
 
   def login_required
     unless logged_in?
-      flash[:error] = "You must first log in or sign up before accessing this page."
       store_target_location
-      redirect_to login_url
+      redirect_to login_url, :alert => "You must first log in or sign up before accessing this page."
     end
   end
 
-  def redirect_to_target_or_default(default)
-    redirect_to(session[:return_to] || default)
+  def redirect_to_target_or_default(default, *args)
+    redirect_to(session[:return_to] || default, *args)
     session[:return_to] = nil
   end
 

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

@@ -7,8 +7,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
   def create
     @<%= session_singular_name %> = <%= session_class_name %>.new(params[:<%= session_singular_name %>])
     if @<%= session_singular_name %>.save
-      flash[:notice] = "Logged in successfully."
-      redirect_to_target_or_default("/")
+      redirect_to_target_or_default root_url, :notice => "Logged in successfully."
     else
       render :action => 'new'
     end
@@ -17,8 +16,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
   def destroy
     @<%= session_singular_name %> = <%= session_class_name %>.find
     @<%= session_singular_name %>.destroy
-    flash[:notice] = "You have been logged out."
-    redirect_to "/"
+    redirect_to root_url, :notice => "You have been logged out."
   end
 <%- else -%>
   def new
@@ -28,18 +26,16 @@ class <%= session_plural_class_name %>Controller < ApplicationController
     <%= user_singular_name %> = <%= user_class_name %>.authenticate(params[:login], params[:password])
     if <%= user_singular_name %>
       session[:<%= user_singular_name %>_id] = <%= user_singular_name %>.id
-      flash[:notice] = "Logged in successfully."
-      redirect_to_target_or_default("/")
+      redirect_to_target_or_default root_url, :notice => "Logged in successfully."
     else
-      flash.now[:error] = "Invalid login or password."
+      flash.now[:alert] = "Invalid login or password."
       render :action => 'new'
     end
   end
 
   def destroy
     session[:<%= user_singular_name %>_id] = nil
-    flash[:notice] = "You have been logged out."
-    redirect_to "/"
+    redirect_to root_url, :notice => "You have been logged out."
   end
 <%- end -%>
 end

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

@@ -18,7 +18,7 @@ describe <%= session_plural_class_name %>Controller do
 
   it "create action should redirect when authentication is valid" do
     post :create, :<%= session_singular_name %> => { :username => "foo", :password => "secret" }
-    response.should redirect_to("/")
+    response.should redirect_to(root_url)
     <%= session_class_name %>.find.<%= user_singular_name %>.should == <%= user_plural_name %>(:foo)
   end
 <%- else -%>
@@ -32,7 +32,7 @@ describe <%= session_plural_class_name %>Controller do
   it "create action should redirect when authentication is valid" do
     <%= user_class_name %>.stubs(:authenticate).returns(<%= user_class_name %>.first)
     post :create
-    response.should redirect_to("/")
+    response.should redirect_to(root_url)
     session['<%= user_singular_name %>_id'].should == <%= user_class_name %>.first.id
   end
 <%- end -%>

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

@@ -18,7 +18,7 @@ describe <%= user_plural_class_name %>Controller do
   it "create action should redirect when model is valid" do
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create
-    response.should redirect_to("/")
+    response.should redirect_to(root_url)
   <%- unless options[:authlogic] -%>
     session['<%= user_singular_name %>_id'].should == assigns['<%= user_singular_name %>'].id
   <%- end -%>
@@ -51,6 +51,6 @@ describe <%= user_plural_class_name %>Controller 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"
-    response.should redirect_to("/")
+    response.should redirect_to(root_url)
   end
 end

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

@@ -18,7 +18,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
 
     should "redirect when authentication is valid" do
       post :create, :<%= session_singular_name %> => { :username => "foo", :password => "secret" }
-      assert_redirected_to "/"
+      assert_redirected_to root_url
       assert_equal <%= user_plural_name %>(:foo), <%= session_class_name %>.find.<%= user_singular_name %>
     end
   <%- else -%>
@@ -32,7 +32,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
     should "redirect when authentication is valid" do
       <%= user_class_name %>.stubs(:authenticate).returns(<%= user_class_name %>.first)
       post :create
-      assert_redirected_to "/"
+      assert_redirected_to root_url
       assert_equal <%= user_class_name %>.first.id, session['<%= user_singular_name %>_id']
     end
   <%- end -%>

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

@@ -21,37 +21,37 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
   end
 
   should "require username" do
-    assert new_<%= user_singular_name %>(:username => '').errors[:username]
+    assert_equal ["can't be blank"], new_<%= user_singular_name %>(:username => '').errors[:username]
   end
 
   should "require password" do
-    assert new_<%= user_singular_name %>(:password => '').errors[:password]
+    assert_equal ["can't be blank"], 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]
+    assert_equal ["is invalid"], 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]
+    assert_equal ["has already been taken"], 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]
+    assert_equal ["has already been taken"], 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]
+    assert_equal ["should only contain letters, numbers, or .-_@"], 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]
+    assert_equal ["is too short (minimum is 4 characters)"], 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]
+    assert_equal ["doesn't match confirmation"], new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').errors[:password]
   end
 
   should "generate password hash and salt on create" do

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

@@ -18,7 +18,7 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
     should "redirect when <%= user_singular_name %> is valid" do
       <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
       post :create
-      assert_redirected_to "/"
+      assert_redirected_to root_url
     <%- unless options[:authlogic] -%>
       assert_equal assigns['<%= user_singular_name %>'].id, session['<%= user_singular_name %>_id']
     <%- end -%>
@@ -55,7 +55,7 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
       @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 "/"
+      assert_redirected_to root_url
     end
   end
 end

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

@@ -15,7 +15,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
 
   def test_create_valid
     post :create, :<%= session_singular_name %> => { :username => "foo", :password => "secret" }
-    assert_redirected_to "/"
+    assert_redirected_to root_url
     assert_equal <%= user_plural_name %>(:foo), <%= session_class_name %>.find.<%= user_singular_name %>
   end
 <%- else -%>
@@ -29,7 +29,7 @@ class <%= session_plural_class_name %>ControllerTest < ActionController::TestCas
   def test_create_valid
     <%= user_class_name %>.stubs(:authenticate).returns(<%= user_class_name %>.first)
     post :create
-    assert_redirected_to "/"
+    assert_redirected_to root_url
     assert_equal <%= user_class_name %>.first.id, session['<%= user_singular_name %>_id']
   end
 <%- end -%>

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

@@ -21,37 +21,37 @@ class <%= user_class_name %>Test < ActiveSupport::TestCase
   end
 
   def test_require_username
-    assert new_<%= user_singular_name %>(:username => '').errors[:username]
+    assert_equal ["can't be blank"], new_<%= user_singular_name %>(:username => '').errors[:username]
   end
 
   def test_require_password
-    assert new_<%= user_singular_name %>(:password => '').errors[:password]
+    assert_equal ["can't be blank"], 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]
+    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 new_<%= user_singular_name %>(:email => 'bar@example.com').errors[:email]
+    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 new_<%= user_singular_name %>(:username => 'uniquename').errors[:username]
+    assert_equal ["has already been taken"], 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]
+    assert_equal ["should only contain letters, numbers, or .-_@"], new_<%= user_singular_name %>(:username => 'odd ^&(@)').errors[:username]
   end
 
   def test_validate_password_length
-    assert new_<%= user_singular_name %>(:password => 'bad').errors[:password]
+    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 new_<%= user_singular_name %>(:password_confirmation => 'nonmatching').errors[:password]
+    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

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

@@ -15,7 +15,7 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
   def test_create_valid
     <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create
-    assert_redirected_to "/"
+    assert_redirected_to root_url
   <%- unless options[:authlogic] -%>
     assert_equal assigns['<%= user_singular_name %>'].id, session['<%= user_singular_name %>_id']
   <%- end -%>
@@ -48,6 +48,6 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
     @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 "/"
+    assert_redirected_to root_url
   end
 end

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

@@ -19,11 +19,11 @@ class <%= user_class_name %> < ActiveRecord::Base
   # 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)
+    return <%= user_singular_name %> if <%= user_singular_name %> && <%= user_singular_name %>.password_hash == <%= user_singular_name %>.encrypt_password(pass)
   end
 
-  def matching_password?(pass)
-    self.password_hash == encrypt_password(pass)
+  def encrypt_password(pass)
+    BCrypt::Engine.hash_secret(pass, password_salt)
   end
 
   private
@@ -34,9 +34,5 @@ class <%= user_class_name %> < ActiveRecord::Base
       self.password_hash = encrypt_password(password)
     end
   end
-
-  def encrypt_password(pass)
-    BCrypt::Engine.hash_secret(pass, password_salt)
-  end
 <%- end -%>
 end

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

@@ -11,8 +11,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController
     <%- unless options[:authlogic] -%>
       session[:<%= user_singular_name %>_id] = @<%= user_singular_name %>.id
     <%- end -%>
-      flash[:notice] = "Thank you for signing up! You are now logged in."
-      redirect_to "/"
+      redirect_to root_url, :notice => "Thank you for signing up! You are now logged in."
     else
       render :action => 'new'
     end
@@ -25,8 +24,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController
   def update
     @<%= user_singular_name %> = current_<%= user_singular_name %>
     if @<%= user_singular_name %>.update_attributes(params[:<%= user_singular_name %>])
-      flash[:notice] = "Your profile has been updated."
-      redirect_to "/"
+      redirect_to root_url, :notice => "Your profile has been updated."
     else
       render :action => 'edit'
     end

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

@@ -2,8 +2,8 @@ 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[:header_message] ||= "Invalid Fields"
-    options[:message] ||= "Correct the following errors and try again."
+    options[:header_message] ||= I18n.t(:"activerecord.errors.header", :default => "Invalid Fields")
+    options[:message] ||= I18n.t(:"activerecord.errors.message", :default => "Correct the following errors and try again.")
     messages = objects.compact.map { |o| o.errors.full_messages }.flatten
     unless messages.empty?
       content_tag(:div, :class => "error_messages") do

data/lib/generators/nifty/scaffold/scaffold_generator.rb

@@ -209,26 +209,25 @@ module Nifty
       end
 
       def item_path(options = {})
-        if action? :show
-          name = options[:instance_variable] ? "@#{instance_name}" : instance_name
-          if %w(new edit).include? options[:action].to_s
-            "#{options[:action].to_s}_#{item_resource}_path(#{name})"
+        name = options[:instance_variable] ? "@#{instance_name}" : instance_name
+        suffix = options[:full_url] ? "url" : "path"
+        if options[:action].to_s == "new"
+          "new_#{item_resource}_#{suffix}"
+        elsif options[:action].to_s == "edit"
+          "edit_#{item_resource}_#{suffix}(#{name})"
+        else
+          if scaffold_name.include?('::') && !@namespace_model
+            namespace = singular_name.split('/')[0..-2]
+            "[:#{namespace.join(', :')}, #{name}]"
           else
-            if scaffold_name.include?('::') && !@namespace_model
-              namespace = singular_name.split('/')[0..-2]
-              "[ :#{namespace.join(', :')}, #{name} ]"
-            else
-              name
-            end
+            name
           end
-        else
-          items_path
         end
       end
 
       def item_url
         if action? :show
-          item_resource + '_url'
+          item_path(:full_url => true, :instance_variable => true)
         else
           items_url
         end

data/lib/generators/nifty/scaffold/templates/actions/create.rb

@@ -1,8 +1,7 @@
   def create
     @<%= instance_name %> = <%= class_name %>.new(params[:<%= instance_name %>])
     if @<%= instance_name %>.save
-      flash[:notice] = "Successfully created <%= class_name.underscore.humanize.downcase %>."
-      redirect_to <%= item_path :instance_variable => true %>
+      redirect_to <%= item_url %>, :notice => "Successfully created <%= class_name.underscore.humanize.downcase %>."
     else
       render :action => 'new'
     end

data/lib/generators/nifty/scaffold/templates/actions/destroy.rb

@@ -1,6 +1,5 @@
   def destroy
     @<%= instance_name %> = <%= class_name %>.find(params[:id])
     @<%= instance_name %>.destroy
-    flash[:notice] = "Successfully destroyed <%= class_name.underscore.humanize.downcase %>."
-    redirect_to <%= items_url %>
+    redirect_to <%= items_url %>, :notice => "Successfully destroyed <%= class_name.underscore.humanize.downcase %>."
   end

data/lib/generators/nifty/scaffold/templates/actions/update.rb

@@ -1,8 +1,7 @@
   def update
     @<%= instance_name %> = <%= class_name %>.find(params[:id])
     if @<%= instance_name %>.update_attributes(params[:<%= instance_name %>])
-      flash[:notice] = "Successfully updated <%= class_name.underscore.humanize.downcase %>."
-      redirect_to <%= item_url %>
+      redirect_to <%= item_url %>, :notice  => "Successfully updated <%= class_name.underscore.humanize.downcase %>."
     else
       render :action => 'edit'
     end

data/lib/generators/nifty/scaffold/templates/model.rb

@@ -1,4 +1,4 @@
 class <%= class_name %> < ActiveRecord::Base
-  <%= "set_table_name :#{table_name}\n" if table_name -%>
+<%= "  set_table_name :#{table_name}\n" if table_name -%>
   attr_accessible <%= model_attributes.map { |a| ":#{a.name}" }.join(", ") %>
 end

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

@@ -1,4 +1,4 @@
-= form_for <%= item_path %> do |f|
+= form_for <%= item_path :instance_variable => true %> do |f|
   = f.error_messages
   <%- for attribute in model_attributes -%>
   %p

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Ryan Bates
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -08:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency