Capcode 0.6.1 → 0.6.2

data/doc/rdoc/classes/Capcode/Helpers.html

@@ -111,10 +111,10 @@ controllers
   <p class="source-link">[ <a href="javascript:toggleSource('M000009_source')" id="l_M000009_source">show source</a> ]</p>
   <div id="M000009_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/capcode.rb, line 26</span>
-26:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">root=</span>(<span class="ruby-identifier">p</span>)
-27:       <span class="ruby-ivar">@@__ROOT_DIRECTORY</span>=<span class="ruby-identifier">p</span>
-28:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/capcode.rb, line 27</span>
+27:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">root=</span>(<span class="ruby-identifier">p</span>)
+28:       <span class="ruby-ivar">@@__ROOT_DIRECTORY</span>=<span class="ruby-identifier">p</span>
+29:     <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -146,21 +146,42 @@ then
   <p class="source-link">[ <a href="javascript:toggleSource('M000013_source')" id="l_M000013_source">show source</a> ]</p>
   <div id="M000013_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/capcode.rb, line 91</span>
- 91:     <span class="ruby-keyword kw">def</span> <span class="ruby-constant">URL</span>( <span class="ruby-identifier">klass</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">a</span> )
- 92:       <span class="ruby-identifier">path</span> = <span class="ruby-keyword kw">nil</span>
- 93:       <span class="ruby-identifier">a</span> = <span class="ruby-identifier">a</span>.<span class="ruby-identifier">delete_if</span>{ <span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span>.<span class="ruby-identifier">nil?</span> }
- 94:       
- 95:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">klass</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Class</span>
- 96:         <span class="ruby-constant">Capcode</span>.<span class="ruby-identifier">routes</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">p</span>, <span class="ruby-identifier">k</span><span class="ruby-operator">|</span>
- 97:           <span class="ruby-identifier">path</span> = <span class="ruby-identifier">p</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">k</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">klass</span>
- 98:         <span class="ruby-keyword kw">end</span>
- 99:       <span class="ruby-keyword kw">else</span>
-100:         <span class="ruby-identifier">path</span> = <span class="ruby-identifier">klass</span>
-101:       <span class="ruby-keyword kw">end</span>
-102:       
-103:       <span class="ruby-identifier">path</span><span class="ruby-operator">+</span>((<span class="ruby-identifier">a</span>.<span class="ruby-identifier">size</span><span class="ruby-operator">&gt;</span><span class="ruby-value">0</span>)<span class="ruby-operator">?</span>(<span class="ruby-value str">&quot;/&quot;</span><span class="ruby-operator">+</span><span class="ruby-identifier">a</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;/&quot;</span>))<span class="ruby-operator">:</span>(<span class="ruby-value str">&quot;&quot;</span>))
-104:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/capcode.rb, line 120</span>
+120:     <span class="ruby-keyword kw">def</span> <span class="ruby-constant">URL</span>( <span class="ruby-identifier">klass</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">a</span> )
+121:       <span class="ruby-identifier">path</span> = <span class="ruby-keyword kw">nil</span>
+122:       <span class="ruby-identifier">a</span> = <span class="ruby-identifier">a</span>.<span class="ruby-identifier">delete_if</span>{ <span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span>.<span class="ruby-identifier">nil?</span> }
+123:       
+124:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">klass</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Class</span>
+125:         <span class="ruby-constant">Capcode</span>.<span class="ruby-identifier">routes</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">p</span>, <span class="ruby-identifier">k</span><span class="ruby-operator">|</span>
+126:           <span class="ruby-identifier">path</span> = <span class="ruby-identifier">p</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">k</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">klass</span>
+127:         <span class="ruby-keyword kw">end</span>
+128:       <span class="ruby-keyword kw">else</span>
+129:         <span class="ruby-identifier">path</span> = <span class="ruby-identifier">klass</span>
+130:       <span class="ruby-keyword kw">end</span>
+131:       
+132:       <span class="ruby-identifier">path</span><span class="ruby-operator">+</span>((<span class="ruby-identifier">a</span>.<span class="ruby-identifier">size</span><span class="ruby-operator">&gt;</span><span class="ruby-value">0</span>)<span class="ruby-operator">?</span>(<span class="ruby-value str">&quot;/&quot;</span><span class="ruby-operator">+</span><span class="ruby-identifier">a</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;/&quot;</span>))<span class="ruby-operator">:</span>(<span class="ruby-value str">&quot;&quot;</span>))
+133:     <span class="ruby-keyword kw">end</span>
+</pre>
+  </div>
+</div>
+<h4 class="ruled">Public Instance method: 
+<strong><a name="M000014">content_for( x ) {|| ...}</a></strong> <a href="#M000014"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: content_for" /></a></h4>
+
+<p>
+Calling <a href="Helpers.html#M000014">content_for</a> stores a block of
+markup in an identifier.
+</p>
+
+<div class="sourcecode">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show source</a> ]</p>
+  <div id="M000014_source" class="dyn-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/capcode.rb, line 136</span>
+136:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">content_for</span>( <span class="ruby-identifier">x</span> )
+137:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@__ARGS__</span>.<span class="ruby-identifier">map</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">_</span><span class="ruby-operator">|</span> <span class="ruby-identifier">_</span>.<span class="ruby-identifier">to_s</span> }.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">x</span>.<span class="ruby-identifier">to_s</span>)
+138:         <span class="ruby-keyword kw">yield</span>
+139:       <span class="ruby-keyword kw">end</span>
+140:     <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -184,12 +205,12 @@ Help you to return a JSON response
   <p class="source-link">[ <a href="javascript:toggleSource('M000011_source')" id="l_M000011_source">show source</a> ]</p>
   <div id="M000011_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/capcode.rb, line 55</span>
-55:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">json</span>( <span class="ruby-identifier">d</span> ) <span class="ruby-comment cmt">## DELETE THIS IN 1.0.0</span>
-56:       <span class="ruby-identifier">warn</span>( <span class="ruby-value str">&quot;json is deprecated, please use `render( :json =&gt; ... )'&quot;</span> )
-57:       <span class="ruby-ivar">@response</span>[<span class="ruby-value str">'Content-Type'</span>] = <span class="ruby-value str">'application/json'</span>
-58:       <span class="ruby-identifier">d</span>.<span class="ruby-identifier">to_json</span>
-59:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/capcode.rb, line 84</span>
+84:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">json</span>( <span class="ruby-identifier">d</span> ) <span class="ruby-comment cmt">## DELETE THIS IN 1.0.0</span>
+85:       <span class="ruby-identifier">warn</span>( <span class="ruby-value str">&quot;json is deprecated, please use `render( :json =&gt; ... )'&quot;</span> )
+86:       <span class="ruby-ivar">@response</span>[<span class="ruby-value str">'Content-Type'</span>] = <span class="ruby-value str">'application/json'</span>
+87:       <span class="ruby-identifier">d</span>.<span class="ruby-identifier">to_json</span>
+88:     <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -217,10 +238,10 @@ Send a <a href="Helpers.html#M000012">redirect</a> response
   <p class="source-link">[ <a href="javascript:toggleSource('M000012_source')" id="l_M000012_source">show source</a> ]</p>
   <div id="M000012_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/capcode.rb, line 74</span>
-74:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">redirect</span>( <span class="ruby-identifier">klass</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">a</span> )
-75:       [<span class="ruby-value">302</span>, {<span class="ruby-value str">'Location'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">URL</span>(<span class="ruby-identifier">klass</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">a</span>)}, <span class="ruby-value str">''</span>]
-76:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/capcode.rb, line 103</span>
+103:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">redirect</span>( <span class="ruby-identifier">klass</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">a</span> )
+104:       [<span class="ruby-value">302</span>, {<span class="ruby-value str">'Location'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">URL</span>(<span class="ruby-identifier">klass</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">a</span>)}, <span class="ruby-value str">''</span>]
+105:     <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -230,25 +251,77 @@ Send a <a href="Helpers.html#M000012">redirect</a> response
 <p>
 Render a view
 </p>
+<p>
+<a href="Helpers.html#M000010">render</a>&#8216;s parameter can be a Hash
+or a string. Passing a string is equivalent to do
+</p>
+<pre>
+  render( :text =&gt; string )
+</pre>
+<p>
+If you want to use a specific renderer, use one of this options :
+</p>
+<ul>
+<li>:markaby =&gt; :my_func : :my_func must be defined in <a
+href="Views.html">Capcode::Views</a>
+
+</li>
+<li>:erb =&gt; :my_erb_file : this suppose that&#8216;s my_erb_file.rhtml exist
+in erb_path
+
+</li>
+<li>:haml =&gt; :my_haml_file : this suppose that&#8216;s my_haml_file.rhtml
+exist in haml_path
+
+</li>
+<li>:text =&gt; &quot;my text&quot;
+
+</li>
+<li>:<a href="Helpers.html#M000011">json</a> =&gt; MyObject : this suppose
+that&#8216;s MyObject respond to .to_json
+
+</li>
+</ul>
+<p>
+If you want to use a specific layout, you can specify it with option
+</p>
+<pre>
+  :layout
+</pre>
 
 <div class="sourcecode">
   <p class="source-link">[ <a href="javascript:toggleSource('M000010_source')" id="l_M000010_source">show source</a> ]</p>
   <div id="M000010_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/capcode.rb, line 31</span>
-31:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render</span>( <span class="ruby-identifier">h</span> )
-32:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">h</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Hash</span>
-33:         <span class="ruby-identifier">t</span> = (<span class="ruby-identifier">h</span>.<span class="ruby-identifier">keys</span>)[<span class="ruby-value">0</span>]
-34:         <span class="ruby-identifier">v</span> = <span class="ruby-identifier">h</span>[<span class="ruby-identifier">t</span>]
-35:         <span class="ruby-keyword kw">begin</span>
-36:           <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">send</span>( <span class="ruby-node">&quot;render_#{t.to_s}&quot;</span>, <span class="ruby-identifier">v</span> )
-37:         <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-38:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">RenderError</span>, <span class="ruby-node">&quot;Error rendering `#{t.to_s}' : #{e.message}&quot;</span>, <span class="ruby-identifier">caller</span>
-39:         <span class="ruby-keyword kw">end</span>
-40:       <span class="ruby-keyword kw">else</span>
-41:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">send</span>(<span class="ruby-identifier">h</span>.<span class="ruby-identifier">to_s</span>)
-42:       <span class="ruby-keyword kw">end</span>
-43:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/capcode.rb, line 46</span>
+46:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render</span>( <span class="ruby-identifier">h</span> )
+47:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">h</span>.<span class="ruby-identifier">class</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Hash</span>
+48:         <span class="ruby-identifier">render_type</span> = <span class="ruby-keyword kw">nil</span>
+49:         
+50:         <span class="ruby-identifier">h</span>.<span class="ruby-identifier">keys</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">k</span><span class="ruby-operator">|</span>
+51:           <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-node">&quot;render_#{k.to_s}&quot;</span>)
+52:             <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">render_type</span>.<span class="ruby-identifier">nil?</span>
+53:               <span class="ruby-identifier">raise</span> <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">RenderError</span>, <span class="ruby-node">&quot;Can't use multiple renderer (`#{render_type}' and `#{k}') !&quot;</span>, <span class="ruby-identifier">caller</span>
+54:             <span class="ruby-keyword kw">end</span>
+55:             <span class="ruby-identifier">render_type</span> = <span class="ruby-identifier">k</span>
+56:           <span class="ruby-keyword kw">end</span>
+57:         <span class="ruby-keyword kw">end</span>
+58: 
+59:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">render_type</span>.<span class="ruby-identifier">nil?</span>
+60:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">RenderError</span>, <span class="ruby-value str">&quot;Renderer type not specified!&quot;</span>, <span class="ruby-identifier">caller</span>
+61:         <span class="ruby-keyword kw">end</span>
+62: 
+63:         <span class="ruby-identifier">render_name</span> = <span class="ruby-identifier">h</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-identifier">render_type</span>)
+64: 
+65:         <span class="ruby-keyword kw">begin</span>
+66:           <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">send</span>( <span class="ruby-node">&quot;render_#{render_type.to_s}&quot;</span>, <span class="ruby-identifier">render_name</span>, <span class="ruby-identifier">h</span> )
+67:         <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+68:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">RenderError</span>, <span class="ruby-node">&quot;Error rendering `#{render_type.to_s}' : #{e.message}&quot;</span>, <span class="ruby-identifier">caller</span>
+69:         <span class="ruby-keyword kw">end</span>
+70:       <span class="ruby-keyword kw">else</span>
+71:         <span class="ruby-identifier">render</span>( <span class="ruby-identifier">:text</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">h</span> )
+72:       <span class="ruby-keyword kw">end</span>
+73:     <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Mon, 15 Jun 2009 21:14:15 +0200
+Mon, 29 Jun 2009 17:37:38 +0200

data/doc/rdoc/files/README.html

@@ -81,7 +81,7 @@ end</strong>
     <div id="README" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">README / Mon Jun 15 21:12:58 +0200 2009</div>
+  <div class="path">README / Mon Jun 29 17:32:18 +0200 2009</div>
 </div>
 
 <h1><a href="../classes/Capcode.html">Capcode</a></h1>
@@ -98,6 +98,19 @@ Copyright (C) 2009 Gregoire Lejeune
 <a href="../classes/Capcode.html">Capcode</a> is a web microframework
 </p>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.6.2</h3>
+<ul>
+<li>Add Markaby, Erb and Haml layout see Capcode::Helpers.render for more
+informations
+
+</li>
+<li>Add content_for&#8230;
+
+</li>
+<li>Major bugs corrections
+
+</li>
+</ul>
 <h3>0.6.1</h3>
 <ul>
 <li>Major bugs corrections in haml and erb renderer ($%&amp;! Windows)
@@ -109,7 +122,9 @@ Copyright (C) 2009 Gregoire Lejeune
 <li>Add Markaby layout support
 
 </li>
-<li>Rewrite blog-couchdb example
+<li>Rewrite blog-couchdb example (based on the very sympatic camping example :
+<a
+href="http://github.com/judofyr/camping/blob/master/examples/blog.rb">github.com/judofyr/camping/blob/master/examples/blog.rb</a>)
 
 </li>
 </ul>

data/doc/rdoc/files/lib/capcode_rb.html

@@ -81,7 +81,7 @@ end</strong>
     <div id="lib/capcode.rb" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">lib/capcode.rb / Mon Jun 15 19:58:55 +0200 2009</div>
+  <div class="path">lib/capcode.rb / Mon Jun 29 17:30:35 +0200 2009</div>
 </div>
 
 <pre>

data/examples/blog-couchdb.rb

@@ -1,3 +1,4 @@
+$:.unshift( "../lib" )
 require 'rubygems'
 require 'capcode'
 require 'capcode/base/couchdb'
@@ -33,7 +34,7 @@ module Capcode
     def get
       @story = Story.find( :all )
       
-      render( :markaby => :home )
+      render( :markaby => :home, :layout => :my_layout )
     end
   end
   
@@ -46,7 +47,7 @@ module Capcode
   
   class Add < Route '/add'
     def get
-      render( :markaby => :add )
+      render( :markaby => :add, :layout => :my_layout )
     end
     def post
       Story.create( :title => params['title'], :body => params['body'], :create_at => Time.now )
@@ -80,7 +81,7 @@ module Capcode::Views
     end
   end
   
-  def layout
+  def my_layout
     html do
       head do
         title 'My Blog'

data/examples/erb/cf.rhtml

@@ -0,0 +1,7 @@
+<% content_for( :header ) do %>
+<title>title This is the title!</title>
+<% end %>
+
+<% content_for( :content ) do %>
+<p>this is the content!</p>
+<% end %>

data/examples/erb/cf_layout.rhtml

@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <%= yield :header %>
+	</head>
+  <body>
+    <%= yield :content %>
+  </body>
+</html>

data/examples/erb/layout.rhtml

@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>Use a layout ;)</title>
+	</head>
+	<body>
+		<%= yield %>
+	</body>
+</html>

data/examples/erb/m_hello.rhtml

@@ -1,5 +1 @@
-<html>
-  <body>
-    <p>Hello <%= @you %> it's <%= Time.now %></p>
-	</body>
-</html>
+<p>Hello <b><%= @you %></b> it's <%= Time.now %></p>

data/examples/haml/cf.haml

@@ -0,0 +1,4 @@
+- content_for( :header ) do
+  %title This is the title!
+- content_for( :content ) do
+  %p this is the content!

data/examples/haml/cf_layout.haml

@@ -0,0 +1,5 @@
+%html
+  %head
+    = yield :header
+  %body
+    = yield :content

data/examples/haml/layout.haml

@@ -0,0 +1,5 @@
+%html
+  %head
+    %title= "Use a layout ;)"
+  %body
+    = yield

data/examples/haml/m_hello.haml

@@ -1,7 +1,5 @@
-%html
-  %body
-    %p 
-      hello 
-      %b= @you 
-      it's 
-      = Time.now
+%p 
+  hello 
+  %b= @you 
+  it's 
+  = Time.now

data/examples/sample.rb

@@ -1,4 +1,5 @@
 $:.unshift( "../lib" )
+require 'rubygems'
 require 'capcode'
 require 'capcode/render/markaby'
 require 'capcode/render/haml'
@@ -29,8 +30,7 @@ module Capcode
       
       session = { :user => @you }
       
-      # "Hello " + bold { you } + " it's '#{Time.now} !"
-      render( :markaby => :m_hello )
+      render( :haml => :m_hello )
     end
   end
   
@@ -42,7 +42,7 @@ module Capcode
   
   class Glop < Route '/glop/(.*)', '/glop/code/([^\/]*)/(.*)'
     def get( r, v )
-      "Glop receive #{r}, type #{r.class} and #{v}, type #{v.class} from #{URL(Glop)}"
+      render( :text => "Glop receive #{r}, type #{r.class} and #{v}, type #{v.class} from #{URL(Glop)}" )
     end
   end
   
@@ -57,12 +57,39 @@ module Capcode
       x = env.map do |k,v|
         "#{k} => #{v}"
       end.join( "<br />\n" )      
-      x
+      render( :text => x )
+    end
+  end
+  
+  class ContentFor < Route '/cf'
+    def get
+      render( :erb => :cf, :layout => :cf_layout )
     end
   end
 end
 
 module Capcode::Views
+  def cf_layout
+    html do
+      head do
+        yield :header
+      end
+      body do
+        yield :content
+      end
+    end
+  end
+  
+  def cf
+    content_for :header do
+      title "This is the title!"
+    end
+    
+    content_for :content do
+      p "this is the content!"
+    end
+  end
+  
   def layout
     html do
       head do
@@ -75,16 +102,12 @@ module Capcode::Views
   end
   
   def m_hello
-        p do 
-          text "Hello " 
-          b @you
-          text " it's '#{Time.now} !"
-        end
+    p do 
+      text "Hello " 
+      b @you
+      text " it's '#{Time.now} !"
+    end
   end
 end
 
-#Capcode.map( "/file" ) do
-#  Rack::File.new( "." )
-#end
-
 Capcode.run( :port => 3001, :host => "localhost", :root => "." )

data/lib/capcode.rb

@@ -23,26 +23,55 @@ module Capcode
   # Helpers contains methods available in your controllers
   module Helpers
     @@__ROOT_DIRECTORY = ""
+    @@__ARGS__ = nil
     def self.root=(p)
       @@__ROOT_DIRECTORY=p
     end
     
     # Render a view
+    # 
+    # render's parameter can be a Hash or a string. Passing a string is equivalent to do
+    #   render( :text => string )
+    # 
+    # If you want to use a specific renderer, use one of this options :
+    # 
+    # * :markaby => :my_func : :my_func must be defined in Capcode::Views
+    # * :erb => :my_erb_file : this suppose that's my_erb_file.rhtml exist in erb_path
+    # * :haml => :my_haml_file : this suppose that's my_haml_file.rhtml exist in haml_path
+    # * :text => "my text"
+    # * :json => MyObject : this suppose that's MyObject respond to .to_json
+    #
+    # If you want to use a specific layout, you can specify it with option 
+    #   :layout
     def render( h )
       if h.class == Hash
-        t = (h.keys)[0]
-        v = h[t]
+        render_type = nil
+        
+        h.keys.each do |k|
+          if self.respond_to?("render_#{k.to_s}")
+            unless render_type.nil?
+              raise Capcode::RenderError, "Can't use multiple renderer (`#{render_type}' and `#{k}') !", caller
+            end
+            render_type = k
+          end
+        end
+
+        if render_type.nil?
+          raise Capcode::RenderError, "Renderer type not specified!", caller
+        end
+
+        render_name = h.delete(render_type)
+
         begin
-          self.send( "render_#{t.to_s}", v )
+          self.send( "render_#{render_type.to_s}", render_name, h )
         rescue => e
-          raise Capcode::RenderError, "Error rendering `#{t.to_s}' : #{e.message}", caller
+          raise Capcode::RenderError, "Error rendering `#{render_type.to_s}' : #{e.message}", caller
         end
       else
-        return self.send(h.to_s)
+        render( :text => h )
       end
     end
     
-    
     # Help you to return a JSON response
     #
     #   module Capcode
@@ -102,6 +131,13 @@ module Capcode
       
       path+((a.size>0)?("/"+a.join("/")):(""))
     end
+    
+    # Calling content_for stores a block of markup in an identifier.
+    def content_for( x )
+      if @@__ARGS__.map{|_| _.to_s }.include?(x.to_s)
+        yield
+      end
+    end
   end
   
   include Rack
@@ -165,7 +201,7 @@ module Capcode
       
       [200, {
         "Last-Modified"  => File.mtime(@path).httpdate,
-        "Content-Type"   => (MIME::Types.type_for(@path)[0] || '/text/plain').to_s,
+        "Content-Type"   => (MIME::Types.type_for(@path)[0] || 'text/plain').to_s,
         "Content-Length" => size.to_s
       }, body]
     end
@@ -182,6 +218,8 @@ module Capcode
   end
   
   class << self
+    attr :__args__, true
+    
     # Add routes to a controller class
     # 
     #   module Capcode