wee 0.3.1 → 0.4.0

data/README

@@ -16,7 +16,6 @@ things.
 Known Bugs:
 
 * Continuations leak memory!
-* Sessions get never reclaimed (easy to fix). 
 
 == Introduction
 

data/Rakefile

@@ -21,6 +21,11 @@ task :package do
   sh 'gem build wee.gemspec' 
 end
 
+task :local_install => [:package] do
+  sh 'gem uninstall wee || true'
+  sh 'gem install wee-*.gem'
+end
+
 task :clean => [:clobber_rdoc]
 
 task :default => [:test, :rdoc, :clean]

data/TODO

@@ -1,3 +1,9 @@
+* req-handler gc interval
+
+* use LiteralMethod object instead of block if callback(:method_name) is given
+
+* log requests
+
 * call method #backtrack from backtrack_state. you don't need to call super for #backtrack (at least for direct subclasses of Component).
 * call method #setup from initialize. same reason as for #backtrack.  
 

data/doc/rdoc/classes/Enumerable.html

@@ -86,7 +86,7 @@ for Ruby 1.8
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000216">min_by</a>&nbsp;&nbsp;
+      <a href="#M000228">min_by</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -108,19 +108,19 @@ for Ruby 1.8
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000216" class="method-detail">
-        <a name="M000216"></a>
+      <div id="method-M000228" class="method-detail">
+        <a name="M000228"></a>
 
         <div class="method-heading">
-          <a href="#M000216" class="method-signature">
+          <a href="#M000228" class="method-signature">
           <span class="method-name">min_by</span><span class="method-args">(&amp;block)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000216-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000216-source">
+            onclick="toggleCode('M000228-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000228-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/cache/cache.rb, line 4</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">min_by</span>(<span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)

data/doc/rdoc/classes/Wee/AnswerDecoration.html

@@ -84,9 +84,9 @@
       <p>
 A <a href="AnswerDecoration.html">Wee::AnswerDecoration</a> is wrapped
 around a component that will call <a
-href="Component.html#M000179">Component#answer</a>. This makes it possible
+href="Component.html#M000188">Component#answer</a>. This makes it possible
 to use such components without the need to call them (<a
-href="Component.html#M000178">Component#call</a>), e.g. as child components
+href="Component.html#M000187">Component#call</a>), e.g. as child components
 of other components.
 </p>
 
@@ -99,7 +99,7 @@ of other components.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000042">process_callbacks</a>&nbsp;&nbsp;
+      <a href="#M000044">process_callbacks</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -125,7 +125,7 @@ of other components.
           <td class="context-item-desc">
 When a component answers, <tt>on_answer.call(args)</tt> will be executed
 (unless nil), where <tt>args</tt> are the arguments passed to <a
-href="Component.html#M000179">Component#answer</a>. Note that no snapshot
+href="Component.html#M000188">Component#answer</a>. Note that no snapshot
 of on_answer is taken, so you should avoid modifying it!
 
 </td>
@@ -140,21 +140,21 @@ of on_answer is taken, so you should avoid modifying it!
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000042" class="method-detail">
-        <a name="M000042"></a>
+      <div id="method-M000044" class="method-detail">
+        <a name="M000044"></a>
 
         <div class="method-heading">
-          <a href="#M000042" class="method-signature">
+          <a href="#M000044" class="method-signature">
           <span class="method-name">process_callbacks</span><span class="method-args">(callback_stream)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000042-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000042-source">
+            onclick="toggleCode('M000044-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000044-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/wee/core/decoration.rb, line 122</span>
+<span class="ruby-comment cmt"># File lib/wee/core/decoration.rb, line 131</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">process_callbacks</span>(<span class="ruby-identifier">callback_stream</span>)
     <span class="ruby-identifier">args</span> = <span class="ruby-identifier">catch</span>(<span class="ruby-identifier">:wee_answer</span>) { <span class="ruby-keyword kw">super</span>; <span class="ruby-keyword kw">nil</span> }
     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">args</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span>

data/doc/rdoc/classes/Wee/Application.html

@@ -98,11 +98,12 @@ the correct handler by examining the request.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000138">default_request_handler</a>&nbsp;&nbsp;
-      <a href="#M000140">handle_request</a>&nbsp;&nbsp;
-      <a href="#M000139">new</a>&nbsp;&nbsp;
-      <a href="#M000142">request_handler_expired</a>&nbsp;&nbsp;
-      <a href="#M000141">unique_request_handler_id</a>&nbsp;&nbsp;
+      <a href="#M000146">default_request_handler</a>&nbsp;&nbsp;
+      <a href="#M000150">garbage_collect_handlers</a>&nbsp;&nbsp;
+      <a href="#M000148">handle_request</a>&nbsp;&nbsp;
+      <a href="#M000147">new</a>&nbsp;&nbsp;
+      <a href="#M000151">request_handler_expired</a>&nbsp;&nbsp;
+      <a href="#M000149">unique_request_handler_id</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -148,11 +149,11 @@ The maximum number of request handlers
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000139" class="method-detail">
-        <a name="M000139"></a>
+      <div id="method-M000147" class="method-detail">
+        <a name="M000147"></a>
 
         <div class="method-heading">
-          <a href="#M000139" class="method-signature">
+          <a href="#M000147" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(&amp;block)</span>
           </a>
         </div>
@@ -169,8 +170,8 @@ Creates a new application. The block is used to initialize the attributes:
   }
 </pre>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000139-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000139-source">
+            onclick="toggleCode('M000147-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000147-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/wee/application.rb, line 34</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
@@ -181,6 +182,13 @@ Creates a new application. The block is used to initialize the attributes:
       <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-value str">&quot;No default request handler specified&quot;</span>
     <span class="ruby-keyword kw">end</span>
     <span class="ruby-ivar">@mutex</span> = <span class="ruby-constant">Mutex</span>.<span class="ruby-identifier">new</span>
+
+    <span class="ruby-comment cmt"># start request-handler collecting thread</span>
+    <span class="ruby-comment cmt"># run once every minute</span>
+    <span class="ruby-ivar">@gc_thread</span> = <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> {
+      <span class="ruby-identifier">sleep</span> <span class="ruby-value">60</span>
+      <span class="ruby-ivar">@mutex</span>.<span class="ruby-identifier">synchronize</span> { <span class="ruby-identifier">garbage_collect_handlers</span> }
+    }
   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -189,11 +197,11 @@ Creates a new application. The block is used to initialize the attributes:
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000138" class="method-detail">
-        <a name="M000138"></a>
+      <div id="method-M000146" class="method-detail">
+        <a name="M000146"></a>
 
         <div class="method-heading">
-          <a href="#M000138" class="method-signature">
+          <a href="#M000146" class="method-signature">
           <span class="method-name">default_request_handler</span><span class="method-args">(&amp;block)</span>
           </a>
         </div>
@@ -204,8 +212,8 @@ Get or set the default request handler. The default request handler is used
 if no request handler id is given in a request.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000138-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000138-source">
+            onclick="toggleCode('M000146-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000146-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/wee/application.rb, line 18</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">default_request_handler</span>(<span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
@@ -220,50 +228,71 @@ if no request handler id is given in a request.
         </div>
       </div>
 
-      <div id="method-M000140" class="method-detail">
-        <a name="M000140"></a>
+      <div id="method-M000148" class="method-detail">
+        <a name="M000148"></a>
 
         <div class="method-heading">
-          <a href="#M000140" class="method-signature">
+          <a href="#M000148" class="method-signature">
           <span class="method-name">handle_request</span><span class="method-args">(context)</span>
           </a>
         </div>
       
         <div class="method-description">
-          <p>
-TODO: we have to use mutexes here NOTE that id_generator must be
-thread-safe! TODO: test for max_request_handlers
-</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000140-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000140-source">
+            onclick="toggleCode('M000148-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000148-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/wee/application.rb, line 48</span>
+<span class="ruby-comment cmt"># File lib/wee/application.rb, line 51</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">handle_request</span>(<span class="ruby-identifier">context</span>)
-    <span class="ruby-ivar">@mutex</span>.<span class="ruby-identifier">synchronize</span> <span class="ruby-keyword kw">do</span>
-      <span class="ruby-identifier">request_handler_id</span> = <span class="ruby-identifier">context</span>.<span class="ruby-identifier">request</span>.<span class="ruby-identifier">request_handler_id</span>
-      <span class="ruby-identifier">request_handler</span> = <span class="ruby-ivar">@request_handlers</span>[<span class="ruby-identifier">request_handler_id</span>]
+    <span class="ruby-identifier">request_handler_id</span> = <span class="ruby-identifier">context</span>.<span class="ruby-identifier">request</span>.<span class="ruby-identifier">request_handler_id</span>
+    <span class="ruby-identifier">request_handler</span> = <span class="ruby-ivar">@mutex</span>.<span class="ruby-identifier">synchronize</span> { <span class="ruby-ivar">@request_handlers</span>[<span class="ruby-identifier">request_handler_id</span>] }
+
+    <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">request_handler_id</span>.<span class="ruby-identifier">nil?</span>
 
-      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">request_handler_id</span>.<span class="ruby-identifier">nil?</span>
-        <span class="ruby-comment cmt"># No id was given -&gt; create new id and handler</span>
-        <span class="ruby-identifier">request_handler_id</span> = <span class="ruby-identifier">unique_request_handler_id</span>()
+      <span class="ruby-comment cmt"># No id was given -&gt; check whether the maximum number of request-handlers</span>
+      <span class="ruby-comment cmt"># limit is reached. if not, create new id and handler</span>
+
+      <span class="ruby-ivar">@mutex</span>.<span class="ruby-identifier">synchronize</span> {
+        <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@max_request_handlers</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-keyword kw">and</span> <span class="ruby-ivar">@request_handlers</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;=</span> <span class="ruby-ivar">@max_request_handlers</span>
+          <span class="ruby-comment cmt"># limit reached -&gt; remove non-alive handlers...</span>
+          <span class="ruby-identifier">garbage_collect_handlers</span>()
+
+          <span class="ruby-comment cmt"># ...and test again</span>
+          <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@request_handlers</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;=</span> <span class="ruby-ivar">@max_request_handlers</span>
+            <span class="ruby-comment cmt"># TODO: show a custom error message</span>
+            <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;maximum number of request-handlers reached&quot;</span> 
+          <span class="ruby-keyword kw">end</span>
+        <span class="ruby-keyword kw">end</span>
+
+        <span class="ruby-identifier">request_handler_id</span> =  <span class="ruby-identifier">unique_request_handler_id</span>()
         <span class="ruby-identifier">request_handler</span> = <span class="ruby-ivar">@default_request_handler</span>.<span class="ruby-identifier">call</span>  
         <span class="ruby-identifier">request_handler</span>.<span class="ruby-identifier">id</span> = <span class="ruby-identifier">request_handler_id</span>
         <span class="ruby-identifier">request_handler</span>.<span class="ruby-identifier">application</span> = <span class="ruby-keyword kw">self</span>
         <span class="ruby-ivar">@request_handlers</span>[<span class="ruby-identifier">request_handler_id</span>] = <span class="ruby-identifier">request_handler</span>
+      }
+
+      <span class="ruby-identifier">context</span>.<span class="ruby-identifier">response</span> = <span class="ruby-constant">Wee</span><span class="ruby-operator">::</span><span class="ruby-constant">RedirectResponse</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">context</span>.<span class="ruby-identifier">request</span>.<span class="ruby-identifier">build_url</span>(<span class="ruby-identifier">request_handler_id</span>))
+      <span class="ruby-keyword kw">return</span>
 
-        <span class="ruby-identifier">context</span>.<span class="ruby-identifier">response</span> = <span class="ruby-constant">Wee</span><span class="ruby-operator">::</span><span class="ruby-constant">RedirectResponse</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">context</span>.<span class="ruby-identifier">request</span>.<span class="ruby-identifier">build_url</span>(<span class="ruby-identifier">request_handler_id</span>))
-        <span class="ruby-keyword kw">return</span>
+    <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">request_handler</span>.<span class="ruby-identifier">nil?</span>
 
-      <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">request_handler</span>.<span class="ruby-identifier">nil?</span>
-        <span class="ruby-comment cmt"># A false request handler id was given. This might indicate that a</span>
-        <span class="ruby-comment cmt"># request handler has expired. </span>
-        <span class="ruby-identifier">request_handler_expired</span>(<span class="ruby-identifier">context</span>)
-        <span class="ruby-keyword kw">return</span>
-      <span class="ruby-keyword kw">end</span>
+      <span class="ruby-comment cmt"># A false request handler id was given. This might indicate that a</span>
+      <span class="ruby-comment cmt"># request handler has expired. </span>
+
+      <span class="ruby-identifier">request_handler_expired</span>(<span class="ruby-identifier">context</span>)
+      <span class="ruby-keyword kw">return</span>
+
+    <span class="ruby-keyword kw">elsif</span> <span class="ruby-operator">!</span><span class="ruby-identifier">request_handler</span>.<span class="ruby-identifier">alive?</span>
+
+      <span class="ruby-comment cmt"># The request_handler is not alive anymore.</span>
+
+      <span class="ruby-identifier">request_handler_expired</span>(<span class="ruby-identifier">context</span>)
+      <span class="ruby-keyword kw">return</span>
 
-      <span class="ruby-identifier">request_handler</span>.<span class="ruby-identifier">handle_request</span>(<span class="ruby-identifier">context</span>)
     <span class="ruby-keyword kw">end</span>
+
+    <span class="ruby-identifier">request_handler</span>.<span class="ruby-identifier">handle_request</span>(<span class="ruby-identifier">context</span>)
+
   <span class="ruby-keyword kw">rescue</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">exn</span>
     <span class="ruby-identifier">context</span>.<span class="ruby-identifier">response</span> = <span class="ruby-constant">Wee</span><span class="ruby-operator">::</span><span class="ruby-constant">ErrorResponse</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">exn</span>) 
   <span class="ruby-keyword kw">end</span>
@@ -274,21 +303,47 @@ thread-safe! TODO: test for max_request_handlers
 
       <h3 class="section-bar">Private Instance methods</h3>
 
-      <div id="method-M000142" class="method-detail">
-        <a name="M000142"></a>
+      <div id="method-M000150" class="method-detail">
+        <a name="M000150"></a>
 
         <div class="method-heading">
-          <a href="#M000142" class="method-signature">
+          <a href="#M000150" class="method-signature">
+          <span class="method-name">garbage_collect_handlers</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+MUST be called while holding @mutex
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000150-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000150-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/wee/application.rb, line 117</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">garbage_collect_handlers</span>
+    <span class="ruby-ivar">@request_handlers</span>.<span class="ruby-identifier">delete_if</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">id</span>,<span class="ruby-identifier">rh</span><span class="ruby-operator">|</span> <span class="ruby-operator">!</span><span class="ruby-identifier">rh</span>.<span class="ruby-identifier">alive?</span> }
+  <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000151" class="method-detail">
+        <a name="M000151"></a>
+
+        <div class="method-heading">
+          <a href="#M000151" class="method-signature">
           <span class="method-name">request_handler_expired</span><span class="method-args">(context)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000142-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000142-source">
+            onclick="toggleCode('M000151-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000151-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/wee/application.rb, line 85</span>
+<span class="ruby-comment cmt"># File lib/wee/application.rb, line 121</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">request_handler_expired</span>(<span class="ruby-identifier">context</span>)
     <span class="ruby-identifier">context</span>.<span class="ruby-identifier">response</span> = <span class="ruby-constant">Wee</span><span class="ruby-operator">::</span><span class="ruby-constant">RefreshResponse</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;Invalid or expired request handler!&quot;</span>, <span class="ruby-identifier">context</span>.<span class="ruby-identifier">request</span>.<span class="ruby-identifier">application_path</span>)
   <span class="ruby-keyword kw">end</span>
@@ -297,21 +352,24 @@ thread-safe! TODO: test for max_request_handlers
         </div>
       </div>
 
-      <div id="method-M000141" class="method-detail">
-        <a name="M000141"></a>
+      <div id="method-M000149" class="method-detail">
+        <a name="M000149"></a>
 
         <div class="method-heading">
-          <a href="#M000141" class="method-signature">
+          <a href="#M000149" class="method-signature">
           <span class="method-name">unique_request_handler_id</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
+          <p>
+MUST be called while holding @mutex
+</p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000141-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000141-source">
+            onclick="toggleCode('M000149-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000149-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/wee/application.rb, line 79</span>
+<span class="ruby-comment cmt"># File lib/wee/application.rb, line 109</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">unique_request_handler_id</span>
     <span class="ruby-identifier">id</span> = <span class="ruby-ivar">@id_generator</span>.<span class="ruby-identifier">next</span>.<span class="ruby-identifier">to_s</span>
     <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;failed to create unique request handler id&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@request_handlers</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">id</span>)

data/doc/rdoc/classes/Wee/Brush/ActionCallbackMixin.html

@@ -80,7 +80,7 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000075">callback</a>&nbsp;&nbsp;
+      <a href="#M000081">callback</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -88,13 +88,6 @@
 
 
     <!-- if includes -->
-    <div id="includes">
-      <h3 class="section-bar">Included Modules</h3>
-
-      <div id="includes-list">
-        <span class="include-name"><a href="CallbackMixin.html">Brush::CallbackMixin</a></span>
-      </div>
-    </div>
 
     <div id="section">
 
@@ -109,25 +102,25 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000075" class="method-detail">
-        <a name="M000075"></a>
+      <div id="method-M000081" class="method-detail">
+        <a name="M000081"></a>
 
         <div class="method-heading">
-          <a href="#M000075" class="method-signature">
+          <a href="#M000081" class="method-signature">
           <span class="method-name">callback</span><span class="method-args">(symbol=nil, &amp;block)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000075-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000075-source">
+            onclick="toggleCode('M000081-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000081-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/wee/renderer/html/brushes.rb, line 178</span>
+<span class="ruby-comment cmt"># File lib/wee/renderer/html/brushes.rb, line 165</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">callback</span>(<span class="ruby-identifier">symbol</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
     <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">symbol</span> <span class="ruby-keyword kw">and</span> <span class="ruby-identifier">block</span>
     <span class="ruby-identifier">block</span> = <span class="ruby-ivar">@canvas</span>.<span class="ruby-identifier">current_component</span>.<span class="ruby-identifier">method</span>(<span class="ruby-identifier">symbol</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">block</span>
-    <span class="ruby-identifier">name</span>(<span class="ruby-identifier">register_callback</span>(<span class="ruby-identifier">:action</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>))
+    <span class="ruby-identifier">name</span>(<span class="ruby-ivar">@canvas</span>.<span class="ruby-identifier">register_callback</span>(<span class="ruby-identifier">:action</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>))
   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>

data/doc/rdoc/classes/Wee/Brush/ActionURLCallbackMixin.html

@@ -86,7 +86,7 @@ The callback id is listed in the URL (not as a form-data field)
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000074">callback</a>&nbsp;&nbsp;
+      <a href="#M000080">callback</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -94,13 +94,6 @@ The callback id is listed in the URL (not as a form-data field)
 
 
     <!-- if includes -->
-    <div id="includes">
-      <h3 class="section-bar">Included Modules</h3>
-
-      <div id="includes-list">
-        <span class="include-name"><a href="CallbackMixin.html">Brush::CallbackMixin</a></span>
-      </div>
-    </div>
 
     <div id="section">
 
@@ -115,27 +108,23 @@ The callback id is listed in the URL (not as a form-data field)
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000074" class="method-detail">
-        <a name="M000074"></a>
+      <div id="method-M000080" class="method-detail">
+        <a name="M000080"></a>
 
         <div class="method-heading">
-          <a href="#M000074" class="method-signature">
+          <a href="#M000080" class="method-signature">
           <span class="method-name">callback</span><span class="method-args">(symbol=nil, &amp;block)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000074-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000074-source">
+            onclick="toggleCode('M000080-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000080-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/wee/renderer/html/brushes.rb, line 191</span>
+<span class="ruby-comment cmt"># File lib/wee/renderer/html/brushes.rb, line 176</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">callback</span>(<span class="ruby-identifier">symbol</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
-    <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">symbol</span> <span class="ruby-keyword kw">and</span> <span class="ruby-identifier">block</span>
-    <span class="ruby-identifier">block</span> = <span class="ruby-ivar">@canvas</span>.<span class="ruby-identifier">current_component</span>.<span class="ruby-identifier">method</span>(<span class="ruby-identifier">symbol</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">block</span>
-    <span class="ruby-identifier">req</span> = <span class="ruby-ivar">@canvas</span>.<span class="ruby-identifier">rendering_context</span>.<span class="ruby-identifier">request</span>
-    <span class="ruby-identifier">url</span> = <span class="ruby-identifier">req</span>.<span class="ruby-identifier">build_url</span>(<span class="ruby-identifier">req</span>.<span class="ruby-identifier">request_handler_id</span>, <span class="ruby-identifier">req</span>.<span class="ruby-identifier">page_id</span>, <span class="ruby-identifier">register_callback</span>(<span class="ruby-identifier">:action</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>))
-    <span class="ruby-identifier">__set_url</span>(<span class="ruby-identifier">url</span>)
+    <span class="ruby-identifier">__set_url</span>(<span class="ruby-ivar">@canvas</span>.<span class="ruby-identifier">url_for_callback</span>(<span class="ruby-identifier">symbol</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>))
   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>