merb 0.0.4 → 0.0.5

data/README

@@ -29,7 +29,7 @@ including multipart uploads and post as well as ?query=strings. Puts the
 params into params and the cookies into cookies when it instantiates your
 controller class.
 
-2. New RouteMatcher and route compiler. Reads your route definition and compiles
+2. RouteMatcher and route compiler. Reads your route definition and compiles
 a method on the fly that will match the request path against each route and do the 
 right thing. So the following routes:
 
@@ -93,6 +93,34 @@ end
   <h1>Hello, <%= @name %>!</h1> 
 <% end %>
 
+You can also render partials like so:
+<%= partial(:comments) %>
+
+This assumes a _comments.rhtml file in the same view dir as the current 
+controller/view
+
+Merb also allows for returning javascript instead of html for ajax actions
+You have to use the render_js instead of normal render
+
+def ajax_action
+  @posts = Post.find :all
+  render_js
+end
+
+# ajax_action.merbjs
+$('comments').update('<%= escape_js(partial(:posts)) %>');
+
+# _posts.rhtml
+<ul>
+  <% @posts.each do |p| %>
+    <li>
+    <%= p.title %><br />
+    <%= p.body %>
+    </li>
+  <% end %>
+</ul>	
+
+
 
 4. the server. right now you add your routes in
 the appdir/conf/router.rb file. So by default it runs on port 4000
@@ -100,6 +128,15 @@ the appdir/conf/router.rb file. So by default it runs on port 4000
 $ cd /path/to/your/merb/app
 $ merb  
 
+Or to start merb on a different port:
+$ merb -p 3500
+
+To start a cluster of merb servers you specify the first port and then how many 
+servers you want spawned. SO this command will start a merb instance on ports
+3000, 3001, 3002
+
+$ merb -p 3000 -c 3
+
 5. File uploads. This is the thing that Merb was written for. Rails doesn't allow 
 multiple concurrent file uploads at once without blocking an entire rails backend 
 for each file upload. Merb allows multiple file uploads at once. Start the server 
@@ -125,11 +162,12 @@ and DIST_ROOT. MERB_ROOT is the root of the whole tree. And DISTROOT is MERB_ROO
 You will cd into MERB_ROOT to run the merb command line. ANd when you deploy live you
 will put the dist dir into another empty MERB_ROOT on the production server.
 
-skeleton_app
+app_skeleton
   Rakefile
   README
   scripts
   test
+    test_helper.rb
     fixtures
     spec
     unit
@@ -143,3 +181,4 @@ skeleton_app
     lib
     public
     plugins
+    schema

data/Rakefile

@@ -3,11 +3,12 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'rake/testtask'
+require 'code_statistics' 
 require 'fileutils'
 include FileUtils
 
 NAME = "merb"
-VERS = "0.0.4"
+VERS = "0.0.5"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "Merb Documentation",
   "--opname", "index.html",
@@ -68,6 +69,7 @@ task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}
 end
 
+desc "rdoc to rubyforge"
 task :doc_rforge do
   sh %{rake doc}
   sh %{scp -r -p doc/rdoc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
@@ -112,7 +114,7 @@ STATS_DIRECTORIES = [
 
 desc "Report code statistics (KLOCs, etc) from the application"
 task :stats do
-  require 'extra/stats'
+  #require 'extra/stats'
   verbose = true
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
 end

data/TODO

@@ -1,8 +1,8 @@
 [TODO]
 * Irb Console **DONE**
-* Migrations
+* Migrations **DONE**
 * Helpers
-* config file
+* config file **DONE**
 * merg args and params **DONE**
 * session
   ** AR
@@ -11,7 +11,7 @@
 * Mongoose ?
 * Text backend?
 * plugins support(rails plugins too?)
-* Layouts
+* Layouts **DONE**
 * auto template_dir
 * before/after filters
 * merbjs

data/bin/merb

@@ -1,7 +1,161 @@
 #!/usr/local/bin/ruby
 require 'rubygems'
 require 'merb'
-#require 'merb_daemon'
-require 'merb_config'
-DEBUG=true
+require 'optparse'
+require 'ostruct'
+require 'fileutils'
+module Merb
+end
+
+class Merb::Config
+  def self.setup
+    defaults = {
+      :host => "0.0.0.0",
+      :port => "4000",
+      :allow_reloading => true,
+      :merb_root => Dir.pwd
+    }
+
+    begin
+      options = defaults.merge(YAML.load(ERB.new(IO.read("#{defaults[:merb_root]}/dist/conf/merb.yml")).result))
+    rescue
+      options = defaults
+    end
+
+    options
+  end
+end
+
+class Merb::Server
+
+  def self.merb_config
+    options = Merb::Config.setup
+
+    opts = OptionParser.new do |opts|
+      opts.on("-f", "--config-file [String]") do |config|
+        options[:config] = config
+      end
+      
+      opts.on("-d", "--daemonize [String]") do |config|
+        options[:daemonize] = true
+      end
+      
+      opts.on("-c", "--cluster-nodes [String]") do |nodes|
+        options[:cluster] = nodes
+      end
+
+      opts.on("-p", "--port [Integer]") do |port|
+        options[:port] = port
+      end
+      
+      opts.on("-n", "--num-procs [Integer]") do |numprocs|
+        options[:numprocs] = numprocs
+      end
+
+      opts.on("-h", "--host [String]") do |host|
+        options[:host] = host
+      end
+
+      opts.on("-m", "--merb-root [String]") do |merb_root|
+        options[:merb_root] = File.expand_path(merb_root)
+      end
+      
+      opts.on("-i", "--irb-console [String]") do |console|
+        options[:console] = true
+      end
+    end
+
+    opts.parse!(@@merb_raw_opts)
+
+
+    @@merb_opts = options
+    puts %{Merb started with these options:}
+    puts @@merb_opts.to_yaml; puts
+  end
+
+  def self.run
+    @@merb_raw_opts = ARGV
+    merb_config
+    
+    @@merb_opts[:dist_root] = @@merb_opts[:merb_root]+'/dist' 
+    
+    $LOAD_PATH.unshift( File.join(@@merb_opts[:merb_root] , '/dist/app/controllers') )
+    $LOAD_PATH.unshift( File.join(@@merb_opts[:merb_root] , '/dist/lib') )
+    require @@merb_opts[:merb_root]+'/dist/conf/router.rb'
+    require @@merb_opts[:merb_root]+'/dist/conf/merb_init.rb'
+
+    if @@merb_opts[:console]
+      ARGV.clear # Avoid passing args to IRB 
+      require 'irb' 
+      require 'irb/completion' 
+      def exit
+        exit!
+      end   
+      if File.exists? ".irbrc"
+        ENV['IRBRC'] = ".irbrc"
+      end
+      IRB.start
+      exit!
+    end
+    
+    if @@merb_opts[:cluster]
+      delete_pidfile
+      @@merb_opts[:port].to_i.upto(@@merb_opts[:port].to_i+@@merb_opts[:cluster].to_i-1) do |port|
+        puts "Starting merb server on port: #{port}"
+        start(port)
+      end   
+    elsif @@merb_opts[:daemonize]
+      delete_pidfile
+      start(@@merb_opts[:port])
+    else
+      trap('INT') {exit}
+      mongrel_start(@@merb_opts[:port])
+    end     
+
+  end
+
+  def self.store_pid(pid)
+    File.open("#{@@merb_opts[:merb_root]}/log/merb.pid", 'a'){|f| f.write("#{Process.pid}\n")}
+  end  
+
+  def self.start(port)
+    fork do
+      Process.setsid
+      exit if fork
+      store_pid(Process.pid)
+      Dir.chdir @@merb_opts[:merb_root]
+      File.umask 0000
+      STDIN.reopen "/dev/null"
+      STDOUT.reopen "/dev/null", "a"
+      STDERR.reopen STDOUT
+      trap("TERM") { exit }
+      mongrel_start(port)
+    end
+  end
+  
+  def self.delete_pidfile
+    FileUtils.rm("#{@@merb_opts[:merb_root]}/log/merb.pid")  rescue nil
+  end  
+  
+  def self.start_cluster(ports)
+    delete_pidfile
+    ports.each do |p|
+      start(port)
+    end
+  end
+
+  def self.mongrel_start(port)
+    h = Mongrel::HttpServer.new((@@merb_opts[:host]||"0.0.0.0"), (port ||4000), (@@merb_opts[:numprocs]||100))
+    h.register("/", MerbHandler.new(@@merb_opts[:dist_root]+'/public'))
+    h.register("/favicon.ico", Mongrel::Error404Handler.new(""))
+    h.run.join
+  end  
+
+  def self.config
+    @@merb_opts
+  end  
+
+end
+
+
 Merb::Server.run

data/doc/rdoc/classes/Hash.html

@@ -124,10 +124,10 @@
             onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000008-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_utils.rb, line 38</span>
-38:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">with_indifferent_access</span>
-39:     <span class="ruby-constant">MerbHash</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword kw">self</span>)
-40:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/merb/merb_utils.rb, line 47</span>
+47:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">with_indifferent_access</span>
+48:     <span class="ruby-constant">MerbHash</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword kw">self</span>)
+49:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/rdoc/classes/Merb.html

@@ -58,18 +58,10 @@
                 <a href="../files/lib/merb_rb.html">
                 lib/merb.rb
                 </a>
-        <br />
-                <a href="../files/lib/merb_config_rb.html">
-                lib/merb_config.rb
-                </a>
         <br />
                 <a href="../files/lib/merb/merb_controller_rb.html">
                 lib/merb/merb_controller.rb
                 </a>
-        <br />
-                <a href="../files/lib/merb/merb_daemon_rb.html">
-                lib/merb/merb_daemon.rb
-                </a>
         <br />
                 <a href="../files/lib/merb/merb_router_rb.html">
                 lib/merb/merb_router.rb
@@ -103,10 +95,8 @@
     <div id="class-list">
       <h3 class="section-bar">Classes and Modules</h3>
 
-      Class <a href="Merb/Config.html" class="link">Merb::Config</a><br />
-Class <a href="Merb/Controller.html" class="link">Merb::Controller</a><br />
+      Class <a href="Merb/Controller.html" class="link">Merb::Controller</a><br />
 Class <a href="Merb/RouteMatcher.html" class="link">Merb::RouteMatcher</a><br />
-Class <a href="Merb/Server.html" class="link">Merb::Server</a><br />
 
     </div>
 
@@ -118,7 +108,7 @@ Class <a href="Merb/Server.html" class="link">Merb::Server</a><br />
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">VERSION</td>
           <td>=</td>
-          <td class="context-item-value">'0.0.4' unless defined?VERSION</td>
+          <td class="context-item-value">'0.0.5' unless defined?VERSION</td>
         </tr>
         </table>
       </div>

data/doc/rdoc/classes/Merb/Controller.html

@@ -84,14 +84,14 @@
       <p>
 All of your controllers will inherit from <a
 href="Controller.html">Merb::Controller</a>. This superclass takes care of
-parsing the incoming <a href="Controller.html#M000040">headers</a> and body
-into <a href="Controller.html#M000038">params</a> and <a
-href="Controller.html#M000039">cookies</a> and <a
-href="Controller.html#M000040">headers</a>. If the request is a file upload
+parsing the incoming <a href="Controller.html#M000039">headers</a> and body
+into <a href="Controller.html#M000037">params</a> and <a
+href="Controller.html#M000038">cookies</a> and <a
+href="Controller.html#M000039">headers</a>. If the request is a file upload
 it will stream it into a tempfile and pass in the filename and tempfile
-object to your controller via <a href="Controller.html#M000038">params</a>.
+object to your controller via <a href="Controller.html#M000037">params</a>.
 It also parses the ?query=string and puts that into <a
-href="Controller.html#M000038">params</a> as well.
+href="Controller.html#M000037">params</a> as well.
 </p>
 
     </div>
@@ -103,19 +103,24 @@ href="Controller.html#M000038">params</a> as well.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000039">cookies</a>&nbsp;&nbsp;
-      <a href="#M000045">current_method_name</a>&nbsp;&nbsp;
-      <a href="#M000042">escape</a>&nbsp;&nbsp;
-      <a href="#M000040">headers</a>&nbsp;&nbsp;
-      <a href="#M000046">layout</a>&nbsp;&nbsp;
-      <a href="#M000038">params</a>&nbsp;&nbsp;
-      <a href="#M000041">query_parse</a>&nbsp;&nbsp;
-      <a href="#M000036">redirect</a>&nbsp;&nbsp;
-      <a href="#M000048">render</a>&nbsp;&nbsp;
-      <a href="#M000047">render_no_layout</a>&nbsp;&nbsp;
-      <a href="#M000037">send_file</a>&nbsp;&nbsp;
-      <a href="#M000044">template_dir</a>&nbsp;&nbsp;
-      <a href="#M000043">unescape</a>&nbsp;&nbsp;
+      <a href="#M000038">cookies</a>&nbsp;&nbsp;
+      <a href="#M000046">current_method_name</a>&nbsp;&nbsp;
+      <a href="#M000041">escape</a>&nbsp;&nbsp;
+      <a href="#M000043">escape_js</a>&nbsp;&nbsp;
+      <a href="#M000039">headers</a>&nbsp;&nbsp;
+      <a href="#M000044">js</a>&nbsp;&nbsp;
+      <a href="#M000048">layout</a>&nbsp;&nbsp;
+      <a href="#M000037">params</a>&nbsp;&nbsp;
+      <a href="#M000051">partial</a>&nbsp;&nbsp;
+      <a href="#M000040">query_parse</a>&nbsp;&nbsp;
+      <a href="#M000035">redirect</a>&nbsp;&nbsp;
+      <a href="#M000052">render</a>&nbsp;&nbsp;
+      <a href="#M000047">render_js</a>&nbsp;&nbsp;
+      <a href="#M000050">render_no_layout</a>&nbsp;&nbsp;
+      <a href="#M000049">render_nothing</a>&nbsp;&nbsp;
+      <a href="#M000036">send_file</a>&nbsp;&nbsp;
+      <a href="#M000045">template_dir</a>&nbsp;&nbsp;
+      <a href="#M000042">unescape</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -150,230 +155,346 @@ href="Controller.html#M000038">params</a> as well.
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000039" class="method-detail">
-        <a name="M000039"></a>
+      <div id="method-M000038" class="method-detail">
+        <a name="M000038"></a>
 
         <div class="method-heading">
-          <a href="#M000039" class="method-signature">
+          <a href="#M000038" class="method-signature">
           <span class="method-name">cookies</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+accessor for @<a href="Controller.html#M000038">cookies</a>. Please use <a
+href="Controller.html#M000038">cookies</a> and never @<a
+href="Controller.html#M000038">cookies</a> directly.
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000039-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000039-source">
+            onclick="toggleCode('M000038-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000038-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 77</span>
-77:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cookies</span>
-78:       <span class="ruby-ivar">@cookies</span>
-79:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 92</span>
+92:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cookies</span>
+93:       <span class="ruby-ivar">@cookies</span>
+94:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000045" class="method-detail">
-        <a name="M000045"></a>
+      <div id="method-M000046" class="method-detail">
+        <a name="M000046"></a>
 
         <div class="method-heading">
-          <a href="#M000045" class="method-signature">
+          <a href="#M000046" class="method-signature">
           <span class="method-name">current_method_name</span><span class="method-args">(depth=0)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+returns the current method name. Used for auto discovery of which template
+to <a href="Controller.html#M000052">render</a> based on the action name.
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000045-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000045-source">
+            onclick="toggleCode('M000046-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000046-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 107</span>
-107:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">current_method_name</span>(<span class="ruby-identifier">depth</span>=<span class="ruby-value">0</span>)
-108:       <span class="ruby-identifier">caller</span>[<span class="ruby-identifier">depth</span>] <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/`(.*)'$/</span>; <span class="ruby-identifier">$1</span>
-109:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 140</span>
+140:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">current_method_name</span>(<span class="ruby-identifier">depth</span>=<span class="ruby-value">0</span>)
+141:       <span class="ruby-identifier">caller</span>[<span class="ruby-identifier">depth</span>] <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/`(.*)'$/</span>; <span class="ruby-identifier">$1</span>
+142:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000042" class="method-detail">
-        <a name="M000042"></a>
+      <div id="method-M000041" class="method-detail">
+        <a name="M000041"></a>
 
         <div class="method-heading">
-          <a href="#M000042" class="method-signature">
+          <a href="#M000041" class="method-signature">
           <span class="method-name">escape</span><span class="method-args">(s)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+does url escaping
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000042-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000042-source">
+            onclick="toggleCode('M000041-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000041-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 94</span>
-94:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">escape</span>(<span class="ruby-identifier">s</span>)
-95:       <span class="ruby-constant">Mongrel</span><span class="ruby-operator">::</span><span class="ruby-constant">HttpRequest</span>.<span class="ruby-identifier">escape</span>(<span class="ruby-identifier">s</span>)
-96:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 117</span>
+117:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">escape</span>(<span class="ruby-identifier">s</span>)
+118:       <span class="ruby-constant">Mongrel</span><span class="ruby-operator">::</span><span class="ruby-constant">HttpRequest</span>.<span class="ruby-identifier">escape</span>(<span class="ruby-identifier">s</span>)
+119:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000040" class="method-detail">
-        <a name="M000040"></a>
+      <div id="method-M000043" class="method-detail">
+        <a name="M000043"></a>
 
         <div class="method-heading">
-          <a href="#M000040" class="method-signature">
+          <a href="#M000043" class="method-signature">
+          <span class="method-name">escape_js</span><span class="method-args">(javascript)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+<a href="Controller.html#M000041">escape</a> text for javascript.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000043-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000043-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 127</span>
+127:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">escape_js</span>(<span class="ruby-identifier">javascript</span>)
+128:       (<span class="ruby-identifier">javascript</span> <span class="ruby-operator">||</span> <span class="ruby-value str">''</span>).<span class="ruby-identifier">gsub</span>(<span class="ruby-value str">'\\'</span>,<span class="ruby-value str">'\0\0'</span>).<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/\r\n|\n|\r/</span>, <span class="ruby-value str">&quot;\\n&quot;</span>).<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/[&quot;']/</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">m</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;\\#{m}&quot;</span> }
+129:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000039" class="method-detail">
+        <a name="M000039"></a>
+
+        <div class="method-heading">
+          <a href="#M000039" class="method-signature">
           <span class="method-name">headers</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+accessor for @<a href="Controller.html#M000039">headers</a>. Please use <a
+href="Controller.html#M000039">headers</a> and never @<a
+href="Controller.html#M000039">headers</a> directly.
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000040-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000040-source">
+            onclick="toggleCode('M000039-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000039-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 81</span>
-81:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">headers</span>
-82:       <span class="ruby-ivar">@headers</span>
-83:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 98</span>
+ 98:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">headers</span>
+ 99:       <span class="ruby-ivar">@headers</span>
+100:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000046" class="method-detail">
-        <a name="M000046"></a>
+      <div id="method-M000044" class="method-detail">
+        <a name="M000044"></a>
 
         <div class="method-heading">
-          <a href="#M000046" class="method-signature">
+          <span class="method-name">js</span><span class="method-args">(javascript)</span>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Alias for <a href="Controller.html#M000043">escape_js</a>
+</p>
+        </div>
+      </div>
+
+      <div id="method-M000048" class="method-detail">
+        <a name="M000048"></a>
+
+        <div class="method-heading">
+          <a href="#M000048" class="method-signature">
           <span class="method-name">layout</span><span class="method-args">(l)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+set the @<a href="Controller.html#M000048">layout</a>. Use this right
+before a <a href="Controller.html#M000052">render</a> to set the name of
+the <a href="Controller.html#M000048">layout</a> to use minus the .rhtml
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000046-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000046-source">
+            onclick="toggleCode('M000048-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000048-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 112</span>
-112:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">layout</span>(<span class="ruby-identifier">l</span>)
-113:        <span class="ruby-ivar">@layout</span> = <span class="ruby-identifier">l</span> 
-114:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 156</span>
+156:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">layout</span>(<span class="ruby-identifier">l</span>)
+157:        <span class="ruby-ivar">@layout</span> = <span class="ruby-identifier">l</span> 
+158:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000038" class="method-detail">
-        <a name="M000038"></a>
+      <div id="method-M000037" class="method-detail">
+        <a name="M000037"></a>
 
         <div class="method-heading">
-          <a href="#M000038" class="method-signature">
+          <a href="#M000037" class="method-signature">
           <span class="method-name">params</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+accessor for @<a href="Controller.html#M000037">params</a>. Please use <a
+href="Controller.html#M000037">params</a> and never @<a
+href="Controller.html#M000037">params</a> directly.
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000038-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000038-source">
+            onclick="toggleCode('M000037-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000037-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 73</span>
-73:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">params</span>
-74:       <span class="ruby-ivar">@params</span>
-75:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 86</span>
+86:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">params</span>
+87:       <span class="ruby-ivar">@params</span>
+88:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000041" class="method-detail">
-        <a name="M000041"></a>
+      <div id="method-M000051" class="method-detail">
+        <a name="M000051"></a>
 
         <div class="method-heading">
-          <a href="#M000041" class="method-signature">
+          <a href="#M000051" class="method-signature">
+          <span class="method-name">partial</span><span class="method-args">(template)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000051-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000051-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 171</span>
+171:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">partial</span>(<span class="ruby-identifier">template</span>)
+172:       <span class="ruby-identifier">template</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>( <span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>( <span class="ruby-identifier">template_dir</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">snake_case</span>) <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/_#{template}.rhtml&quot;</span> ) ) 
+173:       <span class="ruby-identifier">template</span>.<span class="ruby-identifier">result</span>(<span class="ruby-identifier">binding</span>)
+174:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000040" class="method-detail">
+        <a name="M000040"></a>
+
+        <div class="method-heading">
+          <a href="#M000040" class="method-signature">
           <span class="method-name">query_parse</span><span class="method-args">(qs, d = '&amp;;')</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+parses a query string or the payload of a POST request into the <a
+href="Controller.html#M000037">params</a> hash. So for example:
+/foo?bar=nik&amp;post[title]=heya&amp;post[body]=whatever parses into:
+{:bar =&gt; &#8216;nik&#8217;, :post =&gt; {:title =&gt;
+&#8216;heya&#8217;, :body =&gt; &#8216;whatever}}
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000041-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000041-source">
+            onclick="toggleCode('M000040-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000040-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 85</span>
-85:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">query_parse</span>(<span class="ruby-identifier">qs</span>, <span class="ruby-identifier">d</span> = <span class="ruby-value str">'&amp;;'</span>)
-86:       <span class="ruby-identifier">m</span> = <span class="ruby-identifier">proc</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">_</span>,<span class="ruby-identifier">o</span>,<span class="ruby-identifier">n</span><span class="ruby-operator">|</span><span class="ruby-identifier">o</span>.<span class="ruby-identifier">update</span>(<span class="ruby-identifier">n</span>,<span class="ruby-operator">&amp;</span><span class="ruby-identifier">m</span>)<span class="ruby-keyword kw">rescue</span>([<span class="ruby-operator">*</span><span class="ruby-identifier">o</span>]<span class="ruby-operator">&lt;&lt;</span><span class="ruby-identifier">n</span>)}
-87:       (<span class="ruby-identifier">qs</span><span class="ruby-operator">||</span><span class="ruby-value str">''</span>).<span class="ruby-identifier">split</span>(<span class="ruby-node">/[#{d}] */n</span>).<span class="ruby-identifier">inject</span>(<span class="ruby-constant">MerbHash</span>[]) { <span class="ruby-operator">|</span><span class="ruby-identifier">h</span>,<span class="ruby-identifier">p</span><span class="ruby-operator">|</span> 
-88:               <span class="ruby-identifier">k</span>, <span class="ruby-identifier">v</span>=<span class="ruby-identifier">unescape</span>(<span class="ruby-identifier">p</span>).<span class="ruby-identifier">split</span>(<span class="ruby-value str">'='</span>,<span class="ruby-value">2</span>)
-89:               <span class="ruby-identifier">h</span>.<span class="ruby-identifier">update</span>(<span class="ruby-identifier">k</span>.<span class="ruby-identifier">split</span>(<span class="ruby-regexp re">/[\]\[]+/</span>).<span class="ruby-identifier">reverse</span>.
-90:                 <span class="ruby-identifier">inject</span>(<span class="ruby-identifier">v</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">x</span>,<span class="ruby-identifier">i</span><span class="ruby-operator">|</span> <span class="ruby-constant">MerbHash</span>[<span class="ruby-identifier">i</span>,<span class="ruby-identifier">x</span>] },<span class="ruby-operator">&amp;</span><span class="ruby-identifier">m</span>)
-91:           }
-92:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 107</span>
+107:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">query_parse</span>(<span class="ruby-identifier">qs</span>, <span class="ruby-identifier">d</span> = <span class="ruby-value str">'&amp;;'</span>)
+108:       <span class="ruby-identifier">m</span> = <span class="ruby-identifier">proc</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">_</span>,<span class="ruby-identifier">o</span>,<span class="ruby-identifier">n</span><span class="ruby-operator">|</span><span class="ruby-identifier">o</span>.<span class="ruby-identifier">update</span>(<span class="ruby-identifier">n</span>,<span class="ruby-operator">&amp;</span><span class="ruby-identifier">m</span>)<span class="ruby-keyword kw">rescue</span>([<span class="ruby-operator">*</span><span class="ruby-identifier">o</span>]<span class="ruby-operator">&lt;&lt;</span><span class="ruby-identifier">n</span>)}
+109:       (<span class="ruby-identifier">qs</span><span class="ruby-operator">||</span><span class="ruby-value str">''</span>).<span class="ruby-identifier">split</span>(<span class="ruby-node">/[#{d}] */n</span>).<span class="ruby-identifier">inject</span>(<span class="ruby-constant">MerbHash</span>[]) { <span class="ruby-operator">|</span><span class="ruby-identifier">h</span>,<span class="ruby-identifier">p</span><span class="ruby-operator">|</span> 
+110:               <span class="ruby-identifier">k</span>, <span class="ruby-identifier">v</span>=<span class="ruby-identifier">unescape</span>(<span class="ruby-identifier">p</span>).<span class="ruby-identifier">split</span>(<span class="ruby-value str">'='</span>,<span class="ruby-value">2</span>)
+111:               <span class="ruby-identifier">h</span>.<span class="ruby-identifier">update</span>(<span class="ruby-identifier">k</span>.<span class="ruby-identifier">split</span>(<span class="ruby-regexp re">/[\]\[]+/</span>).<span class="ruby-identifier">reverse</span>.
+112:                 <span class="ruby-identifier">inject</span>(<span class="ruby-identifier">v</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">x</span>,<span class="ruby-identifier">i</span><span class="ruby-operator">|</span> <span class="ruby-constant">MerbHash</span>[<span class="ruby-identifier">i</span>,<span class="ruby-identifier">x</span>] },<span class="ruby-operator">&amp;</span><span class="ruby-identifier">m</span>)
+113:           }
+114:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000036" class="method-detail">
-        <a name="M000036"></a>
+      <div id="method-M000035" class="method-detail">
+        <a name="M000035"></a>
 
         <div class="method-heading">
-          <a href="#M000036" class="method-signature">
+          <a href="#M000035" class="method-signature">
           <span class="method-name">redirect</span><span class="method-args">(url)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+<a href="Controller.html#M000035">redirect</a> to another url It can be
+like /foo/bar for redirecting within your same app. Or it can be a fully
+qualified url to another site.
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000036-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000036-source">
+            onclick="toggleCode('M000035-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000035-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 62</span>
-62:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">redirect</span>(<span class="ruby-identifier">url</span>)
-63:       <span class="ruby-ivar">@status</span> = <span class="ruby-value">302</span>
-64:       <span class="ruby-ivar">@headers</span>.<span class="ruby-identifier">merge!</span>({<span class="ruby-value str">'Location'</span>=<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">url</span>})
-65:       <span class="ruby-keyword kw">return</span> <span class="ruby-value str">''</span>
-66:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 69</span>
+69:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">redirect</span>(<span class="ruby-identifier">url</span>)
+70:       <span class="ruby-constant">MERB_LOGGER</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Redirecting to: #{url}&quot;</span>)
+71:       <span class="ruby-ivar">@status</span> = <span class="ruby-value">302</span>
+72:       <span class="ruby-ivar">@headers</span>.<span class="ruby-identifier">merge!</span>({<span class="ruby-value str">'Location'</span>=<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">url</span>})
+73:       <span class="ruby-keyword kw">return</span> <span class="ruby-value str">''</span>
+74:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000048" class="method-detail">
-        <a name="M000048"></a>
+      <div id="method-M000052" class="method-detail">
+        <a name="M000052"></a>
 
         <div class="method-heading">
-          <a href="#M000048" class="method-signature">
+          <a href="#M000052" class="method-signature">
           <span class="method-name">render</span><span class="method-args">(template=current_method_name(1), b=binding)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+renders a template based on the current action name you can pass the name
+of a template if you want to <a href="Controller.html#M000052">render</a> a
+template with a different name then then current action name. Wraps the
+rendered template in the <a href="Controller.html#M000048">layout</a>. Uses
+layout/application.rhtml unless there is a <a
+href="Controller.html#M000048">layout</a> named after the current
+controller or @<a href="Controller.html#M000048">layout</a> has been set to
+another value.
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000048-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000048-source">
+            onclick="toggleCode('M000052-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000052-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 121</span>
-121:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render</span>(<span class="ruby-identifier">template</span>=<span class="ruby-identifier">current_method_name</span>(<span class="ruby-value">1</span>), <span class="ruby-identifier">b</span>=<span class="ruby-identifier">binding</span>)
-122:       <span class="ruby-identifier">name</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">snake_case</span>
-123:       <span class="ruby-identifier">template</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>( <span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>( <span class="ruby-identifier">template_dir</span>(<span class="ruby-identifier">name</span>) <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/#{template}.rhtml&quot;</span> ) ) 
-124:       <span class="ruby-identifier">layout_content</span> = <span class="ruby-identifier">template</span>.<span class="ruby-identifier">result</span>(<span class="ruby-identifier">b</span>)
-125:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">layout_content</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-ivar">@layout</span>.<span class="ruby-identifier">to_s</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'none'</span>)
-126:       <span class="ruby-keyword kw">if</span> [<span class="ruby-value str">'application'</span>, <span class="ruby-identifier">name</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-ivar">@layout</span>.<span class="ruby-identifier">to_s</span>)
-127:         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">template_dir</span>(<span class="ruby-node">&quot;layout/#{name}.rhtml&quot;</span>))
-128:           <span class="ruby-identifier">layout</span> = <span class="ruby-identifier">name</span>
-129:         <span class="ruby-keyword kw">else</span>
-130:           <span class="ruby-identifier">layout</span> = <span class="ruby-value str">'application'</span>
-131:         <span class="ruby-keyword kw">end</span>
-132:       <span class="ruby-keyword kw">else</span>
-133:         <span class="ruby-identifier">layout</span> = <span class="ruby-ivar">@layout</span>.<span class="ruby-identifier">to_s</span>
-134:       <span class="ruby-keyword kw">end</span>
-135:       <span class="ruby-ivar">@layout_content</span> = <span class="ruby-identifier">layout_content</span>
-136:       <span class="ruby-identifier">layout_tmpl</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>( <span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>( <span class="ruby-identifier">template_dir</span>(<span class="ruby-value str">'layout'</span>) <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/#{layout}.rhtml&quot;</span> ) )      
-137:       <span class="ruby-identifier">layout_tmpl</span>.<span class="ruby-identifier">result</span>(<span class="ruby-identifier">b</span>)
-138:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 183</span>
+183:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render</span>(<span class="ruby-identifier">template</span>=<span class="ruby-identifier">current_method_name</span>(<span class="ruby-value">1</span>), <span class="ruby-identifier">b</span>=<span class="ruby-identifier">binding</span>)
+184:       <span class="ruby-constant">MERB_LOGGER</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;Rendering template: #{template_dir(template)}&quot;</span>)
+185:       <span class="ruby-identifier">name</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">snake_case</span>
+186:       <span class="ruby-identifier">template</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>( <span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>( <span class="ruby-identifier">template_dir</span>(<span class="ruby-identifier">name</span>) <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/#{template}.rhtml&quot;</span> ) ) 
+187:       <span class="ruby-identifier">layout_content</span> = <span class="ruby-identifier">template</span>.<span class="ruby-identifier">result</span>(<span class="ruby-identifier">b</span>)
+188:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">layout_content</span> <span class="ruby-keyword kw">if</span> (<span class="ruby-ivar">@layout</span>.<span class="ruby-identifier">to_s</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'none'</span>)
+189:       <span class="ruby-keyword kw">if</span> [<span class="ruby-value str">'application'</span>, <span class="ruby-identifier">name</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-ivar">@layout</span>.<span class="ruby-identifier">to_s</span>)
+190:         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">template_dir</span>(<span class="ruby-node">&quot;layout/#{name}.rhtml&quot;</span>))
+191:           <span class="ruby-identifier">layout</span> = <span class="ruby-identifier">name</span>
+192:         <span class="ruby-keyword kw">else</span>
+193:           <span class="ruby-identifier">layout</span> = <span class="ruby-value str">'application'</span>
+194:         <span class="ruby-keyword kw">end</span>
+195:       <span class="ruby-keyword kw">else</span>
+196:         <span class="ruby-identifier">layout</span> = <span class="ruby-ivar">@layout</span>.<span class="ruby-identifier">to_s</span>
+197:       <span class="ruby-keyword kw">end</span>
+198:       <span class="ruby-constant">MERB_LOGGER</span>.<span class="ruby-identifier">info</span>(<span class="ruby-node">&quot;With Layout: #{template_dir('layout')}/#{layout}.rhtml&quot;</span>)
+199:       <span class="ruby-ivar">@layout_content</span> = <span class="ruby-identifier">layout_content</span>
+200:       <span class="ruby-identifier">layout_tmpl</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>( <span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>( <span class="ruby-identifier">template_dir</span>(<span class="ruby-value str">'layout'</span>) <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/#{layout}.rhtml&quot;</span> ) )      
+201:       <span class="ruby-identifier">layout_tmpl</span>.<span class="ruby-identifier">result</span>(<span class="ruby-identifier">b</span>)
+202:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -384,90 +505,160 @@ href="Controller.html#M000038">params</a> as well.
 
         <div class="method-heading">
           <a href="#M000047" class="method-signature">
-          <span class="method-name">render_no_layout</span><span class="method-args">(template=current_method_name(1), b=binding)</span>
+          <span class="method-name">render_js</span><span class="method-args">(template=current_method_name(1), b=binding)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+does a <a href="Controller.html#M000052">render</a> with no <a
+href="Controller.html#M000048">layout</a>. Also sets the content type
+header to text/javascript and escapes the template for javascript eval on
+the client
+</p>
           <p><a class="source-toggle" href="#"
             onclick="toggleCode('M000047-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000047-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 116</span>
-116:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render_no_layout</span>(<span class="ruby-identifier">template</span>=<span class="ruby-identifier">current_method_name</span>(<span class="ruby-value">1</span>), <span class="ruby-identifier">b</span>=<span class="ruby-identifier">binding</span>)
-117:       <span class="ruby-identifier">template</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>( <span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>( <span class="ruby-identifier">template_dir</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">snake_case</span>) <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/#{template}.rhtml&quot;</span> ) ) 
-118:       <span class="ruby-identifier">template</span>.<span class="ruby-identifier">result</span>(<span class="ruby-identifier">b</span>)
-119:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 148</span>
+148:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render_js</span>(<span class="ruby-identifier">template</span>=<span class="ruby-identifier">current_method_name</span>(<span class="ruby-value">1</span>), <span class="ruby-identifier">b</span>=<span class="ruby-identifier">binding</span>)
+149:       <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Content-Type'</span>] = <span class="ruby-value str">&quot;text/javascript&quot;</span>
+150:       <span class="ruby-identifier">template</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>( <span class="ruby-identifier">template_dir</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">snake_case</span>) <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/#{template}.merbjs&quot;</span> )) 
+151:       <span class="ruby-identifier">template</span>.<span class="ruby-identifier">result</span>(<span class="ruby-identifier">b</span>)
+152:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000037" class="method-detail">
-        <a name="M000037"></a>
+      <div id="method-M000050" class="method-detail">
+        <a name="M000050"></a>
 
         <div class="method-heading">
-          <a href="#M000037" class="method-signature">
+          <a href="#M000050" class="method-signature">
+          <span class="method-name">render_no_layout</span><span class="method-args">(template=current_method_name(1), b=binding)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+renders the action without wrapping it in a <a
+href="Controller.html#M000048">layout</a>.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000050-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000050-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 166</span>
+166:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render_no_layout</span>(<span class="ruby-identifier">template</span>=<span class="ruby-identifier">current_method_name</span>(<span class="ruby-value">1</span>), <span class="ruby-identifier">b</span>=<span class="ruby-identifier">binding</span>)
+167:       <span class="ruby-identifier">template</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>( <span class="ruby-constant">IO</span>.<span class="ruby-identifier">read</span>( <span class="ruby-identifier">template_dir</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">name</span>.<span class="ruby-identifier">snake_case</span>) <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/#{template}.rhtml&quot;</span> ) ) 
+168:       <span class="ruby-identifier">template</span>.<span class="ruby-identifier">result</span>(<span class="ruby-identifier">b</span>)
+169:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000049" class="method-detail">
+        <a name="M000049"></a>
+
+        <div class="method-heading">
+          <a href="#M000049" class="method-signature">
+          <span class="method-name">render_nothing</span><span class="method-args">(status)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000049-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000049-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 160</span>
+160:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render_nothing</span>(<span class="ruby-identifier">status</span>)
+161:       <span class="ruby-ivar">@status</span> = <span class="ruby-identifier">status</span>
+162:       <span class="ruby-keyword kw">return</span> <span class="ruby-value str">''</span>
+163:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000036" class="method-detail">
+        <a name="M000036"></a>
+
+        <div class="method-heading">
+          <a href="#M000036" class="method-signature">
           <span class="method-name">send_file</span><span class="method-args">(file)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+pass in a path to a file and this will set the right <a
+href="Controller.html#M000039">headers</a> and let mongrel do its thang and
+serve the static file directly.
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000037-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000037-source">
+            onclick="toggleCode('M000036-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000036-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 68</span>
-68:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_file</span>(<span class="ruby-identifier">file</span>)
-69:       <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'X-SENDFILE'</span>] = <span class="ruby-identifier">file</span>
-70:       <span class="ruby-keyword kw">return</span>
-71:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 79</span>
+79:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_file</span>(<span class="ruby-identifier">file</span>)
+80:       <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'X-SENDFILE'</span>] = <span class="ruby-identifier">file</span>
+81:       <span class="ruby-keyword kw">return</span>
+82:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000044" class="method-detail">
-        <a name="M000044"></a>
+      <div id="method-M000045" class="method-detail">
+        <a name="M000045"></a>
 
         <div class="method-heading">
-          <a href="#M000044" class="method-signature">
+          <a href="#M000045" class="method-signature">
           <span class="method-name">template_dir</span><span class="method-args">(loc)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+shortcut to a template path based on name.
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000044-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000044-source">
+            onclick="toggleCode('M000045-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000045-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 103</span>
-103:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">template_dir</span>(<span class="ruby-identifier">loc</span>)
-104:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">Merb</span><span class="ruby-operator">::</span><span class="ruby-constant">Server</span>.<span class="ruby-identifier">config</span>[<span class="ruby-identifier">:merb_root</span>] <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/dist/app/views/#{loc}&quot;</span>)
-105:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 133</span>
+133:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">template_dir</span>(<span class="ruby-identifier">loc</span>)
+134:       <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-constant">Merb</span><span class="ruby-operator">::</span><span class="ruby-constant">Server</span>.<span class="ruby-identifier">config</span>[<span class="ruby-identifier">:merb_root</span>] <span class="ruby-operator">+</span> <span class="ruby-node">&quot;/dist/app/views/#{loc}&quot;</span>)
+135:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000043" class="method-detail">
-        <a name="M000043"></a>
+      <div id="method-M000042" class="method-detail">
+        <a name="M000042"></a>
 
         <div class="method-heading">
-          <a href="#M000043" class="method-signature">
+          <a href="#M000042" class="method-signature">
           <span class="method-name">unescape</span><span class="method-args">(s)</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+does url unescaping
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000043-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000043-source">
+            onclick="toggleCode('M000042-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000042-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 98</span>
- 98:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unescape</span>(<span class="ruby-identifier">s</span>)
- 99:       <span class="ruby-constant">Mongrel</span><span class="ruby-operator">::</span><span class="ruby-constant">HttpRequest</span>.<span class="ruby-identifier">unescape</span>(<span class="ruby-identifier">s</span>)
-100:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 122</span>
+122:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unescape</span>(<span class="ruby-identifier">s</span>)
+123:       <span class="ruby-constant">Mongrel</span><span class="ruby-operator">::</span><span class="ruby-constant">HttpRequest</span>.<span class="ruby-identifier">unescape</span>(<span class="ruby-identifier">s</span>)
+124:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>