ajax_scaffold_generator 3.0.4 → 3.1.0

data/ajax_scaffold_generator.rb

@@ -5,7 +5,7 @@ class AjaxScaffoldingSandbox < ScaffoldingSandbox
     Proc.new { |record, column| "<div class=\"form-element\">\n  <label for=\"#{record}_#{column.name}\">#{column.human_name}</label>\n  #{input(record, column.name)}\n</div>\n" }
   end
   
-  def all_input_tags(record, record_name, options)
+  def all_input_tags(record, record_name, options) 
     input_block = options[:input_block] || default_input_block
     
     if !options[:exclude].blank?
@@ -49,8 +49,12 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
       
       # Check for class naming collisions.
       m.class_collisions controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest", "#{controller_class_name}Helper"
+      m.class_collisions class_path, class_name, "#{singular_name}Test"
 
-      # Controller, helper, views, and test directories.
+      # Model, controller, helper, views, and test directories.
+      m.directory File.join('app/models', class_path)
+      m.directory File.join('test/unit', class_path)
+      m.directory File.join('test/fixtures', class_path)
       m.directory File.join('app/controllers', controller_class_path)
       m.directory File.join('app/helpers', controller_class_path)
       m.directory File.join('app/views', controller_class_path, controller_file_name)
@@ -58,9 +62,11 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
       m.directory File.join('public/images')
       m.directory File.join('test/functional', controller_class_path)
 
-      # Depend on model generator but skip if the model exists.
-      m.dependency 'model', [singular_name], :collision => :skip, :skip_migration => true
-
+      # Model class, unit test, and fixtures.
+      m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
+      m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
+      m.template 'fixtures.yml',  File.join('test/fixtures', class_path, "#{table_name}.yml")
+      
       # Scaffolded forms.
       m.complex_template 'form.rhtml',
         File.join('app/views',
@@ -129,10 +135,6 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
                   File.join('app/helpers',
                             controller_class_path,
                             "#{controller_file_name}_helper.rb")
-                            
-      m.template 'ajax_scaffold_helper.rb',
-                  File.join('app/helpers',
-                            "ajax_scaffold_helper.rb")
 
       # Layout and stylesheet.
       m.template 'layout.rhtml',
@@ -164,19 +166,15 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
     end
     
     def scaffold_rjs_templates
-      %w( create destroy edit new update )
+      %w( create destroy edit new update cancel )
     end
     
     def scaffold_partials
       %w( form_messages messages column_headings new_edit pagination_links )
     end
-     
-    def scaffold_helpers 
-      %w( helper ajax_scaffold_helper )
-    end
     
     def scaffold_lib
-      %w( ajax_scaffold_util content_column_patch )
+      %w( ajax_scaffold )
     end
 
     def scaffold_images

data/templates/ajax_scaffold.css

@@ -1,5 +1,5 @@
 /*  
- AjaxScaffoldGenerator version 3.0.0
+ AjaxScaffoldGenerator version 3.1.0
  (c) 2006 Richard White <rrwhite@gmail.com>
  
  AjaxScaffoldGenerator is freely distributable under the terms of an MIT-style license.
@@ -16,11 +16,6 @@ margin: 0;
 padding: 0;
 }
 
-.ajax-scaffold a {
-color: #06c;
-text-decoration: none;
-}
-
 .ajax-scaffold {
 margin: 5px 0;
 }
@@ -29,6 +24,15 @@ margin: 5px 0;
 width: 100%;
 }
 
+.ajax-scaffold a {
+color: #06c;
+text-decoration: none;
+}
+
+.ajax-scaffold a:hover {
+background: #ff8;
+}
+
 /* Header Styling
    ======================== */
 
@@ -69,26 +73,55 @@ text-align: right;
 margin-bottom: -3px;
 }
 
+/* Header Styling : Nested
+   ======================== */
+
+.ajax-scaffold .ajax-scaffold {
+margin: 2px 5px;
+}
+
+.ajax-scaffold .ajax-scaffold .ajax-scaffold-header h2 {
+font-size: 13px;
+font-weight: bold;
+}
+
+.ajax-scaffold .ajax-scaffold .ajax-scaffold-header div.actions a {
+font: bold 11px verdana, sans-serif;
+padding: 0 2px 1px 17px;
+}
+
+.ajax-scaffold .ajax-scaffold .ajax-scaffold-header div.actions {
+top: 4px;
+}
+
 /* Table Column Headers
    ============================= */
 
 .ajax-scaffold th {
-font-size: 11px;
-color: #fff;
 background: #555;
-letter-spacing: 0;
-font-family: Arial, sans-serif;
 text-align: left;
 }
 
+.ajax-scaffold th a,
+.ajax-scaffold th p {
+font: bold 11px arial, sans-serif;
+display: block;
+background: #555;
+}
+
 .ajax-scaffold th a {
 color: #fff;
 padding: 2px 15px 2px 5px;
-display: block;
+}
+
+.ajax-scaffold th p {
+color: #eee;
+padding: 2px 5px;
 }
 
 .ajax-scaffold th a:hover {
 background: #000;
+color: #ff8;
 }
 
 .ajax-scaffold th.sorted {
@@ -115,11 +148,11 @@ background: #333 url(/images/indicator-small.gif) right 50% no-repeat;
 
 .ajax-scaffold td {
 padding: 5px 4px;
-border-bottom: solid 1px #C5DBF7;
 color: #333;
 font-family: Verdana, sans-serif;
 font-size: 11px;
 background-color: #E6F2FF;
+border-bottom: solid 1px #C5DBF7;
 border-left: solid 1px #C5DBF7;
 }
 
@@ -133,18 +166,13 @@ border-left: solid 1px #ddd;
 }
 
 .ajax-scaffold tr td.sorted {
-background-color: #ffa;
-border-bottom: solid 1px #ccc;
+background-color: #B9DCFF;
+border-bottom: solid 1px #AFD0F5;
 }
 
 .ajax-scaffold tr.even td.sorted {
-background-color: #ffd;
-border-bottom: solid 1px #ccc;
-}
-
-.ajax-scaffold .update td,
-.ajax-scaffold .create td {
-padding: 4px;
+background-color: #E6F2FF;
+border-bottom: solid 1px #AFD0F5;
 }
 
 .ajax-scaffold td.empty {
@@ -155,44 +183,28 @@ text-align: center;
 /* Table Actions (Edit, Delete) Styling
    ============================= */
 
-.ajax-scaffold td a {
-font: bold 11px verdana, sans-serif;
-letter-spacing: -1px;
-padding: 2px;
-line-height: 16px;
-}
-
-.ajax-scaffold td a:hover {
-background: #ff8;
-}
-
-.ajax-scaffold .update td,
-.ajax-scaffold .create td {
-background: #DAFFCD;
-}
-
-.ajax-scaffold .update td,
-.ajax-scaffold .create td {
-border-left: solid 1px #7FcF00;
-border-bottom: solid 1px #7FcF00;
-border-right: solid 1px #7FcF00;
-}
-
-.ajax-scaffold .actions {
+.ajax-scaffold td.actions {
 padding: 0;
-width: 95px;
+width: 1%;
 }
 
-.ajax-scaffold .actions table {
+.ajax-scaffold td.actions table {
 float: right;
 width: auto;
 margin-right: 5px;
 }
 
-.ajax-scaffold .actions table td {
+.ajax-scaffold td.actions table td {
 border: none;
 text-align: right;
-padding: 0 0 0 2px;
+padding: 0 2px;
+}
+
+.ajax-scaffold td.actions a {
+font: bold 11px verdana, sans-serif;
+letter-spacing: -1px;
+padding: 2px;
+line-height: 16px;
 }
 
 /* ajax-scaffold Footer Styling 
@@ -235,7 +247,8 @@ border-right: solid 1px #ccc;
 /* Messages 
    ========================= */
 
-.ajax-scaffold .messages-container {
+.ajax-scaffold .messages-container,
+.ajax-scaffold .ajax-scaffold .messages-container{
 padding: 0;
 margin: 0 7px;
 border: none;
@@ -356,6 +369,21 @@ margin-bottom: 3px;
 
 /* Form Styling 
    ============================== */
+
+.ajax-scaffold td.update,
+.ajax-scaffold td.create {
+background: #DAFFCD;
+padding: 4px;
+border: solid 1px #7FcF00;
+border-top: none;
+}
+
+.ajax-scaffold .ajax-scaffold td.update,
+.ajax-scaffold .ajax-scaffold td.create {
+background: #ffb;
+border: solid 1px #DDDF37;
+border-top: none;
+}
    
 .ajax-scaffold .submit {
 font-weight: bold;
@@ -389,11 +417,8 @@ letter-spacing: -1px;
 font: bold 16px arial;
 }
 
-.ajax-scaffold .update a,
-.ajax-scaffold .create a {
-font-size: 14px;
-font-weight: bold;
-font-family: Arial, sans-serif;
+.ajax-scaffold p.form-footer a {
+font: bold 14px arial, sans-serif;
 letter-spacing: 0;
 }
 

data/templates/ajax_scaffold.js

@@ -1,5 +1,5 @@
 /*  
- AjaxScaffoldGenerator version 3.0.0
+ AjaxScaffoldGenerator version 3.1.0
  (c) 2006 Richard White <rrwhite@gmail.com>
  
  AjaxScaffoldGenerator is freely distributable under the terms of an MIT-style license.

data/templates/controller.rb

@@ -1,5 +1,5 @@
 class <%= controller_class_name %>Controller < ApplicationController
-  include AjaxScaffoldUtil
+  include AjaxScaffold::Controller
   
   after_filter :clear_flashes
   
@@ -32,15 +32,15 @@ class <%= controller_class_name %>Controller < ApplicationController
     else
       # If this is from a client without javascript we want to update the session parameters and then delegate
       # back to whatever page is displaying the scaffold, which will then rerender all scaffolds with these update parameters
-      update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => "id", :default_sort_direction => "asc"
+      update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => nil, :default_sort_direction => "asc"
       return_to_main
     end
   end
 
   def component
-    update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => "id", :default_sort_direction => "asc"
-    
-    @sort_by = session[params[:scaffold_id]][:sort] + " " + session[params[:scaffold_id]][:sort_direction] 
+    update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => nil, :default_sort_direction => "asc"
+     
+    @sort_by = current_sort(params).nil? ? "<%= plural_name %>.id asc" : <%= model_name %>.scaffold_columns_hash[current_sort(params)].sort_sql  + " " + current_sort_direction(params)
     @paginator, @<%= plural_name %> = paginate(:<%= plural_name %>, :order_by => @sort_by, :per_page => default_per_page)
     
     render :action => "component", :layout => false
@@ -126,4 +126,12 @@ class <%= controller_class_name %>Controller < ApplicationController
     # Javascript disabled fallback
     return_to_main
   end
+  
+  def cancel
+    @successful = true
+    
+    return if request.xhr?
+    
+    return_to_main
+  end
 end

data/templates/fixtures.yml

@@ -0,0 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+first:
+  id: 1
+another:
+  id: 2

data/templates/helper.rb

@@ -1,8 +1,12 @@
 module <%= controller_class_name %>Helper
-  include AjaxScaffoldHelper
+  include AjaxScaffold::Helper
   
   def num_columns
-    <%= model_name %>.content_columns.length + 1 
+    scaffold_columns.length + 1 
+  end
+  
+  def scaffold_columns
+    <%= model_name %>.scaffold_columns
   end
 
 end

data/templates/lib_ajax_scaffold.rb

@@ -0,0 +1,208 @@
+module AjaxScaffold
+
+  class ScaffoldColumn
+   
+    attr_reader :name, :eval, :sort_sql, :label
+    
+    # Only options[:name] is required. It will infer the eval and sort values
+    # based on the given class.    
+    def initialize(klass, options)
+      @name = options[:name]
+      @eval = options[:eval].nil? ?  klass.to_s.downcase + "." + @name : options[:eval]
+      @label = options[:label].nil? ? Inflector.titleize(@name) : options[:label]      
+      @sortable = options[:sortable].nil? ? true : options[:sortable]      
+      @sort_sql = options[:sort_sql].nil? ? Inflector.tableize(klass.to_s) + "." + @name : options[:sort_sql] unless !@sortable
+    end
+    
+    def sortable? 
+      @sortable
+    end
+  
+  end
+  
+  module Model
+    module ClassMethods
+  
+    def build_scaffold_columns
+      scaffold_columns = Array.new
+      content_columns.each do |column|
+        scaffold_columns << ScaffoldColumn.new(self, { :name => column.name })
+      end 
+      scaffold_columns
+    end    
+    
+    def build_scaffold_columns_hash
+      scaffold_columns_hash = Hash.new
+      scaffold_columns.each do |scaffold_column|
+        scaffold_columns_hash[scaffold_column.name] = scaffold_column
+      end
+        scaffold_columns_hash
+      end
+    end
+  end
+
+  module Common
+    def current_sort(params)
+      session[params[:scaffold_id]][:sort]
+    end
+  
+    def current_sort_direction(params)
+      session[params[:scaffold_id]][:sort_direction]
+    end  
+  end 
+  
+  module Controller
+    include AjaxScaffold::Common
+  
+    def default_per_page
+      25
+    end
+ 
+    def clear_flashes 
+    #We want to clear flashes so they don't appear on a page reload
+      if request.xhr? 
+        flash.keys.each do |flash_key|
+          flash[flash_key] = nil
+        end
+      end
+    end
+  
+    def store_or_get_from_session(id_key, value_key)
+      session[id_key][value_key] = params[value_key] if !params[value_key].nil?
+      params[value_key] ||= session[id_key][value_key]
+    end
+  
+    def update_params(options)
+      @scaffold_id = params[:scaffold_id] ||= options[:default_scaffold_id]
+      session[@scaffold_id] ||= {:sort => options[:default_sort], :sort_direction => options[:default_sort_direction], :page => 1}
+    
+      store_or_get_from_session(@scaffold_id, :sort)
+      store_or_get_from_session(@scaffold_id, :sort_direction)
+      store_or_get_from_session(@scaffold_id, :page)
+    end
+    
+  end
+  
+  module Helper
+    include AjaxScaffold::Common
+    
+    def format_column(column_value) 
+      if column_empty?(column_value) 
+        empty_column_text  
+      elsif column_value.instance_of? Time
+        format_time(column_value)
+      elsif column_value.instance_of? Date
+        format_date(column_value)
+      else 
+        column_value.to_s
+      end
+    end
+
+    def format_time(time)
+      time.strftime("%m/%d/%Y %I:%M %p")
+    end 
+  
+    def format_date(date) 
+      date.strftime("%m/%d/%Y")
+    end 
+  
+    def column_empty?(column_value)
+      column_value.nil? || (column_value.empty? rescue false)
+    end
+    
+    def empty_column_text
+      "-"
+    end  
+  
+    # Generates a temporary id for creating a new element
+    def generate_temporary_id
+      (Time.now.to_f*1000).to_i.to_s
+    end 
+  
+    def pagination_ajax_links(paginator, params)
+      pagination_links_each(paginator, {}) do |n|
+        link_to_remote n, 
+           { :url => params.merge(:page => n ),
+           :loading => "Element.show('#{loading_indicator_id(params.merge(:action => 'pagination'))}');",
+           :update => scaffold_content_id(params) },
+           { :href => url_for(params.merge(:page => n )) }
+      end 
+    end
+  
+    def column_sort_direction(column_name, params)
+      column_name && current_sort_direction(params) == "asc" ? "desc" : "asc"
+    end
+  
+    def column_class(column_name, column_value, sort_column)
+      class_name = String.new
+      class_name += "empty " if column_empty?(column_value)
+      class_name += "sorted " if (!sort_column.nil? && column_name == sort_column)
+      class_name
+    end
+  
+    def loading_indicator_tag(options)
+      image_filename = "indicator.gif"
+      "<img src=\"/images/#{image_filename}\" style=\"display: none;\" id=\"#{loading_indicator_id(options)}\" alt=\"loading indicator\" class=\"loading-indicator\" />"
+    end  
+  
+    # The following are a bunch of helper methods to produce the common scaffold view id's
+  
+    def scaffold_content_id(options)
+      "#{options[:scaffold_id]}-content"
+    end
+  
+    def scaffold_column_header_id(options)
+      "#{options[:scaffold_id]}-#{options[:column_name]}"
+    end
+  
+    def scaffold_tbody_id(options)
+      "#{options[:scaffold_id]}-tbody"
+    end
+
+    def scaffold_messages_id(options)
+      "#{options[:scaffold_id]}-messages"
+    end 
+  
+    def empty_message_id(options)
+      "#{options[:scaffold_id]}-empty-message"
+    end 
+  
+    def element_row_id(options)
+      "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}"
+    end
+  
+    def element_cell_id(options)
+      "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-cell"
+    end
+  
+    def element_form_id(options)
+      "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-form"
+    end 
+
+    def loading_indicator_id(options)
+      if options[:id].nil?
+        "#{options[:scaffold_id]}-#{options[:action]}-loading-indicator"
+      else
+        "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-loading-indicator"
+      end
+    end
+
+    def element_messages_id(options)
+      "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-messages"
+    end 
+  end
+end
+
+class ActiveRecord::Base
+  extend AjaxScaffold::Model::ClassMethods
+  
+  @scaffold_columns = nil
+  def self.scaffold_columns
+    @scaffold_columns ||= build_scaffold_columns
+  end
+     
+  @scaffold_columns_hash = nil
+  def self.scaffold_columns_hash
+    @scaffold_columns_hash ||= build_scaffold_columns_hash
+  end
+end

data/templates/model.rb

@@ -0,0 +1,5 @@
+require 'ajax_scaffold'
+
+class <%= class_name %> < ActiveRecord::Base
+
+end

data/templates/partial_column_headings.rhtml

@@ -1,13 +1,17 @@
-      <%% current_sort = session[params[:scaffold_id]][:sort] %>
-      <%% current_sort_direction = session[params[:scaffold_id]][:sort_direction] %>
-      <%% for column in <%= model_name %>.content_columns %>
-        <%% sort_direction = current_sort == column.name && current_sort_direction == "asc" ? "desc" : "asc" %>  
-        <%% sort_params = params.merge(:controller => '<%= controller_file_path %>', :action => 'component_update', :sort => column.name, :sort_direction => sort_direction, :page => 1) %>
-        <th id="<%%= scaffold_column_header_id(sort_params.merge(:column_name => column.name)) %>" <%%= "class=\"sorted #{current_sort_direction}\"" if column.name == current_sort %>>
-          <%%= link_to_remote column.human_name, 
+      <%% for scaffold_column in scaffold_columns %>
+        <%% column_sort_direction = column_sort_direction(scaffold_column.name, params) %>  
+        <%% sort_params = params.merge(:controller => '<%= controller_file_path %>', :action => 'component_update', :sort => scaffold_column.name, :sort_direction => column_sort_direction, :page => 1) %>
+        <%% column_header_id = scaffold_column_header_id(sort_params.merge(:column_name => scaffold_column.name)) %>
+        <th id="<%%= column_header_id %>" <%%= "class=\"sorted #{current_sort_direction(params)}\"" if scaffold_column.name == current_sort(params) %>>
+          <%% if scaffold_column.sortable? %>
+            <%%= link_to_remote scaffold_column.label, 
                 { :url => sort_params,
-                :loading => "Element.addClassName('#{scaffold_column_header_id(sort_params.merge(:column_name => column.name))}','loading');",
+                :loading => "Element.addClassName('#{column_header_id}','loading');",
                 :update => scaffold_content_id(sort_params) },
-                { :href => url_for(sort_params) } %></th>
+                { :href => url_for(sort_params) } %>
+          <%% else %>
+            <p><%%= scaffold_column.label %></p>
+          <%% end %>
+        </th>
       <%% end %>
       <th></th>

data/templates/partial_item.rhtml

@@ -3,10 +3,10 @@
 <%% @options = params.merge(:controller => '<%= controller_file_path %>', :action => "view", :id => <%= singular_name %>.id) %>
 
 <tr <%%= classAttr %> id="<%%= element_row_id(@options) %>" <%%= "style=\"display: none;\"" if hidden %>>
-	<%% for column in <%= model_name %>.content_columns %>
-	  <%% column_value = column_value(<%= singular_name %>, column) %>
-	  <td class="<%%= column_class(column.name, column_value, session[params[:scaffold_id]][:sort]) %>" >
-	    <%%= !column_empty?(column_value) ? column_value : "-" %>
+	<%% for scaffold_column in scaffold_columns %>
+	  <%% column_value = eval(scaffold_column.eval) rescue nil %>
+	  <td class="<%%= column_class(scaffold_column.name, column_value, current_sort(params)) %>" >
+	    <%%= format_column(column_value) %>
 	  </td>
 	<%% end %>
   <td class="actions">

data/templates/partial_new_edit.rhtml

@@ -2,8 +2,8 @@
 <table class="ajax-scaffold" cellpadding="0" cellspacing="0">
   <tbody>
 <%% end %>
-<tr id="<%%= element_row_id(@options) %>" class="<%%= @options[:action] %>" <%%= "style=\"display:none;\"" if request.xhr? %>>
-  <td id="<%%= element_cell_id(@options) %>" colspan="<%%= num_columns %>">
+<tr id="<%%= element_row_id(@options) %>" <%%= "style=\"display:none;\"" if request.xhr? %>>
+  <td id="<%%= element_cell_id(@options) %>" class="<%%= @options[:action] %>" colspan="<%%= num_columns %>">
   
     <%%= form_remote_tag :url => @options.merge(:controller => '<%= controller_file_path %>'), 
     			:loading => "Element.show('#{loading_indicator_id(@options)}');",
@@ -22,17 +22,19 @@
             
       <%%= render :partial => 'form' %>
       
-      <p>
+      <p class="form-footer">
       	<%%= submit_tag Inflector.titleize(@options[:action]), :class => "submit" %>
-      	<%% if request.xhr? %>
-      	  <%% on_cancel = "Element.remove('#{element_row_id(@options)}');" %>
-      	  <%% on_cancel += "Element.show('#{element_row_id(@view_options)}');" if @options[:action] == "update" %>
-      	  <%% on_cancel += "AjaxScaffold.displayMessageIfEmpty('#{scaffold_tbody_id(@options)}','#{empty_message_id(@options)}');" if @options[:action] == "create" %>
-      	<%% end %>
-      	<%%= link_to_function "Cancel", on_cancel,
-	                      :href => url_for(:controller => '<%= controller_file_path %>', :action => 'return_to_main') %>           
+      	<%% cancel_params = @options.merge(:controller => '<%= controller_file_path %>', :action => 'cancel', :referring_action => @options[:action]) %>
+      	<%%= link_to_remote "Cancel",
+      	  { :url => cancel_params,
+      	    :loading => "Element.show('#{loading_indicator_id(@options)}');" },
+	        { :href => url_for(cancel_params) } %>    	                          
       	<%%= loading_indicator_tag @options %>
     	</p>
     <%%= end_form_tag %>
   </td>
 </tr>
+<%% if not request.xhr? %>
+  </tbody>
+</table>
+<%% end %>

data/templates/rjs_cancel.rjs

@@ -0,0 +1,12 @@
+@options = { :scaffold_id => params[:scaffold_id], :action => params[:referring_action], :id => params[:id] }
+
+if @successful
+  page.remove element_row_id(@options)
+  if @options[:action] == "update"
+    page.show element_row_id(@options.merge(:action => "view"))
+  elsif @options[:action] == "create"
+    page << "AjaxScaffold.displayMessageIfEmpty('#{scaffold_tbody_id(@options)}','#{empty_message_id(@options)}');"
+  end
+else
+  page.hide loading_indicator_id(@options)
+end

data/templates/unit_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+
+class <%= class_name %>Test < Test::Unit::TestCase
+  fixtures :<%= table_name %>
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajax_scaffold_generator
 version: !ruby/object:Gem::Version 
-  version: 3.0.4
-date: 2006-04-14 00:00:00 -04:00
+  version: 3.1.0
+date: 2006-04-18 00:00:00 -04:00
 summary: Ajax scaffold generator is a rails generator for ajaxified scaffolds
 require_paths: 
   - lib
@@ -35,11 +35,13 @@ files:
   - templates/warning.gif
   - templates/view_list.rhtml
   - templates/view_component.rhtml
+  - templates/unit_test.rb
   - templates/rjs_update.rjs
   - templates/rjs_new.rjs
   - templates/rjs_edit.rjs
   - templates/rjs_destroy.rjs
   - templates/rjs_create.rjs
+  - templates/rjs_cancel.rjs
   - templates/rico_corner.js
   - templates/partial_pagination_links.rhtml
   - templates/partial_new_edit.rhtml
@@ -47,8 +49,10 @@ files:
   - templates/partial_item.rhtml
   - templates/partial_form_messages.rhtml
   - templates/partial_column_headings.rhtml
+  - templates/model.rb
   - templates/lib_content_column_patch.rb
   - templates/lib_ajax_scaffold_util.rb
+  - templates/lib_ajax_scaffold.rb
   - templates/layout.rhtml
   - templates/information.gif
   - templates/indicator.gif
@@ -57,11 +61,11 @@ files:
   - templates/functional_test.rb
   - templates/form_scaffolding.rhtml
   - templates/form.rhtml
+  - templates/fixtures.yml
   - templates/error.gif
   - templates/controller.rb
   - templates/arrow_up.gif
   - templates/arrow_down.gif
-  - templates/ajax_scaffold_helper.rb
   - templates/ajax_scaffold.js
   - templates/ajax_scaffold.css
   - templates/add.gif

data/templates/ajax_scaffold_helper.rb

@@ -1,99 +0,0 @@
-module AjaxScaffoldHelper
-
-  def column_value(data_object, column)
-    column_value = data_object.send(column.name)
-    
-    if column_value.instance_of? Time
-        column_value = format_time(column_value)
-    elsif column_value.instance_of? Date
-        column_value = format_date(column_value)
-    end
-    
-    column_value
-  end
-
-  def format_time(time)
-    time.strftime("%m/%d/%Y %I:%M %p")
-  end 
-  
-  def format_date(date) 
-    date.strftime("%m/%d/%Y")
-  end 
-  
-  # Generates a temporary id for creating a new element
-  def generate_temporary_id
-    (Time.now.to_f*1000).to_i.to_s
-  end 
-  
-  def pagination_ajax_links(paginator, params)
-    pagination_links_each(paginator, {}) do |n|
-      link_to_remote n, 
-           { :url => params.merge(:page => n ),
-           :update => scaffold_content_id(params) },
-           { :href => url_for(params.merge(:page => n )) }
-    end 
-  end
-  
-  def column_class(column_name, column_value, sort_column)
-    class_name = String.new
-    class_name += "empty " if column_empty?(column_value)
-    class_name += "sorted " if (!sort_column.nil? && column_name == sort_column)
-    class_name
-  end
-  
-  def column_empty?(column_value)
-    column_value.nil? || (column_value.empty? rescue false)
-  end
-  
-  def loading_indicator_tag(options)
-    image_filename = "indicator.gif"
-    "<img src=\"/images/#{image_filename}\" style=\"display: none;\" id=\"#{loading_indicator_id(options)}\" alt=\"loading indicator\" class=\"loading-indicator\" />"
-  end  
-  
-  # The following are a bunch of helper methods to produce the common scaffold view id's
-  
-  def scaffold_content_id(options)
-    "#{options[:scaffold_id]}-content"
-  end
-  
-  def scaffold_column_header_id(options)
-    "#{options[:scaffold_id]}-#{options[:column_name]}"
-  end
-  
-  def scaffold_tbody_id(options)
-    "#{options[:scaffold_id]}-tbody"
-  end
-
-  def scaffold_messages_id(options)
-    "#{options[:scaffold_id]}-messages"
-  end 
-  
-  def empty_message_id(options)
-    "#{options[:scaffold_id]}-empty-message"
-  end 
-  
-  def element_row_id(options)
-    "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}"
-  end
-  
-  def element_cell_id(options)
-    "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-cell"
-  end
-  
-  def element_form_id(options)
-    "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-form"
-  end 
-
-  def loading_indicator_id(options)
-    if options[:id].nil?
-      "#{options[:scaffold_id]}-#{options[:action]}-loading-indicator"
-    else
-      "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-loading-indicator"
-    end
-  end
-
-  def element_messages_id(options)
-    "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-messages"
-  end 
-  
-end