stage 0.1.9 → 0.1.10

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.10 2008-04-20
+
+  * Fix to controller to use delete instead of destroy.
+  * Fix to index.erb.html to use delete terminology
+
+== 0.1.9 2008-04-20
+
+  * Fix to generated form partial.  Edit functionality was broken.
+
 == 0.1.8 2008-04-20
 
   * Several bug fixes while learning the Merb helpers.

data/lib/stage/version.rb

@@ -2,7 +2,7 @@ module Stage #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 9
+    TINY  = 10
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/merb_generators/stage/templates/app/controllers/%controller_file_name%.rb

@@ -44,7 +44,7 @@
 <%= "  " * counter %>    end
 <%= "  " * counter %>  end
   
-<%= "  " * counter %>  def destroy
+<%= "  " * counter %>  def delete
 <%= "  " * counter %>    if @<%= resource_name %>.destroy! 
 <%= "  " * counter %>      redirect url(:<%= resource_name %>)
 <%= "  " * counter %>    else

data/merb_generators/stage/templates/app/views/%controller_file_name%/index.html.erb

@@ -14,7 +14,7 @@
 <% end -%>
     <td><%%= link_to 'Show', url(:<%= resource_name %>, <%= resource_name %>) %></td>
     <td><%%= link_to 'Edit', url(:edit_<%= resource_name %>, <%= resource_name %>) %></td>
-    <td><%%= link_to 'Destroy', url(:delete_<%= resource_name %>, <%= resource_name %>)  %></td>
+    <td><%%= link_to 'Delete', url(:delete_<%= resource_name %>, <%= resource_name %>)  %></td>
   </tr>
 <%% end %>
 </table>

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>stage</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/stage"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/stage" class="numbers">0.1.9</a>
+      <a href="http://rubyforge.org/projects/stage" class="numbers">0.1.10</a>
     </div>
     <h1>&#x2192; &#8216;stage&#8217;</h1>
 
@@ -115,7 +115,7 @@
       <span class="keyword">end</span>
     <span class="keyword">end</span>
 
-    <span class="keyword">def </span><span class="method">destroy</span>
+    <span class="keyword">def </span><span class="method">delete</span>
       <span class="keyword">if</span> <span class="attribute">@page</span><span class="punct">.</span><span class="ident">destroy!</span>
         <span class="ident">redirect</span> <span class="ident">url</span><span class="punct">(</span><span class="symbol">:page</span><span class="punct">)</span>
       <span class="keyword">else</span>
@@ -152,7 +152,7 @@
 
   &lt;%= error_messages_for @page %</span><span class="punct">&gt;</span>
 
-  <span class="punct">&lt;%</span> <span class="ident">form_for</span><span class="punct">(</span><span class="symbol">:page</span><span class="punct">,</span> <span class="symbol">:action</span> <span class="punct">=&gt;</span> <span class="ident">url</span><span class="punct">(</span><span class="symbol">:page</span><span class="punct">))</span> <span class="keyword">do</span> <span class="punct">%&gt;</span><span class="string">
+  <span class="punct">&lt;%</span> <span class="ident">form_for</span><span class="punct">(</span><span class="symbol">:page</span><span class="punct">,</span> <span class="symbol">:action</span> <span class="punct">=&gt;</span> <span class="ident">url</span><span class="punct">(</span><span class="symbol">:page</span><span class="punct">,</span><span class="attribute">@page</span><span class="punct">))</span> <span class="keyword">do</span> <span class="punct">%&gt;</span><span class="string">
     &lt;%= partial :data %</span><span class="punct">&gt;</span>
     <span class="punct">&lt;</span><span class="ident">p</span><span class="punct">&gt;</span> <span class="punct">&lt;%=</span><span class="string"> submit_button submit_label %&gt; &lt;/p&gt;
   &lt;% end %&gt;<span class="normal">
@@ -234,7 +234,14 @@
     </p>
 </div>
 
-<!-- insert site tracking codes here, like Google Urchin -->
-
+<script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+  var pageTracker = _gat._getTracker("UA-4186995-1");
+  pageTracker._initData();
+  pageTracker._trackPageview();
+</script>
 </body>
 </html>

data/website/index.txt

@@ -74,7 +74,7 @@ The controller generated:
       end
     end
 
-    def destroy
+    def delete
       if @page.destroy!
         redirect url(:page)
       else
@@ -109,7 +109,7 @@ The form partial:
 
   <%= error_messages_for @page %>
 
-  <% form_for(:page, :action => url(:page)) do %>
+  <% form_for(:page, :action => url(:page,@page)) do %>
     <%= partial :data %>
     <p> <%= submit_button submit_label %> </p>
   <% end %>

data/website/template.html.erb

@@ -42,7 +42,14 @@
     </p>
 </div>
 
-<!-- insert site tracking codes here, like Google Urchin -->
-
+<script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+  var pageTracker = _gat._getTracker("UA-4186995-1");
+  pageTracker._initData();
+  pageTracker._trackPageview();
+</script>
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stage
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Andrew Stone