Capcode 0.7.0 → 0.7.1

data/README

@@ -10,6 +10,10 @@ Capcode is a web microframework
 
 == FEATURES/PROBLEMS:
 
+=== 0.7.1
+* You need to include Capcode::Resource in your models !!!!
+* Add option --version
+
 === 0.7.0
 * You no more need to include Capcode::Resource in your models
 * Capcode.run now accept a block. The content of the block is executed just before the server start.

data/doc/rdoc/classes/Capcode.html

@@ -446,104 +446,108 @@ main.rb)
 433:           <span class="ruby-identifier">puts</span> <span class="ruby-identifier">opts</span>
 434:           <span class="ruby-identifier">exit</span>
 435:         <span class="ruby-keyword kw">end</span>  
-436:       <span class="ruby-keyword kw">end</span>
-437:       
-438:       <span class="ruby-keyword kw">begin</span>
-439:         <span class="ruby-identifier">opts</span>.<span class="ruby-identifier">parse!</span> <span class="ruby-constant">ARGV</span>
-440:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">OptionParser</span><span class="ruby-operator">::</span><span class="ruby-constant">ParseError</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">ex</span>
-441:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;!! #{ex.message}&quot;</span>
-442:         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;** use `#{File.basename($0)} --help` for more details...&quot;</span>
-443:         <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
-444:       <span class="ruby-keyword kw">end</span>
-445:       
-446:       <span class="ruby-comment cmt"># Run in the Working directory</span>
-447:       <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:working_directory</span>] ) <span class="ruby-keyword kw">do</span>
-448:         <span class="ruby-comment cmt"># Set root directory for helpers</span>
-449:         <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">root</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>( <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:root</span>] )
-450:         
-451:         <span class="ruby-comment cmt"># Check that mongrel exists </span>
-452:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>].<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>] <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;mongrel&quot;</span>
-453:           <span class="ruby-keyword kw">begin</span>
-454:             <span class="ruby-identifier">require</span> <span class="ruby-value str">'mongrel'</span>
-455:             <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>] = <span class="ruby-value str">&quot;mongrel&quot;</span>
-456:           <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">LoadError</span> 
-457:             <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;!! could not load mongrel. Falling back to webrick.&quot;</span>
-458:             <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>] = <span class="ruby-value str">&quot;webrick&quot;</span>
-459:           <span class="ruby-keyword kw">end</span>
-460:         <span class="ruby-keyword kw">end</span>
-461:             
-462:         <span class="ruby-constant">Capcode</span>.<span class="ruby-identifier">constants</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>
-463:           <span class="ruby-keyword kw">begin</span>
-464:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">eval</span> <span class="ruby-node">&quot;Capcode::#{k}.public_methods(true).include?( '__urls__' )&quot;</span>
-465:               <span class="ruby-identifier">u</span>, <span class="ruby-identifier">m</span>, <span class="ruby-identifier">c</span> = <span class="ruby-identifier">eval</span> <span class="ruby-node">&quot;Capcode::#{k}.__urls__&quot;</span>
-466:               <span class="ruby-identifier">u</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">_u</span><span class="ruby-operator">|</span>
-467:                 <span class="ruby-identifier">raise</span> <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">RouteError</span>, <span class="ruby-node">&quot;Route `#{_u}' already define !&quot;</span>, <span class="ruby-identifier">caller</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@__ROUTES</span>.<span class="ruby-identifier">keys</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">_u</span>)
-468:                 <span class="ruby-ivar">@@__ROUTES</span>[<span class="ruby-identifier">_u</span>] = <span class="ruby-identifier">c</span>.<span class="ruby-identifier">new</span>
-469:               <span class="ruby-keyword kw">end</span>
-470:             <span class="ruby-keyword kw">end</span>
-471:           <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-472:             <span class="ruby-identifier">raise</span> <span class="ruby-identifier">e</span>.<span class="ruby-identifier">message</span>
-473:           <span class="ruby-keyword kw">end</span>
-474:         <span class="ruby-keyword kw">end</span>
-475:         
-476:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">URLMap</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@@__ROUTES</span>)
-477:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">Session</span><span class="ruby-operator">::</span><span class="ruby-constant">Cookie</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">app</span>, <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:session</span>] )
-478:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTPError</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">app</span>, <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:root</span>])
-479:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">ContentLength</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">app</span>)
-480:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">Lint</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">app</span>)
-481:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">ShowExceptions</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">app</span>)
-482: <span class="ruby-comment cmt">#        app = Rack::Reloader.new(app) ## -- NE RELOAD QUE capcode.rb -- So !!!</span>
-483:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">CommonLogger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">app</span>, <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:log</span>]) )
-484:         
-485:         <span class="ruby-comment cmt"># From rackup !!!</span>
-486:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:daemonize</span>]
-487:           <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_VERSION</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value str">&quot;1.9&quot;</span>
-488:             <span class="ruby-identifier">exit</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fork</span>
-489:             <span class="ruby-constant">Process</span>.<span class="ruby-identifier">setsid</span>
-490:             <span class="ruby-identifier">exit</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fork</span>
-491:             <span class="ruby-comment cmt"># Dir.chdir &quot;/&quot;</span>
-492:             <span class="ruby-constant">File</span>.<span class="ruby-identifier">umask</span> <span class="ruby-value">0000</span>
-493:             <span class="ruby-constant">STDIN</span>.<span class="ruby-identifier">reopen</span> <span class="ruby-value str">&quot;/dev/null&quot;</span>
-494:             <span class="ruby-constant">STDOUT</span>.<span class="ruby-identifier">reopen</span> <span class="ruby-value str">&quot;/dev/null&quot;</span>, <span class="ruby-value str">&quot;a&quot;</span>
-495:             <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">reopen</span> <span class="ruby-value str">&quot;/dev/null&quot;</span>, <span class="ruby-value str">&quot;a&quot;</span>
-496:           <span class="ruby-keyword kw">else</span>
-497:             <span class="ruby-constant">Process</span>.<span class="ruby-identifier">daemon</span>
-498:           <span class="ruby-keyword kw">end</span>
-499:         
-500:           <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:pid</span>], <span class="ruby-value str">'w'</span>){ <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">write</span>(<span class="ruby-node">&quot;#{Process.pid}&quot;</span>) }
-501:           <span class="ruby-identifier">at_exit</span> { <span class="ruby-constant">File</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:pid</span>]) <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:pid</span>]) }
-502:         <span class="ruby-keyword kw">end</span>
+436:         <span class="ruby-identifier">opts</span>.<span class="ruby-identifier">on_tail</span>(<span class="ruby-value str">&quot;-v&quot;</span>, <span class="ruby-value str">&quot;--version&quot;</span>, <span class="ruby-value str">&quot;Show versions&quot;</span>) <span class="ruby-keyword kw">do</span>
+437:           <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Capcode version #{Capcode::CAPCOD_VERION} (ruby v#{RUBY_VERSION})&quot;</span>
+438:           <span class="ruby-identifier">exit</span>
+439:         <span class="ruby-keyword kw">end</span>  
+440:       <span class="ruby-keyword kw">end</span>
+441:       
+442:       <span class="ruby-keyword kw">begin</span>
+443:         <span class="ruby-identifier">opts</span>.<span class="ruby-identifier">parse!</span> <span class="ruby-constant">ARGV</span>
+444:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">OptionParser</span><span class="ruby-operator">::</span><span class="ruby-constant">ParseError</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">ex</span>
+445:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;!! #{ex.message}&quot;</span>
+446:         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;** use `#{File.basename($0)} --help` for more details...&quot;</span>
+447:         <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
+448:       <span class="ruby-keyword kw">end</span>
+449:       
+450:       <span class="ruby-comment cmt"># Run in the Working directory</span>
+451:       <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">chdir</span>( <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:working_directory</span>] ) <span class="ruby-keyword kw">do</span>
+452:         <span class="ruby-comment cmt"># Set root directory for helpers</span>
+453:         <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">root</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>( <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:root</span>] )
+454:         
+455:         <span class="ruby-comment cmt"># Check that mongrel exists </span>
+456:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>].<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>] <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;mongrel&quot;</span>
+457:           <span class="ruby-keyword kw">begin</span>
+458:             <span class="ruby-identifier">require</span> <span class="ruby-value str">'mongrel'</span>
+459:             <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>] = <span class="ruby-value str">&quot;mongrel&quot;</span>
+460:           <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">LoadError</span> 
+461:             <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;!! could not load mongrel. Falling back to webrick.&quot;</span>
+462:             <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>] = <span class="ruby-value str">&quot;webrick&quot;</span>
+463:           <span class="ruby-keyword kw">end</span>
+464:         <span class="ruby-keyword kw">end</span>
+465:             
+466:         <span class="ruby-constant">Capcode</span>.<span class="ruby-identifier">constants</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>
+467:           <span class="ruby-keyword kw">begin</span>
+468:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">eval</span> <span class="ruby-node">&quot;Capcode::#{k}.public_methods(true).include?( '__urls__' )&quot;</span>
+469:               <span class="ruby-identifier">u</span>, <span class="ruby-identifier">m</span>, <span class="ruby-identifier">c</span> = <span class="ruby-identifier">eval</span> <span class="ruby-node">&quot;Capcode::#{k}.__urls__&quot;</span>
+470:               <span class="ruby-identifier">u</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">_u</span><span class="ruby-operator">|</span>
+471:                 <span class="ruby-identifier">raise</span> <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">RouteError</span>, <span class="ruby-node">&quot;Route `#{_u}' already define !&quot;</span>, <span class="ruby-identifier">caller</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@__ROUTES</span>.<span class="ruby-identifier">keys</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">_u</span>)
+472:                 <span class="ruby-ivar">@@__ROUTES</span>[<span class="ruby-identifier">_u</span>] = <span class="ruby-identifier">c</span>.<span class="ruby-identifier">new</span>
+473:               <span class="ruby-keyword kw">end</span>
+474:             <span class="ruby-keyword kw">end</span>
+475:           <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+476:             <span class="ruby-identifier">raise</span> <span class="ruby-identifier">e</span>.<span class="ruby-identifier">message</span>
+477:           <span class="ruby-keyword kw">end</span>
+478:         <span class="ruby-keyword kw">end</span>
+479:         
+480:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">URLMap</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@@__ROUTES</span>)
+481:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">Session</span><span class="ruby-operator">::</span><span class="ruby-constant">Cookie</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">app</span>, <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:session</span>] )
+482:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Capcode</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTPError</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">app</span>, <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:root</span>])
+483:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">ContentLength</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">app</span>)
+484:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">Lint</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">app</span>)
+485:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">ShowExceptions</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">app</span>)
+486: <span class="ruby-comment cmt">#        app = Rack::Reloader.new(app) ## -- NE RELOAD QUE capcode.rb -- So !!!</span>
+487:         <span class="ruby-identifier">app</span> = <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">CommonLogger</span>.<span class="ruby-identifier">new</span>( <span class="ruby-identifier">app</span>, <span class="ruby-constant">Logger</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:log</span>]) )
+488:         
+489:         <span class="ruby-comment cmt"># From rackup !!!</span>
+490:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:daemonize</span>]
+491:           <span class="ruby-keyword kw">if</span> <span class="ruby-constant">RUBY_VERSION</span> <span class="ruby-operator">&lt;</span> <span class="ruby-value str">&quot;1.9&quot;</span>
+492:             <span class="ruby-identifier">exit</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fork</span>
+493:             <span class="ruby-constant">Process</span>.<span class="ruby-identifier">setsid</span>
+494:             <span class="ruby-identifier">exit</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">fork</span>
+495:             <span class="ruby-comment cmt"># Dir.chdir &quot;/&quot;</span>
+496:             <span class="ruby-constant">File</span>.<span class="ruby-identifier">umask</span> <span class="ruby-value">0000</span>
+497:             <span class="ruby-constant">STDIN</span>.<span class="ruby-identifier">reopen</span> <span class="ruby-value str">&quot;/dev/null&quot;</span>
+498:             <span class="ruby-constant">STDOUT</span>.<span class="ruby-identifier">reopen</span> <span class="ruby-value str">&quot;/dev/null&quot;</span>, <span class="ruby-value str">&quot;a&quot;</span>
+499:             <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">reopen</span> <span class="ruby-value str">&quot;/dev/null&quot;</span>, <span class="ruby-value str">&quot;a&quot;</span>
+500:           <span class="ruby-keyword kw">else</span>
+501:             <span class="ruby-constant">Process</span>.<span class="ruby-identifier">daemon</span>
+502:           <span class="ruby-keyword kw">end</span>
 503:         
-504:         <span class="ruby-comment cmt"># Start database</span>
-505:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">methods</span>.<span class="ruby-identifier">include?</span> <span class="ruby-value str">&quot;db_connect&quot;</span>
-506:           <span class="ruby-identifier">db_connect</span>( <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:db_config</span>], <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:log</span>] )
-507:         <span class="ruby-keyword kw">end</span>
-508:         
-509:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
-510:           <span class="ruby-keyword kw">yield</span>( <span class="ruby-keyword kw">self</span> )
+504:           <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:pid</span>], <span class="ruby-value str">'w'</span>){ <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span> <span class="ruby-identifier">f</span>.<span class="ruby-identifier">write</span>(<span class="ruby-node">&quot;#{Process.pid}&quot;</span>) }
+505:           <span class="ruby-identifier">at_exit</span> { <span class="ruby-constant">File</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:pid</span>]) <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:pid</span>]) }
+506:         <span class="ruby-keyword kw">end</span>
+507:         
+508:         <span class="ruby-comment cmt"># Start database</span>
+509:         <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">methods</span>.<span class="ruby-identifier">include?</span> <span class="ruby-value str">&quot;db_connect&quot;</span>
+510:           <span class="ruby-identifier">db_connect</span>( <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:db_config</span>], <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:log</span>] )
 511:         <span class="ruby-keyword kw">end</span>
 512:         
-513:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:console</span>]
-514:           <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Run console...&quot;</span>
-515:           <span class="ruby-constant">IRB</span>.<span class="ruby-identifier">start</span>
-516:           <span class="ruby-identifier">exit</span>
-517:         <span class="ruby-keyword kw">end</span>
-518:         
-519:         <span class="ruby-comment cmt"># Start server</span>
-520:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>]
-521:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;mongrel&quot;</span>
-522:           <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;** Starting Mongrel on #{conf[:host]}:#{conf[:port]}&quot;</span>
-523:           <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">Handler</span><span class="ruby-operator">::</span><span class="ruby-constant">Mongrel</span>.<span class="ruby-identifier">run</span>( <span class="ruby-identifier">app</span>, {<span class="ruby-identifier">:Port</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:port</span>], <span class="ruby-identifier">:Host</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:host</span>]} ) { <span class="ruby-operator">|</span><span class="ruby-identifier">server</span><span class="ruby-operator">|</span>
-524:             <span class="ruby-identifier">trap</span> <span class="ruby-value str">&quot;SIGINT&quot;</span>, <span class="ruby-identifier">proc</span> { <span class="ruby-identifier">server</span>.<span class="ruby-identifier">stop</span> }
-525:           }
-526:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;webrick&quot;</span>
-527:           <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;** Starting WEBrick on #{conf[:host]}:#{conf[:port]}&quot;</span>
-528:           <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">Handler</span><span class="ruby-operator">::</span><span class="ruby-constant">WEBrick</span>.<span class="ruby-identifier">run</span>( <span class="ruby-identifier">app</span>, {<span class="ruby-identifier">:Port</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:port</span>], <span class="ruby-identifier">:BindAddress</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:host</span>]} ) { <span class="ruby-operator">|</span><span class="ruby-identifier">server</span><span class="ruby-operator">|</span>
-529:             <span class="ruby-identifier">trap</span> <span class="ruby-value str">&quot;SIGINT&quot;</span>, <span class="ruby-identifier">proc</span> { <span class="ruby-identifier">server</span>.<span class="ruby-identifier">shutdown</span> }
-530:           }
-531:         <span class="ruby-keyword kw">end</span>
-532:       <span class="ruby-keyword kw">end</span>
-533:     <span class="ruby-keyword kw">end</span>
+513:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+514:           <span class="ruby-keyword kw">yield</span>( <span class="ruby-keyword kw">self</span> )
+515:         <span class="ruby-keyword kw">end</span>
+516:         
+517:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:console</span>]
+518:           <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Run console...&quot;</span>
+519:           <span class="ruby-constant">IRB</span>.<span class="ruby-identifier">start</span>
+520:           <span class="ruby-identifier">exit</span>
+521:         <span class="ruby-keyword kw">end</span>
+522:         
+523:         <span class="ruby-comment cmt"># Start server</span>
+524:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:server</span>]
+525:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;mongrel&quot;</span>
+526:           <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;** Starting Mongrel on #{conf[:host]}:#{conf[:port]}&quot;</span>
+527:           <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">Handler</span><span class="ruby-operator">::</span><span class="ruby-constant">Mongrel</span>.<span class="ruby-identifier">run</span>( <span class="ruby-identifier">app</span>, {<span class="ruby-identifier">:Port</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:port</span>], <span class="ruby-identifier">:Host</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:host</span>]} ) { <span class="ruby-operator">|</span><span class="ruby-identifier">server</span><span class="ruby-operator">|</span>
+528:             <span class="ruby-identifier">trap</span> <span class="ruby-value str">&quot;SIGINT&quot;</span>, <span class="ruby-identifier">proc</span> { <span class="ruby-identifier">server</span>.<span class="ruby-identifier">stop</span> }
+529:           }
+530:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;webrick&quot;</span>
+531:           <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;** Starting WEBrick on #{conf[:host]}:#{conf[:port]}&quot;</span>
+532:           <span class="ruby-constant">Rack</span><span class="ruby-operator">::</span><span class="ruby-constant">Handler</span><span class="ruby-operator">::</span><span class="ruby-constant">WEBrick</span>.<span class="ruby-identifier">run</span>( <span class="ruby-identifier">app</span>, {<span class="ruby-identifier">:Port</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:port</span>], <span class="ruby-identifier">:BindAddress</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">conf</span>[<span class="ruby-identifier">:host</span>]} ) { <span class="ruby-operator">|</span><span class="ruby-identifier">server</span><span class="ruby-operator">|</span>
+533:             <span class="ruby-identifier">trap</span> <span class="ruby-value str">&quot;SIGINT&quot;</span>, <span class="ruby-identifier">proc</span> { <span class="ruby-identifier">server</span>.<span class="ruby-identifier">shutdown</span> }
+534:           }
+535:         <span class="ruby-keyword kw">end</span>
+536:       <span class="ruby-keyword kw">end</span>
+537:     <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

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

@@ -103,26 +103,11 @@ controllers
 </ul>
 
 <h2 class="ruled">Methods</h2>
-<h4 class="ruled">Public Class method: 
-<strong><a name="M000009">root=(p)</a></strong> <a href="#M000009"><img src="../../permalink.gif" border="0" title="Permalink to Public Class method: root=" /></a></h4>
-
-
-<div class="sourcecode">
-  <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 35</span>
-35:     <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>)
-36:       <span class="ruby-ivar">@@__ROOT_DIRECTORY</span>=<span class="ruby-identifier">p</span>
-37:     <span class="ruby-keyword kw">end</span>
-</pre>
-  </div>
-</div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000013">URL( klass, *a )</a></strong> <a href="#M000013"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: URL" /></a></h4>
+<strong><a name="M000012">URL( klass, *a )</a></strong> <a href="#M000012"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: URL" /></a></h4>
 
 <p>
-Builds an <a href="Helpers.html#M000013">URL</a> route to a controller or a
+Builds an <a href="Helpers.html#M000012">URL</a> route to a controller or a
 path
 </p>
 <p>
@@ -143,8 +128,8 @@ then
 </pre>
 
 <div class="sourcecode">
-  <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">
+  <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 128</span>
 128:     <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> )
@@ -165,16 +150,16 @@ then
   </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>
+<strong><a name="M000013">content_for( x ) {|| ...}</a></strong> <a href="#M000013"><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
+Calling <a href="Helpers.html#M000013">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">
+  <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 144</span>
 144:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">content_for</span>( <span class="ruby-identifier">x</span> )
@@ -186,7 +171,7 @@ markup in an identifier.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000011">json( d )</a></strong> <a href="#M000011"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: json" /></a></h4>
+<strong><a name="M000010">json( d )</a></strong> <a href="#M000010"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: json" /></a></h4>
 
 <p>
 Help you to return a JSON response
@@ -202,8 +187,8 @@ Help you to return a JSON response
 </pre>
 
 <div class="sourcecode">
-  <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">
+  <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 92</span>
 92:     <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>
@@ -215,10 +200,10 @@ Help you to return a JSON response
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000012">redirect( klass, *a )</a></strong> <a href="#M000012"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: redirect" /></a></h4>
+<strong><a name="M000011">redirect( klass, *a )</a></strong> <a href="#M000011"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: redirect" /></a></h4>
 
 <p>
-Send a <a href="Helpers.html#M000012">redirect</a> response
+Send a <a href="Helpers.html#M000011">redirect</a> response
 </p>
 <pre>
   module Capcode
@@ -235,8 +220,8 @@ Send a <a href="Helpers.html#M000012">redirect</a> response
 </pre>
 
 <div class="sourcecode">
-  <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">
+  <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 111</span>
 111:     <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> )
@@ -246,13 +231,13 @@ Send a <a href="Helpers.html#M000012">redirect</a> response
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000010">render( h )</a></strong> <a href="#M000010"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: render" /></a></h4>
+<strong><a name="M000009">render( h )</a></strong> <a href="#M000009"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: render" /></a></h4>
 
 <p>
 Render a view
 </p>
 <p>
-<a href="Helpers.html#M000010">render</a>&#8216;s parameter can be a Hash
+<a href="Helpers.html#M000009">render</a>&#8216;s parameter can be a Hash
 or a string. Passing a string is equivalent to do
 </p>
 <pre>
@@ -277,7 +262,7 @@ exist in haml_path
 <li>:text =&gt; &quot;my text&quot;
 
 </li>
-<li>:<a href="Helpers.html#M000011">json</a> =&gt; MyObject : this suppose
+<li>:<a href="Helpers.html#M000010">json</a> =&gt; MyObject : this suppose
 that&#8216;s MyObject respond to .to_json
 
 </li>
@@ -290,8 +275,8 @@ If you want to use a specific layout, you can specify it with option
 </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">
+  <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 54</span>
 54:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render</span>( <span class="ruby-identifier">h</span> )

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Wed, 01 Jul 2009 18:49:06 +0200
+Thu, 02 Jul 2009 17:58:19 +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 / Wed Jul 01 12:10:01 +0200 2009</div>
+  <div class="path">README / Thu Jul 02 17:56:23 +0200 2009</div>
 </div>
 
 <h1><a href="../classes/Capcode.html">Capcode</a></h1>
@@ -98,6 +98,15 @@ Copyright (C) 2009 Gregoire Lejeune
 <a href="../classes/Capcode.html">Capcode</a> is a web microframework
 </p>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.7.1</h3>
+<ul>
+<li>You need to include Capcode::Resource in your models !!!!
+
+</li>
+<li>Add option &#8212;version
+
+</li>
+</ul>
 <h3>0.7.0</h3>
 <ul>
 <li>You no more need to include Capcode::Resource in your models

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 / Wed Jul 01 17:54:22 +0200 2009</div>
+  <div class="path">lib/capcode.rb / Thu Jul 02 17:56:13 +0200 2009</div>
 </div>
 
 <pre>

data/doc/rdoc_iphone/classes/Capcode.html

@@ -0,0 +1,175 @@
+
+<!-- BEGIN: BODY -->
+ 
+<div id="Capcode" title="Module: Capcode" class="panel">
+
+
+<h2>Includes</h2>
+<ul>
+  <li>Rack</li>
+  <li>Capcode::Helpers</li>
+  <li>Capcode::Views</li>
+</ul>
+
+
+<h2 class="ruled">Methods</h2>
+<ul>
+  <li>
+    Public Class method: 
+    <b>Route(*u)</b>
+  </li>
+  <li>
+    <p>
+Add routes to a controller class
+</p>
+<pre>
+  module Capcode
+    class Hello &lt; Route '/hello/(.*)', '/hello/([^#]*)#(.*)'
+      def get( arg1, arg2 )
+        ...
+      end
+    end
+  end
+</pre>
+<p>
+In the <tt>get</tt> method, you will receive the maximum of parameters
+declared by the routes. In this example, you will receive 2 parameters. So
+if you go to <tt>/hello/world#friend</tt> then <tt>arg1</tt> will be set to
+<tt>world</tt> and <tt>arg2</tt> will be set to <tt>friend</tt>. Now if you
+go to <tt>/hello/you</tt>, then <tt>arg1</tt> will be set to <tt>you</tt>
+and <tt>arg2</tt> will be set to <tt>nil</tt>
+</p>
+<p>
+If the regexp in the route does not match, all arguments will be
+<tt>nil</tt>
+</p>
+  </li>
+</ul>
+<ul>
+  <li>
+    Public Class method: 
+    <b>env()</b>
+  </li>
+  <li>
+    <p>
+Hash containing all the environment variables
+</p>
+  </li>
+</ul>
+<ul>
+  <li>
+    Public Class method: 
+    <b>map( r ) {|| ...}</b>
+  </li>
+  <li>
+    <p>
+This method help you to <a href="Capcode.html#M000007">map</a> and URL to a
+Rack or What you want Helper
+</p>
+<pre>
+  Capcode.map( &quot;/file&quot; ) do
+    Rack::File.new( &quot;.&quot; )
+  end
+</pre>
+  </li>
+</ul>
+<ul>
+  <li>
+    Public Class method: 
+    <b>params()</b>
+  </li>
+  <li>
+    <p>
+Hash containing all the <a href="Capcode.html#M000005">request</a>
+parameters (GET or POST)
+</p>
+  </li>
+</ul>
+<ul>
+  <li>
+    Public Class method: 
+    <b>request()</b>
+  </li>
+  <li>
+    <p>
+Return the Rack::Request object
+</p>
+  </li>
+</ul>
+<ul>
+  <li>
+    Public Class method: 
+    <b>response()</b>
+  </li>
+  <li>
+    <p>
+Return the Rack::Response object
+</p>
+  </li>
+</ul>
+<ul>
+  <li>
+    Public Class method: 
+    <b>run( args = {} ) {|self| ...}</b>
+  </li>
+  <li>
+    <p>
+Start your application.
+</p>
+<p>
+Options :
+</p>
+<ul>
+<li><tt>:port</tt> = Listen port
+
+</li>
+<li><tt>:host</tt> = Listen host
+
+</li>
+<li><tt>:server</tt> = Server type (webrick or mongrel)
+
+</li>
+<li><tt>:log</tt> = Output logfile (default: STDOUT)
+
+</li>
+<li><tt>:<a href="Capcode.html#M000004">session</a></tt> = Session parameters.
+See Rack::Session for more informations
+
+</li>
+<li><tt>:pid</tt> = PID file (default: $0.pid)
+
+</li>
+<li><tt>:daemonize</tt> = Daemonize application (default: false)
+
+</li>
+<li><tt>:db_config</tt> = database configuration file (default: database.yml)
+
+</li>
+<li><tt>:root</tt> = root directory (default: &quot;.&quot; &#8212; relative to
+the working directory)
+
+</li>
+<li><tt>:working_directory</tt> = Working directory (default: directory of the
+main.rb)
+
+</li>
+</ul>
+  </li>
+</ul>
+<ul>
+  <li>
+    Public Class method: 
+    <b>session()</b>
+  </li>
+  <li>
+    <p>
+Hash <a href="Capcode.html#M000004">session</a>
+</p>
+  </li>
+</ul>
+
+
+
+</div>
+
+<!-- BEGIN: BODY -->