iain-pizza-generators 0.1.2 → 0.1.3

data/Manifest

@@ -0,0 +1,113 @@
+README.rdoc
+Manifest
+lib/pizza_generators.rb
+TODO
+LICENSE
+test/test_helper.rb
+test/test_pizza_authentication_generator.rb
+test/test_pizza_config_generator.rb
+test/test_pizza_layout_generator.rb
+test/test_pizza_scaffold_generator.rb
+CHANGELOG
+Rakefile
+tasks/deployment.rake
+rails_generators/pizza_scaffold/USAGE
+rails_generators/pizza_scaffold/templates/helper.rb
+rails_generators/pizza_scaffold/templates/fixtures.yml
+rails_generators/pizza_scaffold/templates/actions/edit.rb
+rails_generators/pizza_scaffold/templates/actions/index.rb
+rails_generators/pizza_scaffold/templates/actions/update.rb
+rails_generators/pizza_scaffold/templates/actions/show.rb
+rails_generators/pizza_scaffold/templates/actions/destroy.rb
+rails_generators/pizza_scaffold/templates/actions/create.rb
+rails_generators/pizza_scaffold/templates/actions/new.rb
+rails_generators/pizza_scaffold/templates/migration.rb
+rails_generators/pizza_scaffold/templates/controller.rb
+rails_generators/pizza_scaffold/templates/views/erb/edit.html.erb
+rails_generators/pizza_scaffold/templates/views/erb/index.html.erb
+rails_generators/pizza_scaffold/templates/views/erb/new.html.erb
+rails_generators/pizza_scaffold/templates/views/erb/_form.html.erb
+rails_generators/pizza_scaffold/templates/views/erb/show.html.erb
+rails_generators/pizza_scaffold/templates/views/haml/new.html.haml
+rails_generators/pizza_scaffold/templates/views/haml/_form.html.haml
+rails_generators/pizza_scaffold/templates/views/haml/edit.html.haml
+rails_generators/pizza_scaffold/templates/views/haml/show.html.haml
+rails_generators/pizza_scaffold/templates/views/haml/index.html.haml
+rails_generators/pizza_scaffold/templates/model.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/actions/edit.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/actions/index.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/actions/update.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/actions/show.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/actions/destroy.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/actions/create.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/actions/new.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/controller.rb
+rails_generators/pizza_scaffold/templates/tests/shoulda/model.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/actions/edit.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/actions/index.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/actions/update.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/actions/show.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/actions/destroy.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/actions/create.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/actions/new.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/controller.rb
+rails_generators/pizza_scaffold/templates/tests/rspec/model.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/actions/edit.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/actions/index.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/actions/update.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/actions/show.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/actions/destroy.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/actions/create.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/actions/new.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/controller.rb
+rails_generators/pizza_scaffold/templates/tests/testunit/model.rb
+rails_generators/pizza_scaffold/pizza_scaffold_generator.rb
+rails_generators/pizza_layout/USAGE
+rails_generators/pizza_layout/templates/helper.rb
+rails_generators/pizza_layout/templates/stylesheet.css
+rails_generators/pizza_layout/templates/will_paginate.rb
+rails_generators/pizza_layout/templates/layout.html.erb
+rails_generators/pizza_layout/templates/application.sass
+rails_generators/pizza_layout/templates/layout.sass
+rails_generators/pizza_layout/templates/_menu.html.haml
+rails_generators/pizza_layout/templates/required.png
+rails_generators/pizza_layout/templates/layout.html.haml
+rails_generators/pizza_layout/templates/reset.sass
+rails_generators/pizza_layout/templates/tables.sass
+rails_generators/pizza_layout/templates/forms.sass
+rails_generators/pizza_layout/templates/definition_lists.sass
+rails_generators/pizza_layout/pizza_layout_generator.rb
+rails_generators/pizza_authentication/lib/insert_commands.rb
+rails_generators/pizza_authentication/USAGE
+rails_generators/pizza_authentication/templates/authentication.rb
+rails_generators/pizza_authentication/templates/fixtures.yml
+rails_generators/pizza_authentication/templates/users_controller.rb
+rails_generators/pizza_authentication/templates/session.rb
+rails_generators/pizza_authentication/templates/migration.rb
+rails_generators/pizza_authentication/templates/users_helper.rb
+rails_generators/pizza_authentication/templates/views/erb/login.html.erb
+rails_generators/pizza_authentication/templates/views/erb/signup.html.erb
+rails_generators/pizza_authentication/templates/views/haml/new.html.haml
+rails_generators/pizza_authentication/templates/views/haml/signup.html.haml
+rails_generators/pizza_authentication/templates/views/haml/login.html.haml
+rails_generators/pizza_authentication/templates/views/haml/edit.html.haml
+rails_generators/pizza_authentication/templates/views/haml/show.html.haml
+rails_generators/pizza_authentication/templates/user.rb
+rails_generators/pizza_authentication/templates/sessions_controller.rb
+rails_generators/pizza_authentication/templates/initializer.rb
+rails_generators/pizza_authentication/templates/factories.rb
+rails_generators/pizza_authentication/templates/sessions_helper.rb
+rails_generators/pizza_authentication/templates/tests/shoulda/users_controller.rb
+rails_generators/pizza_authentication/templates/tests/shoulda/user.rb
+rails_generators/pizza_authentication/templates/tests/shoulda/sessions_controller.rb
+rails_generators/pizza_authentication/templates/tests/rspec/users_controller.rb
+rails_generators/pizza_authentication/templates/tests/rspec/user.rb
+rails_generators/pizza_authentication/templates/tests/rspec/sessions_controller.rb
+rails_generators/pizza_authentication/templates/tests/testunit/users_controller.rb
+rails_generators/pizza_authentication/templates/tests/testunit/user.rb
+rails_generators/pizza_authentication/templates/tests/testunit/sessions_controller.rb
+rails_generators/pizza_authentication/pizza_authentication_generator.rb
+rails_generators/pizza_config/USAGE
+rails_generators/pizza_config/templates/config.yml
+rails_generators/pizza_config/templates/load_config.rb
+rails_generators/pizza_config/pizza_config_generator.rb

data/README.rdoc

@@ -15,19 +15,30 @@ Here is what is Pizza compared to Nifty:
 
 ==== Done
 
+
+===== Global
+
 * Haml is default for pizza_scaffold, use <tt>--erb</tt> to switch back to erb
+* usage of the pizza form builder (from http://github.com/iain/pizza-form_builder)
+* Using Shoulda matchers in RSpec (http://dev.thoughtbot.com/shoulda/)
+* Using RR as mocking framework (http://github.com/btakita/rr)
+
+===== pizza_scaffold
+
 * definition_list_for (from http://github.com/iain/model_based_html)
 * table_for (from http://github.com/iain/model_based_html)
-* form_for (from http://github.com/iain/fieldset_helper)
-* ResourceController (from http://github.com/giraffesoft/resource_controller)
 * Rails i18n and supposes Mr. T (from http://github.com/iain/mr.-t)
 * WillPaginate (from http://github.com/mislav/will_paginate)
 * Some validations for models automaticly entered and some belongs_to stuff too
+
+===== pizza_layout
+
 * reset.sass for layout will keep your view tidy
 * A main menu was added in app/views/shared/_menu.html.haml
-* Provides a cancel_link helper
 * Added WillPaginate.translate! to support i18n (see below)
-* A cancel link for every form
+
+===== pizza_authentication
+
 * AuthLogic usage with pizza_authentication (from http://github.com/binarylogic/authlogic)
 * Added gem dependencies to pizza-generators (my first try, so hopefully that works)
 
@@ -37,27 +48,38 @@ Here is what is Pizza compared to Nifty:
 * Add message_block gem (from http://github.com/railsgarden/message_block)
 * Use a FactoryGirl instead of fixtures
 * Cucumber stories for RESTful controller in scaffold
-* Update ERB, Test::Unit and Shoulda all over the place
+* Update ERB, Test::Unit and Shoulda all over the place (I hardly touched those)
 * Do something with Rails shiny new feature: Templates
 * Make the required plugins gems so they can be a gem dependency (not sure though)
 
+=== No longer in it
+
+* ResourceController (from http://github.com/giraffesoft/resource_controller)
+* Provides a cancel_link helper
+* A cancel link for every form
+
+
 == Setting up
 
 Before doing anything, add these lines to <tt>config/environment.rb</tt>
 
   config.gem "haml"
   config.gem "authlogic"
-  config.gem "giraffesoft-resource_controller", :lib => "resource_controller", :source => "http://gems.github.com"
   config.gem "mislav-will_paginate", :lib => "will_paginate", :source => "http://gems.github.com"
-  config.gem "rspec"
-  config.gem "rspec-rails"
-  config.gem "mocha"
+
+And in <tt>config/environments/test.rb</tt>
+
+  config.gem "rspec",                   :lib => false,          :version => ">= 1.2.2"
+  config.gem "rspec-rails",             :lib => false,          :version => ">= 1.2.2"
+  config.gem "rr",                      :lib => false,          :version => ">= 0.8.1"
+  config.gem "thoughtbot-factory_girl", :lib => "factory_girl", :version => ">= 1.2.0",  :source => "http://gems.github.com"
+  config.gem "thoughtbot-shoulda",      :lib => "shoulda",      :version => ">= 2.10.1", :source => "http://gems.github.com"
 
 Then run these commands:
 
   sudo rake gems:install # this should have already been done via the gem dependencies
+  sudo rake gems:install RAILS_ENV=test
   rake gems:unpack
-  haml --rails .
   ./script/generate rspec
 
 Install plugins:
@@ -67,9 +89,9 @@ Install plugins:
   ./script/plugin install git://github.com/iain/model_based_html.git
   ./script/plugin install git://github.com/iain/i18n_label.git
 
-Configure rspec to use mocha, in <tt>spec/spec_helper.rb</tt>
+Configure rspec to use rr, in <tt>spec/spec_helper.rb</tt>
 
-  config.mock_with :mocha
+  config.mock_with :rr
 
 Generate layout (required for all other generators):
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('pizza-generators', '0.1.2') do |p|
+Echoe.new('pizza-generators', '0.1.3') do |p|
   p.project        = "pizzagenerators"
   p.description    = "A collection of useful generator scripts for Rails."
   p.url            = "http://github.com/iain/pizza-generators"
@@ -10,7 +10,7 @@ Echoe.new('pizza-generators', '0.1.2') do |p|
   p.email          = "iain@iain.nl"
   p.ignore_pattern = ["script/*"]
   p.development_dependencies = []
-  p.runtime_dependencies = ["authlogic", "giraffesoft-resource_controller", "mislav-will_paginate", "rspec", "rspec-rails", "mocha", "haml"]
+  p.runtime_dependencies = ["authlogic", "mislav-will_paginate", "rspec", "rspec-rails", "rr", "haml", "thoughtbot-shoulda", "thoughtbot-factory_girl"]
 end
 
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/pizza-generators.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pizza-generators}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ryan Bates, Iain Hecker"]
-  s.date = %q{2009-01-26}
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ryan Bates", "Iain Hecker"]
+  s.date = %q{2009-04-17}
   s.description = %q{A collection of useful generator scripts for Rails.}
   s.email = %q{iain@iain.nl}
-  s.extra_rdoc_files = ["lib/pizza_generators.rb", "README.rdoc", "LICENSE", "tasks/deployment.rake", "CHANGELOG", "TODO"]
-  s.files = ["pizza-generators.gemspec", "Rakefile", "lib/pizza_generators.rb", "rails_generators/pizza_authentication/USAGE", "rails_generators/pizza_authentication/templates/migration.rb", "rails_generators/pizza_authentication/templates/sessions_helper.rb", "rails_generators/pizza_authentication/templates/users_helper.rb", "rails_generators/pizza_authentication/templates/tests/shoulda/users_controller.rb", "rails_generators/pizza_authentication/templates/tests/shoulda/user.rb", "rails_generators/pizza_authentication/templates/tests/shoulda/sessions_controller.rb", "rails_generators/pizza_authentication/templates/tests/testunit/users_controller.rb", "rails_generators/pizza_authentication/templates/tests/testunit/user.rb", "rails_generators/pizza_authentication/templates/tests/testunit/sessions_controller.rb", "rails_generators/pizza_authentication/templates/tests/rspec/users_controller.rb", "rails_generators/pizza_authentication/templates/tests/rspec/user.rb", "rails_generators/pizza_authentication/templates/tests/rspec/sessions_controller.rb", "rails_generators/pizza_authentication/templates/users_controller.rb", "rails_generators/pizza_authentication/templates/fixtures.yml", "rails_generators/pizza_authentication/templates/user.rb", "rails_generators/pizza_authentication/templates/authentication.rb", "rails_generators/pizza_authentication/templates/session.rb", "rails_generators/pizza_authentication/templates/sessions_controller.rb", "rails_generators/pizza_authentication/templates/views/erb/signup.html.erb", "rails_generators/pizza_authentication/templates/views/erb/login.html.erb", "rails_generators/pizza_authentication/templates/views/haml/login.html.haml", "rails_generators/pizza_authentication/templates/views/haml/signup.html.haml", "rails_generators/pizza_authentication/lib/insert_commands.rb", "rails_generators/pizza_authentication/pizza_authentication_generator.rb", "rails_generators/pizza_scaffold/USAGE", "rails_generators/pizza_scaffold/templates/controller.rb", "rails_generators/pizza_scaffold/templates/migration.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/controller.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/index.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/show.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/new.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/create.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/destroy.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/edit.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/update.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/model.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/controller.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/index.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/show.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/new.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/create.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/destroy.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/edit.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/update.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/model.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/controller.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/index.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/show.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/new.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/create.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/destroy.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/edit.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/update.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/model.rb", "rails_generators/pizza_scaffold/templates/actions/index.rb", "rails_generators/pizza_scaffold/templates/actions/show.rb", "rails_generators/pizza_scaffold/templates/actions/new.rb", "rails_generators/pizza_scaffold/templates/actions/create.rb", "rails_generators/pizza_scaffold/templates/actions/destroy.rb", "rails_generators/pizza_scaffold/templates/actions/edit.rb", "rails_generators/pizza_scaffold/templates/actions/update.rb", "rails_generators/pizza_scaffold/templates/model.rb", "rails_generators/pizza_scaffold/templates/helper.rb", "rails_generators/pizza_scaffold/templates/fixtures.yml", "rails_generators/pizza_scaffold/templates/views/erb/show.html.erb", "rails_generators/pizza_scaffold/templates/views/erb/index.html.erb", "rails_generators/pizza_scaffold/templates/views/erb/_form.html.erb", "rails_generators/pizza_scaffold/templates/views/erb/edit.html.erb", "rails_generators/pizza_scaffold/templates/views/erb/new.html.erb", "rails_generators/pizza_scaffold/templates/views/haml/edit.html.haml", "rails_generators/pizza_scaffold/templates/views/haml/index.html.haml", "rails_generators/pizza_scaffold/templates/views/haml/_form.html.haml", "rails_generators/pizza_scaffold/templates/views/haml/show.html.haml", "rails_generators/pizza_scaffold/templates/views/haml/new.html.haml", "rails_generators/pizza_scaffold/pizza_scaffold_generator.rb", "rails_generators/pizza_config/USAGE", "rails_generators/pizza_config/templates/config.yml", "rails_generators/pizza_config/templates/load_config.rb", "rails_generators/pizza_config/pizza_config_generator.rb", "rails_generators/pizza_layout/USAGE", "rails_generators/pizza_layout/templates/layout.html.haml", "rails_generators/pizza_layout/templates/stylesheet.css", "rails_generators/pizza_layout/templates/_menu.html.haml", "rails_generators/pizza_layout/templates/will_paginate.rb", "rails_generators/pizza_layout/templates/layout.html.erb", "rails_generators/pizza_layout/templates/definition_lists.sass", "rails_generators/pizza_layout/templates/required.png", "rails_generators/pizza_layout/templates/forms.sass", "rails_generators/pizza_layout/templates/layout.sass", "rails_generators/pizza_layout/templates/helper.rb", "rails_generators/pizza_layout/templates/reset.sass", "rails_generators/pizza_layout/templates/application.sass", "rails_generators/pizza_layout/templates/tables.sass", "rails_generators/pizza_layout/pizza_layout_generator.rb", "Manifest", "test/test_pizza_config_generator.rb", "test/test_pizza_authentication_generator.rb", "test/test_pizza_layout_generator.rb", "test/test_pizza_scaffold_generator.rb", "test/test_helper.rb", "README.rdoc", "LICENSE", "tasks/deployment.rake", "CHANGELOG", "TODO"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/pizza_generators.rb", "TODO", "LICENSE", "CHANGELOG", "tasks/deployment.rake"]
+  s.files = ["README.rdoc", "Manifest", "lib/pizza_generators.rb", "TODO", "LICENSE", "test/test_helper.rb", "test/test_pizza_authentication_generator.rb", "test/test_pizza_config_generator.rb", "test/test_pizza_layout_generator.rb", "test/test_pizza_scaffold_generator.rb", "CHANGELOG", "Rakefile", "tasks/deployment.rake", "rails_generators/pizza_scaffold/USAGE", "rails_generators/pizza_scaffold/templates/helper.rb", "rails_generators/pizza_scaffold/templates/fixtures.yml", "rails_generators/pizza_scaffold/templates/actions/edit.rb", "rails_generators/pizza_scaffold/templates/actions/index.rb", "rails_generators/pizza_scaffold/templates/actions/update.rb", "rails_generators/pizza_scaffold/templates/actions/show.rb", "rails_generators/pizza_scaffold/templates/actions/destroy.rb", "rails_generators/pizza_scaffold/templates/actions/create.rb", "rails_generators/pizza_scaffold/templates/actions/new.rb", "rails_generators/pizza_scaffold/templates/migration.rb", "rails_generators/pizza_scaffold/templates/controller.rb", "rails_generators/pizza_scaffold/templates/views/erb/edit.html.erb", "rails_generators/pizza_scaffold/templates/views/erb/index.html.erb", "rails_generators/pizza_scaffold/templates/views/erb/new.html.erb", "rails_generators/pizza_scaffold/templates/views/erb/_form.html.erb", "rails_generators/pizza_scaffold/templates/views/erb/show.html.erb", "rails_generators/pizza_scaffold/templates/views/haml/new.html.haml", "rails_generators/pizza_scaffold/templates/views/haml/_form.html.haml", "rails_generators/pizza_scaffold/templates/views/haml/edit.html.haml", "rails_generators/pizza_scaffold/templates/views/haml/show.html.haml", "rails_generators/pizza_scaffold/templates/views/haml/index.html.haml", "rails_generators/pizza_scaffold/templates/model.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/edit.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/index.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/update.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/show.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/destroy.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/create.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/actions/new.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/controller.rb", "rails_generators/pizza_scaffold/templates/tests/shoulda/model.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/edit.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/index.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/update.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/show.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/destroy.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/create.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/actions/new.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/controller.rb", "rails_generators/pizza_scaffold/templates/tests/rspec/model.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/edit.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/index.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/update.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/show.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/destroy.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/create.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/actions/new.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/controller.rb", "rails_generators/pizza_scaffold/templates/tests/testunit/model.rb", "rails_generators/pizza_scaffold/pizza_scaffold_generator.rb", "rails_generators/pizza_layout/USAGE", "rails_generators/pizza_layout/templates/helper.rb", "rails_generators/pizza_layout/templates/stylesheet.css", "rails_generators/pizza_layout/templates/will_paginate.rb", "rails_generators/pizza_layout/templates/layout.html.erb", "rails_generators/pizza_layout/templates/application.sass", "rails_generators/pizza_layout/templates/layout.sass", "rails_generators/pizza_layout/templates/_menu.html.haml", "rails_generators/pizza_layout/templates/required.png", "rails_generators/pizza_layout/templates/layout.html.haml", "rails_generators/pizza_layout/templates/reset.sass", "rails_generators/pizza_layout/templates/tables.sass", "rails_generators/pizza_layout/templates/forms.sass", "rails_generators/pizza_layout/templates/definition_lists.sass", "rails_generators/pizza_layout/pizza_layout_generator.rb", "rails_generators/pizza_authentication/lib/insert_commands.rb", "rails_generators/pizza_authentication/USAGE", "rails_generators/pizza_authentication/templates/authentication.rb", "rails_generators/pizza_authentication/templates/fixtures.yml", "rails_generators/pizza_authentication/templates/users_controller.rb", "rails_generators/pizza_authentication/templates/session.rb", "rails_generators/pizza_authentication/templates/migration.rb", "rails_generators/pizza_authentication/templates/users_helper.rb", "rails_generators/pizza_authentication/templates/views/erb/login.html.erb", "rails_generators/pizza_authentication/templates/views/erb/signup.html.erb", "rails_generators/pizza_authentication/templates/views/haml/new.html.haml", "rails_generators/pizza_authentication/templates/views/haml/signup.html.haml", "rails_generators/pizza_authentication/templates/views/haml/login.html.haml", "rails_generators/pizza_authentication/templates/views/haml/edit.html.haml", "rails_generators/pizza_authentication/templates/views/haml/show.html.haml", "rails_generators/pizza_authentication/templates/user.rb", "rails_generators/pizza_authentication/templates/sessions_controller.rb", "rails_generators/pizza_authentication/templates/initializer.rb", "rails_generators/pizza_authentication/templates/factories.rb", "rails_generators/pizza_authentication/templates/sessions_helper.rb", "rails_generators/pizza_authentication/templates/tests/shoulda/users_controller.rb", "rails_generators/pizza_authentication/templates/tests/shoulda/user.rb", "rails_generators/pizza_authentication/templates/tests/shoulda/sessions_controller.rb", "rails_generators/pizza_authentication/templates/tests/rspec/users_controller.rb", "rails_generators/pizza_authentication/templates/tests/rspec/user.rb", "rails_generators/pizza_authentication/templates/tests/rspec/sessions_controller.rb", "rails_generators/pizza_authentication/templates/tests/testunit/users_controller.rb", "rails_generators/pizza_authentication/templates/tests/testunit/user.rb", "rails_generators/pizza_authentication/templates/tests/testunit/sessions_controller.rb", "rails_generators/pizza_authentication/pizza_authentication_generator.rb", "rails_generators/pizza_config/USAGE", "rails_generators/pizza_config/templates/config.yml", "rails_generators/pizza_config/templates/load_config.rb", "rails_generators/pizza_config/pizza_config_generator.rb", "pizza-generators.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/iain/pizza-generators}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Pizza-generators", "--main", "README.rdoc"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{pizzagenerators}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{A collection of useful generator scripts for Rails.}
-  s.test_files = ["test/test_pizza_config_generator.rb", "test/test_pizza_authentication_generator.rb", "test/test_pizza_layout_generator.rb", "test/test_pizza_scaffold_generator.rb", "test/test_helper.rb"]
+  s.test_files = ["test/test_helper.rb", "test/test_pizza_authentication_generator.rb", "test/test_pizza_config_generator.rb", "test/test_pizza_layout_generator.rb", "test/test_pizza_scaffold_generator.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -26,28 +26,31 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<authlogic>, [">= 0"])
-      s.add_runtime_dependency(%q<giraffesoft-resource_controller>, [">= 0"])
       s.add_runtime_dependency(%q<mislav-will_paginate>, [">= 0"])
       s.add_runtime_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<rspec-rails>, [">= 0"])
-      s.add_runtime_dependency(%q<mocha>, [">= 0"])
+      s.add_runtime_dependency(%q<rr>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
+      s.add_runtime_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<thoughtbot-factory_girl>, [">= 0"])
     else
       s.add_dependency(%q<authlogic>, [">= 0"])
-      s.add_dependency(%q<giraffesoft-resource_controller>, [">= 0"])
       s.add_dependency(%q<mislav-will_paginate>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<rr>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<thoughtbot-factory_girl>, [">= 0"])
     end
   else
     s.add_dependency(%q<authlogic>, [">= 0"])
-    s.add_dependency(%q<giraffesoft-resource_controller>, [">= 0"])
     s.add_dependency(%q<mislav-will_paginate>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<rr>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<thoughtbot-factory_girl>, [">= 0"])
   end
 end

data/rails_generators/pizza_authentication/pizza_authentication_generator.rb

@@ -1,14 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + "/lib/insert_commands.rb")
 class PizzaAuthenticationGenerator < Rails::Generator::Base
   attr_accessor :user_name, :user_session_name
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
-    
-    @user_name = @args[0] || 'user'
-    @user_session_name = @user_name + '_session'
+
+    @user_name = @args[0] || 'account'
+    @user_session_name = @args[1] || @user_name + '_session'
   end
-  
+
   def manifest
     record do |m|
       m.directory "app/models"
@@ -16,56 +16,64 @@ class PizzaAuthenticationGenerator < Rails::Generator::Base
       m.directory "app/helpers"
       m.directory "app/views"
       m.directory "lib"
-      
+
       m.directory "app/views/#{user_plural_name}"
       m.template "user.rb", "app/models/#{user_singular_name}.rb"
       m.template "users_controller.rb", "app/controllers/#{user_plural_name}_controller.rb"
       m.template "users_helper.rb", "app/helpers/#{user_plural_name}_helper.rb"
       m.template "views/#{view_language}/signup.html.#{view_language}", "app/views/#{user_plural_name}/new.html.#{view_language}"
-      
+
       m.directory "app/views/#{user_session_plural_name}"
       m.template "session.rb", "app/models/#{user_session_singular_name}.rb"
       m.template "sessions_controller.rb", "app/controllers/#{user_session_plural_name}_controller.rb"
+
       m.template "sessions_helper.rb", "app/helpers/#{user_session_plural_name}_helper.rb"
       m.template "views/#{view_language}/login.html.#{view_language}", "app/views/#{user_session_plural_name}/new.html.#{view_language}"
-      
+
       m.template "authentication.rb", "lib/authentication.rb"
       m.migration_template "migration.rb", "db/migrate", :migration_file_name => "create_#{user_plural_name}"
-      
+
       m.route_resources user_plural_name
       m.route_resources user_session_plural_name
       m.route_name :login, 'login', :controller => user_session_plural_name, :action => 'new'
       m.route_name :logout, 'logout', :controller => user_session_plural_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 application_controller, "filter_parameter_logging :password, :password_confirmation"
+      m.insert_into application_controller, 'include Authentication'
+      m.insert_into application_controller, 'unloadable'
+
+      m.directory "app/factories"
+      m.directory "config/initializers"
+      m.file 'initializer.rb', 'config/initializers/factories.rb', :collision => :skip
+      m.template "factories.rb", "app/factories/#{user_plural_name}.rb"
+
       if test_framework == :rspec
         m.directory "spec"
-        m.directory "spec/fixtures"
         m.directory "spec/controllers"
         m.directory "spec/models"
-        m.template "fixtures.yml", "spec/fixtures/#{user_plural_name}.yml"
         m.template "tests/rspec/user.rb", "spec/models/#{user_singular_name}_spec.rb"
         m.template "tests/rspec/users_controller.rb", "spec/controllers/#{user_plural_name}_controller_spec.rb"
         m.template "tests/rspec/sessions_controller.rb", "spec/controllers/#{user_session_plural_name}_controller_spec.rb"
       else
         m.directory "test"
-        m.directory "test/fixtures"
         m.directory "test/functional"
         m.directory "test/unit"
-        m.template "fixtures.yml", "test/fixtures/#{user_plural_name}.yml"
         m.template "tests/#{test_framework}/user.rb", "test/unit/#{user_singular_name}_test.rb"
         m.template "tests/#{test_framework}/users_controller.rb", "test/functional/#{user_plural_name}_controller_test.rb"
         m.template "tests/#{test_framework}/sessions_controller.rb", "test/functional/#{user_session_plural_name}_controller_test.rb"
       end
     end
   end
-  
+
+  def application_controller
+    "app/controllers/#{Rails.version.to_f < 2.3 ? "application" : "application_controller"}.rb"
+  end
+
   def user_singular_name
     user_name.underscore
   end
-  
+
   def user_plural_name
     user_singular_name.pluralize
   end
@@ -73,7 +81,7 @@ class PizzaAuthenticationGenerator < Rails::Generator::Base
   def user_class_name
     user_name.camelize
   end
-  
+
   def user_plural_class_name
     user_plural_name.camelize
   end
@@ -95,15 +103,15 @@ class PizzaAuthenticationGenerator < Rails::Generator::Base
   end
 
 protected
-  
+
   def view_language
     options[:erb] ? 'erb' : 'haml'
   end
-  
+
   def test_framework
     options[:test_framework] ||= File.exist?(destination_path("spec")) ? :rspec : :testunit
   end
-  
+
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
@@ -112,12 +120,12 @@ protected
     opt.on("--shoulda", "Use Shoulda for test files.") { options[:test_framework] = :shoulda }
     opt.on("--erb", "Generate ERB views instead of HAML.") { |v| options[:erb] = true }
   end
-  
+
   def banner
     <<-EOS
 Creates user model and controllers to handle registration and authentication.
 
-USAGE: #{$0} #{spec.name} [user_name] [sessions_controller_name]
+USAGE: #{$0} #{spec.name} [user_name] [session_name]
 EOS
   end
 end

data/rails_generators/pizza_authentication/templates/authentication.rb

@@ -18,26 +18,52 @@ module Authentication
 
   def self.included(controller)
     controller.send :helper_method, :current_<%= user_singular_name %>, :logged_in?, :current_<%= user_session_singular_name %>
+    controller.send :before_filter, :activate_authlogic
+    controller.send :before_filter, :load_<%= user_session_singular_name %>
   end
-  
-  def current_<%= user_singular_name %>
-    return @current_<%= user_singular_name %> if defined?(@current_<%= user_singular_name %>)
-    @current_<%= user_singular_name %> = current_<%= user_session_singular_name %> && current_<%= user_session_singular_name %>.user
+
+  def load_<%= user_session_singular_name %>
+    @<%= user_session_singular_name %> = <%= user_session_class_name %>.find
+    @current_<%= user_singular_name %> = @<%= user_session_singular_name %> && @<%= user_session_singular_name %>.<%= user_singular_name %>
   end
 
   def current_<%= user_session_singular_name %>
-    return @current_<%= user_session_singular_name %> if defined?(@current_<%= user_session_singular_name %>)
-    @current_<%= user_session_singular_name %> = <%= user_session_class_name %>.find
+    @<%= user_session_singular_name %>
   end
-  
+
+  def current_<%= user_singular_name %>
+    @current_<%= user_singular_name %>
+  end
+
   def logged_in?
-    current_<%= user_singular_name %>
+    !!current_<%= user_singular_name %>
   end
-  
+
   def login_required
     unless logged_in?
       flash[:error] = I18n.t("<%= user_session_plural_name %>.login_required")
       redirect_to login_url
     end
   end
+
+  def logout_required
+    if logged_in?
+      flash[:error] = I18n.t("<%= user_session_plural_name %>.logout_required")
+      redirect_to root_url
+    end
+  end
+
+  def activate_authlogic
+    Authlogic::Session::Base.controller = Authlogic::ControllerAdapters::RailsAdapter.new(self)
+  end
+
+  # Uncomment this method when you have an admin and want to filter for it.
+  # def admin_required
+  #   return login_required unless logged_in?
+  #   unless current_<%= user_singular_name %>.admin?
+  #     flash[:error] = I18n.t("<%= user_session_plural_name %>.admin_required")
+  #     redirect_to root_url
+  #   end
+  # end
+
 end

data/rails_generators/pizza_authentication/templates/factories.rb

@@ -0,0 +1,24 @@
+Factory.sequence :<%= user_singular_name %>_login do |n|
+  "user#{n unless n == 1}"
+end
+
+Factory.define :<%= user_singular_name %> do |f|
+  f.login                   { Factory.next(:<%= user_singular_name %>_login) }
+  f.password                { |o| o.login.gsub(/W+/, "_") }
+  f.password_confirmation   { |o| o.password }
+  f.email                   { |o| o.login.gsub(/W+/, "_") + "@test.com" }
+end
+
+# Create factories for additional roles like this:
+# 
+# Factory.sequence :admin_login do |n|
+#   "admin#{n unless n == 1}"
+# end
+#
+# Factory.define :admin, :class => <%= user_class_name %> do |f|
+#   f.login                   { Factory.next(:admin_login) }
+#   f.password                { |o| o.login.gsub(/W+/, "_") }
+#   f.password_confirmation   { |o| o.password }
+#   f.email                   { |o| o.login.gsub(/W+/, "_") + "@test.com" }
+#   f.admin                   true
+# end

data/rails_generators/pizza_authentication/templates/initializer.rb

@@ -0,0 +1,5 @@
+require 'factory_girl'
+
+Dir.glob(RAILS_ROOT+'/app/factories/*.rb') do |file|
+  require file
+end

data/rails_generators/pizza_authentication/templates/migration.rb

@@ -4,11 +4,12 @@ class Create<%= user_plural_class_name %> < ActiveRecord::Migration
 
       # Required database fields
       t.string    :login,                 :null => false
+      t.string    :email,                 :null => false
       t.string    :crypted_password,      :null => false
       t.string    :password_salt,         :null => false
       t.string    :persistence_token,     :null => false
 
-      # Optional tokens, see Authlogic README for more details.
+      # Optional tokens
       # t.string    :single_access_token,   :null => false # or: rss_feed_token
       # t.string    :perishable_token,      :null => false # or: pw_reset_token, activation_token
 
@@ -20,14 +21,23 @@ class Create<%= user_plural_class_name %> < ActiveRecord::Migration
       t.string    :current_login_ip
       t.string    :last_login_ip
 
-      # For activating an account, optional
-      t.boolean   :active,                :null => false, :default => true
+      # Magic states
+      # t.boolean   :active,                :null => false, :default => true
+      # t.boolean   :approved,              :null => false, :default => false
+      # t.boolean   :confirmed,             :null => false, :default => false
 
       t.timestamps
     end
+
+    add_index :<%= user_plural_name %>, :login, :unique => true
+    add_index :<%= user_plural_name %>, :email, :unique => true
+    add_index :<%= user_plural_name %>, :persistence_token
   end
   
   def self.down
-    drop_table :<%= user_plural_name %>
+    remove_index :<%= user_plural_name %>, :login
+    remove_index :<%= user_plural_name %>, :email
+    remove_index :<%= user_plural_name %>, :persistence_token
+    drop_table   :<%= user_plural_name %>
   end
 end

data/rails_generators/pizza_authentication/templates/session.rb

@@ -1,3 +1,4 @@
 class <%= user_session_class_name %> < Authlogic::Session::Base
   extend ActsAsTranslatableModel
+  authenticate_with <%= user_class_name %>
 end