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

merb 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

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/Merb/Session.html DELETED Viewed

@@ -1,201 +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: Merb::Session</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">Merb::Session</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../files/lib/merb/session/merb_session_rb.html">
-                lib/merb/session/merb_session.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                ::ActiveRecord::Base
-            </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="#M000070">generate</a>&nbsp;&nbsp;
-      <a href="#M000071">persist</a>&nbsp;&nbsp;
-      </div>
-    </div>
-  </div>
-    <!-- if includes -->
-    <div id="section">
-    <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">RAND_CHARS</td>
-          <td>=</td>
-          <td class="context-item-value">[*'A'..'Z'] + [*'0'..'9'] + [*'a'..'z']</td>
-        </tr>
-        </table>
-      </div>
-    </div>
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Class methods</h3>
-      <div id="method-M000070" class="method-detail">
-        <a name="M000070"></a>
-        <div class="method-heading">
-          <a href="#M000070" class="method-signature">
-          <span class="method-name">generate</span><span class="method-args">(cookies)</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Generates a new session ID and creates a row for the new session in the
-database.
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000070-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000070-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/merb/session/merb_session.rb, line 40</span>
-40:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">generate</span> <span class="ruby-identifier">cookies</span>
-41:       <span class="ruby-identifier">rand_max</span> = <span class="ruby-constant">RAND_CHARS</span>.<span class="ruby-identifier">size</span>
-42:       <span class="ruby-identifier">sid</span> = (<span class="ruby-value">0</span><span class="ruby-operator">...</span><span class="ruby-value">32</span>).<span class="ruby-identifier">inject</span>(<span class="ruby-value str">&quot;&quot;</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">ret</span>,<span class="ruby-identifier">_</span><span class="ruby-operator">|</span> <span class="ruby-identifier">ret</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-constant">RAND_CHARS</span>[<span class="ruby-identifier">rand</span>(<span class="ruby-identifier">rand_max</span>)] }
-43:       <span class="ruby-identifier">sess</span> = <span class="ruby-constant">Merb</span><span class="ruby-operator">::</span><span class="ruby-constant">Session</span>.<span class="ruby-identifier">create</span>(<span class="ruby-identifier">:sess_id</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">sid</span>, <span class="ruby-identifier">:data</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">MerbHash</span>[])
-44:       <span class="ruby-identifier">cookies</span>[<span class="ruby-identifier">:sess_id</span>] = <span class="ruby-identifier">sess</span>.<span class="ruby-identifier">sess_id</span>
-45:       <span class="ruby-identifier">sess</span>
-46:     <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000071" class="method-detail">
-        <a name="M000071"></a>
-        <div class="method-heading">
-          <a href="#M000071" class="method-signature">
-          <span class="method-name">persist</span><span class="method-args">(cookies)</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Gets the existing session based on the <tt>camping_sid</tt> available in
-cookies. If none is found, generates a new session.
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000071-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000071-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/merb/session/merb_session.rb, line 50</span>
-50:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">persist</span> <span class="ruby-identifier">cookies</span>
-51:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">cookies</span>[<span class="ruby-identifier">:sess_id</span>]
-52:         <span class="ruby-identifier">session</span> = <span class="ruby-constant">Merb</span><span class="ruby-operator">::</span><span class="ruby-constant">Session</span>.<span class="ruby-identifier">find_by_sess_id</span> <span class="ruby-identifier">cookies</span>[<span class="ruby-identifier">:sess_id</span>]
-53:       <span class="ruby-keyword kw">end</span>
-54:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">session</span>
-55:         <span class="ruby-identifier">session</span> = <span class="ruby-constant">Merb</span><span class="ruby-operator">::</span><span class="ruby-constant">Session</span>.<span class="ruby-identifier">generate</span> <span class="ruby-identifier">cookies</span>
-56:       <span class="ruby-keyword kw">end</span>
-57:       <span class="ruby-identifier">session</span>
-58:     <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/Merb/SessionMixin.html DELETED Viewed

@@ -1,199 +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::SessionMixin</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::SessionMixin</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../files/lib/merb/session/merb_session_rb.html">
-                lib/merb/session/merb_session.rb
-                </a>
-        <br />
-            </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="#M000061">finalize_session</a>&nbsp;&nbsp;
-      <a href="#M000062">session</a>&nbsp;&nbsp;
-      <a href="#M000060">setup_session</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-M000061" class="method-detail">
-        <a name="M000061"></a>
-        <div class="method-heading">
-          <a href="#M000061" class="method-signature">
-          <span class="method-name">finalize_session</span><span class="method-args">()</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000061-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000061-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/merb/session/merb_session.rb, line 10</span>
-10:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">finalize_session</span>
-11:       <span class="ruby-constant">MERB_LOGGER</span>.<span class="ruby-identifier">info</span>(<span class="ruby-value str">&quot;Finalize session&quot;</span>)
-12:       <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">Marshal</span>.<span class="ruby-identifier">dump</span>(<span class="ruby-ivar">@session</span>).<span class="ruby-identifier">hash</span> <span class="ruby-operator">==</span> <span class="ruby-ivar">@fingerprint_before</span>
-13:         <span class="ruby-ivar">@session</span>.<span class="ruby-identifier">save</span>
-14:       <span class="ruby-keyword kw">end</span>
-15:       <span class="ruby-ivar">@headers</span>[<span class="ruby-value str">'Set-Cookie'</span>] = <span class="ruby-ivar">@cookies</span>.<span class="ruby-identifier">map</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;#{k}=#{escape(v)}; path=/&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">v</span> <span class="ruby-operator">!=</span> <span class="ruby-ivar">@k</span>[<span class="ruby-identifier">k</span>] } <span class="ruby-operator">-</span> [<span class="ruby-keyword kw">nil</span>]
-16:     <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000062" class="method-detail">
-        <a name="M000062"></a>
-        <div class="method-heading">
-          <a href="#M000062" class="method-signature">
-          <span class="method-name">session</span><span class="method-args">()</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-accessor for @<a href="SessionMixin.html#M000062">session</a>. Please use
-<a href="SessionMixin.html#M000062">session</a> and never @<a
-href="SessionMixin.html#M000062">session</a> directly.
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000062-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000062-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/merb/session/merb_session.rb, line 20</span>
-20:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">session</span>
-21:       <span class="ruby-ivar">@session</span>
-22:     <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000060" class="method-detail">
-        <a name="M000060"></a>
-        <div class="method-heading">
-          <a href="#M000060" class="method-signature">
-          <span class="method-name">setup_session</span><span class="method-args">()</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000060-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000060-source">
-<pre>
-   <span class="ruby-comment cmt"># File lib/merb/session/merb_session.rb, line 4</span>
-4:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setup_session</span>
-5:       <span class="ruby-constant">MERB_LOGGER</span>.<span class="ruby-identifier">info</span>(<span class="ruby-value str">&quot;Setting up session&quot;</span>)
-6:       <span class="ruby-ivar">@session</span> = <span class="ruby-constant">Merb</span><span class="ruby-operator">::</span><span class="ruby-constant">Session</span>.<span class="ruby-identifier">persist</span>(<span class="ruby-identifier">cookies</span>)
-7:       <span class="ruby-ivar">@fingerprint_before</span> = <span class="ruby-constant">Marshal</span>.<span class="ruby-identifier">dump</span>(<span class="ruby-ivar">@session</span>).<span class="ruby-identifier">hash</span>
-8:     <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/MerbControllerError.html DELETED Viewed

@@ -1,111 +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: MerbControllerError</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">MerbControllerError</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 />
-            </td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                RuntimeError
-            </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>