updating blitz

Dan Croak
1 parent 5306b580
Showing 4 changed files with 37 additions and 15 deletions Show diff stats
vendor/plugins/blitz/features/step_definitions/view_steps.rb
vendor/plugins/blitz/features/view_generator.feature
vendor/plugins/blitz/generators/view/templates/index.html.erb
vendor/plugins/blitz/generators/view/view_generator.rb
@@ -45,3 +45,21 @@ Then /^an empty &quot;(.*)&quot; view for &quot;posts&quot; should be generated$/ do |view|
   assert_generated_empty_file("app/views/posts/#{view}.html.erb")
 end
+Then /^a model\-reflected "index" view for "posts" should be generated$/ do
+  assert_generated_file("app/views/posts/index.html.erb") do
+    "<h1>Posts</h1>\n\n" <<
+    "<ul>\n" <<
+    "  <% @posts.each do |post| -%>\n" <<
+    "    <li><%= link_to post.to_s, post_path(post) %></li>\n" <<
+    "  <% end -%>\n" <<
+    "</ul>\n"
+  end
+end
+
+Then /^a non\-model\-reflected "index" view for "posts" should be generated$/ do
+  assert_generated_file("app/views/posts/index.html.erb") do
+    "<h1>Posts</h1>"
+  end
+end
+
+
@@ -20,18 +20,19 @@ Feature: Rails view generator
     Given a Rails app
     And the blitz plugin is installed
     When I generate a Post model with title, body, and User
-    When I generate a "new" view for "Posts" with the empty option
+    And I generate a "new" view for "Posts" with the empty option
     Then an empty "new" view for "posts" should be generated
-  Scenario: View generator for show action
+  Scenario: View generator for index action
     Given a Rails app
     And the blitz plugin is installed
-    When I generate a "show" view for "Posts" with the empty option
-    Then an empty "show" view for "posts" should be generated
+    When I generate a "index" view for "Posts"
+    Then a non-model-reflected "index" view for "posts" should be generated
   Scenario: View generator for index action
     Given a Rails app
     And the blitz plugin is installed
-    When I generate a "index" view for "Posts" with the empty option
-    Then an empty "index" view for "posts" should be generated
+    When I generate a Post model with title, body, and User
+    And I generate a "index" view for "Posts"
+    Then a model-reflected "index" view for "posts" should be generated
-<h1><%= resource %></h1>
-
-<%%= link_to 'Edit', edit_<%= resource %>_path(@<%= resource %>) %>
+<h1><%= resource_class.pluralize %></h1>
+<% if active_record_defined? -%>
+<ul>
+  <%% @<%= resources %>.each do |<%= resource %>| -%>
+    <li><%%= link_to <%= resource %>.to_s, <%= resource %>_path(<%= resource %>) %></li>
+  <%% end -%>
+</ul>
+<% end -%>
@@ -14,12 +14,10 @@ class ViewGenerator &lt; Rails::Generator::NamedBase
         else
           m.template 'new.html.erb', path
         end
-      elsif %w(index show).any? { |action| actions.include?(action) }
-        actions.each do |action|
-          path = File.join('app/views', class_path, file_name,
-                           "#{action}.html.erb")
-          m.file 'empty.html.erb', path
-        end
+      elsif actions.include?("index")
+        path = File.join('app/views', class_path, file_name,
+                         "index.html.erb")
+        m.template "index.html.erb", path
       end
     end
   end
	@@ -45,3 +45,21 @@ Then /^an empty "(.*)" view for "posts" should be generated$/ do \|view\|		@@ -45,3 +45,21 @@ Then /^an empty "(.*)" view for "posts" should be generated$/ do \|view\|
45	assert_generated_empty_file("app/views/posts/#{view}.html.erb")	45	assert_generated_empty_file("app/views/posts/#{view}.html.erb")
46	end	46	end
47		47
		48	+Then /^a model\-reflected "index" view for "posts" should be generated$/ do
		49	+ assert_generated_file("app/views/posts/index.html.erb") do
		50	+ "<h1>Posts</h1>\n\n" <<
		51	+ "<ul>\n" <<
		52	+ " <% @posts.each do \|post\| -%>\n" <<
		53	+ " <li><%= link_to post.to_s, post_path(post) %></li>\n" <<
		54	+ " <% end -%>\n" <<
		55	+ "</ul>\n"
		56	+ end
		57	+end
		58	+
		59	+Then /^a non\-model\-reflected "index" view for "posts" should be generated$/ do
		60	+ assert_generated_file("app/views/posts/index.html.erb") do
		61	+ "<h1>Posts</h1>"
		62	+ end
		63	+end
		64	+
		65	+
1	-<h1><%= resource %></h1>
2	-
3	-<%%= link_to 'Edit', edit_<%= resource %>_path(@<%= resource %>) %>	1	+<h1><%= resource_class.pluralize %></h1>
		2	+<% if active_record_defined? -%>
4		3
		4	+<ul>
		5	+ <%% @<%= resources %>.each do \|<%= resource %>\| -%>
		6	+ <li><%%= link_to <%= resource %>.to_s, <%= resource %>_path(<%= resource %>) %></li>
		7	+ <%% end -%>
		8	+</ul>
		9	+<% end -%>