stage 0.1.2 → 0.1.3

data/lib/stage/version.rb

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

data/merb_generators/stage/templates/app/helpers/%controller_file_name%_helper.rb

@@ -11,7 +11,7 @@ module Merb
 <%= "  " * counter %>    if @action_name == "show"
 <%= "  " * counter %>       @<%= resource_name %>.<%= attr.first %>
 <%= "  " * counter %>    else
-<%= "  " * counter %>      text_field :<%= attr.first %>
+<%= "  " * counter %>      text_field :name => "<%=resource_name%>[<%= attr.first %>]"
 <%= "  " * counter %>    end
 <%= "  " * counter %>  end
 

data/website/index.html

@@ -41,16 +41,163 @@
 	<h2>What</h2>
 
 
+	<p>Stage is a code template generator that utilizes helpers as presenters to reduce ruby code used in views. The initial release only works with Merb and DataMapper.  Support for RubyOnRails, ActiveRecord, Sequel and other ORMs will be added as I get the time.  Of course, contributions are welcome if you like the concept.</p>
+
+
 	<h2>Installing</h2>
 
 
 	<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">stage</span></pre></p>
 
 
-	<h2>The basics</h2>
+	<h2>Demonstration of usage</h2>
 
 
-	<h2>Demonstration of usage</h2>
+	<p><pre class='syntax'>
+<span class="global">$ </span><span class="ident">merb</span><span class="punct">-</span><span class="ident">gen</span> <span class="ident">stage</span> <span class="ident">page</span> <span class="ident">title</span><span class="symbol">:string</span> <span class="ident">content</span><span class="symbol">:text</span>
+<span class="ident">exists</span>  <span class="ident">app</span>
+<span class="ident">exists</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">controllers</span>
+<span class="ident">exists</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">helpers</span>
+<span class="ident">exists</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">models</span>
+<span class="ident">exists</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">views</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">views</span><span class="punct">/</span><span class="ident">pages</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">controllers</span><span class="punct">/</span><span class="ident">pages</span><span class="punct">.</span><span class="ident">rb</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">helpers</span><span class="punct">/</span><span class="ident">pages_helper</span><span class="punct">.</span><span class="ident">rb</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">models</span><span class="punct">/</span><span class="ident">page</span><span class="punct">.</span><span class="ident">rb</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">views</span><span class="punct">/</span><span class="ident">pages</span><span class="punct">/</span><span class="ident">_data</span><span class="punct">.</span><span class="ident">html</span><span class="punct">.</span><span class="ident">erb</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">views</span><span class="punct">/</span><span class="ident">pages</span><span class="punct">/</span><span class="ident">_form</span><span class="punct">.</span><span class="ident">html</span><span class="punct">.</span><span class="ident">erb</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">views</span><span class="punct">/</span><span class="ident">pages</span><span class="punct">/</span><span class="ident">edit</span><span class="punct">.</span><span class="ident">html</span><span class="punct">.</span><span class="ident">erb</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">views</span><span class="punct">/</span><span class="ident">pages</span><span class="punct">/</span><span class="ident">index</span><span class="punct">.</span><span class="ident">html</span><span class="punct">.</span><span class="ident">erb</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">views</span><span class="punct">/</span><span class="ident">pages</span><span class="punct">/</span><span class="ident">new</span><span class="punct">.</span><span class="ident">html</span><span class="punct">.</span><span class="ident">erb</span>
+<span class="ident">create</span>  <span class="ident">app</span><span class="punct">/</span><span class="ident">views</span><span class="punct">/</span><span class="ident">pages</span><span class="punct">/</span><span class="ident">show</span><span class="punct">.</span><span class="ident">html</span><span class="punct">.</span><span class="ident">erb</span>
+</pre></p>
+
+
+	<p>The controller generated:
+<pre class='syntax'>
+  <span class="keyword">class </span><span class="class">Pages</span> <span class="punct">&lt;</span> <span class="constant">Application</span>
+    <span class="ident">before</span> <span class="symbol">:find_page</span><span class="punct">,</span> <span class="symbol">:only</span> <span class="punct">=&gt;</span> <span class="punct">[</span><span class="symbol">:show</span><span class="punct">,</span> <span class="symbol">:edit</span><span class="punct">,</span> <span class="symbol">:update</span><span class="punct">,</span> <span class="symbol">:delete</span><span class="punct">]</span>
+
+    <span class="keyword">def </span><span class="method">index</span>
+      <span class="attribute">@pages</span> <span class="punct">=</span> <span class="constant">Page</span><span class="punct">.</span><span class="ident">all</span>
+      <span class="ident">display</span> <span class="attribute">@pages</span>
+    <span class="keyword">end</span>
+
+    <span class="keyword">def </span><span class="method">show</span>
+      <span class="ident">display</span> <span class="attribute">@page</span>
+    <span class="keyword">end</span>
+
+    <span class="keyword">def </span><span class="method">new</span>
+      <span class="ident">only_provides</span> <span class="symbol">:html</span>
+      <span class="attribute">@page</span> <span class="punct">=</span> <span class="constant">Page</span><span class="punct">.</span><span class="ident">new</span>
+      <span class="ident">render</span>
+    <span class="keyword">end</span>
+
+    <span class="keyword">def </span><span class="method">edit</span>
+      <span class="ident">only_provides</span> <span class="symbol">:html</span>
+      <span class="ident">render</span>
+    <span class="keyword">end</span>
+
+    <span class="keyword">def </span><span class="method">create</span>
+      <span class="attribute">@page</span> <span class="punct">=</span> <span class="constant">Page</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">params</span><span class="punct">[</span><span class="symbol">:page</span><span class="punct">])</span>
+      <span class="keyword">if</span> <span class="attribute">@page</span><span class="punct">.</span><span class="ident">save</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="attribute">@page</span><span class="punct">)</span>
+      <span class="keyword">else</span>
+        <span class="ident">render</span> <span class="symbol">:new</span>
+      <span class="keyword">end</span>
+    <span class="keyword">end</span>
+
+    <span class="keyword">def </span><span class="method">update</span>
+      <span class="keyword">if</span> <span class="attribute">@page</span><span class="punct">.</span><span class="ident">update_attributes</span><span class="punct">(</span><span class="ident">params</span><span class="punct">[</span><span class="symbol">:page</span><span class="punct">])</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="attribute">@page</span><span class="punct">)</span>
+      <span class="keyword">else</span>
+        <span class="keyword">raise</span> <span class="constant">BadRequest</span>
+      <span class="keyword">end</span>
+    <span class="keyword">end</span>
+
+    <span class="keyword">def </span><span class="method">destroy</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>
+        <span class="keyword">raise</span> <span class="constant">BadRequest</span>
+      <span class="keyword">end</span>
+    <span class="keyword">end</span>
+
+    <span class="ident">private</span>
+    <span class="keyword">def </span><span class="method">find_page</span>
+      <span class="attribute">@page</span> <span class="punct">=</span> <span class="constant">Page</span><span class="punct">.</span><span class="ident">first</span><span class="punct">(</span><span class="ident">params</span><span class="punct">[</span><span class="symbol">:id</span><span class="punct">])</span>
+      <span class="keyword">raise</span> <span class="constant">NotFound</span> <span class="keyword">unless</span> <span class="attribute">@page</span>
+    <span class="keyword">end</span>
+  <span class="keyword">end</span>
+</pre></p>
+
+
+	<p>The edit page:
+<pre class='syntax'>
+  <span class="punct">&lt;</span><span class="ident">h1</span><span class="punct">&gt;</span><span class="constant">Editing</span> <span class="ident">page</span><span class="punct">&lt;/</span><span class="regex">h1&gt;
+
+  &lt;%= partial &quot;form&quot; %&gt;
+
+  &lt;%= link_to 'Show', url(:page, @page) %&gt; |
+  &lt;%= link_to 'Back', url(:pages) %&gt;<span class="normal">
+</span></span></pre></p>
+
+
+	<p>The form partial:
+<pre class='syntax'>
+  <span class="punct">&lt;%</span>
+    <span class="ident">submit_label</span> <span class="punct">=</span> <span class="punct">&quot;</span><span class="string">Update</span><span class="punct">&quot;</span>
+    <span class="ident">submit_label</span> <span class="punct">=</span> <span class="punct">&quot;</span><span class="string">Create</span><span class="punct">&quot;</span> <span class="keyword">if</span> <span class="attribute">@page</span><span class="punct">.</span><span class="ident">new_record?</span>
+  <span class="punct">-%&gt;</span><span class="string">
+
+  &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">
+    &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">
+</span></span></pre></p>
+
+
+	<p>The data partial (the show view calls this directly):
+<pre class='syntax'>
+  <span class="punct">&lt;</span><span class="ident">p</span><span class="punct">&gt;</span>
+    <span class="punct">&lt;</span><span class="ident">b</span><span class="punct">&gt;</span><span class="constant">Title</span><span class="punct">&lt;/</span><span class="regex">b&gt;&lt;br </span><span class="punct">/&gt;</span>
+    <span class="punct">&lt;%=</span><span class="string"> page_title_value %&gt;
+  &lt;/p&gt;
+
+  &lt;p&gt;
+    &lt;b&gt;Content&lt;/b&gt;&lt;br /&gt;
+    &lt;%</span><span class="punct">=</span> <span class="ident">page_content_value</span> <span class="punct">%&gt;</span><span class="string">
+  &lt;/p</span><span class="punct">&gt;</span>
+</pre></p>
+
+
+	<p>As you can see, there are &lt;model&gt;_&lt;field&gt;_value methods.  These are defined in the pages helper:
+<pre class='syntax'>
+  <span class="keyword">module </span><span class="module">Merb</span>
+    <span class="keyword">module </span><span class="module">PagesHelper</span>
+      <span class="keyword">def </span><span class="method">page_title_value</span>
+        <span class="keyword">if</span> <span class="attribute">@action_name</span> <span class="punct">==</span> <span class="punct">&quot;</span><span class="string">show</span><span class="punct">&quot;</span>
+          <span class="attribute">@page</span><span class="punct">.</span><span class="ident">title</span>
+        <span class="keyword">else</span>
+          <span class="ident">text_field</span> <span class="symbol">:title</span>
+        <span class="keyword">end</span>
+      <span class="keyword">end</span>
+
+      <span class="keyword">def </span><span class="method">page_content_value</span>
+        <span class="keyword">if</span> <span class="attribute">@action_name</span> <span class="punct">==</span> <span class="punct">&quot;</span><span class="string">show</span><span class="punct">&quot;</span>
+          <span class="attribute">@page</span><span class="punct">.</span><span class="ident">content</span>
+        <span class="keyword">else</span>
+          <span class="ident">text_field</span> <span class="symbol">:content</span>
+        <span class="keyword">end</span>
+      <span class="keyword">end</span>
+    <span class="keyword">end</span>
+  <span class="keyword">end</span>
+</pre></p>
+
+
+	<p>I need to get more precise with the form helpers, but for now this will do.</p>
 
 
 	<h2>Forum</h2>
@@ -62,9 +209,15 @@
 	<h2>How to submit patches</h2>
 
 
+	<p>The Clone <span class="caps">URL</span>: git://github.com/stonean/stage.git</p>
+
+
 	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
 
 
+	<p>I&#8217;m new to git and this whole opensource project admin gig, so please be patient with my stumbling around.</p>
+
+
 	<h2>License</h2>
 
 
@@ -74,9 +227,9 @@
 	<h2>Contact</h2>
 
 
-	<p>Comments are welcome. Send an email to <a href="mailto:stonean_stage@googlegroups.com">Andrew Stone</a> email via the <a href="http://groups.google.com/group/stonean_stage?hl=en">forum</a></p>
+	<p>Comments and suggestions are welcome via the <a href="http://groups.google.com/group/stonean_stage?hl=en">forum</a></p>
     <p class="coda">
-      <a href="FIXME email">FIXME full name</a>, 18th April 2008<br>
+      18th April 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -5,17 +5,153 @@ h1. → 'stage'
 
 h2. What
 
+Stage is a code template generator that utilizes helpers as presenters to reduce ruby code used in views. The initial release only works with Merb and DataMapper.  Support for RubyOnRails, ActiveRecord, Sequel and other ORMs will be added as I get the time.  Of course, contributions are welcome if you like the concept.
 
 h2. Installing
 
 <pre syntax="ruby">sudo gem install stage</pre>
 
-h2. The basics
-
-
 h2. Demonstration of usage
 
-
+<pre syntax="ruby">
+$ merb-gen stage page title:string content:text
+exists  app
+exists  app/controllers
+exists  app/helpers
+exists  app/models
+exists  app/views
+create  app/views/pages
+create  app/controllers/pages.rb
+create  app/helpers/pages_helper.rb
+create  app/models/page.rb
+create  app/views/pages/_data.html.erb
+create  app/views/pages/_form.html.erb
+create  app/views/pages/edit.html.erb
+create  app/views/pages/index.html.erb
+create  app/views/pages/new.html.erb
+create  app/views/pages/show.html.erb
+</pre>
+
+The controller generated:
+<pre syntax="ruby">
+  class Pages < Application
+    before :find_page, :only => [:show, :edit, :update, :delete]
+
+    def index
+      @pages = Page.all
+      display @pages
+    end
+
+    def show
+      display @page
+    end
+
+    def new
+      only_provides :html
+      @page = Page.new
+      render
+    end
+
+    def edit
+      only_provides :html
+      render
+    end
+
+    def create
+      @page = Page.new(params[:page])
+      if @page.save
+        redirect url(:page, @page)
+      else
+        render :new
+      end
+    end
+
+    def update
+      if @page.update_attributes(params[:page])
+        redirect url(:page, @page)
+      else
+        raise BadRequest
+      end
+    end
+
+    def destroy
+      if @page.destroy!
+        redirect url(:page)
+      else
+        raise BadRequest
+      end
+    end
+
+    private
+    def find_page
+      @page = Page.first(params[:id])
+      raise NotFound unless @page
+    end
+  end
+</pre>
+
+The edit page:
+<pre syntax="ruby">
+  <h1>Editing page</h1>
+
+  <%= partial "form" %>
+
+  <%= link_to 'Show', url(:page, @page) %> |
+  <%= link_to 'Back', url(:pages) %>
+</pre>
+
+The form partial:
+<pre syntax="ruby">
+  <%
+    submit_label = "Update"
+    submit_label = "Create" if @page.new_record?
+  -%>
+
+  <%= error_messages_for :page %>
+
+  <% form_for(:page, :action => url(:page)) do %>
+    <%= partial :data %>
+    <p> <%= submit_button submit_label %> </p>
+  <% end %>
+</pre>
+
+The data partial (the show view calls this directly):
+<pre syntax="ruby">
+  <p>
+    <b>Title</b><br />
+    <%= page_title_value %>
+  </p>
+
+  <p>
+    <b>Content</b><br />
+    <%= page_content_value %>
+  </p>
+</pre>
+
+As you can see, there are &lt;model&gt;_&lt;field&gt;_value methods.  These are defined in the pages helper:
+<pre syntax="ruby">
+  module Merb
+    module PagesHelper
+      def page_title_value
+        if @action_name == "show"
+          @page.title
+        else
+          text_field :name => "page[title]"
+        end
+      end
+
+      def page_content_value
+        if @action_name == "show"
+          @page.content
+        else
+          text_field :name => "page[content]"
+        end
+      end
+    end
+  end
+</pre>
+
+I need to get more precise with the form helpers, but for now this will do.
 
 h2. Forum
 
@@ -24,8 +160,11 @@ h2. Forum
 
 h2. How to submit patches
 
+The Clone URL: git://github.com/stonean/stage.git
+
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
+I'm new to git and this whole opensource project admin gig, so please be patient with my stumbling around. 
 
 h2. License
 
@@ -33,5 +172,5 @@ This code is free to use under the terms of the MIT license.
 
 h2. Contact
 
-Comments are welcome. Send an email to "Andrew Stone":mailto:stonean_stage@googlegroups.com email via the "forum":http://groups.google.com/group/stonean_stage?hl=en
+Comments and suggestions are welcome via the "forum":http://groups.google.com/group/stonean_stage?hl=en
 

data/website/template.html.erb

@@ -37,7 +37,7 @@
     </div>
     <%= body %>
     <p class="coda">
-      <a href="FIXME email">FIXME full name</a>, <%= modified.pretty %><br>
+      <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

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