nifty-generators 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,20 @@
+0.4.2 (October 15, 2010)
+
+* adding mocha to Gemfile automatically if it's not there already
+
+* switching to BCrypt for user password encryption on nifty:authentication - issue #53
+
+* adding Gemfile, now just run "bunde" and "rake" to get cucumber features running - issue #56
+
+* renaming Authentication module to ControllerAuthentication to avoid conflicts in nifty:authentication - issue #57
+
+* automatically use RSpec when there's a spec directory - issue #50
+
+* escaping page title in layout helper (thanks cbmeeks) - issue #52
+
+* adding edit profile page to nifty:authentication - closes #54
+
+
 0.4.1 (September 23rd, 2010)
 
 * fixing frozen hash error when not passing additional arguments to nifty:scaffold - issue #35

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,110 @@
+PATH
+  remote: .
+  specs:
+    nifty-generators (0.4.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
+      mail (~> 2.2.5)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    bcrypt-ruby (2.1.2)
+    builder (2.1.2)
+    cucumber (0.9.2)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.2.5)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    gherkin (2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    i18n (0.4.1)
+    json (1.4.6)
+    mail (2.2.7)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    mocha (0.9.8)
+      rake
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
+      bundler (~> 1.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+    rspec-rails (2.0.1)
+      rspec (~> 2.0.0)
+    sqlite3-ruby (1.3.1)
+    term-ansicolor (1.0.5)
+    thor (0.14.3)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bcrypt-ruby (~> 2.1.2)
+  cucumber (~> 0.9.2)
+  mocha (~> 0.9.8)
+  nifty-generators!
+  rails (~> 3.0.0)
+  rspec-rails (~> 2.0.1)
+  sqlite3-ruby (~> 1.3.1)

data/Rakefile

@@ -1,18 +1,10 @@
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
 require 'cucumber'
 require 'cucumber/rake/task'
 
-desc "Run tests."
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/test*.rb']
-  t.verbose = true
-end
-
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format progress"
 end
 
-task :default => [:test, :features]
+task :default => :features

data/features/nifty_authentication.feature

@@ -11,10 +11,11 @@ Feature: Nifty Authentication Generator
       | app/controllers/users_controller.rb         |
       | app/helpers/users_helper.rb                 |
       | app/views/users/new.html.erb                |
+      | app/views/users/edit.html.erb               |
       | app/controllers/sessions_controller.rb      |
       | app/helpers/sessions_helper.rb              |
       | app/views/sessions/new.html.erb             |
-      | lib/authentication.rb                       |
+      | lib/controller_authentication.rb            |
       | test/fixtures/users.yml                     |
       | test/unit/user_test.rb                      |
       | test/functional/users_controller_test.rb    |
@@ -26,10 +27,12 @@ Feature: Nifty Authentication Generator
       | match 'login' => 'sessions#new', :as => :login       |
       | match 'logout' => 'sessions#destroy', :as => :logout |
       | match 'signup' => 'users#new', :as => :signup        |
-    And I should see "include Authentication" in file "app/controllers/application_controller.rb"
+      | match 'user/edit' => 'users#edit', :as => :edit_user |
+    And I should see "include ControllerAuthentication" in file "app/controllers/application_controller.rb"
+    And I should see "gem "mocha", :group => :test" in file "Gemfile"
+    And I should see "gem "bcrypt-ruby", :require => "bcrypt"" in file "Gemfile"
     When I run "rails g nifty:layout -f"
     And I run "rake db:migrate"
-    And I add "gem 'mocha', :group => :test" to file "Gemfile"
     Then I should successfully run "rake test"
 
   Scenario: Generate named authentication
@@ -40,6 +43,7 @@ Feature: Nifty Authentication Generator
       | app/controllers/accounts_controller.rb              |
       | app/helpers/accounts_helper.rb                      |
       | app/views/accounts/new.html.erb                     |
+      | app/views/accounts/edit.html.erb                    |
       | app/controllers/current_sessions_controller.rb      |
       | app/helpers/current_sessions_helper.rb              |
       | app/views/current_sessions/new.html.erb             |
@@ -48,12 +52,26 @@ Feature: Nifty Authentication Generator
       | test/functional/accounts_controller_test.rb         |
       | test/functional/current_sessions_controller_test.rb |
     And I should see the following in file "config/routes.rb"
-      | resources :current_sessions                                  |
-      | resources :accounts                                          |
-      | match 'login' => 'current_sessions#new', :as => :login       |
-      | match 'logout' => 'current_sessions#destroy', :as => :logout |
-      | match 'signup' => 'accounts#new', :as => :signup             |
+      | resources :current_sessions                                   |
+      | resources :accounts                                           |
+      | match 'login' => 'current_sessions#new', :as => :login        |
+      | match 'logout' => 'current_sessions#destroy', :as => :logout  |
+      | match 'signup' => 'accounts#new', :as => :signup              |
+      | match 'account/edit' => 'accounts#edit', :as => :edit_account |
     When I run "rails g nifty:layout -f"
     And I run "rake db:migrate"
-    And I add "gem 'mocha', :group => :test" to file "Gemfile"
     Then I should successfully run "rake test"
+
+  Scenario: Generate named authentication with rspec
+    Given a new Rails app
+    When 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         |
+      | spec/controllers/current_sessions_controller_spec.rb |
+    When I run "rails g nifty:layout -f"
+    And I run "rake db:migrate"
+    And I add "gem 'rspec-rails', '>= 2.0.1'" to file "Gemfile"
+    And I run "rails g rspec:install"
+    And I replace "mock_with :rspec" with "mock_with :mocha" in file "spec/spec_helper.rb"
+    Then I should successfully run "rake spec"

data/features/nifty_layout.feature

@@ -7,6 +7,7 @@ Feature: Nifty Layout Generator
     Given a new Rails app
     When I run "rails g nifty:layout -f"
     Then I should see "stylesheet_link_tag "application"" in file "app/views/layouts/application.html.erb"
+    Then I should see "h(page_title" in file "app/helpers/layout_helper.rb"
     And I should see file "app/helpers/layout_helper.rb"
     And I should see file "app/helpers/error_messages_helper.rb"
     And I should see file "public/stylesheets/application.css"

data/features/nifty_scaffold.feature

@@ -16,10 +16,10 @@ Feature: Nifty Scaffold Generator
       | app/views/projects/edit.html.erb       |
       | db/migrate                             |
     And I should see "resources :projects" in file "config/routes.rb"
+    And I should see "gem "mocha", :group => :test" in file "Gemfile"
     When I run "rails g nifty:layout -f"
     And I run "rake db:migrate"
     And I should successfully run "rails g nifty:scaffold Project -f"
-    And I add "gem 'mocha', :group => :test" to file "Gemfile"
     Then I should successfully run "rake test"
 
   Scenario: Generate scaffold with rspec tests
@@ -28,10 +28,13 @@ Feature: Nifty Scaffold Generator
     Then I should see the following files
       | spec/models/project_spec.rb                  |
       | spec/controllers/projects_controller_spec.rb |
-    And I should see "resources :projects" in file "config/routes.rb"
+    When I run "rails g nifty:scaffold Task project_id:integer"
+    Then I should see the following files
+      | spec/models/task_spec.rb                  |
+      | spec/controllers/tasks_controller_spec.rb |
     When I run "rails g nifty:layout -f"
     And I run "rake db:migrate"
-    And I add "gem 'mocha', :group => :test" to file "Gemfile"
     And I add "gem 'rspec-rails', '>= 2.0.0.beta.19'" to file "Gemfile"
     And I run "rails g rspec:install"
+    And I replace "mock_with :rspec" with "mock_with :mocha" in file "spec/spec_helper.rb"
     Then I should successfully run "rake spec"

data/features/step_definitions/common_steps.rb

@@ -8,6 +8,13 @@ When /^I add "([^\"]*)" to file "([^\"]*)"$/ do |content, short_path|
   File.open(path, 'a') { |f| f.write(content + "\n") }
 end
 
+When /^I replace "([^\"]*)" with "([^\"]*)" in file "([^\"]*)"$/ do |old_content, new_content, short_path|
+  path = File.join(@current_directory, short_path)
+  File.should exist(path)
+  content = File.read(path).gsub(old_content, new_content)
+  File.open(path, 'w') { |f| f.write(content) }
+end
+
 Then /^I should see file "([^\"]*)"$/ do |path|
   File.should exist(File.join(@current_directory, path))
 end

data/features/support/env.rb

@@ -1,5 +1,5 @@
 require 'cucumber'
-require 'spec'
+require 'rspec'
 
 Before do
   FileUtils.rm_rf "tmp/rails_app"

data/features/support/matchers.rb

@@ -1,4 +1,4 @@
-Spec::Matchers.define :exist do |path|
+RSpec::Matchers.define :exist do |path|
   match do
     File.exist?(path)
   end

data/lib/generators/nifty/authentication/authentication_generator.rb

@@ -16,6 +16,11 @@ module Nifty
       class_option :haml, :desc => 'Generate HAML views instead of ERB.', :type => :boolean
       class_option :authlogic, :desc => 'Use Authlogic for authentication.', :type => :boolean
 
+      def add_gems
+        gem "bcrypt-ruby", :require => "bcrypt" unless File.read(destination_path("Gemfile")).include? "bcrypt"
+        gem "mocha", :group => :test unless File.read(destination_path("Gemfile")).include? "mocha"
+      end
+
       def create_model_files
         template 'user.rb', "app/models/#{user_singular_name}.rb"
         template 'authlogic_session.rb', "app/models/#{user_singular_name}_session.rb" if options.authlogic?
@@ -33,11 +38,13 @@ module Nifty
 
       def create_view_files
         template "views/#{view_language}/signup.html.#{view_language}", "app/views/#{user_plural_name}/new.html.#{view_language}"
+        template "views/#{view_language}/edit.html.#{view_language}", "app/views/#{user_plural_name}/edit.html.#{view_language}"
+        template "views/#{view_language}/_form.html.#{view_language}", "app/views/#{user_plural_name}/_form.html.#{view_language}"
         template "views/#{view_language}/login.html.#{view_language}", "app/views/#{session_plural_name}/new.html.#{view_language}"
       end
 
       def create_lib_files
-        template 'authentication.rb', 'lib/authentication.rb'
+        template 'controller_authentication.rb', 'lib/controller_authentication.rb'
       end
 
       def create_routes
@@ -46,6 +53,7 @@ module Nifty
         route "match 'login' => '#{session_plural_name}#new', :as => :login"
         route "match 'logout' => '#{session_plural_name}#destroy', :as => :logout"
         route "match 'signup' => '#{user_plural_name}#new', :as => :signup"
+        route "match '#{user_singular_name}/edit' => '#{user_plural_name}#edit', :as => :edit_#{user_singular_name}"
       end
 
       def create_migration
@@ -54,7 +62,7 @@ module Nifty
 
       def load_and_include_authentication
         inject_into_class "config/application.rb", "Application", "    config.autoload_paths << \"\#{config.root}/lib\""
-        inject_into_class "app/controllers/application_controller.rb", "ApplicationController", "  include Authentication\n"
+        inject_into_class "app/controllers/application_controller.rb", "ApplicationController", "  include ControllerAuthentication\n"
       end
 
       def create_test_files

data/lib/generators/nifty/authentication/templates/{authentication.rb → controller_authentication.rb}

@@ -3,7 +3,8 @@
 # common example you might add to your application layout file.
 #
 #   <%% if logged_in? %>
-#     Welcome <%%= current_<%= user_singular_name %>.username %>! Not you?
+#     Welcome <%%= current_<%= user_singular_name %>.username %>.
+#     <%%= link_to "Edit profile", edit_<%= user_singular_name %>_path %> or
 #     <%%= link_to "Log out", logout_path %>
 #   <%% else %>
 #     <%%= link_to "Sign up", signup_path %> or
@@ -14,7 +15,7 @@
 # a before filter. For example.
 #
 #   before_filter :login_required, :except => [:index, :show]
-module Authentication
+module ControllerAuthentication
   def self.included(controller)
     controller.send :helper_method, :current_<%= user_singular_name %>, :logged_in?, :redirect_to_target_or_default
   end
@@ -55,6 +56,6 @@ module Authentication
   private
 
   def store_target_location
-    session[:return_to] = request.request_uri
+    session[:return_to] = request.url
   end
 end

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

@@ -23,4 +23,34 @@ describe <%= user_plural_class_name %>Controller do
     session['<%= user_singular_name %>_id'].should == assigns['<%= user_singular_name %>'].id
   <%- end -%>
   end
+
+  it "edit action should redirect when not logged in" do
+    get :edit, :id => "ignored"
+    response.should redirect_to(login_url)
+  end
+
+  it "edit action should render edit template" do
+    @controller.stubs(:current_<%= user_singular_name %>).returns(<%= user_class_name %>.first)
+    get :edit, :id => "ignored"
+    response.should render_template(:edit)
+  end
+
+  it "update action should redirect when not logged in" do
+    put :update, :id => "ignored"
+    response.should redirect_to(login_url)
+  end
+
+  it "update action 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"
+    response.should render_template(:edit)
+  end
+
+  it "update action 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"
+    response.should redirect_to("/")
+  end
 end

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

@@ -9,13 +9,13 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
   end
 
   context "create action" do
-    should "render new template when model is invalid" 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 model is valid" do
+    should "redirect when <%= user_singular_name %> is valid" do
       <%= user_class_name %>.any_instance.stubs(:valid?).returns(true)
       post :create
       assert_redirected_to "/"
@@ -24,4 +24,38 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
     <%- 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 "/"
+    end
+  end
 end

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

@@ -20,4 +20,34 @@ class <%= user_plural_class_name %>ControllerTest < ActionController::TestCase
     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 "/"
+  end
 end

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

@@ -30,13 +30,13 @@ class <%= user_class_name %> < ActiveRecord::Base
 
   def prepare_password
     unless password.blank?
-      self.password_salt = Digest::SHA1.hexdigest([Time.now, rand].join)
+      self.password_salt = BCrypt::Engine.generate_salt
       self.password_hash = encrypt_password(password)
     end
   end
 
   def encrypt_password(pass)
-    Digest::SHA1.hexdigest([pass, password_salt].join)
+    BCrypt::Engine.hash_secret(pass, password_salt)
   end
 <%- end -%>
 end

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

@@ -1,4 +1,6 @@
 class <%= user_plural_class_name %>Controller < ApplicationController
+  before_filter :login_required, :except => [:new, :create]
+
   def new
     @<%= user_singular_name %> = <%= user_class_name %>.new
   end
@@ -15,4 +17,18 @@ class <%= user_plural_class_name %>Controller < ApplicationController
       render :action => '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 %>])
+      flash[:notice] = "Your profile has been updated."
+      redirect_to "/"
+    else
+      render :action => 'edit'
+    end
+  end
 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 %>
+  <p>
+    <%%= f.label :username %><br />
+    <%%= f.text_field :username %>
+  </p>
+  <p>
+    <%%= f.label :email, "Email Address" %><br />
+    <%%= f.text_field :email %>
+  </p>
+  <p>
+    <%%= f.label :password %><br />
+    <%%= f.password_field :password %>
+  </p>
+  <p>
+    <%%= f.label :password_confirmation, "Confirm Password" %><br />
+    <%%= f.password_field :password_confirmation %>
+  </p>
+  <p><%%= f.submit (@<%= user_singular_name %>.new_record? ? "Sign up" : "Update") %></p>
+<%% 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/signup.html.erb

@@ -2,23 +2,4 @@
 
 <p>Already have an account? <%%= link_to "Log in", login_path %>.</p>
 
-<%%= form_for @<%= user_singular_name %> do |f| %>
-  <%%= f.error_messages %>
-  <p>
-    <%%= f.label :username %><br />
-    <%%= f.text_field :username %>
-  </p>
-  <p>
-    <%%= f.label :email, "Email Address" %><br />
-    <%%= f.text_field :email %>
-  </p>
-  <p>
-    <%%= f.label :password %><br />
-    <%%= f.password_field :password %>
-  </p>
-  <p>
-    <%%= f.label :password_confirmation, "Confirm Password" %><br />
-    <%%= f.password_field :password_confirmation %>
-  </p>
-  <p><%%= f.submit "Sign up" %></p>
-<%% end %>
+<%%= render 'form' %>

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

@@ -0,0 +1,20 @@
+- form_for @<%= user_singular_name %> do |f|
+  = f.error_messages
+  %p
+    = f.label :username
+    %br
+    = f.text_field :username
+  %p
+    = f.label :email, "Email Address"
+    %br
+    = f.text_field :email
+  %p
+    = f.label :password
+    %br
+    = f.password_field :password
+  %p
+    = f.label :password_confirmation, "Confirm Password"
+    %br
+    = f.password_field :password_confirmation
+  %p
+    = 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/signup.html.haml

@@ -2,23 +2,4 @@
 
 %p== Already have an account? #{link_to "Log in", login_path}.
 
-- form_for @<%= user_singular_name %> do |f|
-  = f.error_messages
-  %p
-    = f.label :username
-    %br
-    = f.text_field :username
-  %p
-    = f.label :email, "Email Address"
-    %br
-    = f.text_field :email
-  %p
-    = f.label :password
-    %br
-    = f.password_field :password
-  %p
-    = f.label :password_confirmation, "Confirm Password"
-    %br
-    = f.password_field :password_confirmation
-  %p
-    = f.submit "Sign up"
+= render 'form'

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

@@ -4,7 +4,7 @@
 #   helper :layout
 module LayoutHelper
   def title(page_title, show_title = true)
-    content_for(:title) { page_title.to_s }
+    content_for(:title) { h(page_title.to_s) }
     @show_title = show_title
   end
 

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

@@ -61,10 +61,14 @@ module Nifty
         end
       end
 
+      def add_gems
+        gem "mocha", :group => :test unless File.read(destination_path("Gemfile")).include? "mocha"
+      end
+
       def create_model
         unless @skip_model
           template 'model.rb', "app/models/#{singular_name}.rb"
-          if options.rspec?
+          if test_framework == :rspec
             template "tests/rspec/model.rb", "spec/models/#{singular_name}_spec.rb"
             template 'fixtures.yml', "spec/fixtures/#{plural_name}.yml"
           else
@@ -98,7 +102,7 @@ module Nifty
 
           route "resources #{plural_name.to_sym.inspect}"
 
-          if options.rspec?
+          if test_framework == :rspec
             template "tests/#{test_framework}/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
           else
             template "tests/#{test_framework}/controller.rb", "test/functional/#{plural_name}_controller_test.rb"

data/rails_generators/nifty_authentication/templates/fixtures.yml

@@ -7,8 +7,8 @@ foo:
   crypted_password: 3d16c326648cccafe3d4b4cb024475c381dda92f430dfedf6f933e1f61203bacb6bae2437849bdb43b06be335e23790e4aa03902b3c28c3bbbbe27d501e521f3
   password_salt: n6z_wtpWoIsHgQb5IcFd
 <%- else -%>
-  password_hash: 3488f5f7efecab14b91eb96169e5e1ee518a569f
-  password_salt: bef65e058905c379436d80d1a32e7374b139e7b0
+  password_hash: "$2a$10$tUpEtZKDRfgosDmX2cUIFeCvHAHn9VT/0ZvmUhXiZCxSIrSdRiLhu"
+  password_salt: "$2a$10$tUpEtZKDRfgosDmX2cUIFe"
 <%- end -%>
 
 bar:
@@ -19,6 +19,6 @@ bar:
   crypted_password: 3bc9f4113ca645a186765df3d31a9352d0067bf2304ba0cdd6b08a7f3d58c6668ab1762fa3e76aef466ea2ff188399d8e6c40244fa59312bb4112292dac9f7f0
   password_salt: UiAh9ejabnKRxqsiK0xO
 <%- else -%>
-  password_hash: 3488f5f7efecab14b91eb96169e5e1ee518a569f
-  password_salt: bef65e058905c379436d80d1a32e7374b139e7b0
+  password_hash: "$2a$10$tUpEtZKDRfgosDmX2cUIFeCvHAHn9VT/0ZvmUhXiZCxSIrSdRiLhu"
+  password_salt: "$2a$10$tUpEtZKDRfgosDmX2cUIFe"
 <%- end -%>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ryan Bates
@@ -14,10 +14,99 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -07:00
+date: 2010-10-15 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id006
 description: A collection of useful Rails generator scripts for scaffolding, layout files, authentication, and more.
 email: ryan@railscasts.com
 executables: []
@@ -28,8 +117,8 @@ extra_rdoc_files: []
 
 files: 
 - lib/generators/nifty/authentication/authentication_generator.rb
-- lib/generators/nifty/authentication/templates/authentication.rb
 - lib/generators/nifty/authentication/templates/authlogic_session.rb
+- lib/generators/nifty/authentication/templates/controller_authentication.rb
 - lib/generators/nifty/authentication/templates/fixtures.yml
 - lib/generators/nifty/authentication/templates/migration.rb
 - lib/generators/nifty/authentication/templates/sessions_controller.rb
@@ -46,8 +135,12 @@ files:
 - lib/generators/nifty/authentication/templates/user.rb
 - lib/generators/nifty/authentication/templates/users_controller.rb
 - lib/generators/nifty/authentication/templates/users_helper.rb
+- lib/generators/nifty/authentication/templates/views/erb/_form.html.erb
+- lib/generators/nifty/authentication/templates/views/erb/edit.html.erb
 - lib/generators/nifty/authentication/templates/views/erb/login.html.erb
 - lib/generators/nifty/authentication/templates/views/erb/signup.html.erb
+- lib/generators/nifty/authentication/templates/views/haml/_form.html.haml
+- lib/generators/nifty/authentication/templates/views/haml/edit.html.haml
 - lib/generators/nifty/authentication/templates/views/haml/login.html.haml
 - lib/generators/nifty/authentication/templates/views/haml/signup.html.haml
 - lib/generators/nifty/authentication/USAGE
@@ -216,6 +309,8 @@ files:
 - rails_generators/nifty_scaffold/templates/views/haml/show.html.haml
 - rails_generators/nifty_scaffold/USAGE
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - Rakefile
 - README.rdoc