ajax_scaffold_generator 3.1.4 → 3.1.5

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/functional_test.rb

@@ -1,116 +1,120 @@
-require File.dirname(__FILE__) + '<%= "/.." * controller_class_nesting_depth %>/../test_helper'
-require '<%= base_controller_file_path %>_controller'
-
-# Re-raise errors caught by the 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 %>
-
-	NEW_<%= class_name.upcase %> = {}	# e.g. {:name => 'Test <%= class_name %>', :description => 'Dummy'}
-	REDIRECT_TO_MAIN = {:action => 'list'} # put hash or string redirection that you normally expect
-
-	def setup
-		@controller = <%= controller_class_name %>Controller.new
-		@request    = ActionController::TestRequest.new
-		@response   = ActionController::TestResponse.new
-		# Retrieve fixtures via their name
-		# @first = <%= table_name %>(:first)
-		@first = <%= class_name %>.find_first
-	end
-
-  def test_component
-    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"
-  end
-
-  def test_component_update
-    get :component_update
-    assert_response :redirect
-    assert_redirected_to REDIRECT_TO_MAIN
-  end
-
-  def test_component_update_xhr
-    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"
-  end
-
-  def test_create
-  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
-    post :create, {:<%= class_name.upcase.swapcase %> => NEW_<%= class_name.upcase %>}
-    <%= class_name.upcase.swapcase %> = check_attrs(%w(<%= class_name.upcase.swapcase %>))
-    assert_response :redirect
-    assert_redirected_to REDIRECT_TO_MAIN
-    assert_equal <%= class_name.upcase.swapcase %>_count + 1, <%= class_name %>.find(:all).length, "Expected an additional <%= class_name %>"
-  end
-
-  def test_create_xhr
-  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
-    xhr :post, :create, {:<%= class_name.upcase.swapcase %> => NEW_<%= class_name.upcase %>}
-    <%= class_name.upcase.swapcase %> = check_attrs(%w(<%= class_name.upcase.swapcase %>))
-    assert_response :success
-    assert_template 'create.rjs'
-    assert_equal <%= class_name.upcase.swapcase %>_count + 1, <%= class_name %>.find(:all).length, "Expected an additional <%= class_name %>"
-  end
-
-  def test_update
-  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
-    post :update, {:id => @first.id, :<%= class_name.upcase.swapcase %> => @first.attributes.merge(NEW_<%= class_name.upcase %>)}
-    <%= class_name.upcase.swapcase %> = check_attrs(%w(<%= class_name.upcase.swapcase %>))
-    <%= class_name.upcase.swapcase %>.reload
-   	NEW_<%= class_name.upcase %>.each do |attr_name|
-      assert_equal NEW_<%= class_name.upcase %>[attr_name], <%= class_name.upcase.swapcase %>.attributes[attr_name], "@<%= class_name.upcase.swapcase %>.#{attr_name.to_s} incorrect"
-    end
-    assert_equal <%= class_name.upcase.swapcase %>_count, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be the same"
-    assert_response :redirect
-    assert_redirected_to REDIRECT_TO_MAIN
-  end
-
-  def test_update_xhr
-  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
-    xhr :post, :update, {:id => @first.id, :<%= class_name.upcase.swapcase %> => @first.attributes.merge(NEW_<%= class_name.upcase %>)}
-    <%= class_name.upcase.swapcase %> = check_attrs(%w(<%= class_name.upcase.swapcase %>))
-    <%= class_name.upcase.swapcase %>.reload
-   	NEW_<%= class_name.upcase %>.each do |attr_name|
-      assert_equal NEW_<%= class_name.upcase %>[attr_name], <%= class_name.upcase.swapcase %>.attributes[attr_name], "@<%= class_name.upcase.swapcase %>.#{attr_name.to_s} incorrect"
-    end
-    assert_equal <%= class_name.upcase.swapcase %>_count, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be the same"
-    assert_response :success
-    assert_template 'update.rjs'
-  end
-
-  def test_destroy
-  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
-    post :destroy, {:id => @first.id}
-    assert_response :redirect
-    assert_equal <%= class_name.upcase.swapcase %>_count - 1, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be one less"
-    assert_redirected_to REDIRECT_TO_MAIN
-  end
-
-  def test_destroy_xhr
-  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
-    xhr :post, :destroy, {:id => @first.id}
-    assert_response :success
-    assert_equal <%= class_name.upcase.swapcase %>_count - 1, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be one less"
-    assert_template 'destroy.rjs'
-  end
-
-protected
-	# Could be put in a Helper library and included at top of test class
-  def check_attrs(attr_list)
-    attrs = []
-    attr_list.each do |attr_sym|
-      attr = assigns(attr_sym.to_sym)
-      assert_not_nil attr,       "Attribute @#{attr_sym} should not be nil"
-      assert !attr.new_record?,  "Should have saved the @#{attr_sym} obj" if attr.class == ActiveRecord
-      attrs << attr
-    end
-    attrs.length > 1 ? attrs : attrs[0]
-  end
-end
+require File.dirname(__FILE__) + '<%= "/.." * controller_class_nesting_depth %>/../test_helper'
+require '<%= base_controller_file_path %>_controller'
+
+# Re-raise errors caught by the 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 %>
+
+	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
+
+	def setup
+		@controller = <%= controller_class_name %>Controller.new
+		@request    = ActionController::TestRequest.new
+		@response   = ActionController::TestResponse.new
+		# Retrieve fixtures via their name
+		# @first = <%= table_name %>(:first)
+		@first = <%= class_name %>.find_first
+	end
+
+  def test_component
+    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"
+  end
+
+  def test_component_update
+    get :component_update
+    assert_response :redirect
+    assert_redirected_to REDIRECT_TO_MAIN
+  end
+
+  def test_component_update_xhr
+    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"
+  end
+
+  def test_create
+  	<%= singular_name %>_count = <%= class_name %>.find(:all).length
+    post :create, {:<%= singular_name %> => NEW_<%= singular_name.upcase %>}
+    <%= singular_name %>, successful = check_attrs(%w(<%= singular_name %> successful))
+    assert successful, "Should be successful"
+    assert_response :redirect
+    assert_redirected_to REDIRECT_TO_MAIN
+    assert_equal <%= singular_name %>_count + 1, <%= class_name %>.find(:all).length, "Expected an additional <%= class_name %>"
+  end
+
+  def test_create_xhr
+  	<%= singular_name %>_count = <%= class_name %>.find(:all).length
+    xhr :post, :create, {:<%= singular_name %> => NEW_<%= singular_name.upcase %>}
+    <%= singular_name %>, successful = check_attrs(%w(<%= singular_name %> successful))
+    assert successful, "Should be successful"
+    assert_response :success
+    assert_template 'create.rjs'
+    assert_equal <%= singular_name %>_count + 1, <%= class_name %>.find(:all).length, "Expected an additional <%= class_name %>"
+  end
+
+  def test_update
+  	<%= singular_name %>_count = <%= class_name %>.find(:all).length
+    post :update, {:id => @first.id, :<%= singular_name %> => @first.attributes.merge(NEW_<%= singular_name.upcase %>)}
+    <%= singular_name %>, successful = check_attrs(%w(<%= singular_name %> successful))
+    assert successful, "Should be successful"
+    <%= singular_name %>.reload
+   	NEW_<%= singular_name.upcase %>.each do |attr_name|
+      assert_equal NEW_<%= singular_name.upcase %>[attr_name], <%= singular_name %>.attributes[attr_name], "@<%= singular_name %>.#{attr_name.to_s} incorrect"
+    end
+    assert_equal <%= singular_name %>_count, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be the same"
+    assert_response :redirect
+    assert_redirected_to REDIRECT_TO_MAIN
+  end
+
+  def test_update_xhr
+  	<%= singular_name %>_count = <%= class_name %>.find(:all).length
+    xhr :post, :update, {:id => @first.id, :<%= singular_name %> => @first.attributes.merge(NEW_<%= singular_name.upcase %>)}
+    <%= singular_name %>, successful = check_attrs(%w(<%= singular_name %> successful))
+    assert successful, "Should be successful"
+    <%= singular_name %>.reload
+   	NEW_<%= singular_name.upcase %>.each do |attr_name|
+      assert_equal NEW_<%= singular_name.upcase %>[attr_name], <%= singular_name %>.attributes[attr_name], "@<%= singular_name %>.#{attr_name.to_s} incorrect"
+    end
+    assert_equal <%= singular_name %>_count, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be the same"
+    assert_response :success
+    assert_template 'update.rjs'
+  end
+
+  def test_destroy
+  	<%= singular_name %>_count = <%= class_name %>.find(:all).length
+    post :destroy, {:id => @first.id}
+    assert_response :redirect
+    assert_equal <%= singular_name %>_count - 1, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be one less"
+    assert_redirected_to REDIRECT_TO_MAIN
+  end
+
+  def test_destroy_xhr
+  	<%= singular_name %>_count = <%= class_name %>.find(:all).length
+    xhr :post, :destroy, {:id => @first.id}
+    assert_response :success
+    assert_equal <%= singular_name %>_count - 1, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be one less"
+    assert_template 'destroy.rjs'
+  end
+
+protected
+	# Could be put in a Helper library and included at top of test class
+  def check_attrs(attr_list)
+    attrs = []
+    attr_list.each do |attr_sym|
+      attr = assigns(attr_sym.to_sym)
+      assert_not_nil attr,       "Attribute @#{attr_sym} should not be nil"
+      assert !attr.new_record?,  "Should have saved the @#{attr_sym} obj" if attr.class == ActiveRecord
+      attrs << attr
+    end
+    attrs.length > 1 ? attrs : attrs[0]
+  end
+end

data/templates/partial_item.rhtml

@@ -1,36 +1,36 @@
-<%% # The following is used when the browser doesn't have javascript enabled %>
-<%% classAttr = cycle("", "class=\"even\"") %>
-<%% @options = params.merge(:controller => '<%= controller_file_path %>', :action => "view", :id => <%= singular_name %>.send("#{<%= model_name %>.primary_key}")) %>
-
-<tr <%%= classAttr %> id="<%%= element_row_id(@options) %>" <%%= "style=\"display: none;\"" if hidden %>>
-	<%% 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">
-    <table cellpadding="0" cellspacing="0">
-      <tr>
-        <td class="indicator-container">
-          <%%= loading_indicator_tag(@options) %>
-        </td>
-        <td> 
-          <%% edit_options = @options.merge(:action => 'edit') %>
- 	        <%%= link_to_remote "Edit", 
-   	                    { :url => edit_options, 
-                          :loading => "Element.show('#{loading_indicator_id(@options)}');" },
-   	                    { :href => url_for(edit_options) } %>
-   	     </td>
-   	     <td>
-   	       <%% delete_options = @options.merge(:action => 'destroy') %>
- 	         <%%= link_to_remote "Delete", 
-   	                    { :url => delete_options, 
-   	                      :confirm => 'Are you sure?',
-                          :loading => "Element.show('#{loading_indicator_id(@options)}');" },
-   	                    { :href => url_for( delete_options ) } %>
-   	      </td>
-   	    </tr>
-   	  </table>
-  </td>
-</tr>
+<%% # The following is used when the browser doesn't have javascript enabled %>
+<%% classAttr = cycle("", "class=\"even\"") %>
+<%% @options = params.merge(:controller => '<%= controller_file_path %>', :action => "view", :id => <%= singular_name %>.send("#{<%= model_name %>.primary_key}")) %>
+
+<tr <%%= classAttr %> id="<%%= element_row_id(@options) %>" <%%= "style=\"display: none;\"" if hidden %>>
+	<%% 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">
+    <table cellpadding="0" cellspacing="0">
+      <tr>
+        <td class="indicator-container">
+          <%%= loading_indicator_tag(@options) %>
+        </td>
+        <td> 
+          <%% edit_options = @options.merge(:action => 'edit') %>
+ 	        <%%= link_to_remote "Edit", 
+   	                    { :url => edit_options, 
+                          :loading => "Element.show('#{loading_indicator_id(@options)}');" },
+   	                    { :href => url_for(edit_options) } %>
+   	     </td>
+   	     <td>
+   	       <%% delete_options = @options.merge(:action => 'destroy') %>
+ 	         <%%= link_to_remote "Delete", 
+   	                    { :url => delete_options, 
+   	                      :confirm => 'Are you sure?',
+                          :loading => "Element.show('#{loading_indicator_id(@options)}');" },
+   	                    { :href => url_for( delete_options ) } %>
+   	      </td>
+   	    </tr>
+   	  </table>
+  </td>
+</tr>