ajax_scaffold_generator 3.1.5 → 3.1.6

data/templates/ajax_scaffold.js

@@ -1,126 +1,126 @@
-/*  
- AjaxScaffoldGenerator version 3.1.0
- (c) 2006 Richard White <rrwhite@gmail.com>
- 
- AjaxScaffoldGenerator is freely distributable under the terms of an MIT-style license.
- 
- For details, see the AjaxScaffoldGenerator web site: http://www.ajaxscaffold.com/
-*/
-
-/*
- * The following is a cross browser way to move around <tr> elements in a <table> or <tbody>
- */
- 
-var Abstract = new Object();
-Abstract.Table = function() {};
-Abstract.Table.prototype = {
-  tagTest: function(element, tagName) {
-    return $(element).tagName.toLowerCase() == tagName.toLowerCase();
-  }		
-};	
-
-Abstract.TableRow = function() {};
-Abstract.TableRow.prototype = Object.extend(new Abstract.Table(), {
-  initialize: function(targetTableRow, sourceTableRow) {
-    try {
-      var sourceTableRow = $(sourceTableRow);
-      var targetTableRow = $(targetTableRow);
-      
-      if (targetTableRow == null || !this.tagTest(targetTableRow,'tr') 
-      	|| sourceTableRow == null || !this.tagTest(sourceTableRow,'tr')) {
-        throw("TableRow: both parameters must be a <tr> tag.");
-      }
-      
-      var tableOrTbody = this.findParentTableOrTbody(targetTableRow);
-      
-      var newRow = tableOrTbody.insertRow(this.getNewRowIndex(targetTableRow) - this.getRowOffset(tableOrTbody));
-      newRow.parentNode.replaceChild(sourceTableRow, newRow);
-
-    } catch (e) {
-      alert(e);
-    }
-  },
-  getRowOffset: function(tableOrTbody) {
-    //If we are inserting into a tablebody we would need figure out the rowIndex of the first
-    // row in that tbody and subtract that offset from the new row index  
-    var rowOffset = 0;
-    if (this.tagTest(tableOrTbody,'tbody')) {
-      rowOffset = tableOrTbody.rows[0].rowIndex;
-    }
-    return rowOffset;
-  },
-  findParentTableOrTbody: function(element) {
-    var element = $(element);
-    // Completely arbitrary value
-    var maxSearchDepth = 3;
-    var currentSearchDepth = 1;
-    var current = element;
-    while (currentSearchDepth <= maxSearchDepth) {
-      current = current.parentNode;
-      if (this.tagTest(current, 'tbody') || this.tagTest(current, 'table')) {
-        return current;
-      }
-      currentSearchDepth++;
-    }
-  }		
-});
-
-var TableRow = new Object();
-
-TableRow.MoveBefore = Class.create();
-TableRow.MoveBefore.prototype = Object.extend(new Abstract.TableRow(), {
-  getNewRowIndex: function(target) {
-    return target.rowIndex;
-  }
-});
-
-TableRow.MoveAfter = Class.create();
-TableRow.MoveAfter.prototype = Object.extend(new Abstract.TableRow(), {
-  getNewRowIndex: function(target) {
-    return target.rowIndex+1;
-  }
-});
-
-/*
- * The following are simple utility methods
- */
- 
-var AjaxScaffold = {  
-  stripe: function(tableBody) {
-    var even = false;
-    var tableBody = $(tableBody);
-    var tableRows = tableBody.getElementsByTagName("tr");
-    var length = tableBody.rows.length;
-      
-    for (var i = 0; i < length; i++) {
-      var tableRow = tableBody.rows[i];
-      //Make sure to skip rows that are create or edit rows or messages
-      if (!Element.hasClassName(tableRow, "create") 
-        && !Element.hasClassName(tableRow, "update")) {
-      	
-        if (even) {
-          Element.addClassName(tableRow, "even");
-        } else {
-          Element.removeClassName(tableRow, "even");
-        }
-        even = !even;
-      }
-    }
-  },
-  displayMessageIfEmpty: function(tableBody, emptyMessageElement) {
-    // Check to see if this was the last element in the list
-    if ($(tableBody).rows.length == 0) {
-      Element.show($(emptyMessageElement));
-    }
-  },
-  removeSortClasses: function(scaffoldId) {
-    $$('#' + scaffoldId + ' td.sorted').each(function(element) {
-      Element.removeClassName(element, "sorted");
-    });
-    $$('#' + scaffoldId + ' th.sorted').each(function(element) {
-      Element.removeClassName(element, "sorted");
-      Element.removeClassName(element, "asc");
-      Element.removeClassName(element, "desc");
-    });
-  }
+/*  
+ AjaxScaffoldGenerator version 3.1.0
+ (c) 2006 Richard White <rrwhite@gmail.com>
+ 
+ AjaxScaffoldGenerator is freely distributable under the terms of an MIT-style license.
+ 
+ For details, see the AjaxScaffoldGenerator web site: http://www.ajaxscaffold.com/
+*/
+
+/*
+ * The following is a cross browser way to move around <tr> elements in a <table> or <tbody>
+ */
+ 
+var Abstract = new Object();
+Abstract.Table = function() {};
+Abstract.Table.prototype = {
+  tagTest: function(element, tagName) {
+    return $(element).tagName.toLowerCase() == tagName.toLowerCase();
+  }		
+};	
+
+Abstract.TableRow = function() {};
+Abstract.TableRow.prototype = Object.extend(new Abstract.Table(), {
+  initialize: function(targetTableRow, sourceTableRow) {
+    try {
+      var sourceTableRow = $(sourceTableRow);
+      var targetTableRow = $(targetTableRow);
+      
+      if (targetTableRow == null || !this.tagTest(targetTableRow,'tr') 
+      	|| sourceTableRow == null || !this.tagTest(sourceTableRow,'tr')) {
+        throw("TableRow: both parameters must be a <tr> tag.");
+      }
+      
+      var tableOrTbody = this.findParentTableOrTbody(targetTableRow);
+      
+      var newRow = tableOrTbody.insertRow(this.getNewRowIndex(targetTableRow) - this.getRowOffset(tableOrTbody));
+      newRow.parentNode.replaceChild(sourceTableRow, newRow);
+
+    } catch (e) {
+      alert(e);
+    }
+  },
+  getRowOffset: function(tableOrTbody) {
+    //If we are inserting into a tablebody we would need figure out the rowIndex of the first
+    // row in that tbody and subtract that offset from the new row index  
+    var rowOffset = 0;
+    if (this.tagTest(tableOrTbody,'tbody')) {
+      rowOffset = tableOrTbody.rows[0].rowIndex;
+    }
+    return rowOffset;
+  },
+  findParentTableOrTbody: function(element) {
+    var element = $(element);
+    // Completely arbitrary value
+    var maxSearchDepth = 3;
+    var currentSearchDepth = 1;
+    var current = element;
+    while (currentSearchDepth <= maxSearchDepth) {
+      current = current.parentNode;
+      if (this.tagTest(current, 'tbody') || this.tagTest(current, 'table')) {
+        return current;
+      }
+      currentSearchDepth++;
+    }
+  }		
+});
+
+var TableRow = new Object();
+
+TableRow.MoveBefore = Class.create();
+TableRow.MoveBefore.prototype = Object.extend(new Abstract.TableRow(), {
+  getNewRowIndex: function(target) {
+    return target.rowIndex;
+  }
+});
+
+TableRow.MoveAfter = Class.create();
+TableRow.MoveAfter.prototype = Object.extend(new Abstract.TableRow(), {
+  getNewRowIndex: function(target) {
+    return target.rowIndex+1;
+  }
+});
+
+/*
+ * The following are simple utility methods
+ */
+ 
+var AjaxScaffold = {  
+  stripe: function(tableBody) {
+    var even = false;
+    var tableBody = $(tableBody);
+    var tableRows = tableBody.getElementsByTagName("tr");
+    var length = tableBody.rows.length;
+      
+    for (var i = 0; i < length; i++) {
+      var tableRow = tableBody.rows[i];
+      //Make sure to skip rows that are create or edit rows or messages
+      if (!Element.hasClassName(tableRow, "create") 
+        && !Element.hasClassName(tableRow, "update")) {
+      	
+        if (even) {
+          Element.addClassName(tableRow, "even");
+        } else {
+          Element.removeClassName(tableRow, "even");
+        }
+        even = !even;
+      }
+    }
+  },
+  displayMessageIfEmpty: function(tableBody, emptyMessageElement) {
+    // Check to see if this was the last element in the list
+    if ($(tableBody).rows.length == 0) {
+      Element.show($(emptyMessageElement));
+    }
+  },
+  removeSortClasses: function(scaffoldId) {
+    $$('#' + scaffoldId + ' td.sorted').each(function(element) {
+      Element.removeClassName(element, "sorted");
+    });
+    $$('#' + scaffoldId + ' th.sorted').each(function(element) {
+      Element.removeClassName(element, "sorted");
+      Element.removeClassName(element, "asc");
+      Element.removeClassName(element, "desc");
+    });
+  }
 }

data/templates/controller.rb

@@ -1,135 +1,135 @@
-class <%= controller_class_name %>Controller < ApplicationController
-  include AjaxScaffold::Controller
-  
-  after_filter :clear_flashes
-  before_filter :update_params_filter
-  
-  def update_params_filter
-    update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => nil, :default_sort_direction => "asc"
-  end
-<% unless suffix -%>
-  def index
-    redirect_to :action => 'list'
-  end
-<% end -%>
-  def return_to_main
-    # If you have multiple scaffolds on the same view then you will want to change this to
-    # to whatever controller/action shows all the views 
-    # (ex: redirect_to :controller => 'AdminConsole', :action => 'index')
-    redirect_to :action => 'list'
-  end
-
-  def list
-  end
-  
-  # All posts to change scaffold level variables like sort values or page changes go through this action
-  def component_update
-    @show_wrapper = false # don't show the outer wrapper elements if we are just updating an existing scaffold 
-    if request.xhr?
-      # If this is an AJAX request then we just want to delegate to the component to rerender itself
-      component
-    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
-      return_to_main
-    end
-  end
-
-  def component  
-    @show_wrapper = true if @show_wrapper.nil?
-    @sort_sql = <%= model_name %>.scaffold_columns_hash[current_sort(params)].sort_sql rescue nil
-    @sort_by = @sort_sql.nil? ? "#{<%= model_name %>.table_name}.#{<%= model_name %>.primary_key} asc" : @sort_sql  + " " + current_sort_direction(params)
-    @paginator, @<%= plural_name %> = paginate(:<%= plural_name %>, :order => @sort_by, :per_page => default_per_page)
-    
-    render :action => "component", :layout => false
-  end
-
-  def new
-    @<%= singular_name %> = <%= model_name %>.new
-    @successful = true
-
-    return render(:action => 'new.rjs') if request.xhr?
-
-    # Javascript disabled fallback
-    if @successful
-      @options = { :action => "create" }
-      render :partial => "new_edit", :layout => true
-    else 
-      return_to_main
-    end
-  end
-  
-  def create
-    begin
-      @<%= singular_name %> = <%= model_name %>.new(params[:<%= singular_name %>])
-      @successful = @<%= singular_name %>.save
-    rescue
-      flash[:error], @successful  = $!.to_s, false
-    end
-    
-    return render(:action => 'create.rjs') if request.xhr?
-    if @successful
-      return_to_main
-    else
-      @options = { :scaffold_id => params[:scaffold_id], :action => "create" }
-      render :partial => 'new_edit', :layout => true
-    end
-  end
-
-  def edit
-    begin
-      @<%= singular_name %> = <%= model_name %>.find(params[:id])
-      @successful = !@<%= singular_name %>.nil?
-    rescue
-      flash[:error], @successful  = $!.to_s, false
-    end
-    
-    return render(:action => 'edit.rjs') if request.xhr?
-
-    if @successful
-      @options = { :scaffold_id => params[:scaffold_id], :action => "update", :id => params[:id] }
-      render :partial => 'new_edit', :layout => true
-    else
-      return_to_main
-    end    
-  end
-
-  def update
-    begin
-      @<%= singular_name %> = <%= model_name %>.find(params[:id])
-      @successful = @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
-    rescue
-      flash[:error], @successful  = $!.to_s, false
-    end
-    
-    return render(:action => 'update.rjs') if request.xhr?
-
-    if @successful
-      return_to_main
-    else
-      @options = { :action => "update" }
-      render :partial => 'new_edit', :layout => true
-    end
-  end
-
-  def destroy
-    begin
-      @successful = <%= model_name %>.find(params[:id]).destroy
-    rescue
-      flash[:error], @successful  = $!.to_s, false
-    end
-    
-    return render(:action => 'destroy.rjs') if request.xhr?
-    
-    # Javascript disabled fallback
-    return_to_main
-  end
-  
-  def cancel
-    @successful = true
-    
-    return render(:action => 'cancel.rjs') if request.xhr?
-    
-    return_to_main
-  end
-end
+class <%= controller_class_name %>Controller < ApplicationController
+  include AjaxScaffold::Controller
+  
+  after_filter :clear_flashes
+  before_filter :update_params_filter
+  
+  def update_params_filter
+    update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => nil, :default_sort_direction => "asc"
+  end
+<% unless suffix -%>
+  def index
+    redirect_to :action => 'list'
+  end
+<% end -%>
+  def return_to_main
+    # If you have multiple scaffolds on the same view then you will want to change this to
+    # to whatever controller/action shows all the views 
+    # (ex: redirect_to :controller => 'AdminConsole', :action => 'index')
+    redirect_to :action => 'list'
+  end
+
+  def list
+  end
+  
+  # All posts to change scaffold level variables like sort values or page changes go through this action
+  def component_update
+    @show_wrapper = false # don't show the outer wrapper elements if we are just updating an existing scaffold 
+    if request.xhr?
+      # If this is an AJAX request then we just want to delegate to the component to rerender itself
+      component
+    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
+      return_to_main
+    end
+  end
+
+  def component  
+    @show_wrapper = true if @show_wrapper.nil?
+    @sort_sql = <%= model_name %>.scaffold_columns_hash[current_sort(params)].sort_sql rescue nil
+    @sort_by = @sort_sql.nil? ? "#{<%= model_name %>.table_name}.#{<%= model_name %>.primary_key} asc" : @sort_sql  + " " + current_sort_direction(params)
+    @paginator, @<%= plural_name %> = paginate(:<%= plural_name %>, :order => @sort_by, :per_page => default_per_page)
+    
+    render :action => "component", :layout => false
+  end
+
+  def new
+    @<%= singular_name %> = <%= model_name %>.new
+    @successful = true
+
+    return render(:action => 'new.rjs') if request.xhr?
+
+    # Javascript disabled fallback
+    if @successful
+      @options = { :action => "create" }
+      render :partial => "new_edit", :layout => true
+    else 
+      return_to_main
+    end
+  end
+  
+  def create
+    begin
+      @<%= singular_name %> = <%= model_name %>.new(params[:<%= singular_name %>])
+      @successful = @<%= singular_name %>.save
+    rescue
+      flash[:error], @successful  = $!.to_s, false
+    end
+    
+    return render(:action => 'create.rjs') if request.xhr?
+    if @successful
+      return_to_main
+    else
+      @options = { :scaffold_id => params[:scaffold_id], :action => "create" }
+      render :partial => 'new_edit', :layout => true
+    end
+  end
+
+  def edit
+    begin
+      @<%= singular_name %> = <%= model_name %>.find(params[:id])
+      @successful = !@<%= singular_name %>.nil?
+    rescue
+      flash[:error], @successful  = $!.to_s, false
+    end
+    
+    return render(:action => 'edit.rjs') if request.xhr?
+
+    if @successful
+      @options = { :scaffold_id => params[:scaffold_id], :action => "update", :id => params[:id] }
+      render :partial => 'new_edit', :layout => true
+    else
+      return_to_main
+    end    
+  end
+
+  def update
+    begin
+      @<%= singular_name %> = <%= model_name %>.find(params[:id])
+      @successful = @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
+    rescue
+      flash[:error], @successful  = $!.to_s, false
+    end
+    
+    return render(:action => 'update.rjs') if request.xhr?
+
+    if @successful
+      return_to_main
+    else
+      @options = { :action => "update" }
+      render :partial => 'new_edit', :layout => true
+    end
+  end
+
+  def destroy
+    begin
+      @successful = <%= model_name %>.find(params[:id]).destroy
+    rescue
+      flash[:error], @successful  = $!.to_s, false
+    end
+    
+    return render(:action => 'destroy.rjs') if request.xhr?
+    
+    # Javascript disabled fallback
+    return_to_main
+  end
+  
+  def cancel
+    @successful = true
+    
+    return render(:action => 'cancel.rjs') if request.xhr?
+    
+    return_to_main
+  end
+end

data/templates/form.rhtml

@@ -1,5 +1,5 @@
 <fieldset>
-	<div class="row">
-		<%= template_for_inclusion %>
-	</div>
+  <div class="row">
+    <%= template_for_inclusion %>
+  </div>
 </fieldset>

data/templates/functional_test.rb

@@ -5,7 +5,7 @@ require '<%= base_controller_file_path %>_controller'
 class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
 
 class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
-  fixtures :<%= table_name %>
+  fixtures :<%= plural_name %>
 
 	NEW_<%= singular_name.upcase %> = {}	# e.g. {:name => 'Test <%= class_name %>', :description => 'Dummy'}
 	REDIRECT_TO_MAIN = {:action => 'list'} # put hash or string redirection that you normally expect
@@ -15,7 +15,7 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
 		@request    = ActionController::TestRequest.new
 		@response   = ActionController::TestResponse.new
 		# Retrieve fixtures via their name
-		# @first = <%= table_name %>(:first)
+		# @first = <%= plural_name %>(:first)
 		@first = <%= class_name %>.find_first
 	end
 
@@ -23,8 +23,8 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
     get :component
     assert_response :success
     assert_template '<%= base_controller_file_path %>/component'
-    <%= table_name %> = check_attrs(%w(<%= table_name %>))
-    assert_equal <%= class_name %>.find(:all).length, <%= table_name %>.length, "Incorrect number of <%= table_name %> shown"
+    <%= plural_name %> = check_attrs(%w(<%= plural_name %>))
+    assert_equal <%= class_name %>.find(:all).length, <%= plural_name %>.length, "Incorrect number of <%= plural_name %> shown"
   end
 
   def test_component_update
@@ -37,8 +37,8 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
     xhr :get, :component_update
     assert_response :success
     assert_template '<%= base_controller_file_path %>/component'
-    <%= table_name %> = check_attrs(%w(<%= table_name %>))
-    assert_equal <%= class_name %>.find(:all).length, <%= table_name %>.length, "Incorrect number of <%= table_name %> shown"
+    <%= plural_name %> = check_attrs(%w(<%= plural_name %>))
+    assert_equal <%= class_name %>.find(:all).length, <%= plural_name %>.length, "Incorrect number of <%= plural_name %> shown"
   end
 
   def test_create