iain-pizza-generators 0.1.3 → 0.1.4

data/Manifest

@@ -9,6 +9,7 @@ test/test_pizza_config_generator.rb
 test/test_pizza_layout_generator.rb
 test/test_pizza_scaffold_generator.rb
 CHANGELOG
+pizza-generators.gemspec
 Rakefile
 tasks/deployment.rake
 rails_generators/pizza_scaffold/USAGE

data/README.rdoc

@@ -29,7 +29,8 @@ Here is what is Pizza compared to Nifty:
 * table_for (from http://github.com/iain/model_based_html)
 * 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
+* Turn of XML respond to blocks by using the <tt>--no-xml</tt> option
+* Scaffolded RSpec actions are Heckle proof. A lot of tests, using the Shoulda matchers.
 
 ===== pizza_layout
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('pizza-generators', '0.1.3') do |p|
+Echoe.new('pizza-generators', '0.1.4') do |p|
   p.project        = "pizzagenerators"
   p.description    = "A collection of useful generator scripts for Rails."
   p.url            = "http://github.com/iain/pizza-generators"

data/pizza-generators.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pizza-generators}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
-  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.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-04-21}
   s.description = %q{A collection of useful generator scripts for Rails.}
   s.email = %q{iain@iain.nl}
   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.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", "pizza-generators.gemspec", "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"]
   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"]

data/rails_generators/pizza_authentication/templates/authentication.rb

@@ -4,66 +4,75 @@
 # 
 #   <%% if logged_in? %>
 #     Welcome <%%= current_<%= user_singular_name %>.login %>! Not you?
-#     <%%= link_to "Log out", logout_path %>
+#     <%%= link_to "Sign out", signout_path %>
 #   <%% else %>
 #     <%%= link_to "Sign up", signup_path %> or
-#     <%%= link_to "log in", login_path %>.
+#     <%%= link_to "Sign in", signin_path %>.
 #   <%% end %>
 # 
 # You can also restrict unregistered users from accessing a controller using
 # a before filter. For example.
 # 
-#   before_filter :login_required, :except => [:index, :show]
+#   before_filter :require_<%= user_singular_name %>, :except => [:index, :show]
 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
+  private
 
-  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 %>
+  def self.included(controller)
+    controller.before_filter :require_<%= user_singular_name %>
+    controller.filter_parameter_logging :password, :password_confirmation
+    controller.helper_method :current_<%= user_session_singular_name %>, :current_<%= user_singular_name %>, :signed_in?
   end
 
   def current_<%= user_session_singular_name %>
-    @<%= 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
   end
 
   def current_<%= user_singular_name %>
-    @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_singular_name %>
   end
 
-  def logged_in?
+  def signed_in?
     !!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
+  def require_<%= user_singular_name %>
+    unless current_<%= user_singular_name %>
+      store_location
+      set_require_<%= user_singular_name %>_flash
+      redirect_to signin_url
+      return false
     end
   end
 
-  def logout_required
-    if logged_in?
-      flash[:error] = I18n.t("<%= user_session_plural_name %>.logout_required")
-      redirect_to root_url
+  def require_no_<%= user_singular_name %>
+    if current_<%= user_singular_name %>
+      store_location
+      flash[:warn] = t(:require_no_<%= user_singular_name %>)
+      redirect_to <%= user_singular_name %>_url
+      return false
     end
   end
 
-  def activate_authlogic
-    Authlogic::Session::Base.controller = Authlogic::ControllerAdapters::RailsAdapter.new(self)
+  def store_location
+    session[:return_to] = request.request_uri
   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
+  # Only to be used by UserSessionsController and UsersController
+  def redirect_back_or_default(default)
+    redirect_to(session[:return_to] || default)
+    session[:return_to] = nil
+  end
+
+  # Only when there are no other flash messages to be set
+  def set_require_<%= user_singular_name %>_flash
+    if flash.now.instance_variable_get(:@flash).blank?
+      flash[:info] = t(:require_<%= user_singular_name %>)
+    else
+      flash.keep
+    end
+  end
 
 end

data/rails_generators/pizza_authentication/templates/session.rb

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

data/rails_generators/pizza_authentication/templates/sessions_controller.rb

@@ -1,7 +1,8 @@
-class <%= user_session_plural_class_name %>Controller < ApplicationController
+class <%= user_session_plural_class_name %> < ApplicationController
 
-  before_filter :login_required,  :only   => :destroy
-  before_filter :logout_required, :except => :destroy
+  skip_before_filter :require_<%= user_singular_name %>, :only => [:new, :create]
+  before_filter :require_no_<%= user_singular_name %>, :only => [:new, :create]
+  before_filter :require_<%= user_singular_name %>, :only => :destroy
 
   def new
     @<%= user_session_singular_name %> = <%= user_session_class_name %>.new
@@ -10,17 +11,25 @@ class <%= user_session_plural_class_name %>Controller < ApplicationController
   def create
     @<%= user_session_singular_name %> = <%= user_session_class_name %>.new(params[:<%= user_session_singular_name %>])
     if @<%= user_session_singular_name %>.save
-      flash[:notice] = t(:success)
-      redirect_to root_url
+      set_flash
+      redirect_back_or_default root_url
     else
-      render :action => 'new'
+      failed_sign_in_flash
+      render :new
     end
   end
 
   def destroy
     current_<%= user_session_singular_name %>.destroy
-    flash[:notice] = t(:success)
-    redirect_to root_url
+    set_flash
+    redirect_back_or_default root_url
+  end
+
+  private
+
+  def failed_sign_in_flash
+    @<%= user_session_singular_name %>.errors.clear
+    set_flash_now :error, :failed
   end
 
 end

data/rails_generators/pizza_authentication/templates/user.rb

@@ -1,18 +1,17 @@
 class <%= user_class_name %> < ActiveRecord::Base
-  acts_as_authentic :session_class => "<%= user_session_class_name %>"
 
-  attr_accessible :login, :email, :password, :password_confirmation, :old_password
+  acts_as_authentic
 
-  validate_on_update :old_password_entered
+  attr_accessor :current_password
+  attr_accessible :login, :email, :password, :password_confirmation, :current_password
 
-  def login=(str)
-    write_attribute(:login, str) if new_record?
-  end
+  validate_on_update :require_current_password
 
   private
 
-  def old_password_entered
-    
+  def require_current_password
+    us = <%= user_session_class_name %>.new(:login => login, :password => current_password)
+    errors.add(:current_password) unless us.valid?
   end
 
 end

data/rails_generators/pizza_authentication/templates/users_controller.rb

@@ -1,7 +1,7 @@
 class <%= user_plural_class_name %>Controller < ApplicationController
 
-  before_filter :logout_required, :only => [ :new, :create ]
-  before_filter :login_required,  :only => [ :show, :edit, :update ]
+  before_filter :require_no_<%= user_singular_name %>, :only => [:new, :create]
+  before_filter :require_<%= user_singular_name %>,    :only => [:show, :edit, :update]
 
   def new
     @<%= user_singular_name %> = <%= user_class_name %>.new
@@ -10,15 +10,15 @@ class <%= user_plural_class_name %>Controller < ApplicationController
   def create
     @<%= user_singular_name %> = <%= user_class_name %>.new(params[:<%= user_singular_name %>])
     if @<%= user_singular_name %>.save
-      flash[:notice] = t(:success)
-      redirect_to <%= user_singular_name %>_url
+      set_flash
+      redirect_back_or_default <%= user_singular_name %>_url
     else
-      render :action => 'new'
+      render :new
     end
   end
 
   def show
-    @<%= user_singular_name %> = current_<%= user_singular_name %>
+    edit and render :edit
   end
 
   def edit
@@ -28,10 +28,10 @@ class <%= user_plural_class_name %>Controller < ApplicationController
   def update
     @<%= user_singular_name %> = current_<%= user_singular_name %>
     if @<%= user_singular_name %>.update_attributes(params[:<%= user_singular_name %>])
-      flash[:notice] = t(:success)
+      set_flash
       redirect_to <%= user_singular_name %>_url
     else
-      render :action => 'new'
+      render :edit
     end
   end
 

data/rails_generators/pizza_authentication/templates/views/haml/edit.html.haml

@@ -1,21 +1,12 @@
-- title t(:title)
 
 - form_for @<%= user_singular_name %> do |f|
-  = f.error_messages
-  - f.fieldset do
-    - f.required_field :email
-    - f.field do
-      = f.required :old_password
-      = f.password_field :old_password
-    - f.field do
-      = f.label :password
-      = f.password_field :password
-    - f.field do
-      = f.label :password_confirmation
-      = f.password_field :password_confirmation
+
+  = f.fieldset do
+    - f.field :login
+    - f.field :email
+    - f.field :current_password
+    - f.field :password
+    - f.field :password_confirmation
     - f.field do
       %label &nbsp;
       = f.submit t(:submit)
-
-%ol.actions
-  %li.show= link_to t(:show), <%= user_singular_name %>_path

data/rails_generators/pizza_authentication/templates/views/haml/login.html.haml

@@ -1,15 +1,12 @@
 - title t(:title)
 
 - form_for @<%= user_session_singular_name %>, :url => <%= user_session_singular_name %>_path do |f|
-  = f.error_messages
-  - f.fieldset do
-    - f.required_field :login
-    - f.field do
-      = f.required :password
-      = f.password_field :password
+
+  = f.fieldset do
+    - f.field :login
+    - f.field :password
     - f.field do
       %label &nbsp;
       = f.submit t(:submit)
-
-%ol.actions
-  %li.signup= link_to t(:signup), signup_path
+      &nbsp;
+      = link_to title(:new, :users), new_user_path

data/rails_generators/pizza_authentication/templates/views/haml/new.html.haml

@@ -1,19 +1,10 @@
-- title t(:title)
-
 - form_for @<%= user_singular_name %> do |f|
-  = f.error_messages
-  - f.fieldset do
-    - f.required_field :login
-    - f.required_field :email
-    - f.field do
-      = f.required :password
-      = f.password_field :password
-    - f.field do
-      = f.required :password_confirmation
-      = f.password_field :password_confirmation
+
+  = f.fieldset do
+    - f.field :login
+    - f.field :email
+    - f.field :password
+    - f.field :password_confirmation
     - f.field do
       %label &nbsp;
-      = f.submit t(:submit)
-
-%ol.actions
-  %li.login= link_to t(:login), login_path
+      = f.submit t(:signup)

data/rails_generators/pizza_authentication/templates/views/haml/show.html.haml

@@ -1,5 +1,3 @@
-- title t(:title)
-
 - definition_list_for @<%= user_singular_name %> do |dl|
   - dl.show_h :login
   - dl.show_h :email

data/rails_generators/pizza_scaffold/pizza_scaffold_generator.rb

@@ -39,7 +39,7 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
       end
     end
   end
-  
+
   def manifest
     record do |m|
       unless options[:skip_model]
@@ -48,7 +48,7 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
         unless options[:skip_migration]
           m.migration_template "migration.rb", "db/migrate", :migration_file_name => "create_#{plural_name}"
         end
-        
+
         if rspec?
           m.directory "spec/models"
           m.template "tests/#{test_framework}/model.rb", "spec/models/#{singular_name}_spec.rb"
@@ -61,27 +61,27 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
           m.template "fixtures.yml", "test/fixtures/#{plural_name}.yml"
         end
       end
-      
+
       unless options[:skip_controller]
         m.directory "app/controllers"
         m.template "controller.rb", "app/controllers/#{plural_name}_controller.rb"
-        
+
         m.directory "app/helpers"
         m.template "helper.rb", "app/helpers/#{plural_name}_helper.rb"
-        
+
         m.directory "app/views/#{plural_name}"
         controller_actions.each do |action|
           if File.exist? source_path("views/#{view_language}/#{action}.html.#{view_language}")
             m.template "views/#{view_language}/#{action}.html.#{view_language}", "app/views/#{plural_name}/#{action}.html.#{view_language}"
           end
         end
-      
+
         if form_partial?
           m.template "views/#{view_language}/_form.html.#{view_language}", "app/views/#{plural_name}/_form.html.#{view_language}"
         end
-      
+
         m.route_resources plural_name
-        
+
         if rspec?
           m.directory "spec/controllers"
           m.template "tests/#{test_framework}/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
@@ -92,11 +92,11 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
       end
     end
   end
-  
+
   def form_partial?
     actions? :new, :edit
   end
-  
+
   def all_actions
     %w[index show new create edit update destroy]
   end
@@ -104,27 +104,27 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
   def not_used_actions
     all_actions - controller_actions.map(&:to_s)
   end
-  
+
   def action?(name)
     controller_actions.include? name.to_s
   end
-  
+
   def actions?(*names)
     names.all? { |n| action? n.to_s }
   end
-  
+
   def singular_name
     name.underscore
   end
-  
+
   def plural_name
     name.underscore.pluralize
   end
-  
+
   def class_name
     name.camelize
   end
-  
+
   def plural_class_name
     plural_name.camelize
   end
@@ -132,13 +132,13 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
   def table_link_count
     (controller_actions - %w[new index update create]).size
   end
-  
+
   def controller_methods(dir_name)
     controller_actions.map do |action|
       read_template("#{dir_name}/#{action}.rb")
     end.join("\n").strip
   end
-  
+
   def render_form
     if form_partial?
       if options[:erb]
@@ -150,7 +150,7 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
       read_template("views/#{view_language}/_form.html.#{view_language}")
     end
   end
-  
+
   def item_path(suffix = 'path')
     if action? :show
       "@#{singular_name}"
@@ -158,7 +158,7 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
       "#{plural_name}_#{suffix}"
     end
   end
-  
+
   def item_path_for_spec(suffix = 'path')
     if action? :show
       "#{singular_name}_#{suffix}(assigns[:#{singular_name}])"
@@ -166,7 +166,7 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
       "#{plural_name}_#{suffix}"
     end
   end
-  
+
   def item_path_for_test(suffix = 'path')
     if action? :show
       "#{singular_name}_#{suffix}(assigns(:#{singular_name}))"
@@ -174,17 +174,21 @@ class PizzaScaffoldGenerator < Rails::Generator::Base
       "#{plural_name}_#{suffix}"
     end
   end
-  
+
   def model_columns_for_attributes
     class_name.constantize.columns.reject do |column|
       column.name.to_s =~ /^(id|created_at|updated_at)$/
     end
   end
-  
+
   def rspec?
     test_framework == :rspec
   end
-  
+
+  def xml?
+    !options[:no_xml]
+  end
+
 protected
   
   def view_language
@@ -211,6 +215,7 @@ protected
     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 Shoulda for test files.") { options[:test_framework] = :shoulda }
+    opt.on("--no-xml", "Don't generate XML responses in actions.") { |v| options[:no_xml] = v }
   end
   
   # is there a better way to do this? Perhaps with const_defined?

data/rails_generators/pizza_scaffold/templates/actions/create.rb

@@ -1,16 +1,29 @@
   # POST /<%= plural_name %>
+  <%- if xml? -%>
   # POST /<%= plural_name %>.xml
+  <%- end -%>
   def create
     @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
 
+    <%- if xml? -%>
     respond_to do |format|
       if @<%= singular_name %>.save
-        flash[:notice] = '<%= class_name.titleize %> was successfully created.'
+        set_flash
         format.html { redirect_to(<%= item_path('url') %>) }
         format.xml  { render :xml => @<%= singular_name %>, :status => :created, :location => @<%= singular_name %> }
       else
+        set_flash_now :error, :failed
         format.html { render :new }
         format.xml  { render :xml => @<%= singular_name %>.errors, :status => :unprocessable_entity }
       end
     end
+    <%- else -%>
+    if @<%= singular_name %>.save
+      set_flash
+      redirect_to(<%= item_path('url') %>)
+    else
+      set_flash_now :error, :failed
+      render :new
+    end
+    <%- end -%>
   end

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

@@ -1,11 +1,29 @@
   # DELETE /<%= plural_name %>/1
+  <%- if xml? -%>
   # DELETE /<%= plural_name %>/1.xml
+  <%- end -%>
   def destroy
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
-    @<%= singular_name %>.destroy
 
+    <%- if xml? -%>
     respond_to do |format|
-      format.html { redirect_to(<%= plural_name %>_url) }
-      format.xml  { head :ok }
+      if @<%= singular_name %>.destroy
+        set_flash
+        format.html { redirect_to <%= plural_name %>_url }
+        format.xml  { head :ok }
+      else
+        set_flash :error, :failed
+        format.html { redirect_to :back }
+        format.xml  { head :ok }
+      end
     end
+    <%- else -%>
+    if @<%= singular_name %>.destroy
+      set_flash
+      redirect_to <%= plural_name %>_url
+    else
+      set_flash :error, :failed
+      redirect_to :back
+    end
+    <%- end -%>
   end

data/rails_generators/pizza_scaffold/templates/actions/index.rb

@@ -1,10 +1,14 @@
   # GET /<%= plural_name %>
+  <%- if xml? -%>
   # GET /<%= plural_name %>.xml
+  <%- end -%>
   def index
     @<%= plural_name %> = <%= class_name %>.paginate(:page => params[:page])
+    <%- if xml? -%>
 
     respond_to do |format|
       format.html # index.html.<%= view_language %>
       format.xml  { render :xml => @<%= plural_name %> }
     end
+    <%- end -%>
   end

data/rails_generators/pizza_scaffold/templates/actions/new.rb

@@ -1,10 +1,14 @@
   # GET /<%= plural_name %>/new
+  <%- if xml? -%>
   # GET /<%= plural_name %>/new.xml
+  <%- end -%>
   def new
     @<%= singular_name %> = <%= class_name %>.new
+    <%- if xml? -%>
 
     respond_to do |format|
       format.html # new.html.<%= view_language %>
       format.xml  { render :xml => @<%= singular_name %> }
     end
+    <%- end -%>
   end

data/rails_generators/pizza_scaffold/templates/actions/show.rb

@@ -1,10 +1,14 @@
   # GET /<%= plural_name %>/1
+  <%- if xml? -%>
   # GET /<%= plural_name %>/1.xml
+  <%- end -%>
   def show
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
+    <%- if xml? -%>
 
     respond_to do |format|
       format.html # show.html.<%= view_language %>
       format.xml  { render :xml => @<%= singular_name %> }
     end
+    <%- end -%>
   end

data/rails_generators/pizza_scaffold/templates/actions/update.rb

@@ -1,16 +1,29 @@
   # PUT /<%= plural_name %>/1
+  <%- if xml? -%>
   # PUT /<%= plural_name %>/1.xml
+  <%- end -%>
   def update
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
 
+    <%- if xml? -%>
     respond_to do |format|
       if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
-        flash[:notice] = '<%= class_name.titleize %> was successfully updated.'
+        set_flash
         format.html { redirect_to(<%= item_path('url') %>) }
         format.xml  { head :ok }
       else
+        set_flash_now :error, :failed
         format.html { render :edit }
         format.xml  { render :xml => @<%= singular_name %>.errors, :status => :unprocessable_entity }
       end
     end
+    <%- else -%>
+    if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
+      set_flash
+      redirect_to <%= item_path('url') %>
+    else
+      set_flash_now :error, :failed
+      render :edit
+    end
+    <%- end -%>
   end

data/rails_generators/pizza_scaffold/templates/model.rb

@@ -1,21 +1,2 @@
 class <%= class_name %> < ActiveRecord::Base
-
-  # Default validations:
-  exclude_validations = %w{id created_at updated_at}
-  columns.each do |column|
-    unless exclude_validations.include?(column.name)
-      validates_presence_of column.name unless column.null
-      validates_numericality_of column.name, :allow_blank => column.null if column.number?
-      validates_length_of column.name, :maximum => column.limit, :allow_blank => column.null if column.limit
-    end
-  end
-
-  <%- (attrs = attributes.select{|it|it.name =~ /_id$/}).each_with_index do |a, index| -%>
-  <%- if index == 0 -%>
-  # Only belongs_to can be guessed, uncomment if correct and don't forget to
-  # define has_many on the other side of the relation.
-  <%- end -%>
-  # belongs_to :<%= a.name.sub(/_id$/,'') %><%= ", :polymorphic => true" unless attributes.select{|it|it.name==a.name.sub(/_id$/, '_type')}.empty? %><%= ", :counter_cache => true" unless attributes.select{|it|it.name==a.name.sub(/_id$/, '_count')}.empty? %>
-  <%- end -%>
-
 end

data/rails_generators/pizza_scaffold/templates/views/haml/_form.html.haml

@@ -6,4 +6,5 @@
     - f.field :<%= attribute.name %>
     <%- end -%>
     - f.field do
+      = empty_label
       = f.submit t(:submit)

data/rails_generators/pizza_scaffold/templates/views/haml/edit.html.haml

@@ -1,3 +1,5 @@
+%h2= title
+
 <%= render_form %>
 
 <%- if actions? :show, :index -%>

data/rails_generators/pizza_scaffold/templates/views/haml/index.html.haml

@@ -1,3 +1,5 @@
+%h2= title
+
 - table_for @<%= plural_name %> do |t|
 
   - t.head do

data/rails_generators/pizza_scaffold/templates/views/haml/new.html.haml

@@ -1,3 +1,5 @@
+%h2= title
+
 <%= render_form %>
 
 <%- if action? :index -%>

data/rails_generators/pizza_scaffold/templates/views/haml/show.html.haml

@@ -1,3 +1,5 @@
+%h2= title
+
 - definition_list_for @<%= singular_name %> do |dl|
   <%- for attribute in attributes -%>
   - dl.show_h :<%= attribute.name %>

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: iain-pizza-generators
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
-- Ryan Bates
-- Iain Hecker
+- Ryan Bates, Iain Hecker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-17 00:00:00 -07:00
+date: 2009-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +117,7 @@ files:
 - test/test_pizza_layout_generator.rb
 - test/test_pizza_scaffold_generator.rb
 - CHANGELOG
+- pizza-generators.gemspec
 - Rakefile
 - tasks/deployment.rake
 - rails_generators/pizza_scaffold/USAGE
@@ -220,7 +220,6 @@ files:
 - 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
 has_rdoc: true
 homepage: http://github.com/iain/pizza-generators
 post_install_message: 
@@ -243,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.3"
+      version: "1.2"
   version: 
 requirements: []