ramaze 2009.05 → 2009.06

data/doc/meta/announcement.txt

@@ -1,5 +1,5 @@
-This time we are proud to announce Version 2008.07 of Ramaze, the light and
-modular open source web framework.
+The Ramaze development team is happy to announce version 2009.06 of Ramaze, the
+light and modular open source web framework that tries to stay out of your way.
 
 This release features a lot of work directly from our community and we are
 really greatful for everybody who helped in testing, patching and contributing
@@ -9,14 +9,17 @@ Our extensive set of specs and docs now covers almost every detail of
 implementation and usage. Ramaze is under development by a growing community
 and in production use at companies.
 
+There have been too many changes since the last official announcement in
+2008.07, so I will only list changes since the last release.
+
+
+== Metadata
 
 Home page:       http://ramaze.net
-Screencasts:     http://ramaze.net/screencasts
+Wiki:            http://wiki.ramaze.net
 
-Source browser:  http://source.ramaze.net
 Repository:      http://github.com/manveru/ramaze
 
-Nightly gems:    http://gems.ramaze.net
 Git clone:       git://github.com/manveru/ramaze
 Current tarball: http://github.com/manveru/ramaze/tarball/master
 
@@ -36,61 +39,105 @@ Simple example:
   Ramaze.start
 
 
-Some of 52 patches since 2008.06:
-
-  - Loggers are now in Ramaze::Logger namespace
-  - Global.prefix for nested deployment via webserver in front
-  - Binding#locals fixed for Ruby 1.9
-  - Redirects now use HTTP status 302 instead of 303
-  - Logger::Syslog works again
-
-Special (alphabetic) thanks go to:
-
-  Pistos                  - The usual Mathetes, patches and lots of friendly support
-  Aman 'tmm1' Gupta       - Time snippets for numeric
-  Clinton R. Nixon        - More REST and some fixes
-  Jean-Francois Chevrette - Restore --console feature
-  raggi                   - Various fixes
-  Rob Lievaart            - Fix Logger::Syslog
-  Sam Carr                - Cleanup of Cache
-  Wang Jinjing            - 1.9 compatibility
-  Yasushi Abe             - First patch!
+== Around 80 commits since 2009.05
+
+- Improved bin/ramaze with lots of specs, should work now even on windows.
+- Middleware order has been inverted.
+- Support for Webrat out of the box.
+- Fixed MemCache caching and sessions.
+- Removed a whole lot of methods that were marked deprecated.
+- New default Layout helper
+
+
+== Summarized changes with their respective commits
+
+- Antti Tuomi 
+  - Link helper did not set the prefix, added spec and fixed the behaviour
+    [ af753a0 | bae2b53 | eba4734 ]
+
+- Michael Fellinger (manveru)
+  - Fix bug that made default port/handler break in bin/ramaze [ e6715e1 ]
+  - Remove deprecated methods on Ramaze::Controller, Helper::Cache,
+    Helper::Link, and Helper::Auth. Also remove the deprecated methods
+    Object#acquire, String#/, and Symbol#/
+    [ 272fced | 1e4ac92 | a0a9329 | 68242b3 | 57e7a85 | 31b809a | 3fc4622 ]
+  - The bacon scope :mock was renamed to :rack_test, added shared :webrat, so
+    you can run your specs with that as well. Also move the bacon-specific code
+    to ramaze/spec/bacon, prepare for test-framework-agnostic behaviour.
+    [ f1a2669 | c12a0a4 | fdde916 ]
+  - Fix ordering of middleware [ 508bffc ]
+  - Warn and fix the ttl if someone exceeds the maximum ttl allowed by MemCache
+    [ 3124879 | bc08091 ]
+  - Comaptibility with localmemcache 0.4.0 [ 096f051 ]
+  - Fixed Cache::Sequel to work with 3.1.0 [ d2c2b85 ]
+  - Fix bug with memcache on 1.9, make sure the Etag middleware works on it
+    [ 21763df | 1d0dff5 ]
+  - A little bit of example-usage for Helper::Form#form_select, improve by
+    allowing :multiple => 10 [ a634582 | de73014 ]
+  - Avoid useless iteration and fix ambigous linking in helper/paginate
+    [ 6fb74df | 9b73450 ]
+  - Respect preset options for port/adapter on ramaze start [ 6efaaaa ]
+  - Preserve file permissions during `ramaze create` [ 3e3bc0a ]
+  - Implement and spec the lonely controller rule [ fdfe5b9 | 4dd866b ]
+  - Fix "bug" pointed out by druby [ 796627a ]
+  - Output to logger in ramaze/setup if Log is available, don't output the
+    require exception twice. Avoid infinite recursion when a
+    gem name does not match it's lib name [ b9fa0c4 | 7bc9d65 | e6b4996 ]
+  - Put a notice into config.ru making clear that the handler cannot be set
+    inside [ b4bad57 ]
+  - Some mods to contrib, fix facebook.rb syntax for ruby 1.9 and adding
+    Ramaze::AddressableRoute for great profit!  [ c7fbf0c | cafe657 ]
+  - Don't write a file to /tmp during the bin/ramaze spec [ eb5e4ef ]
+
+- Pistos 
+  - Explicitly state top-level namespace for ::File in config.ru, since
+    otherwise it is confused for Rack::File.
+    [ 5509950 ]
+  - Added Layout helper with specs and documentation
+    [ a84f675 | 41ad023 | 4f23d16 ]
+
+- TJ Vanderpoel (bougyman)
+  - Added some specs for ramaze/bin, correcting a require bug already in
+    bin/ramaze. [ 8bbb8e8 | 9a3edf3 | 33fa3aa ]
 
 A complete Changelog is available at
 http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true
 
 
-Known issues:
+== Known issues
+
+- Some problems may show up when running the specs, these are mostly caused
+  by the gem-versions of Rack::Test and Rack, they only affect the specs and
+  should have no influence on the actual runtime.
 
-  - none yet, waiting for your reports :)
 
+== Ramaze Features
 
-Ramaze Features:
-  - Builds on top of the Rack library, which provides easy use of adapters like
-    Mongrel, WEBrick, LiteSpeed, Thin, CGI or FCGI.
+- Builds on top of the Rack library, which provides easy use of adapters like
+  Mongrel, WEBrick, LiteSpeed, Thin, CGI or FCGI.
 
-  - Supports a wide range of templating-engines like: Amrita2, Erubis, Haml,
-    Liquid, Markaby, Remarkably and its own engine called Ezamar and (still
-    unofficial) Nagoro.
+- Supports a wide range of templating-engines like: ERB, Erubis, Haml, Liquid,
+  Maruku, Redcloth, Remarkably, Sass, Tagz, Tenjin. And its own engines called
+  Etanni, Ezamar, Gestalt, and Nagoro.
 
-  - Highly modular structure: you can just use the parts you like. This also
-    means that it's very simple to add your own customizations.
+- Highly modular structure: you can just use the parts you like. This also
+  means that it's very simple to add your own customizations.
 
-  - A variety of helpers is already available, giving you things like advanced
-    caching, OpenID-authentication or aspect-oriented programming for your
-    controllers.
+- A variety of helpers is already available, giving you things like advanced
+  caching, OpenID-authentication or aspect-oriented programming for your
+  controllers.
 
-  - It is possible to use the ORM you like, be it Sequel, DataMapper,
-    ActiveRecord, Og, Kansas or something more simplistic like DBI, or a
-    wrapper around YAML::Store.
+- It is possible to use the ORM you like, be it Sequel, DataMapper,
+  ActiveRecord, Og, Kansas or something more simplistic like DBI, or a wrapper
+  around YAML::Store.
 
-  - Good documentation: although we don't have 100% documentation right now
-    (dcov says around 75%), just about every part of Ramaze is covered with
-    basic and advanced docs. There are a variety of examples, screencasts and a
-    tutorial available.
+- Good documentation: although we don't have 100% documentation right now (dcov
+  says around 75%), just about every part of Ramaze is covered with basic and
+  advanced docs. There are a variety of examples, screencasts and a tutorial
+  available.
 
-  - Friendly community: there are people from all over the world using Ramaze,
-    so you can get almost instant help and info.
+- Friendly community: there are people from all over the world using Ramaze, so
+  you can get almost instant help and info.
 
 
 For more information please come to http://ramaze.net or ask directly on IRC

data/doc/tutorial/todolist.html

@@ -444,16 +444,16 @@ be because Ramaze changed (which happens very often while it is still young)
 or I actually made some mistake while writing it.</p></div>
 <div class="paragraph"><p>In either case it would make me (and all other poor fellows who happen to try
 this tutorial) very happy if you could spare some time and report the issue
-either on the <a href="http://ramazetrac.purepistos.org/">Bug tracker</a>, or just
+either on the <a href="http://github.com/manveru/ramaze/issues">Bug tracker</a> , or just
 drop by on IRC on <tt>irc.freenode.org</tt> in the channel <tt>#ramaze</tt>.</p></div>
 <div class="paragraph"><p>If you have trouble with some of the terms used in this tutorial you can
 consult the <a href="#glossary">Glossary</a> at the end of this document.</p></div>
 <div class="paragraph"><p>We are also working on a book that describes Ramaze in more depth, called
 <em>Journey to Ramaze</em>, it is still very much work in progress, but some of the
 contents might interest you.</p></div>
-<div class="paragraph"><p>The repository for the book is at <a href="http://github.com/manveru/ramaze-book">http://github.com/manveru/ramaze-book</a>.
-Every once in a while, updates for the book will be available in HTML and PDF
-form at <a href="http://book.ramaze.net">http://book.ramaze.net</a>.</p></div>
+<div class="paragraph"><p>The repository for the book is at <a href="http://github.com/manveru/ramaze-book">http://github.com/manveru/ramaze-book</a>. Every
+once in a while, updates for the book will be put in HTML and PDF form at
+<a href="http://book.ramaze.net">http://book.ramaze.net</a>.</p></div>
 </div>
 <h2 id="_first_step_create">First Step, Create</h2>
 <div class="sectionbody">
@@ -514,7 +514,7 @@ http://www.gnu.org/software/src-highlite -->
 <pre><tt><span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'rubygems'</span>
 <span style="font-weight: bold"><span style="color: #000080">require</span></span> <span style="color: #FF0000">'ramaze'</span>
 
-<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> Hello <span style="color: #990000">&lt;</span> Ramaze<span style="color: #990000">::</span>Controller
+<span style="font-weight: bold"><span style="color: #0000FF">class</span></span> MainController <span style="color: #990000">&lt;</span> Ramaze<span style="color: #990000">::</span>Controller
   <span style="font-weight: bold"><span style="color: #0000FF">def</span></span> index
     <span style="color: #FF0000">"Hello, World!"</span>
   <span style="font-weight: bold"><span style="color: #0000FF">end</span></span>
@@ -767,56 +767,20 @@ http://www.gnu.org/software/src-highlite -->
   &lt;?r Task.each do |task| ?&gt;
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;li&gt;</span></span>
       #{ h(task.title) }: #{ task.done },
-      (#{ anchor('close', route('close', url_encode(task.title))) })
+      (#{ anchor('close', 'close', task.title) })
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;/li&gt;</span></span>
   &lt;?r end ?&gt;
 <span style="font-weight: bold"><span style="color: #0000FF">&lt;/ul&gt;</span></span></tt></pre></div></div>
 <div class="paragraph"><p>Now we have an additional link next to each task that allows us to set it to
 done.</p></div>
-<div class="paragraph"><p>The line we added requires some closer examination, it consists of following
-parts (from inside out and with intermediate variables and annotation):</p></div>
-<div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.11.1
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt>title <span style="color: #990000">=</span> task<span style="color: #990000">.</span>title                 <span style="color: #FF0000"><b>&lt;1&gt;</b></span>
-url_title <span style="color: #990000">=</span> url_encode<span style="color: #990000">(</span>title<span style="color: #990000">)</span>      <span style="color: #FF0000"><b>&lt;2&gt;</b></span>
-action <span style="color: #990000">=</span> route<span style="color: #990000">(</span><span style="color: #FF0000">'close'</span><span style="color: #990000">,</span> url_title<span style="color: #990000">)</span> <span style="color: #FF0000"><b>&lt;3&gt;</b></span>
-link <span style="color: #990000">=</span> anchor<span style="color: #990000">(</span><span style="color: #FF0000">'close'</span><span style="color: #990000">,</span> action<span style="color: #990000">)</span>     <span style="color: #FF0000"><b>&lt;4&gt;</b></span></tt></pre></div></div>
-<div class="colist arabic"><ol>
-<li>
-<p>
-Obtain the title of the task from the Model object.
-</p>
-</li>
-<li>
-<p>
-Encode the title for use in an URL.
-</p>
-</li>
-<li>
-<p>
-Ask the Controller about it&#8217;s mapping for the <em>close</em> action and build a
-    link from that, this means that if you ever change the mapping of the
-    <tt>Tasks</tt> Controller, you will not have to change any links.
-</p>
-</li>
-<li>
-<p>
-Finally create the anchor tag that will look like:
-    <tt>&lt;a href="/close/Wash+dishes"&gt;close&lt;/a&gt;</tt>
-</p>
-</li>
-</ol></div>
 <div class="paragraph"><p>An even shorter way of writing that line using default aliases, that you will
-encounter in other applications is:</p></div>
+encounter in other applications, is:</p></div>
 <div class="listingblock">
 <div class="content"><!-- Generator: GNU source-highlight 2.11.1
 by Lorenzo Bettini
 http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
-<pre><tt> a<span style="color: #990000">(</span><span style="color: #FF0000">'close'</span><span style="color: #990000">,</span> r<span style="color: #990000">(</span><span style="color: #FF0000">'close'</span><span style="color: #990000">,</span> u<span style="color: #990000">(</span>task<span style="color: #990000">.</span>title<span style="color: #990000">)))</span></tt></pre></div></div>
+<pre><tt>a<span style="color: #990000">(</span><span style="color: #FF0000">'close'</span><span style="color: #990000">,</span> <span style="color: #FF0000">'close'</span><span style="color: #990000">,</span> task<span style="color: #990000">.</span>title<span style="color: #990000">)</span></tt></pre></div></div>
 <div class="paragraph"><p>But for the purpose of this tutorial we&#8217;ll try to be as explicit as possible.</p></div>
 <div class="paragraph"><p>Now that&#8217;s a lot of things at once, but I&#8217;m sure you will be able to keep up,
 the hardest part is behind us.</p></div>
@@ -862,8 +826,8 @@ http://www.gnu.org/software/src-highlite -->
   &lt;?r Task.each do |task| ?&gt;
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;li&gt;</span></span>
       #{ h(task.title) }: #{ task.done },
-      (#{ anchor('close', route('close', url_encode(task.title))) })
-      (#{ anchor('open', route('open', url_encode(task.title))) })
+      (#{ anchor('close', 'close', task.title) })
+      (#{ anchor('open', 'open', task.title) })
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;/li&gt;</span></span>
   &lt;?r end ?&gt;
 <span style="font-weight: bold"><span style="color: #0000FF">&lt;/ul&gt;</span></span></tt></pre></div></div>
@@ -915,9 +879,9 @@ http://www.gnu.org/software/src-highlite -->
   &lt;?r Task.each do |task| ?&gt;
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;li&gt;</span></span>
       #{ h(task.title) }: #{ task.done },
-      (#{ anchor('close', route('close', url_encode(task.title))) })
-      (#{ anchor('open', route('open', url_encode(task.title))) })
-      (#{ anchor('delete', route('delete', url_encode(task.title))) })
+      (#{ anchor('close', 'close', task.title)})
+      (#{ anchor('open', 'open', task.title)})
+      (#{ anchor('delete', 'delete', task.title)})
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;/li&gt;</span></span>
   &lt;?r end ?&gt;
 <span style="font-weight: bold"><span style="color: #0000FF">&lt;/ul&gt;</span></span></tt></pre></div></div>
@@ -1146,8 +1110,8 @@ http://www.gnu.org/software/src-highlite -->
       &lt;?r Task.filter(:done =&gt; true).each do |task| ?&gt;
         <span style="font-weight: bold"><span style="color: #0000FF">&lt;li&gt;</span></span>
           #{ h(task.title) }: #{ task.done },
-          (#{ anchor('open', route('open', url_encode(task.title))) })
-          (#{ anchor('delete', route('delete', url_encode(task.title))) })
+          (#{ anchor('open', 'open', task.title) })
+          (#{ anchor('delete', 'delete', task.title) })
         <span style="font-weight: bold"><span style="color: #0000FF">&lt;/li&gt;</span></span>
       &lt;?r end ?&gt;
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;/ul&gt;</span></span>
@@ -1206,14 +1170,14 @@ http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
 <pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h2&gt;</span></span>Done Tasks<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h2&gt;</span></span>
 
-#{ anchor('Pending tasks', route('done')) }
+#{ anchor('Pending tasks', 'done') }
 
 <span style="font-weight: bold"><span style="color: #0000FF">&lt;ul&gt;</span></span>
   &lt;?r Task.filter(:done =&gt; false).each do |task| ?&gt;
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;li&gt;</span></span>
       #{ h(task.title) },
-      (#{ anchor('close', route('close', url_encode(task.title))) })
-      (#{ anchor('delete', route('delete', url_encode(task.title))) })
+      (#{ anchor('close', 'close', task.title) })
+      (#{ anchor('delete', 'delete', task.title) })
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;/li&gt;</span></span>
   &lt;?r end ?&gt;
 <span style="font-weight: bold"><span style="color: #0000FF">&lt;/ul&gt;</span></span></tt></pre></div></div>
@@ -1225,14 +1189,14 @@ http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
 <pre><tt><span style="font-weight: bold"><span style="color: #0000FF">&lt;h2&gt;</span></span>Pending Tasks<span style="font-weight: bold"><span style="color: #0000FF">&lt;/h2&gt;</span></span>
 
-#{ anchor('Done tasks', route('done')) }
+#{ anchor('Done tasks', 'done') }
 
 <span style="font-weight: bold"><span style="color: #0000FF">&lt;ul&gt;</span></span>
   &lt;?r Task.filter(:done =&gt; true).each do |task| ?&gt;
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;li&gt;</span></span>
       #{ h(task.title) },
-      (#{ anchor('open', route('open', url_encode(task.title))) })
-      (#{ anchor('delete', route('delete', url_encode(task.title))) })
+      (#{ anchor('open', 'open', task.title) })
+      (#{ anchor('delete', 'delete', task.title) })
     <span style="font-weight: bold"><span style="color: #0000FF">&lt;/li&gt;</span></span>
   &lt;?r end ?&gt;
 <span style="font-weight: bold"><span style="color: #0000FF">&lt;/ul&gt;</span></span></tt></pre></div></div>
@@ -1408,7 +1372,7 @@ RSI
 <div id="footer">
 <div id="footer-text">
 Version 2.0<br />
-Last updated 2009-04-07 19:08:12 JST
+Last updated 2009-05-10 10:37:49 JST
 </div>
 </div>
 </body>

data/doc/tutorial/todolist.txt

@@ -26,7 +26,7 @@ or I actually made some mistake while writing it.
 
 In either case it would make me (and all other poor fellows who happen to try
 this tutorial) very happy if you could spare some time and report the issue
-either on the http://ramazetrac.purepistos.org/[Bug tracker], or just
+either on the http://github.com/manveru/ramaze/issues[Bug tracker] , or just
 drop by on IRC on `irc.freenode.org` in the channel `#ramaze`.
 
 If you have trouble with some of the terms used in this tutorial you can
@@ -36,9 +36,9 @@ We are also working on a book that describes Ramaze in more depth, called
 'Journey to Ramaze', it is still very much work in progress, but some of the
 contents might interest you.
 
-The repository for the book is at http://github.com/manveru/ramaze-book.
-Every once in a while, updates for the book will be available in HTML and PDF
-form at http://book.ramaze.net.
+The repository for the book is at http://github.com/manveru/ramaze-book. Every
+once in a while, updates for the book will be put in HTML and PDF form at
+http://book.ramaze.net.
 
 
 == First Step, Create
@@ -351,7 +351,7 @@ change the status of a task:
   <?r Task.each do |task| ?>
     <li>
       #{ h(task.title) }: #{ task.done },
-      (#{ anchor('close', route('close', url_encode(task.title))) })
+      (#{ anchor('close', 'close', task.title) })
     </li>
   <?r end ?>
 </ul>
@@ -360,31 +360,12 @@ change the status of a task:
 Now we have an additional link next to each task that allows us to set it to
 done.
 
-The line we added requires some closer examination, it consists of following
-parts (from inside out and with intermediate variables and annotation):
-
-[source,ruby]
-----
-title = task.title                 <1>
-url_title = url_encode(title)      <2>
-action = route('close', url_title) <3>
-link = anchor('close', action)     <4>
-----
-
-<1> Obtain the title of the task from the Model object.
-<2> Encode the title for use in an URL.
-<3> Ask the Controller about it's mapping for the 'close' action and build a
-    link from that, this means that if you ever change the mapping of the
-    `Tasks` Controller, you will not have to change any links.
-<4> Finally create the anchor tag that will look like:
-    `<a href="/close/Wash+dishes">close</a>`
-
 An even shorter way of writing that line using default aliases, that you will
-encounter in other applications is:
+encounter in other applications, is:
 
 [source,ruby]
 --------------------------------------------------------------------------------
- a('close', r('close', u(task.title)))
+a('close', 'close', task.title)
 --------------------------------------------------------------------------------
 
 But for the purpose of this tutorial we'll try to be as explicit as possible.
@@ -433,8 +414,8 @@ And add a link to that action:
   <?r Task.each do |task| ?>
     <li>
       #{ h(task.title) }: #{ task.done },
-      (#{ anchor('close', route('close', url_encode(task.title))) })
-      (#{ anchor('open', route('open', url_encode(task.title))) })
+      (#{ anchor('close', 'close', task.title) })
+      (#{ anchor('open', 'open', task.title) })
     </li>
   <?r end ?>
 </ul>
@@ -490,9 +471,9 @@ And a link to the `delete` action.
   <?r Task.each do |task| ?>
     <li>
       #{ h(task.title) }: #{ task.done },
-      (#{ anchor('close', route('close', url_encode(task.title))) })
-      (#{ anchor('open', route('open', url_encode(task.title))) })
-      (#{ anchor('delete', route('delete', url_encode(task.title))) })
+      (#{ anchor('close', 'close', task.title)})
+      (#{ anchor('open', 'open', task.title)})
+      (#{ anchor('delete', 'delete', task.title)})
     </li>
   <?r end ?>
 </ul>
@@ -715,8 +696,8 @@ So off we go and add a new template at 'view/done.xhtml'.
       <?r Task.filter(:done => true).each do |task| ?>
         <li>
           #{ h(task.title) }: #{ task.done },
-          (#{ anchor('open', route('open', url_encode(task.title))) })
-          (#{ anchor('delete', route('delete', url_encode(task.title))) })
+          (#{ anchor('open', 'open', task.title) })
+          (#{ anchor('delete', 'delete', task.title) })
         </li>
       <?r end ?>
     </ul>
@@ -780,14 +761,14 @@ boilerplate we can delete the slack from our templates.
 --------------------------------------------------------------------------------
 <h2>Done Tasks</h2>
 
-#{ anchor('Pending tasks', route('done')) }
+#{ anchor('Pending tasks', 'done') }
 
 <ul>
   <?r Task.filter(:done => false).each do |task| ?>
     <li>
       #{ h(task.title) },
-      (#{ anchor('close', route('close', url_encode(task.title))) })
-      (#{ anchor('delete', route('delete', url_encode(task.title))) })
+      (#{ anchor('close', 'close', task.title) })
+      (#{ anchor('delete', 'delete', task.title) })
     </li>
   <?r end ?>
 </ul>
@@ -799,14 +780,14 @@ boilerplate we can delete the slack from our templates.
 --------------------------------------------------------------------------------
 <h2>Pending Tasks</h2>
 
-#{ anchor('Done tasks', route('done')) }
+#{ anchor('Done tasks', 'done') }
 
 <ul>
   <?r Task.filter(:done => true).each do |task| ?>
     <li>
       #{ h(task.title) },
-      (#{ anchor('open', route('open', url_encode(task.title))) })
-      (#{ anchor('delete', route('delete', url_encode(task.title))) })
+      (#{ anchor('open', 'open', task.title) })
+      (#{ anchor('delete', 'delete', task.title) })
     </li>
   <?r end ?>
 </ul>