RubyGems - merb - Versions diffs - 0.0.2 → 0.0.3 - Mend

merb 0.0.2 → 0.0.3

Files changed (29) hide show

data/Rakefile +3 -3
data/examples/sample_app/app/controllers/posts.rb +3 -3
data/examples/sample_app/app/controllers/test.rb +2 -2
data/examples/sample_app/app/controllers/upload.rb +4 -4
data/examples/sample_app/app/views/posts/list.rhtml +1 -1
data/examples/sample_app/app/views/posts/show.rhtml +1 -1
data/examples/sample_app/app/views/test/hello.rhtml +1 -1
data/examples/sample_app/app/views/upload/upload.rhtml +2 -2
data/examples/sample_app/conf/router.rb +13 -4
data/lib/merb/merb_controller.rb +20 -1
data/lib/merb/merb_daemon.rb +1 -1
data/lib/merb/merb_handler.rb +94 -45
data/lib/merb/merb_router.rb +25 -30
data/lib/merb.rb +1 -1
metadata +2 -21
data/doc/rdoc/classes/Merb/Config.html +0 -159
data/doc/rdoc/classes/Merb.html +0 -128
data/doc/rdoc/created.rid +0 -1
data/doc/rdoc/files/LICENSE.html +0 -129
data/doc/rdoc/files/README.html +0 -297
data/doc/rdoc/files/lib/merb_config_rb.html +0 -101
data/doc/rdoc/files/lib/merb_rb.html +0 -113
data/doc/rdoc/files/server_rb.html +0 -122
data/doc/rdoc/fr_class_index.html +0 -28
data/doc/rdoc/fr_file_index.html +0 -31
data/doc/rdoc/fr_method_index.html +0 -27
data/doc/rdoc/index.html +0 -24
data/doc/rdoc/rdoc-style.css +0 -208
data/server.rb +0 -13

data/doc/rdoc/classes/Merb.html DELETED Viewed

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Module: Merb</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-    elemStyle = elem.style;
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-    return true;
-  }
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  // ]]>
-  </script>
-</head>
-<body>
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Module</strong></td>
-          <td class="class-name-in-header">Merb</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <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 />
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-   </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-      Class <a href="Merb/Config.html" class="link">Merb::Config</a><br />
-    </div>
-    <div id="constants-list">
-      <h3 class="section-bar">Constants</h3>
-      <div class="name-list">
-        <table summary="Constants">
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">VERSION</td>
-          <td>=</td>
-          <td class="context-item-value">'0.0.2' unless defined?VERSION</td>
-        </tr>
-        </table>
-      </div>
-    </div>
-    <!-- if method_list -->
-  </div>
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-</body>
-</html>

data/doc/rdoc/created.rid DELETED Viewed

	@@ -1 +0,0 @@
1	- Mon Oct 16 20:09:10 -0700 2006

data/doc/rdoc/files/LICENSE.html DELETED Viewed

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>File: LICENSE</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-    elemStyle = elem.style;
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-    return true;
-  }
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  // ]]>
-  </script>
-</head>
-<body>
-  <div id="fileHeader">
-    <h1>LICENSE</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>LICENSE
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Sat Oct 14 14:18:28 -0700 2006</td>
-    </tr>
-    </table>
-  </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-    <div id="description">
-      <p>
-Copyright (c) 2006 Ezra Zygmuntowicz
-</p>
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-&quot;Software&quot;), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-</p>
-<p>
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-</p>
-    </div>
-   </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <!-- if method_list -->
-  </div>
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-</body>
-</html>

data/doc/rdoc/files/README.html DELETED Viewed

@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>File: README</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-    elemStyle = elem.style;
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-    return true;
-  }
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  // ]]>
-  </script>
-</head>
-<body>
-  <div id="fileHeader">
-    <h1>README</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>README
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Sun Oct 15 16:21:25 -0700 2006</td>
-    </tr>
-    </table>
-  </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-    <div id="description">
-      <p>
-&lt;html&gt;&lt;body&gt; &lt;pre&gt; Copyright (c) 2006 Ezra Zygmuntowicz
-</p>
-<p>
-<a href="../classes/Merb.html">Merb</a>. Mongrel+Erb
-</p>
-<p>
-Little bitty lightweight ruby app server. FOr when you really need
-performance for simple dynamic pages.
-</p>
-<p>
-**Sample APP included**
-</p>
-<p>
-Unpack the gem and grab the sample app
-</p>
-<p>
-$ gem unpack merb
-</p>
-<p>
-cd merb* cd examples/smaple_app
-</p>
-<p>
-$ merb start -t
-</p>
-<p>
-then the sample app will be running on port 4000 in the foreground. you can
-go to a few urls:
-</p>
-<p>
-<a
-href="http://localhost:4000/upload/start">localhost:4000/upload/start</a>
-</p>
-<p>
-<a
-href="http://localhost:4000/foo/123/baz/12234345">localhost:4000/foo/123/baz/12234345</a>
-</p>
-<p>
-*<b>FEATURES</b>* 1. Mongrel handler built in that parses incoming requests
-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.
-</p>
-<ol>
-<li>New RouteMatcher and route compiler. Reads your route definition and
-compiles
-</li>
-</ol>
-<p>
-a method on the fly that will match the request path against each route and
-do the right thing. So the following routes:
-</p>
-<p>
-Merb::RouteMatcher.prepare do |r|
-</p>
-<pre>
-  r.add '/foo/:bar/baz/:id', :class =&gt; 'Test', :method =&gt; 'foo'
-  r.add '/hey/:there/you/:guys', :class =&gt; 'Test', :method =&gt; 'hello'
-  r.add '/:class/:method/:id', {}
-  r.add '/:class/:method', {}
-  r.add '.*', {:class =&gt; 'NoRouteFound', :method =&gt; 'noroute'}
-</pre>
-<p>
-end
-</p>
-<p>
-Will be compiled and defined as a method with this lambda as the body:
-</p>
-<p>
-lambda{|path|
-</p>
-<pre>
-  if Regexp.new('/foo/(.+)/baz/(.+)') =~ path
-    @sections[:bar] = $1
-    @sections[:id] = $2
-    return {:class=&gt;&quot;Test&quot;, :method=&gt;&quot;foo&quot;}.merge(@sections)
-  end
-  if Regexp.new('/hey/(.+)/you/(.+)') =~ path
-    @sections[:there] = $1
-    @sections[:guys] = $2
-    return {:class=&gt;&quot;Test&quot;, :method=&gt;&quot;hello&quot;}.merge(@sections)
-  end
-  if Regexp.new('/(.+)/(.+)/(.+)') =~ path
-    @sections[:class] = $1
-    @sections[:method] = $2
-    @sections[:id] = $3
-    return {}.merge(@sections)
-  end
-  if Regexp.new('/(.+)/(.+)') =~ path
-    @sections[:class] = $1
-    @sections[:method] = $2
-    return {}.merge(@sections)
-  end
-  if Regexp.new('.*') =~ path
-    return {:class=&gt;&quot;NoRouteFound&quot;, :method=&gt;&quot;noroute&quot;}.merge(@sections)
-  end
-  return default_route
-</pre>
-<p>
-}
-</p>
-<ol>
-<li>Simple controller classes with built in render method and template handling
-</li>
-</ol>
-<p>
-with instance vars available in the views automatically.
-</p>
-<p>
-class Test &lt; Merb::Controller
-</p>
-<pre>
-  template_dir :test
-  def hello(args)
-    # args is a hash of the remaining templated
-    # parameters from the url matched in routing.
-    # @params and @cookies are avaialable here. string
-    # keys and not symbols just yet.
-    # Assign the parameter to an instance variable
-    @name = args[:name]
-    render
-  end
-</pre>
-<p>
-end
-</p>
-<p>
-&lt;html&gt;
-</p>
-<pre>
-  &lt;head&gt;
-    &lt;title&gt;Hello, &lt;%= @name %&gt;&lt;/title&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    &lt;h1&gt;&lt;%= @params.inspect %&gt;&lt;/h1&gt;
-    &lt;h1&gt;&lt;%= @cookies.inspect %&gt;&lt;/h1&gt;
-    &lt;% 5.times do %&gt;
-      &lt;h1&gt;Hello, &lt;%= @name %&gt;!&lt;/h1&gt;
-    &lt;% end %&gt;
-  &lt;/body&gt;
-</pre>
-<p>
-&lt;/html&gt;
-</p>
-<ol>
-<li>the server. right now you add your routes in
-</li>
-</ol>
-<p>
-the appdir/conf/router.rb file. So by default it runs on port 4000
-</p>
-<p>
-$ cd /path/to/your/merb/app $ merb start
-</p>
-<ol>
-<li>File uploads. This is the thing that <a
-href="../classes/Merb.html">Merb</a> was written for. Rails doesn&#8216;t
-allow
-</li>
-</ol>
-<p>
-multiple concurrent file uploads at once without blocking an entire rails
-backend for each file upload. <a href="../classes/Merb.html">Merb</a>
-allows multiple file uploads at once. Start the server and browse to <a
-href="http://localhost:4000/upload/start">localhost:4000/upload/start</a>
-and you will get a file upload form. There is a very simple upload
-controller example that handles this upload. When a file is uploaded with
-<a href="../classes/Merb.html">Merb</a>, it gets put in a Tempfile. So you
-just want to copy it to the right place on the filesystem.
-</p>
-<p>
-def upload(args)
-</p>
-<pre>
-  puts @params[:file].inspect
-  FileUtils.mv @params[:file][:tempfile].path, MERB_ROOT+&quot;/uploads/#{@params[:file][:filename]}&quot;
-  render
-</pre>
-<p>
-end &lt;/pre&gt; &lt;/body&gt; &lt;/html&gt;
-</p>
-    </div>
-   </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <!-- if method_list -->
-  </div>
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-</body>
-</html>

data/doc/rdoc/files/lib/merb_config_rb.html DELETED Viewed

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>File: merb_config.rb</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-    elemStyle = elem.style;
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-    return true;
-  }
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  // ]]>
-  </script>
-</head>
-<body>
-  <div id="fileHeader">
-    <h1>merb_config.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/merb_config.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Sun Oct 15 15:43:45 -0700 2006</td>
-    </tr>
-    </table>
-  </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-   </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <!-- if method_list -->
-  </div>
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-</body>
-</html>