ajax_scaffold_generator 3.1.1 → 3.1.2

data/ajax_scaffold_generator.rb

@@ -63,9 +63,9 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
       m.directory File.join('test/functional', controller_class_path)
 
       # 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")
+      m.template 'model.rb',      File.join('app/models', "#{singular_name}.rb")
+      m.template 'unit_test.rb',  File.join('test/unit', "#{singular_name}_test.rb")
+      m.template 'fixtures.yml',  File.join('test/fixtures', "#{singular_name}.yml")
       
       # Scaffolded forms.
       m.complex_template 'form.rhtml',

data/templates/controller.rb

@@ -41,8 +41,8 @@ class <%= controller_class_name %>Controller < ApplicationController
     update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => nil, :default_sort_direction => "asc"
      
     @sort_sql = <%= model_name %>.scaffold_columns_hash[current_sort(params)].sort_sql rescue nil
-    @sort_by = @sort_sql.nil? ? "<%= plural_name %>.id asc" : @sort_sql  + " " + current_sort_direction(params)
-    @paginator, @<%= plural_name %> = paginate(:<%= plural_name %>, :order_by => @sort_by, :per_page => default_per_page)
+    @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
@@ -51,7 +51,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= singular_name %> = <%= model_name %>.new
     @successful = true
 
-    return if request.xhr?
+    return render :action => 'new.rjs' if request.xhr?
 
     # Javascript disabled fallback
     if @successful
@@ -70,7 +70,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       flash[:error], @successful  = $!.to_s, false
     end
     
-    return if request.xhr?
+    return render :action => 'create.rjs' if request.xhr?
     if @successful
       return_to_main
     else
@@ -87,7 +87,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       flash[:error], @successful  = $!.to_s, false
     end
     
-    return if request.xhr?
+    return render :action => 'edit.rjs' if request.xhr?
 
     if @successful
       @options = { :scaffold_id => params[:scaffold_id], :action => "update", :id => params[:id] }
@@ -105,7 +105,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       flash[:error], @successful  = $!.to_s, false
     end
     
-    return if request.xhr?
+    return render :action => 'update.rjs' if request.xhr?
 
     if @successful
       return_to_main
@@ -122,7 +122,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       flash[:error], @successful  = $!.to_s, false
     end
     
-    return if request.xhr?
+    return render :action => 'destroy.rjs' if request.xhr?
     
     # Javascript disabled fallback
     return_to_main
@@ -131,7 +131,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   def cancel
     @successful = true
     
-    return if request.xhr?
+    return render :action => 'cancel.rjs' if request.xhr?
     
     return_to_main
   end

data/templates/functional_test.rb

@@ -13,76 +13,6 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
   end
 
-<% for action in unscaffolded_actions -%>
-  def test_<%= action %>
-    get :<%= action %>
-    assert_response :success
-    assert_template '<%= action %>'
-  end
-
-<% end -%>
-<% unless suffix -%>
-  def test_index
-    get :index
-    assert_response :success
-    assert_template 'list'
-  end
-
-<% end -%>
-  def test_list<%= suffix %>
-    get :list<%= suffix %>
-
-    assert_response :success
-    assert_template 'list<%= suffix %>'
-
-    assert_not_nil assigns(:<%= plural_name %>)
-  end
-
-  def test_new<%= suffix %>
-    get :new<%= suffix %>
-
-    assert_response :success
-    assert_template 'new<%= suffix %>'
-
-    assert_not_nil assigns(:<%= singular_name %>)
-  end
-
-  def test_create
-    num_<%= plural_name %> = <%= model_name %>.count
-
-    post :create<%= suffix %>, :<%= singular_name %> => {}
+  # A better generator might actually keep updated tests in here, until then its probably better to have nothing than something broken
 
-    assert_response :redirect
-    assert_redirected_to :action => 'list<%= suffix %>'
-
-    assert_equal num_<%= plural_name %> + 1, <%= model_name %>.count
-  end
-
-  def test_edit<%= suffix %>
-    get :edit<%= suffix %>, :id => 1
-
-    assert_response :success
-    assert_template 'edit<%= suffix %>'
-
-    assert_not_nil assigns(:<%= singular_name %>)
-    assert assigns(:<%= singular_name %>).valid?
-  end
-
-  def test_update<%= suffix %>
-    post :update<%= suffix %>, :id => 1
-    assert_response :redirect
-    assert_redirected_to :action => 'show<%= suffix %>', :id => 1
-  end
-
-  def test_destroy<%= suffix %>
-    assert_not_nil <%= model_name %>.find(1)
-
-    post :destroy, :id => 1
-    assert_response :redirect
-    assert_redirected_to :action => 'list<%= suffix %>'
-
-    assert_raise(ActiveRecord::RecordNotFound) {
-      <%= model_name %>.find(1)
-    }
-  end
 end

data/templates/lib_ajax_scaffold.rb

@@ -152,7 +152,7 @@ module AjaxScaffold
     end
   
     def scaffold_column_header_id(options)
-      "#{options[:scaffold_id]}-#{options[:column_name]}"
+      "#{options[:scaffold_id]}-#{options[:column_name]}-column"
     end
   
     def scaffold_tbody_id(options)
@@ -168,7 +168,7 @@ module AjaxScaffold
     end 
   
     def element_row_id(options)
-      "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}"
+      "#{options[:scaffold_id]}-#{options[:action]}-#{options[:id]}-row"
     end
   
     def element_cell_id(options)

data/templates/partial_item.rhtml

@@ -1,6 +1,6 @@
 <%% # 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 %>.id) %>
+<%% @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 %>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajax_scaffold_generator
 version: !ruby/object:Gem::Version 
-  version: 3.1.1
-date: 2006-04-21 00:00:00 -04:00
+  version: 3.1.2
+date: 2006-04-27 00:00:00 -04:00
 summary: Ajax scaffold generator is a rails generator for ajaxified scaffolds
 require_paths: 
   - lib