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/files/lib/merb/merb_router_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_router.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_router.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/merb/merb_router.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Wed Nov 01 17:35:42 -0800 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>

data/doc/rdoc/files/lib/merb/merb_utils_rb.html DELETED Viewed

@@ -1,108 +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_utils.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_utils.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/merb/merb_utils.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Thu Nov 09 19:38:36 -0800 2006</td>
-    </tr>
-    </table>
-  </div>
-  <!-- banner header -->
-  <div id="bodyContent">
-  <div id="contextContent">
-    <div id="requires-list">
-      <h3 class="section-bar">Required files</h3>
-      <div class="name-list">
-      thread&nbsp;&nbsp;
-      </div>
-    </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/mixins/controller_mixin_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: controller_mixin.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>controller_mixin.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/merb/mixins/controller_mixin.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Thu Nov 09 18:36:28 -0800 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>

data/doc/rdoc/files/lib/merb/mixins/render_mixin_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: render_mixin.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>render_mixin.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/merb/mixins/render_mixin.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Sat Nov 04 13:54:17 -0800 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>

data/doc/rdoc/files/lib/merb/session/merb_session_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_session.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_session.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/merb/session/merb_session.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Tue Nov 07 13:50:17 -0800 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>