nifty-generators 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.2.3 (February 20th, 2009)
+
+* fixing nifty_authentication to work with Rails 2.3 application_controller.rb
+
+* fixing password field in HAML signup page in nifty_authentication
+
 0.2.2 (November 11th, 2008)
 
 * fixing sessions_path reference in nifty_authentication

data/Manifest

@@ -1,7 +1,6 @@
 CHANGELOG
 lib/nifty_generators.rb
 LICENSE
-Manifest
 rails_generators/nifty_authentication/lib/insert_commands.rb
 rails_generators/nifty_authentication/nifty_authentication_generator.rb
 rails_generators/nifty_authentication/templates/authentication.rb
@@ -97,3 +96,4 @@ test/test_nifty_config_generator.rb
 test/test_nifty_layout_generator.rb
 test/test_nifty_scaffold_generator.rb
 TODO
+Manifest

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('nifty-generators', '0.2.2') do |p|
+Echoe.new('nifty-generators', '0.2.3') 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,18 +1,18 @@
 
-# Gem::Specification for Nifty-generators-0.2.2
+# Gem::Specification for Nifty-generators-0.2.3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: nifty-generators
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ryan Bates
 autorequire: 
 bindir: bin
 
-date: 2008-11-11 00:00:00 -08:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -33,7 +33,6 @@ files:
 - CHANGELOG
 - lib/nifty_generators.rb
 - LICENSE
-- Manifest
 - rails_generators/nifty_authentication/lib/insert_commands.rb
 - rails_generators/nifty_authentication/nifty_authentication_generator.rb
 - rails_generators/nifty_authentication/templates/authentication.rb
@@ -129,6 +128,7 @@ files:
 - 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
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: niftygenerators
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 specification_version: 2
 summary: A collection of useful generator scripts for Rails.
 test_files: 

data/rails_generators/nifty_authentication/nifty_authentication_generator.rb

@@ -37,7 +37,7 @@ class NiftyAuthenticationGenerator < Rails::Generator::Base
       m.route_name :logout, 'logout', :controller => sessions_underscore_name, :action => 'destroy'
       m.route_name :signup, 'signup', :controller => user_plural_name, :action => 'new'
       
-      m.insert_into 'app/controllers/application.rb', 'include Authentication'
+      m.insert_into "app/controllers/#{application_controller_name}.rb", 'include Authentication'
       
       if test_framework == :rspec
         m.directory "spec"
@@ -84,6 +84,10 @@ class NiftyAuthenticationGenerator < Rails::Generator::Base
   def sessions_class_name
     sessions_name.camelize
   end
+  
+  def application_controller_name
+    Rails.version >= '2.3.0' ? 'application_controller' : 'application'
+  end
 
 protected
   
@@ -100,7 +104,7 @@ protected
     opt.separator 'Options:'
     opt.on("--testunit", "Use test/unit for test files.") { options[:test_framework] = :testunit }
     opt.on("--rspec", "Use RSpec for test files.") { options[:test_framework] = :rspec }
-    opt.on("--shoulda", "Use RSpec for test files.") { options[:test_framework] = :shoulda }
+    opt.on("--shoulda", "Use Shoulda for test files.") { options[:test_framework] = :shoulda }
     opt.on("--haml", "Generate HAML views instead of ERB.") { |v| options[:haml] = true }
   end
   

data/rails_generators/nifty_authentication/templates/views/haml/signup.html.haml

@@ -15,7 +15,7 @@
   %p
     = f.label :password
     %br
-    = f.password_field :email
+    = f.password_field :password
   %p
     = f.label :password_confirmation, "Confirm Password"
     %br

data/test/test_nifty_authentication_generator.rb

@@ -18,6 +18,7 @@ class TestNiftyAuthenticationGenerator < Test::Unit::TestCase
   #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
   context "" do # empty context so we can use setup block
     setup do
+      Rails.stubs(:version).returns("2.0.2")
       Dir.mkdir("#{RAILS_ROOT}/config") unless File.exists?("#{RAILS_ROOT}/config")
       File.open("#{RAILS_ROOT}/config/routes.rb", 'w') do |f|
         f.puts "ActionController::Routing::Routes.draw do |map|\n\nend"
@@ -64,7 +65,8 @@ class TestNiftyAuthenticationGenerator < Test::Unit::TestCase
       end
     
       should "include Authentication" do
-        assert_generated_file "app/controllers/application.rb" do |body|
+        application_controller_name = Rails.version >= '2.3.0' ? 'application_controller' : 'application'
+        assert_generated_file "app/controllers/#{application_controller_name}.rb" do |body|
           assert_match "include Authentication", body
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nifty-generators
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ryan Bates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-11 00:00:00 -08:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - CHANGELOG
 - lib/nifty_generators.rb
 - LICENSE
-- Manifest
 - rails_generators/nifty_authentication/lib/insert_commands.rb
 - rails_generators/nifty_authentication/nifty_authentication_generator.rb
 - rails_generators/nifty_authentication/templates/authentication.rb
@@ -126,6 +125,7 @@ files:
 - 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
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: niftygenerators
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A collection of useful generator scripts for Rails.