From 467daa7ae40a74675eb63d0195191c150ebb6c78 Mon Sep 17 00:00:00 2001
From: Dan Croak <dcroak@thoughtbot.com>
Date: Sun, 2 Aug 2009 15:15:44 -0400
Subject: [PATCH] updating blitz

---
 vendor/plugins/blitz/.gitignore                              |  9 +++++++++
 vendor/plugins/blitz/README.textile                          | 29 +++++++++++++++++++++++++++++
 vendor/plugins/blitz/features/step_definitions/view_steps.rb | 33 ++++++++++++++++-----------------
 vendor/plugins/blitz/features/support/env.rb                 |  2 +-
 vendor/plugins/blitz/generators/view/templates/new.html.erb  | 18 ++++++++++--------
 5 files changed, 65 insertions(+), 26 deletions(-)
 create mode 100644 vendor/plugins/blitz/.gitignore

diff --git a/vendor/plugins/blitz/.gitignore b/vendor/plugins/blitz/.gitignore
new file mode 100644
index 0000000..017582a
--- /dev/null
+++ b/vendor/plugins/blitz/.gitignore
@@ -0,0 +1,9 @@
+log/*
+tmp/**/*
+db/schema.rb
+db/*.sqlite3
+*.DS_Store
+test/rails_root/vendor/plugins/coulda
+test/rails_root/log/*
+*.swp
+*.swo
diff --git a/vendor/plugins/blitz/README.textile b/vendor/plugins/blitz/README.textile
index dfb4a3f..4c6d986 100644
--- a/vendor/plugins/blitz/README.textile
+++ b/vendor/plugins/blitz/README.textile
@@ -8,6 +8,7 @@ h2. Generated code may contain
 * "Shoulda":http://github.com/thoughtbot/shoulda
 * "Factory Girl":http://github.com/thoughtbot/factory_girl
 * "Mocha":http://github.com/jferris/mocha
+* "Formtastic":http://github.com/justinfrench/formtastic
 
 h2. Installation
 
@@ -73,6 +74,34 @@ h2. View generator
 
     $ script/generate view Posts new
 
+generates a Formtastic view which reflects on your current schema...
+
+<pre><code><h1>New post</h1>
+
+<% semantic_form_for(@post) do |form| %>
+  <% form.inputs do %>
+    <%= form.input :title %>
+    <%= form.input :body %>
+    <%= form.input :user %>
+  <% end %>
+  <% form.buttons do %>
+    <%= form.commit_button 'Create',
+          :button_html => { :disable_with => 'Please wait...' } %>
+  <% end %>
+<% end %></code></pre>
+
+If no ActiveRecord is defined named Post, it will generate...
+
+<pre><code><h1>New post</h1>
+
+<% semantic_form_for(@post) do |form| %>
+  <% form.inputs %>
+  <% form.buttons do %>
+    <%= form.commit_button 'Create',
+          :button_html => { :disable_with => 'Please wait...' } %>
+  <% end %>
+<% end %></code></pre>
+
 h2. Model generator: belongs_to
 
     $ script/generate model post user:belongs_to
diff --git a/vendor/plugins/blitz/features/step_definitions/view_steps.rb b/vendor/plugins/blitz/features/step_definitions/view_steps.rb
index d379608..bf7d457 100644
--- a/vendor/plugins/blitz/features/step_definitions/view_steps.rb
+++ b/vendor/plugins/blitz/features/step_definitions/view_steps.rb
@@ -13,13 +13,12 @@ end
 When /^a SemiFormal "new" view for "posts" should be generated$/ do
   assert_generated_file("app/views/posts/new.html.erb") do
     "<h1>New post</h1>\n\n"                                                <<
-    "<% form_for(@post) do |form| %>\n"                                    <<
-    "  <%= form.error_messages %>\n"                                       <<
-    "  <fieldset class=\"inputs\">\n"                                      <<
-    "  </fieldset>\n"                                                      <<
-    "  <fieldset class=\"buttons\">\n"                                     <<
-    "    <%= form.submit 'Create', :disable_with => 'Please wait...' %>\n" <<
-    "  </fieldset>\n"                                                      <<
+    "<% semantic_form_for(@post) do |form| %>\n"                           <<
+    "  <%= form.inputs %>\n"                                               <<
+    "  <% form.buttons do %>\n"                                            <<
+    "    <%= form.commit_button 'Create',\n"                               <<
+    "          :button_html => { :disable_with => 'Please wait...' } %>\n" <<
+    "  <% end %>\n"                                                        <<
     "<% end %>"
   end
 end
@@ -27,16 +26,16 @@ end
 Then /^a SemiFormal "new" view for "posts" should be generated with fields$/ do
   assert_generated_file("app/views/posts/new.html.erb") do
     "<h1>New post</h1>\n\n"                                                <<
-    "<% form_for(@post) do |form| %>\n"                                    <<
-    "  <%= form.error_messages %>\n"                                       <<
-    "  <fieldset class=\"inputs\">\n"                                      <<
-    "    <%= form.string :title %>\n"                                      <<
-    "    <%= form.text :body %>\n"                                         <<
-    "    <%= form.belongs_to :user %>\n"                                   <<
-    "  </fieldset>\n"                                                      <<
-    "  <fieldset class=\"buttons\">\n"                                     <<
-    "    <%= form.submit 'Create', :disable_with => 'Please wait...' %>\n" <<
-    "  </fieldset>\n"                                                      <<
+    "<% semantic_form_for(@post) do |form| %>\n"                           <<
+    "  <% form.inputs do %>\n"                                             <<
+    "    <%= form.input :title %>\n"                                       <<
+    "    <%= form.input :body %>\n"                                        <<
+    "    <%= form.input :user %>\n"                                        <<
+    "  <% end %>\n"                                                        <<
+    "  <% form.buttons do %>\n"                                            <<
+    "    <%= form.commit_button 'Create',\n"                               <<
+    "          :button_html => { :disable_with => 'Please wait...' } %>\n" <<
+    "  <% end %>\n"                                                        <<
     "<% end %>"
   end
 end
diff --git a/vendor/plugins/blitz/features/support/env.rb b/vendor/plugins/blitz/features/support/env.rb
index 594d7b1..b0e0df5 100644
--- a/vendor/plugins/blitz/features/support/env.rb
+++ b/vendor/plugins/blitz/features/support/env.rb
@@ -9,7 +9,7 @@ module Test::Unit::Assertions
         expected = yield
         body     = file.read
         assert body.include?(expected),
-          "expected #{expected} but was #{body.inspect}"
+          "expected #{expected} but was #{body}"
       end
     end
   end
diff --git a/vendor/plugins/blitz/generators/view/templates/new.html.erb b/vendor/plugins/blitz/generators/view/templates/new.html.erb
index 6174b80..ada21e4 100644
--- a/vendor/plugins/blitz/generators/view/templates/new.html.erb
+++ b/vendor/plugins/blitz/generators/view/templates/new.html.erb
@@ -1,15 +1,17 @@
 <h1>New <%= resource %></h1>
 
-<%% form_for(@<%= resource %>) do |form| %>
-  <%%= form.error_messages %>
-  <fieldset class="inputs">
+<%% semantic_form_for(@<%= resource %>) do |form| %>
 <% if active_record_defined? -%>
+  <%% form.inputs do %>
 <% columns_for_form.each do |attribute_name, attribute_type| -%>
-    <%%= form.<%= attribute_type %> :<%= attribute_name %> %>
+    <%%= form.input :<%= attribute_name %> %>
 <% end -%>
+  <%% end %>
+<% else -%>
+  <%%= form.inputs %>
 <% end -%>
-  </fieldset>
-  <fieldset class="buttons">
-    <%%= form.submit 'Create', :disable_with => 'Please wait...' %>
-  </fieldset>
+  <%% form.buttons do %>
+    <%%= form.commit_button 'Create',
+          :button_html => { :disable_with => 'Please wait...' } %>
+  <%% end %>
 <%% end %>
--
libgit2 0.21.2