jeffp-wizardly 0.1.5 → 0.1.6

data/README.rdoc

@@ -1,6 +1,6 @@
 = wizardly
 
-+wizardly+ produces a functional wizard from an ActiveRecord model in three steps.
++wizardly+ creates a multi-step wizard for any ActiveRecord model in three steps.
 
 == Resources
 
@@ -14,13 +14,13 @@ Source
 
 Install
 
-* sudo gem install jeffp-wizardly --source=http://gems.github.com
+* sudo gem install jeffp-wizardly --source=http://http://gems.github.com
 	
 == Description
 
 +wizardly+ builds on Alex Kira's +validation_group+ plugin code to 
 DRY up the Rails MVC implementation of a wizard.  In three easy steps, +wizardly+
-produces the scaffolding and controller of a functioning wizard.
+produces the scaffolding and controller of a multi-step wizard.
 
 Features include:
 * Model-based definition
@@ -32,11 +32,15 @@ Features include:
 
 == Setup
 
-Install the wizardly gem and require the gem at the bottom of your config/environment.rb file:
+Put the following in your application's config block in config/environment.rb
 
-  require 'wizardly'
+  config.gem 'jeffp-wizardly', :lib=>'wizardly' 
 
-For any rails app, run the following to install rake tasks (optional)
+and run the install gems rake task on your application
+
+  rake gems:install
+
+For any rails app, run the following to install wizardly rake tasks (optional)
 
   ./script/generate wizardly_app
 
@@ -55,7 +59,7 @@ Step 1: Define validation groups for your model.
 
 Step 2: Tell your controller to act 'wizardly'.
 
-  class SignupController < ActionController::Base
+  class SignupController < ApplicationController
     act_wizardly_for :user
   end
 
@@ -100,16 +104,16 @@ uses the HTTP_REFERER for both cases.  What if there is no referer?  The control
 raises a RedirectNotDefined error.  Let's remedy this problem with some options
 in the macro.
 
-  class SignupController < ActionController::Base
+  class SignupController < ApplicationController
     act_wizardly_for :user, :completed=>'/main/finished', 
-      :canceled=>'/main/canceled'
+      :canceled=>{:controller=>:main, :action=>:canceled}
   end
 
 Now whether the user completes or cancels the wizard, the controller knows
 how to redirect.  Alternately, if you want to redirect to the same page 
 for both cases
 
-  class SignupController < ActionController::Base
+  class SignupController < ApplicationController
     act_wizardly_for :user, :redirect=>'/main'
   end
 
@@ -119,11 +123,11 @@ Here's a list of options you can use in the macro
 
   :completed => '/main/finished'
   :canceled => {:controller=>'main', :action=>'canceled'}
-  :skip => {true|false}
+  :skip => true
   :mask_fields => [:password, :password_confirmation] (by default)
 
-The :skip option tells the scaffold helpers to include or exclude a skip button on every page.  
-The :mask_fields options tells the scaffold generator which fields are html 'password' fields.
+Setting the :skip option to +true+ tells the scaffold helpers to include or exclude a skip button on each page.  
+The :mask_fields options tells the scaffold generator which fields to generate as 'type=password' fields.
 
 === Buttons
 
@@ -131,7 +135,7 @@ The wizardly controller defines five default button functions: next, back, skip,
 cancel, and finish.  All but :skip are used in the scaffolding by default.  You
 can add :skip functionality to all pages by adding an option to the macro
 
-  class SignupController < ActionController::Base
+  class SignupController < ApplicationController
     act_wizardly_for :user, :redirect=>'/main', :skip=>true
   end
 
@@ -147,10 +151,10 @@ for the developer to change the processing.  Here's an example.  Say our model
 declares a :step4 validation_group with :username, :password, and 
 :password_confirmation fields.  We'd like to handle this step specifically.
 
-  class SignupController < ActionController::Base
+  class SignupController < ApplicationController
     act_wizardly_for :user, :redirect=>'/main'
 
-    def on_step4_page_errors
+    def on_invalid_step4_form
       #clear the password field if errors
       @user[:password] = ''
       @user[:password_confirmation] = ''
@@ -162,13 +166,14 @@ validation_group.
 
 Every page has a set of callbacks.  Here's the list for our :step1 page.
 
-  def on_get_step1_page; end    # called just before rendering the GET action
-  def on_step1_page_errors; end # called just before rendering with errors
-  def on_step1_page_next; end   
-  def on_step1_page_back; end
-  def on_step1_page_cancel; end
-  def on_step1_page_finish; end
-  def on_step1_page_skip; end
+  def on_get_step1_form; end    
+  def on_post_step1_form; end
+  def on_invalid_step1_form; end 
+  def on_step1_form_next; end   
+  def on_step1_form_back; end
+  def on_step1_form_cancel; end
+  def on_step1_form_finish; end
+  def on_step1_form_skip; end
 
 Each callback is defined for the controller object, thus giving it access to all
 controller variables and methods just as any other action method.  Each callback
@@ -190,7 +195,7 @@ of the button.  For general use, this is not an issue.  See the Advanced Configu
 For anyone needing to handle rendering in a special way, wizardly provides a render
 call back for this.
 
-  class SignupController < ActionController::Base
+  class SignupController < ApplicationController
     act_wizardly_for :user, :redirect=>'/main'
     
     def render_wizard_page

data/lib/jeffp-wizardly.rb

@@ -0,0 +1 @@
+require 'wizardly'

data/lib/validation_group.rb

@@ -23,13 +23,20 @@ module ValidationGroup
 
       def validation_group(name, options={})
         self_groups = (self.validation_group_classes[self] ||= {})
-        self_groups[name.to_sym] = options[:fields] || []
-        @validation_group_order ||= []
-        @validation_group_order << name.to_sym
+        self_groups[name.to_sym] = case options[:fields]
+				when Array then options[:fields]
+				when Symbol, String then [options[:fields].to_sym]
+				else []
+				end
+        # jeffp: capture the declaration order for this class only (no
+        # superclasses)
+        (@validation_group_order ||= []) << name.to_sym
 
         unless included_modules.include?(InstanceMethods)
+          # jeffp: added reader for current_validation_fields
           attr_reader :current_validation_group, :current_validation_fields
           include InstanceMethods
+          # jeffp: add valid?(group = nil), see definition below
           alias_method_chain :valid?, :validation_group
         end
       end
@@ -47,6 +54,7 @@ module ValidationGroup
         end
         if found
           @current_validation_group = group
+          # jeffp: capture current fields for performance optimization
           @current_validation_fields = group_classes[found][group]
         else
           raise ArgumentError, "No validation group of name :#{group}"
@@ -55,9 +63,13 @@ module ValidationGroup
 
       def disable_validation_group
         @current_validation_group = nil
+        # jeffp: delete fields
         @current_validation_fields = nil
       end
 			
+      # jeffp: optimizer for someone writing custom :validate method -- no need
+      # to validate fields outside the current validation group note: could also
+      # use in validation modules to improve performance
       def should_validate?(attribute)
 	!self.validation_group_enabled? || (@current_validation_fields && @current_validation_fields.include?(attribute.to_sym))
       end
@@ -78,6 +90,7 @@ module ValidationGroup
       def add_with_validation_group(attribute,
           msg = @@default_error_messages[:invalid], *args,
           &block)
+        # jeffp: setting @current_validation_fields and use of should_validate? optimizes code
         add_error = @base.respond_to?(:should_validate?) ? @base.should_validate?(attribute.to_sym) : true
         add_without_validation_group(attribute, msg, *args, &block) if add_error
       end
@@ -106,5 +119,7 @@ module ValidationGroup
   end
 end
 
+# jeffp:  moved from init.rb for gemification purposes -- 
+# require 'validation_group' loads everything now, init.rb requires 'validation_group' only
 ActiveRecord::Base.send(:extend, ValidationGroup::ActiveRecord::ActsMethods)
 ActiveRecord::Errors.send :include, ValidationGroup::ActiveRecord::Errors

data/lib/wizardly/action_controller.rb

@@ -20,7 +20,6 @@ module Wizardly
         
         # controller_name = self.name.sub(/Controller$/, '').underscore.to_sym
         @wizard_config = Wizardly::Wizard::Configuration.create(controller_name, model, opts, &block)
-
         # define methods
         self.class_eval @wizard_config.print_page_action_methods
         self.class_eval @wizard_config.print_callbacks

data/lib/wizardly/wizard.rb

@@ -4,6 +4,7 @@ module Wizardly
   class WizardlyError < StandardError; end
   class ModelNotFoundError < WizardlyError; end
   class ValidationGroupError < WizardlyError; end
+  class CallbackError < WizardlyError; end
   class MissingCallbackError < WizardlyError; end
   class WizardConfigurationError < WizardlyError; end
   class RedirectNotDefinedError < WizardlyError; end

data/lib/wizardly/wizard/configuration.rb

@@ -14,6 +14,7 @@ module Wizardly
         @completed_redirect = opts[:redirect] || opts[:completed] || opts[:when_completed] #format_redirect(completed_redirect)
         @canceled_redirect = opts[:redirect] || opts[:canceled] || opts[:when_canceled]
         @allow_skipping = opts[:skip] || opts[:allow_skip] || opts[:allow_skipping] || false
+        @guard = opts.key?(:guard) ? opts[:guard] : true        
         @password_fields = opts[:mask_fields] || opts[:mask_passwords] || [:password, :password_confirmation]
         @page_order = []
         @pages = {}
@@ -23,7 +24,8 @@ module Wizardly
           @default_buttons[default] = Button.new(default)
         end
       end
-    
+
+      def guard?; @guard; end
       def model; @wizard_model_sym; end
       def model_instance_variable; "@#{@wizard_model_sym.to_s}"; end
       def model_class_name; @wizard_model_class_name; end
@@ -67,18 +69,24 @@ module Wizardly
         begin
           @page_order = @wizard_model_const.validation_group_order 
         rescue Exception => e
-          raise ValidationGroupError, "Is validation_group gem installed? " + e.message, caller
+          raise ValidationGroupError, "Unable to read validation groups from #{@wizard_model_class_name}: " + e.message, caller
         end
         raise(ValidationGroupError, "No validation groups defined for model #{@wizard_model_class_name}", caller) unless (@page_order && !@page_order.empty?)
 
         begin
           groups = @wizard_model_const.validation_groups
+          enum_attrs = @wizard_model_const.respond_to?(:enumerated_attributes) ? @wizard_model_const.enumerated_attributes.collect {|k,v| k } : []
           model_inst = @wizard_model_const.new
           last_index = @page_order.size-1
           @page_order.each_with_index do |p, index|
             fields = groups[p].map do |f|
               column = model_inst.column_for_attribute(f)
-              type = (@password_fields && @password_fields.include?(f)) ? :password : (column ? column.type : :string)
+              type = case
+              when enum_attrs.include?(f) then :enum
+              when (@password_fields && @password_fields.include?(f)) then :password
+              else
+                column ? column.type : :string
+              end
               PageField.new(f, type)
             end
             page = Page.new(p, fields)

data/lib/wizardly/wizard/configuration/methods.rb

@@ -25,52 +25,70 @@ module Wizardly
         next_button = self.button_for_function(:next).id
         (mb = StringIO.new) << <<-ONE
   def #{page.name}
-    @step = :#{id}
-    @wizard = wizard_config
-    @title = '#{page.title}'
-    @description = '#{page.description}'
-    h = (flash[:wizard_model]||{}).merge(params[:#{self.model}] || {}) 
-    @#{self.model} = #{self.model_class_name}.new(h)
-    flash[:wizard_model] = h
-    button_id = check_action_for_button
-    return if performed?
-    if request.get?
-      return if callback_performs_action?(:on_get_#{id}_page)
-      render_wizard_page
-      return
-    end
+    begin
+      @step = :#{id}
+      @wizard = wizard_config
+      @title = '#{page.title}'
+      @description = '#{page.description}'
+      h = (flash[:wizard_model]||{}).merge(params[:#{self.model}] || {}) 
+      @#{self.model} = #{self.model_class_name}.new(h)
+      if request.post? && callback_performs_action?(:on_post_#{id}_form)
+        raise CallbackError, "render or redirect not allowed in :filter_params_#{id}_page callback", caller
+      end
+      button_id = check_action_for_button
+      return if performed?
+      if request.get?
+        return if callback_performs_action?(:on_get_#{id}_form)
+        render_wizard_form
+        return
+      end
 
-    @#{self.model}.enable_validation_group :#{id}
-    unless @#{self.model}.valid?
-      return if callback_performs_action?(:on_#{id}_page_errors)
-      render_wizard_page
-      return
-    end
+      # @#{self.model}.enable_validation_group :#{id}
+      unless @#{self.model}.valid?(:#{id})
+        return if callback_performs_action?(:on_invalid_#{id}_form)
+        render_wizard_form
+        return
+      end
 
         ONE
         if self.last_page?(id)
           mb << <<-TWO
-    return if _on_wizard_#{finish_button}
-    redirect_to #{Utils.formatted_redirect(self.completed_redirect)}
-  end
+      return if callback_performs_action?(:on_#{id}_form_#{finish_button})
+      _on_wizard_#{finish_button}
+      redirect_to #{Utils.formatted_redirect(self.completed_redirect)} unless self.performed?
         TWO
         elsif self.first_page?(id)
           mb << <<-THREE
-    return _on_wizard_#{finish_button} if button_id == :#{finish_button}
-    session[:progression] = [:#{id}]
-    return if callback_performs_action?(:on_#{id}_page_#{next_button})
-    redirect_to :action=>:#{self.next_page(id)}
-  end
+      if button_id == :#{finish_button}
+        return if callback_performs_action?(:on_#{id}_form_#{finish_button})
+        _on_wizard_#{finish_button} if button_id == :#{finish_button}
+        redirect_to #{Utils.formatted_redirect(self.completed_redirect)} unless self.performed?
+        return
+      end
+      session[:progression] = [:#{id}]
+      return if callback_performs_action?(:on_#{id}_form_#{next_button})
+      redirect_to :action=>:#{self.next_page(id)}
         THREE
         else
           mb << <<-FOUR
-    return _on_wizard_#{finish_button} if button_id == :#{finish_button}
-    session[:progression].push(:#{id})
-    return if callback_performs_action?(:on_#{id}_page_#{next_button})
-    redirect_to :action=>:#{self.next_page(id)}
-  end
+      if button_id == :#{finish_button}
+        return if callback_performs_action?(:on_#{id}_form_#{finish_button})
+        _on_wizard_#{finish_button} if button_id == :#{finish_button}
+        redirect_to #{Utils.formatted_redirect(self.completed_redirect)} unless self.performed?
+        return
+      end
+      session[:progression].push(:#{id})
+      return if callback_performs_action?(:on_#{id}_form_#{next_button})
+      redirect_to :action=>:#{self.next_page(id)}
         FOUR
         end
+        
+        mb << <<-ENSURE
+    ensure
+      flash[:wizard_model] = h.merge(@#{self.model}.attributes)    
+    end
+  end        
+ENSURE
         mb.string
       end
 
@@ -83,26 +101,26 @@ module Wizardly
   protected
   def _on_wizard_#{finish}
     @#{self.model}.save_without_validation!
-    flash.discard(:wizard_model)
     _wizard_final_redirect_to(:completed)
   end
   def _on_wizard_#{skip}
-    redirect_to :action=>wizard_config.next_page(@step)
-    true
+    redirect_to(:action=>wizard_config.next_page(@step)) unless self.performed?
   end
   def _on_wizard_#{back}
-    redirect_to :action=>((session[:progression]||[]).pop || :#{self.page_order.first})
-    true
+    # TODO: fix progression management
+    redirect_to(:action=>((session[:progression]||[]).pop || :#{self.page_order.first})) unless self.performed?
   end
   def _on_wizard_#{cancel}
     _wizard_final_redirect_to(:canceled)
-    true
   end
   def _wizard_final_redirect_to(which_redirect) 
+    flash.discard(:wizard_model)
     initial_referer = reset_wizard_session_vars
-    redir = (which_redirect == :completed ? wizard_config.completed_redirect : wizard_config.canceled_redirect) || initial_referer
-    return redirect_to(redir) if redir
-    raise Wizardly::RedirectNotDefinedError, "No redirect was defined for completion or canceling the wizard.  Use :completed and :canceled options to define redirects.", caller
+    unless self.performed?
+      redir = (which_redirect == :completed ? wizard_config.completed_redirect : wizard_config.canceled_redirect) || initial_referer
+      return redirect_to(redir) if redir
+      raise Wizardly::RedirectNotDefinedError, "No redirect was defined for completion or canceling the wizard.  Use :completed and :canceled options to define redirects.", caller
+    end
   end
   hide_action :_on_wizard_#{finish}, :_on_wizard_#{skip}, :_on_wizard_#{back}, :_on_wizard_#{cancel}, :_wizard_final_redirect_to
       CALLBACKS
@@ -112,6 +130,7 @@ module Wizardly
         next_id = self.button_for_function(:next).id
         finish_id = self.button_for_function(:finish).id
         first_page = self.page_order.first
+        guard_line = self.guard? ? '' : 'return #guard entry disabled'
       <<-HELPERS
   protected
   def guard_entry
@@ -123,13 +142,14 @@ module Wizardly
       session[:initial_referer] = nil
     end
     flash.discard(:wizard_model)
+    #{guard_line}
     redirect_to :action=>:#{first_page} unless (params[:action] || '') == '#{first_page}'
   end   
   hide_action :guard_entry
 
-  def render_wizard_page
+  def render_wizard_form
   end
-  hide_action :render_wizard_page
+  hide_action :render_wizard_form
 
   def performed?; super; end
   hide_action :performed?
@@ -140,14 +160,13 @@ module Wizardly
     unless (params[:commit] == nil)
       button_name = methodize_button_name(params[:commit])
       unless [:#{next_id}, :#{finish_id}].include?(button_id = button_name.to_sym)
-        action_method_name = "on_" + params[:action].to_s + "_page_" + button_name
-        unless callback_performs_action?(action_method_name)         
-          method_name = "_on_wizard_" + button_name
-          if (method = self.method(method_name))
-            method.call
-          else
-            raise MissingCallbackError, "Callback method either '" + action_method_name + "' or '" + method_name + "' not defined", caller
-          end
+        action_method_name = "on_" + params[:action].to_s + "_form_" + button_name
+        callback_performs_action?(action_method_name)
+        method_name = "_on_wizard_" + button_name
+        if (self.method(method_name))
+          self.__send__(method_name)
+        else
+          raise MissingCallbackError, "Callback method either '" + action_method_name + "' or '" + method_name + "' not defined", caller
         end
       end
     end
@@ -161,22 +180,12 @@ module Wizardly
     attr_reader :wizard_callbacks
   end
   
-  def callback_performs_action?(methId)
-    wc = self.class.wizard_callbacks
-    case wc[methId]
-    when :none 
-      return false
-    when :found
-    else #nil
-      unless self.class.method_defined?(methId)
-        wc[methId] = :none
-        return false
-      end
-      wc[methId] = :found
-    end
-    self.__send__(methId)
-    return self.performed?
-  end    
+  def callback_performs_action?(methId, arg=nil)
+    return false unless self.methods.include?(methId.to_s)
+    #self.__send__(methId)
+    self.method(methId).call
+    self.performed?
+  end
   hide_action :callback_performs_action?
 
       HELPERS

data/lib/wizardly/wizard/page.rb

@@ -43,6 +43,7 @@ module Wizardly
         @field_type ||= case @column_type
         when :string                      then :text_field
         when :password                    then :password_field
+        when :enum                        then :enum_select
         when :text                        then :text_area
         when :boolean                     then :check_box
         when :integer, :float, :decimal   then :text_field

data/rails_generators/wizardly_app/templates/wizardly.rake

@@ -14,14 +14,18 @@ namespace :wizardly do
           puts
           puts c.print_config
         rescue Exception=>e
-          puts "Problem printing configuration: " + e.message
+          puts "Problem printing configuration."
+          puts "#{e.class.name} -- #{e.message}"
+          puts
         end
-      rescue
-        puts "{#{name}} is not a 'wizardly' controller.\nMake sure 'wizard_for_model' is defined in the controller class."
+      rescue Exception=>e
+        puts "{#{name}} is not a 'wizardly' controller.\nMake sure 'wizard_for_model' is defined in the controller class." 
+        puts "#{e.class.name} -- #{e.message}"
         puts
       end
-    rescue
-      puts "{#{name}} does not reference a controller class"
+    rescue Exception=>e
+      puts "{#{name}} does not reference a controller class."
+      puts "#{e.class.name} -- #{e.message}"
       puts
     end
   end

data/rails_generators/wizardly_app/wizardly_app_generator.rb

@@ -8,7 +8,7 @@ class WizardlyAppGenerator < Rails::Generator::Base
   
   def manifest
     record do |m|
-      m.directory "app/lib/tasks"
+      m.directory "lib/tasks"
       
       m.file "wizardly.rake", "lib/tasks/wizardly.rake"
       

data/rails_generators/wizardly_scaffold/templates/form.html.haml.erb

@@ -0,0 +1,22 @@
+%h1 <%= page.title %>
+
+<% unless page.description.blank? %>
+  %p <%= page.description %>
+<% end %>
+- if flash[:notice]
+  %p{:style=>'color: green'}= flash[:notice]
+
+- form_for :<%= model_name %>, :url=>{:action=>:<%= page.name %>} do |f|
+  = f.error_messages
+  
+<% for field in page.fields %>
+  <% first_field_id ||= "#{model_name}_#{field.name}" %>
+  %p
+    = f.label :<%= field.name %>
+    %br
+    = f.<%= field.field_type %> :<%= field.name %>
+<% end %>
+  %p= wizardly_submit
+
+%script{:type=>'text/javascript'} 
+  document.getElementById('<%=first_field_id %>').focus()

data/rails_generators/wizardly_scaffold/templates/layout.html.haml.erb

@@ -0,0 +1,10 @@
+!!! XML
+!!!
+%html{ :'xml:lang' => "en", :lang => "en" }
+  %head
+    %title= "<%=controller_class_name %>: " + controller.action_name
+    %meta{ :"http-equiv" => "Content-Type", :content => "text/html; charset-utf-8" }
+    %link{ :rel => "shortcut icon", :href => "/favicon.ico" }
+    = stylesheet_link_tag "scaffold", :media => "screen"
+  %body
+    = yield

data/rails_generators/wizardly_scaffold/wizardly_scaffold_generator.rb

@@ -13,10 +13,16 @@ class WizardlyScaffoldGenerator < Rails::Generator::Base
   
   alias_method :controller_file_name, :controller_underscore_name
   
+  def add_options!(opt)
+    opt.on('--haml', 'Generate scaffold for haml wizard') { |v| options[:output] = :haml }
+    opt.on('--ajax', 'Generate scaffold for ajax wizard') { |v| options[:output] = :ajax }
+  end
+  
+  
   def initialize(runtime_args, runtime_options = {})
     super
     name = @args[0].sub(/^:/, '').underscore.sub(/_controller$/, '').camelize + 'Controller'
-    
+
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(name)
     @controller_class_name_without_nesting = base_name.camelize
     @controller_underscore_name = base_name.underscore
@@ -26,7 +32,7 @@ class WizardlyScaffoldGenerator < Rails::Generator::Base
     else
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
-    
+
     begin
       @controller_class = @controller_class_name.constantize 
     rescue Exception => e
@@ -34,15 +40,17 @@ class WizardlyScaffoldGenerator < Rails::Generator::Base
     end
     begin
       @wizard_config = @controller_class.wizard_config
-    rescue
-      raise Wizardly::WizardlyScaffoldError, "#{@controller_class_name} must have a valid 'wizard_for_model' declaration", caller
+    rescue Exception => e
+      raise Wizardly::WizardlyScaffoldError, "#{@controller_class_name} must contain a valid 'act_wizardly_for' or 'wizard_for_model' macro: " + e.message, caller
     end
-    
+
     @pages = @wizard_config.pages
     @model_name = @wizard_config.model
-    
+
     #based on options, default is --html, others --ajax, --haml
-    @view_file_ext = "html.erb"
+    @view_file_ext = ["html.erb", "html.erb"]
+    @view_file_ext = ["html.haml.erb", "html.haml"] if options[:output] == :haml
+    #ajax
   end
   
   def manifest
@@ -56,8 +64,8 @@ class WizardlyScaffoldGenerator < Rails::Generator::Base
 
       pages.each do |id, page|
         m.template(
-          "form.#{view_file_ext}",
-          File.join('app/views', controller_class_path, controller_name, "#{id}.#{view_file_ext}"),
+          "form.#{view_file_ext.first}",
+          File.join('app/views', controller_class_path, controller_name, "#{id}.#{view_file_ext.last}"),
           :assigns=>{:id=>id, :page=>page}
         )
       end
@@ -65,7 +73,7 @@ class WizardlyScaffoldGenerator < Rails::Generator::Base
       m.template("helper.rb.erb", File.join('app/helpers', controller_class_path, "#{controller_name}_helper.rb"))
 
       # Layout and stylesheet.
-      m.template("layout.#{view_file_ext}", File.join('app/views/layouts', controller_class_path, "#{controller_name}.#{view_file_ext}"))
+      m.template("layout.#{view_file_ext.first}", File.join('app/views/layouts', controller_class_path, "#{controller_name}.#{view_file_ext.last}"))
       m.template('style.css', 'public/stylesheets/scaffold.css')
 
       #m.dependency 'model', [name] + @args, :collision => :skip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeffp-wizardly
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jeff Patmon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
+date: 2009-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/generators
+- lib/jeffp-wizardly.rb
 - lib/validation_group.rb
 - lib/wizardly
 - lib/wizardly/action_controller.rb
@@ -51,8 +52,10 @@ files:
 - rails_generators/wizardly_scaffold
 - rails_generators/wizardly_scaffold/templates
 - rails_generators/wizardly_scaffold/templates/form.html.erb
+- rails_generators/wizardly_scaffold/templates/form.html.haml.erb
 - rails_generators/wizardly_scaffold/templates/helper.rb.erb
 - rails_generators/wizardly_scaffold/templates/layout.html.erb
+- rails_generators/wizardly_scaffold/templates/layout.html.haml.erb
 - rails_generators/wizardly_scaffold/templates/style.css
 - rails_generators/wizardly_scaffold/USAGE
 - rails_generators/wizardly_scaffold/wizardly_scaffold_generator.rb