nifty-generators 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.2.4 (May 5th, 2009)
+
+* using root_url when no index action in nifty_scaffold
+
+* making password editable in user model in nifty_authentication
+
+* adding filter_parameter_logging :password in nifty_authentication
+
 0.2.3 (February 20th, 2009)
 
 * fixing nifty_authentication to work with Rails 2.3 application_controller.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('nifty-generators', '0.2.3') do |p|
+Echoe.new('nifty-generators', '0.2.4') do |p|
   p.project        = "niftygenerators"
   p.description    = "A collection of useful generator scripts for Rails."
   p.url            = "http://github.com/ryanb/nifty-generators"

data/nifty-generators.gemspec

@@ -1,168 +1,32 @@
+# -*- encoding: utf-8 -*-
 
-# Gem::Specification for Nifty-generators-0.2.3
-# Originally generated by Echoe
+Gem::Specification.new do |s|
+  s.name = %q{nifty-generators}
+  s.version = "0.2.4"
 
---- !ruby/object:Gem::Specification 
-name: nifty-generators
-version: !ruby/object:Gem::Version 
-  version: 0.2.3
-platform: ruby
-authors: 
-- Ryan Bates
-autorequire: 
-bindir: bin
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ryan Bates"]
+  s.date = %q{2009-05-06}
+  s.description = %q{A collection of useful generator scripts for Rails.}
+  s.email = %q{ryan (at) railscasts (dot) com}
+  s.extra_rdoc_files = ["CHANGELOG", "lib/nifty_generators.rb", "LICENSE", "README.rdoc", "tasks/deployment.rake", "TODO"]
+  s.files = ["CHANGELOG", "lib/nifty_generators.rb", "LICENSE", "rails_generators/nifty_authentication/lib/insert_commands.rb", "rails_generators/nifty_authentication/nifty_authentication_generator.rb", "rails_generators/nifty_authentication/templates/authentication.rb", "rails_generators/nifty_authentication/templates/fixtures.yml", "rails_generators/nifty_authentication/templates/migration.rb", "rails_generators/nifty_authentication/templates/sessions_controller.rb", "rails_generators/nifty_authentication/templates/sessions_helper.rb", "rails_generators/nifty_authentication/templates/tests/rspec/sessions_controller.rb", "rails_generators/nifty_authentication/templates/tests/rspec/user.rb", "rails_generators/nifty_authentication/templates/tests/rspec/users_controller.rb", "rails_generators/nifty_authentication/templates/tests/shoulda/sessions_controller.rb", "rails_generators/nifty_authentication/templates/tests/shoulda/user.rb", "rails_generators/nifty_authentication/templates/tests/shoulda/users_controller.rb", "rails_generators/nifty_authentication/templates/tests/testunit/sessions_controller.rb", "rails_generators/nifty_authentication/templates/tests/testunit/user.rb", "rails_generators/nifty_authentication/templates/tests/testunit/users_controller.rb", "rails_generators/nifty_authentication/templates/user.rb", "rails_generators/nifty_authentication/templates/users_controller.rb", "rails_generators/nifty_authentication/templates/users_helper.rb", "rails_generators/nifty_authentication/templates/views/erb/login.html.erb", "rails_generators/nifty_authentication/templates/views/erb/signup.html.erb", "rails_generators/nifty_authentication/templates/views/haml/login.html.haml", "rails_generators/nifty_authentication/templates/views/haml/signup.html.haml", "rails_generators/nifty_authentication/USAGE", "rails_generators/nifty_config/nifty_config_generator.rb", "rails_generators/nifty_config/templates/config.yml", "rails_generators/nifty_config/templates/load_config.rb", "rails_generators/nifty_config/USAGE", "rails_generators/nifty_layout/nifty_layout_generator.rb", "rails_generators/nifty_layout/templates/helper.rb", "rails_generators/nifty_layout/templates/layout.html.erb", "rails_generators/nifty_layout/templates/layout.html.haml", "rails_generators/nifty_layout/templates/stylesheet.css", "rails_generators/nifty_layout/templates/stylesheet.sass", "rails_generators/nifty_layout/USAGE", "rails_generators/nifty_scaffold/nifty_scaffold_generator.rb", "rails_generators/nifty_scaffold/templates/actions/create.rb", "rails_generators/nifty_scaffold/templates/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/actions/edit.rb", "rails_generators/nifty_scaffold/templates/actions/index.rb", "rails_generators/nifty_scaffold/templates/actions/new.rb", "rails_generators/nifty_scaffold/templates/actions/show.rb", "rails_generators/nifty_scaffold/templates/actions/update.rb", "rails_generators/nifty_scaffold/templates/controller.rb", "rails_generators/nifty_scaffold/templates/fixtures.yml", "rails_generators/nifty_scaffold/templates/helper.rb", "rails_generators/nifty_scaffold/templates/migration.rb", "rails_generators/nifty_scaffold/templates/model.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb", "rails_generators/nifty_scaffold/templates/tests/rspec/model.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/controller.rb", "rails_generators/nifty_scaffold/templates/tests/shoulda/model.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/index.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/new.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/show.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/actions/update.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/controller.rb", "rails_generators/nifty_scaffold/templates/tests/testunit/model.rb", "rails_generators/nifty_scaffold/templates/views/erb/_form.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/edit.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/index.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/new.html.erb", "rails_generators/nifty_scaffold/templates/views/erb/show.html.erb", "rails_generators/nifty_scaffold/templates/views/haml/_form.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/edit.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/index.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/new.html.haml", "rails_generators/nifty_scaffold/templates/views/haml/show.html.haml", "rails_generators/nifty_scaffold/USAGE", "Rakefile", "README.rdoc", "tasks/deployment.rake", "test/test_helper.rb", "test/test_nifty_authentication_generator.rb", "test/test_nifty_config_generator.rb", "test/test_nifty_layout_generator.rb", "test/test_nifty_scaffold_generator.rb", "TODO", "Manifest", "nifty-generators.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/ryanb/nifty-generators}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Nifty-generators", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{niftygenerators}
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{A collection of useful generator scripts for Rails.}
+  s.test_files = ["test/test_helper.rb", "test/test_nifty_authentication_generator.rb", "test/test_nifty_config_generator.rb", "test/test_nifty_layout_generator.rb", "test/test_nifty_scaffold_generator.rb"]
 
-date: 2009-02-20 00:00:00 -08:00
-default_executable: 
-dependencies: []
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
 
-description: A collection of useful generator scripts for Rails.
-email: ryan (at) railscasts (dot) com
-executables: []
-
-extensions: []
-
-extra_rdoc_files: 
-- CHANGELOG
-- lib/nifty_generators.rb
-- LICENSE
-- README.rdoc
-- tasks/deployment.rake
-- TODO
-files: 
-- CHANGELOG
-- lib/nifty_generators.rb
-- LICENSE
-- rails_generators/nifty_authentication/lib/insert_commands.rb
-- rails_generators/nifty_authentication/nifty_authentication_generator.rb
-- rails_generators/nifty_authentication/templates/authentication.rb
-- rails_generators/nifty_authentication/templates/fixtures.yml
-- rails_generators/nifty_authentication/templates/migration.rb
-- rails_generators/nifty_authentication/templates/sessions_controller.rb
-- rails_generators/nifty_authentication/templates/sessions_helper.rb
-- rails_generators/nifty_authentication/templates/tests/rspec/sessions_controller.rb
-- rails_generators/nifty_authentication/templates/tests/rspec/user.rb
-- rails_generators/nifty_authentication/templates/tests/rspec/users_controller.rb
-- rails_generators/nifty_authentication/templates/tests/shoulda/sessions_controller.rb
-- rails_generators/nifty_authentication/templates/tests/shoulda/user.rb
-- rails_generators/nifty_authentication/templates/tests/shoulda/users_controller.rb
-- rails_generators/nifty_authentication/templates/tests/testunit/sessions_controller.rb
-- rails_generators/nifty_authentication/templates/tests/testunit/user.rb
-- rails_generators/nifty_authentication/templates/tests/testunit/users_controller.rb
-- rails_generators/nifty_authentication/templates/user.rb
-- rails_generators/nifty_authentication/templates/users_controller.rb
-- rails_generators/nifty_authentication/templates/users_helper.rb
-- rails_generators/nifty_authentication/templates/views/erb/login.html.erb
-- rails_generators/nifty_authentication/templates/views/erb/signup.html.erb
-- rails_generators/nifty_authentication/templates/views/haml/login.html.haml
-- rails_generators/nifty_authentication/templates/views/haml/signup.html.haml
-- rails_generators/nifty_authentication/USAGE
-- rails_generators/nifty_config/nifty_config_generator.rb
-- rails_generators/nifty_config/templates/config.yml
-- rails_generators/nifty_config/templates/load_config.rb
-- rails_generators/nifty_config/USAGE
-- rails_generators/nifty_layout/nifty_layout_generator.rb
-- rails_generators/nifty_layout/templates/helper.rb
-- rails_generators/nifty_layout/templates/layout.html.erb
-- rails_generators/nifty_layout/templates/layout.html.haml
-- rails_generators/nifty_layout/templates/stylesheet.css
-- rails_generators/nifty_layout/templates/stylesheet.sass
-- rails_generators/nifty_layout/USAGE
-- rails_generators/nifty_scaffold/nifty_scaffold_generator.rb
-- rails_generators/nifty_scaffold/templates/actions/create.rb
-- rails_generators/nifty_scaffold/templates/actions/destroy.rb
-- rails_generators/nifty_scaffold/templates/actions/edit.rb
-- rails_generators/nifty_scaffold/templates/actions/index.rb
-- rails_generators/nifty_scaffold/templates/actions/new.rb
-- rails_generators/nifty_scaffold/templates/actions/show.rb
-- rails_generators/nifty_scaffold/templates/actions/update.rb
-- rails_generators/nifty_scaffold/templates/controller.rb
-- rails_generators/nifty_scaffold/templates/fixtures.yml
-- rails_generators/nifty_scaffold/templates/helper.rb
-- rails_generators/nifty_scaffold/templates/migration.rb
-- rails_generators/nifty_scaffold/templates/model.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/actions/create.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/actions/edit.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/actions/index.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/actions/new.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/actions/show.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/actions/update.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/controller.rb
-- rails_generators/nifty_scaffold/templates/tests/rspec/model.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/create.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/destroy.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/edit.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/index.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/new.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/show.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/actions/update.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/controller.rb
-- rails_generators/nifty_scaffold/templates/tests/shoulda/model.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/actions/create.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/actions/edit.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/actions/index.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/actions/new.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/actions/show.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/actions/update.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/controller.rb
-- rails_generators/nifty_scaffold/templates/tests/testunit/model.rb
-- rails_generators/nifty_scaffold/templates/views/erb/_form.html.erb
-- rails_generators/nifty_scaffold/templates/views/erb/edit.html.erb
-- rails_generators/nifty_scaffold/templates/views/erb/index.html.erb
-- rails_generators/nifty_scaffold/templates/views/erb/new.html.erb
-- rails_generators/nifty_scaffold/templates/views/erb/show.html.erb
-- rails_generators/nifty_scaffold/templates/views/haml/_form.html.haml
-- rails_generators/nifty_scaffold/templates/views/haml/edit.html.haml
-- rails_generators/nifty_scaffold/templates/views/haml/index.html.haml
-- rails_generators/nifty_scaffold/templates/views/haml/new.html.haml
-- rails_generators/nifty_scaffold/templates/views/haml/show.html.haml
-- rails_generators/nifty_scaffold/USAGE
-- Rakefile
-- README.rdoc
-- tasks/deployment.rake
-- test/test_helper.rb
-- test/test_nifty_authentication_generator.rb
-- test/test_nifty_config_generator.rb
-- test/test_nifty_layout_generator.rb
-- test/test_nifty_scaffold_generator.rb
-- TODO
-- Manifest
-- nifty-generators.gemspec
-has_rdoc: true
-homepage: http://github.com/ryanb/nifty-generators
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Nifty-generators
-- --main
-- README.rdoc
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
-requirements: []
-
-rubyforge_project: niftygenerators
-rubygems_version: 1.3.1
-specification_version: 2
-summary: A collection of useful generator scripts for Rails.
-test_files: 
-- test/test_helper.rb
-- test/test_nifty_authentication_generator.rb
-- test/test_nifty_config_generator.rb
-- test/test_nifty_layout_generator.rb
-- test/test_nifty_scaffold_generator.rb
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/rails_generators/nifty_authentication/templates/authentication.rb

@@ -17,6 +17,7 @@
 module Authentication
   def self.included(controller)
     controller.send :helper_method, :current_<%= user_singular_name %>, :logged_in?
+    controller.filter_parameter_logging :password
   end
   
   def current_<%= user_singular_name %>

data/rails_generators/nifty_authentication/templates/user.rb

@@ -3,7 +3,7 @@ class <%= user_class_name %> < ActiveRecord::Base
   attr_accessible :username, :email, :password, :password_confirmation
   
   attr_accessor :password
-  before_create :prepare_password
+  before_save :prepare_password
   
   validates_presence_of :username
   validates_uniqueness_of :username, :email, :allow_blank => true
@@ -26,8 +26,10 @@ class <%= user_class_name %> < ActiveRecord::Base
   private
   
   def prepare_password
-    self.password_salt = Digest::SHA1.hexdigest([Time.now, rand].join)
-    self.password_hash = encrypt_password(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)

data/rails_generators/nifty_scaffold/nifty_scaffold_generator.rb

@@ -143,11 +143,19 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
     end
   end
   
+  def items_path(suffix = 'path')
+    if action? :index
+      "#{plural_name}_#{suffix}"
+    else
+      "root_#{suffix}"
+    end
+  end
+  
   def item_path(suffix = 'path')
     if action? :show
       "@#{singular_name}"
     else
-      "#{plural_name}_#{suffix}"
+      items_path(suffix)
     end
   end
   
@@ -155,7 +163,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
     if action? :show
       "#{singular_name}_#{suffix}(assigns[:#{singular_name}])"
     else
-      "#{plural_name}_#{suffix}"
+      items_path(suffix)
     end
   end
   
@@ -163,7 +171,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base
     if action? :show
       "#{singular_name}_#{suffix}(assigns(:#{singular_name}))"
     else
-      "#{plural_name}_#{suffix}"
+      items_path(suffix)
     end
   end
   

data/rails_generators/nifty_scaffold/templates/actions/destroy.rb

@@ -2,5 +2,5 @@
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
     @<%= singular_name %>.destroy
     flash[:notice] = "Successfully destroyed <%= name.humanize.downcase %>."
-    redirect_to <%= plural_name %>_url
+    redirect_to <%= items_path('url') %>
   end

data/rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb

@@ -1,6 +1,6 @@
   it "destroy action should destroy model and redirect to index action" do
     <%= singular_name %> = <%= class_name %>.first
     delete :destroy, :id => <%= singular_name %>
-    response.should redirect_to(<%= plural_name %>_url)
+    response.should redirect_to(<%= items_path('url') %>)
     <%= class_name %>.exists?(<%= singular_name %>.id).should be_false
   end

data/rails_generators/nifty_scaffold/templates/tests/shoulda/actions/destroy.rb

@@ -2,7 +2,7 @@
     should "destroy model and redirect to index action" do
       <%= singular_name %> = <%= class_name %>.first
       delete :destroy, :id => <%= singular_name %>
-      assert_redirected_to <%= plural_name %>_url
+      assert_redirected_to <%= items_path('url') %>
       assert !<%= class_name %>.exists?(<%= singular_name %>.id)
     end
   end

data/rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb

@@ -1,6 +1,6 @@
   def test_destroy
     <%= singular_name %> = <%= class_name %>.first
     delete :destroy, :id => <%= singular_name %>
-    assert_redirected_to <%= plural_name %>_url
+    assert_redirected_to <%= items_path('url') %>
     assert !<%= class_name %>.exists?(<%= singular_name %>.id)
   end

data/test/test_nifty_scaffold_generator.rb

@@ -139,7 +139,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           assert_match "@line_item = LineItem.new(params[:line_item])", body
           assert_match "if @line_item.save", body
           assert_match "flash[:notice] = \"Successfully created line item.\"", body
-          assert_match "redirect_to line_items_url", body
+          assert_match "redirect_to root_url", body
           assert_match "render :action => 'new'", body
         end
       end
@@ -164,7 +164,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           assert_match "def update", body
           assert_match "if @line_item.update_attributes(params[:line_item])", body
           assert_match "flash[:notice] = \"Successfully updated line item.\"", body
-          assert_match "redirect_to line_items_url", body
+          assert_match "redirect_to root_url", body
           assert_match "render :action => 'edit'", body
         end
       end
@@ -181,7 +181,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
           assert_match "@line_item = LineItem.find(params[:id])", body
           assert_match "@line_item.destroy", body
           assert_match "flash[:notice] = \"Successfully destroyed line item.\"", body
-          assert_match "redirect_to line_items_url", body
+          assert_match "redirect_to root_url", body
         end
       end
     end
@@ -256,6 +256,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase
         assert_generated_file "app/controllers/line_items_controller.rb" do |body|
           assert_match "def create", body
           assert_match "def update", body
+          assert_match "root_url", body
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nifty-generators
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-05-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -129,6 +129,8 @@ files:
 - nifty-generators.gemspec
 has_rdoc: true
 homepage: http://github.com/ryanb/nifty-generators
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -154,9 +156,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: niftygenerators
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A collection of useful generator scripts for Rails.
 test_files: 
 - test/test_helper.rb