RubyGems - merb - Versions diffs - 0.0.6 → 0.0.7 - Mend

merb 0.0.6 → 0.0.7

Files changed (88) hide show

data/README +22 -4
data/Rakefile +15 -3
data/TODO +2 -3
data/bin/merb +61 -36
data/examples/sample_app/dist/app/controllers/files.rb +31 -0
data/examples/sample_app/dist/app/controllers/posts.rb +26 -2
data/examples/sample_app/dist/app/controllers/test.rb +7 -1
data/examples/sample_app/dist/app/views/files/progress.jerb +3 -0
data/examples/sample_app/dist/app/views/files/start.herb +62 -0
data/examples/sample_app/dist/app/views/files/upload.herb +6 -0
data/examples/sample_app/dist/app/views/layout/{application.rhtml → application.herb} +2 -3
data/examples/sample_app/dist/app/views/layout/{foo.rhtml → foo.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/{_comments.rhtml → _comments.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/comment.jerb +1 -0
data/examples/sample_app/dist/app/views/posts/{list.rhtml → list.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/{new.rhtml → new.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/{show.rhtml → show.herb} +0 -0
data/examples/sample_app/dist/app/views/posts/xml_test.xerb +3 -0
data/examples/sample_app/dist/app/views/test/{foo.rhtml → foo.herb} +0 -0
data/examples/sample_app/dist/app/views/test/{hello.rhtml → hello.herb} +0 -0
data/examples/sample_app/dist/app/views/test/json.jerb +1 -0
data/examples/sample_app/dist/conf/merb.yml +11 -0
data/examples/sample_app/dist/conf/merb_init.rb +1 -1
data/examples/sample_app/dist/conf/mup.conf +11 -0
data/examples/sample_app/dist/public/javascripts/mup.js +113 -0
data/examples/sample_app/script/merb_stop +7 -3
data/examples/sample_app/script/startdrb +8 -0
data/lib/merb.rb +37 -2
data/lib/merb/merb_class_extensions.rb +21 -22
data/lib/merb/merb_controller.rb +101 -33
data/lib/merb/merb_handler.rb +26 -25
data/lib/merb/merb_router.rb +1 -1
data/lib/merb/merb_utils.rb +35 -37
data/lib/merb/mixins/basic_authentication_mixin.rb +39 -0
data/lib/merb/mixins/controller_mixin.rb +119 -115
data/lib/merb/mixins/javascript_mixin.rb +63 -0
data/lib/merb/mixins/render_mixin.rb +85 -69
data/lib/merb/mixins/responder_mixin.rb +38 -0
data/lib/merb/session/merb_drb_server.rb +107 -0
data/lib/merb/session/merb_drb_session.rb +71 -0
data/lib/merb/session/merb_session.rb +1 -0
data/lib/merb/vendor/paginator/README.txt +84 -0
data/lib/merb/vendor/paginator/paginator.rb +121 -0
data/lib/mutex_hotfix.rb +34 -0
metadata +41 -63
data/doc/rdoc/classes/ControllerMixin.html +0 -676
data/doc/rdoc/classes/Hash.html +0 -148
data/doc/rdoc/classes/Merb.html +0 -140
data/doc/rdoc/classes/Merb/Controller.html +0 -338
data/doc/rdoc/classes/Merb/RouteMatcher.html +0 -388
data/doc/rdoc/classes/Merb/Server.html +0 -148
data/doc/rdoc/classes/Merb/Session.html +0 -201
data/doc/rdoc/classes/Merb/SessionMixin.html +0 -199
data/doc/rdoc/classes/MerbControllerError.html +0 -111
data/doc/rdoc/classes/MerbHandler.html +0 -430
data/doc/rdoc/classes/MerbHash.html +0 -469
data/doc/rdoc/classes/MerbHash/Mutex.html +0 -198
data/doc/rdoc/classes/Noroutefound.html +0 -153
data/doc/rdoc/classes/Object.html +0 -149
data/doc/rdoc/classes/RenderMixin.html +0 -362
data/doc/rdoc/classes/String.html +0 -212
data/doc/rdoc/classes/Symbol.html +0 -179
data/doc/rdoc/created.rid +0 -1
data/doc/rdoc/files/LICENSE.html +0 -129
data/doc/rdoc/files/README.html +0 -417
data/doc/rdoc/files/TODO.html +0 -151
data/doc/rdoc/files/lib/merb/merb_class_extensions_rb.html +0 -101
data/doc/rdoc/files/lib/merb/merb_controller_rb.html +0 -101
data/doc/rdoc/files/lib/merb/merb_handler_rb.html +0 -101
data/doc/rdoc/files/lib/merb/merb_router_rb.html +0 -101
data/doc/rdoc/files/lib/merb/merb_utils_rb.html +0 -108
data/doc/rdoc/files/lib/merb/mixins/controller_mixin_rb.html +0 -101
data/doc/rdoc/files/lib/merb/mixins/render_mixin_rb.html +0 -101
data/doc/rdoc/files/lib/merb/session/merb_session_rb.html +0 -101
data/doc/rdoc/files/lib/merb_rb.html +0 -140
data/doc/rdoc/files/lib/merb_tasks_rb.html +0 -101
data/doc/rdoc/fr_class_index.html +0 -43
data/doc/rdoc/fr_file_index.html +0 -40
data/doc/rdoc/fr_method_index.html +0 -104
data/doc/rdoc/index.html +0 -24
data/doc/rdoc/rdoc-style.css +0 -208
data/examples/sample_app/dist/app/controllers/upload.rb +0 -29
data/examples/sample_app/dist/app/views/posts/comment.merbjs +0 -1
data/examples/sample_app/dist/app/views/upload/start.rhtml +0 -15
data/examples/sample_app/dist/app/views/upload/upload.rhtml +0 -4
data/examples/sample_app/dist/public/files/README +0 -35
data/examples/sample_app/dist/public/files/setup.rb +0 -1346
data/examples/sample_app/log/merb.log +0 -778

data/doc/rdoc/classes/MerbHash/Mutex.html DELETED Viewed

@@ -1,198 +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>Class: MerbHash::Mutex</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>Class</strong></td>
-          <td class="class-name-in-header">MerbHash::Mutex</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../files/lib/merb/merb_utils_rb.html">
-                lib/merb/merb_utils.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                <a href="../Object.html">
-                Object
-               </a>
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-    <div id="description">
-      <p>
-monkey patch <a href="Mutex.html">Mutex</a> so it does not leak memory.
-</p>
-    </div>
-   </div>
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-      <div class="name-list">
-      <a href="#M000023">lock</a>&nbsp;&nbsp;
-      <a href="#M000024">unlock</a>&nbsp;&nbsp;
-      </div>
-    </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-      <div id="method-M000023" class="method-detail">
-        <a name="M000023"></a>
-        <div class="method-heading">
-          <a href="#M000023" class="method-signature">
-          <span class="method-name">lock</span><span class="method-args">()</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000023-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000023-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_utils.rb, line 128</span>
-128:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">lock</span>
-129:     <span class="ruby-keyword kw">while</span> (<span class="ruby-constant">Thread</span>.<span class="ruby-identifier">critical</span> = <span class="ruby-keyword kw">true</span>; <span class="ruby-ivar">@locked</span>)
-130:       <span class="ruby-ivar">@waiting</span>.<span class="ruby-identifier">unshift</span> <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">current</span>
-131:       <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">stop</span>
-132:     <span class="ruby-keyword kw">end</span>
-133:     <span class="ruby-ivar">@locked</span> = <span class="ruby-keyword kw">true</span>
-134:     <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">critical</span> = <span class="ruby-keyword kw">false</span>
-135:     <span class="ruby-keyword kw">self</span>
-136:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000024" class="method-detail">
-        <a name="M000024"></a>
-        <div class="method-heading">
-          <a href="#M000024" class="method-signature">
-          <span class="method-name">unlock</span><span class="method-args">()</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000024-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000024-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_utils.rb, line 138</span>
-138:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unlock</span>
-139:     <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@locked</span>
-140:     <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">critical</span> = <span class="ruby-keyword kw">true</span>
-141:     <span class="ruby-ivar">@locked</span> = <span class="ruby-keyword kw">false</span>
-142:     <span class="ruby-keyword kw">begin</span>
-143:       <span class="ruby-identifier">t</span> = <span class="ruby-ivar">@waiting</span>.<span class="ruby-identifier">pop</span>
-144:       <span class="ruby-identifier">t</span>.<span class="ruby-identifier">wakeup</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">t</span>
-145:     <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ThreadError</span>
-146:       <span class="ruby-keyword kw">retry</span>
-147:     <span class="ruby-keyword kw">end</span>
-148:     <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">critical</span> = <span class="ruby-keyword kw">false</span>
-149:     <span class="ruby-keyword kw">begin</span>
-150:       <span class="ruby-identifier">t</span>.<span class="ruby-identifier">run</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">t</span>
-151:     <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ThreadError</span>
-152:     <span class="ruby-keyword kw">end</span>
-153:     <span class="ruby-keyword kw">self</span>
-154:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-    </div>
-  </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/classes/Noroutefound.html DELETED Viewed

@@ -1,153 +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>Class: Noroutefound</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>Class</strong></td>
-          <td class="class-name-in-header">Noroutefound</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../files/lib/merb/merb_controller_rb.html">
-                lib/merb/merb_controller.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                <a href="Merb/Controller.html">
-                Merb::Controller
-               </a>
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-   </div>
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-      <div class="name-list">
-      <a href="#M000025">method_missing</a>&nbsp;&nbsp;
-      </div>
-    </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-      <div id="method-M000025" class="method-detail">
-        <a name="M000025"></a>
-        <div class="method-heading">
-          <a href="#M000025" class="method-signature">
-          <span class="method-name">method_missing</span><span class="method-args">()</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-This is the class that handles requests that don&#8216;t match any defined
-routes.
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000025-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000025-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/merb/merb_controller.rb, line 130</span>
-130:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">method_missing</span>
-131:     <span class="ruby-ivar">@status</span> = <span class="ruby-value">404</span>
-132:     <span class="ruby-value str">&quot;&lt;html&gt;&lt;body&gt;&lt;h1&gt;No Matching Route&lt;/h1&gt;&lt;/body&gt;&lt;/html&gt;&quot;</span>
-133:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-    </div>
-  </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/classes/Object.html DELETED Viewed

@@ -1,149 +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>Class: Object</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>Class</strong></td>
-          <td class="class-name-in-header">Object</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../files/lib/merb/merb_utils_rb.html">
-                lib/merb/merb_utils.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                <a href="Object.html">
-                Object
-               </a>
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-   </div>
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-      <div class="name-list">
-      <a href="#M000026">returning</a>&nbsp;&nbsp;
-      </div>
-    </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-      <div id="method-M000026" class="method-detail">
-        <a name="M000026"></a>
-        <div class="method-heading">
-          <a href="#M000026" class="method-signature">
-          <span class="method-name">returning</span><span class="method-args">(value) {|value| ...}</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000026-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000026-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/merb/merb_utils.rb, line 40</span>
-40:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returning</span>(<span class="ruby-identifier">value</span>)
-41:     <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">value</span>)
-42:     <span class="ruby-identifier">value</span>
-43:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-</body>
-</html>