ajax_scaffold_generator 1.0.0 → 2.0.0

data/templates/functional_test.rb

@@ -1,71 +1,88 @@
-require File.dirname(__FILE__) + '<%= "/.." * controller_class_nesting_depth %>/../test_helper'
-require '<%= 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 %>
-
-  def setup
-    @controller = <%= controller_class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @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 %>
-    num_<%= plural_name %> = <%= model_name %>.count
-    
-    post :new<%= suffix %>, :<%= singular_name %> => {}
-
-    assert_response :success
-    assert_template '_item'
-
-    assert_equal num_<%= plural_name %> + 1, <%= model_name %>.count
-  end
-
-  def test_edit<%= suffix %>
-    post :edit<%= suffix %>, :id => 1
-
-    assert_response :success
-    assert_template '_item'
-  end
-
-  def test_destroy<%= suffix %>
-    assert_not_nil <%= model_name %>.find(1)
-
-    post :destroy<%= suffix %>, :id => 1
-
-    assert_response :success
-    assert_template nil
-    
-    assert_raise(ActiveRecord::RecordNotFound) {
-      <%= model_name %>.find(1)
-    }
-  end
-end
+require File.dirname(__FILE__) + '<%= "/.." * controller_class_nesting_depth %>/../test_helper'
+require '<%= 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 %>
+
+  def setup
+    @controller = <%= controller_class_name %>Controller.new
+    @request    = ActionController::TestRequest.new
+    @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 %> => {}
+
+    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/helper.rb

@@ -1,2 +1,12 @@
-module <%= controller_class_name %>Helper
-end
+module <%= controller_class_name %>Helper
+
+  def num_columns
+    <%= model_name %>.content_columns.length + 1 
+  end
+  
+  # This can be moved into application_helper.rb
+  def loading_indicator_tag(scope,id)
+    "<img src=\"/images/indicator.gif\" style=\"display: none;\" id=\"#{scope}-#{id}-loading-indicator\" alt=\"loading indicator\" class=\"loading-indicator\" />"
+  end
+
+end

data/templates/layout.rhtml

@@ -1,14 +1,15 @@
-<html>
-<head>
-  <title><%= controller_class_name %>: <%%= controller.action_name %></title>
-  <%%= stylesheet_link_tag 'scaffold' %>
-  <%%= javascript_include_tag 'prototype' %>
-  <%%= javascript_include_tag 'effects' %>
-  <%%= javascript_include_tag '<%= singular_name %>' %>
-</head>
-<body>
-
-<%%= @content_for_layout %>
-
-</body>
-</html>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+     "DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<head>
+  <title><%= Inflector.titleize(plural_name) %></title>
+  <%%= stylesheet_link_tag 'ajax_scaffold', :media => 'all' %>
+  <%%= javascript_include_tag 'prototype', 'effects', 'rico_corner', 'ajax_scaffold' %>
+</head>
+<body>
+
+<%%= @content_for_layout %>
+
+</body>
+</html>

data/templates/partial_form_errors.rhtml

@@ -0,0 +1,9 @@
+<%% unless @<%= singular_name %>.nil? %>
+<%%= error_messages_for '<%= singular_name %>' %>
+<%% end -%>
+
+<%% for name in [:notice, :warning, :error, :message] %>
+  <%% if @flash[name] %>
+    <%%= "<div class=\"#{name}\">#{@flash[name]}</div>" %>
+  <%% end %>
+<%% end %>

data/templates/partial_item.rhtml

@@ -1,16 +1,25 @@
-<div id="<%= singular_name %>_<%%= @<%= singular_name %>.id %>">
-
-<%% for column in <%= model_name %>.content_columns %>
-<p><b><%%= column.human_name %>:</b> <%%=h @<%= singular_name %>.send(column.name) %></p>
-<%% end %>
-
-<%%= link_to_function 'Edit', "<%= plural_name %>Block.edit(#{@<%= singular_name %>.id})" %>
-<%%= link_to_remote 'Destroy',
-      :url => { :action => 'destroy', :id => @<%= singular_name %> },
-      :complete => visual_effect(:fade, "<%= singular_name %>_#{@<%= singular_name %>.id}"),
-      :confirm => "Are you sure you want to delete this item?" %>
-</div>
-
-<div id="edit_<%= singular_name %>_dialog_<%%= @<%= singular_name %>.id %>" style="display: none">
-<%%= render :partial => 'edit' %>
-</div>
+<tr id="view-<%= singular_name %>-<%%= <%= singular_name %>.id %>">
+	<%% for column in <%= model_name %>.content_columns %>
+	<td><%%=h <%= singular_name %>.send(column.name) %>&nbsp;</td>
+	<%% end %>
+ 	<td class="actions">
+ 	  <div>
+ 	  <%%= loading_indicator_tag '<%= singular_name %>', "edit-#{<%= singular_name %>.id}" %>
+   	<%%= link_to_remote "Edit", 
+   				:url => { :controller => '<%= controller_name %>', :action => 'edit', :id => <%= singular_name %> }, 
+   				:loading => "AjaxScaffold.editOnLoading(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
+   				:success => "AjaxScaffold.editOnSuccess(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
+   				:failure => "AjaxScaffold.editOnFailure(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
+   				:complete => "AjaxScaffold.editOnComplete(request,'<%= singular_name %>', #{<%= singular_name %>.id});",
+   				:post => true; %>
+   	<%%= link_to_remote "Delete", 
+   				:url => { :controller => '<%= controller_name %>',:action => 'destroy', :id => <%= singular_name %> }, 
+   				:confirm => 'Are you sure?', 
+   				:loading => "AjaxScaffold.deleteOnLoading('<%= singular_name %>', #{<%= singular_name %>.id});",
+   				:success => "AjaxScaffold.deleteOnSuccess('<%= singular_name %>', #{<%= singular_name %>.id});",
+   				:failure => "AjaxScaffold.deleteOnFailure('<%= singular_name %>', #{<%= singular_name %>.id});",
+   				:complete => "AjaxScaffold.deleteOnComplete('<%= singular_name %>', #{<%= singular_name %>.id});",
+   				:post => true; %>
+   	</div>
+  </td>
+</tr>