safubot 0.0.2 → 0.0.3

data/doc/Safubot/XMPP/Message.html

@@ -284,7 +284,6 @@ The Blather stanza from which to source data.
       <pre class="lines">
 
 
-43
 44
 45
 46
@@ -293,10 +292,11 @@ The Blather stanza from which to source data.
 49
 50
 51
-52</pre>
+52
+53</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/safubot/xmpp.rb', line 43</span>
+      <pre class="code"><span class="info file"># File 'lib/safubot/xmpp.rb', line 44</span>
 
 <span class='kw'>def</span> <span class='id from'>from</span><span class='lparen'>(</span><span class='id raw'>raw</span><span class='rparen'>)</span>
   <span class='const'>Message</span><span class='period'>.</span><span class='id find_by_xmpp_id'>find_by_xmpp_id</span><span class='lparen'>(</span><span class='id raw'>raw</span><span class='period'>.</span><span class='id id'>id</span><span class='rparen'>)</span> <span class='op'>||</span>
@@ -344,12 +344,12 @@ Retrieves or creates an associated Request.
       <pre class="lines">
 
 
-66
 67
-68</pre>
+68
+69</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/safubot/xmpp.rb', line 66</span>
+      <pre class="code"><span class="info file"># File 'lib/safubot/xmpp.rb', line 67</span>
 
 <span class='kw'>def</span> <span class='id make_request'>make_request</span>
 		<span class='kw'>self</span><span class='period'>.</span><span class='id request'>request</span> <span class='op'>||</span> <span class='const'>Request</span><span class='period'>.</span><span class='id create'>create</span><span class='lparen'>(</span><span class='symbol'>:user</span> <span class='op'>=&gt;</span> <span class='id user'>user</span><span class='comma'>,</span> <span class='symbol'>:source</span> <span class='op'>=&gt;</span> <span class='kw'>self</span><span class='comma'>,</span> <span class='symbol'>:text</span> <span class='op'>=&gt;</span> <span class='kw'>self</span><span class='period'>.</span><span class='id text'>text</span><span class='rparen'>)</span>
@@ -384,12 +384,12 @@ Retrieves the KnownUser associated with this Message.
       <pre class="lines">
 
 
-61
 62
-63</pre>
+63
+64</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/safubot/xmpp.rb', line 61</span>
+      <pre class="code"><span class="info file"># File 'lib/safubot/xmpp.rb', line 62</span>
 
 <span class='kw'>def</span> <span class='id user'>user</span>
 		<span class='const'>KnownUser</span><span class='period'>.</span><span class='id by_xmpp'>by_xmpp</span><span class='lparen'>(</span><span class='kw'>self</span><span class='period'>.</span><span class='id from'>from</span><span class='rparen'>)</span>
@@ -424,12 +424,12 @@ Retrieves the sender&#8217;s username from the JID.
       <pre class="lines">
 
 
-56
 57
-58</pre>
+58
+59</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/safubot/xmpp.rb', line 56</span>
+      <pre class="code"><span class="info file"># File 'lib/safubot/xmpp.rb', line 57</span>
 
 <span class='kw'>def</span> <span class='id username'>username</span>
 		<span class='kw'>self</span><span class='period'>.</span><span class='id from'>from</span><span class='period'>.</span><span class='id split'>split</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>@</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='lbracket'>[</span><span class='int'>0</span><span class='rbracket'>]</span>
@@ -444,7 +444,7 @@ Retrieves the sender&#8217;s username from the JID.
 </div>
     
     <div id="footer">
-  Generated on Mon Nov 28 20:20:03 2011 by 
+  Generated on Tue Nov 29 11:44:04 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.7.3 (ruby-1.9.2).
 </div>

data/doc/_index.html

@@ -285,7 +285,7 @@
 </div>
     
     <div id="footer">
-  Generated on Mon Nov 28 20:20:03 2011 by 
+  Generated on Tue Nov 29 11:44:04 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.7.3 (ruby-1.9.2).
 </div>

data/doc/file.README.html

@@ -54,7 +54,7 @@
     
     <iframe id="search_frame"></iframe>
     
-    <div id="content"><div id='filecontents'><h1>safubot - an evented chatbot framework for Ruby</h1>
+    <div id="content"><div id='filecontents'><h1>safubot - an event-driven chatbot framework for Ruby</h1>
 
 <h2><a name="overview">Overview</a></h2>
 
@@ -73,7 +73,7 @@
 
 <p><a href="http://rdoc.info/gems/safubot">http://rdoc.info/gems/safubot</a></p>
 
-<h2><a name="example">Example Usage</a></h2>
+<h2><a name="example">Sample Usage</a></h2>
 
 <pre class="code"><span class='id require'>require</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>safubot</span><span class='tstring_end'>'</span></span>
 
@@ -124,14 +124,52 @@
   <span class='kw'>end</span>
 <span class='kw'>end</span>
 
-<span class='comment'># You can run this from inside another EventMachine loop if
-</span><span class='comment'># you don't want it to block indefinitely.
+<span class='comment'># This will fork the Twitter/XMPP streaming processes as needed
+</span><span class='comment'># and then wait for them. You can call run_nowait if you want
+</span><span class='comment'># a non-blocking form.
 </span><span class='const'>NiftyBot</span><span class='period'>.</span><span class='id new'>new</span><span class='period'>.</span><span class='id run'>run</span>
 </pre>
+
+<h2><a name="logging">Logging</a></h2>
+
+<p>Safubot::Log behaves as a Logger instance and will write to stdout by default. You can also tell it to write to a file:</p>
+
+<pre class="code"><span class='const'>Safubot</span><span class='op'>::</span><span class='const'>Log</span><span class='period'>.</span><span class='id path'>path</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>/some/cool/logfile</span><span class='tstring_end'>&quot;</span></span>
+</pre>
+
+<h2><a name="example">Specific Examples</a></h2>
+
+<h3>Find the last processed request from a user</h3>
+
+<pre class="code"><span class='id on'>on</span><span class='lparen'>(</span><span class='symbol'>:request</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id req'>req</span><span class='op'>|</span>
+  <span class='id req'>req</span><span class='period'>.</span><span class='id user'>user</span><span class='period'>.</span><span class='id requests'>requests</span><span class='period'>.</span><span class='id where'>where</span><span class='lparen'>(</span><span class='symbol'>:processed</span> <span class='op'>=&gt;</span> <span class='kw'>true</span><span class='rparen'>)</span><span class='period'>.</span><span class='id sort'>sort</span><span class='lparen'>(</span><span class='symbol'>:created_at</span><span class='period'>.</span><span class='id desc'>desc</span><span class='rparen'>)</span><span class='period'>.</span><span class='id first'>first</span>
+<span class='kw'>end</span>
+</pre>
+
+<h3>Update our twitter account</h3>
+
+<pre class="code"><span class='ivar'>@twitter</span><span class='period'>.</span><span class='id client'>client</span><span class='period'>.</span><span class='id update'>update</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Hello there, wonderful, scary world of Twitter! I am so *not* a spambot.</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span>
+</pre>
+
+<h3>Reply to a non-request timeline tweet</h3>
+
+<pre class="code"><span class='ivar'>@twitter</span><span class='period'>.</span><span class='id on'>on</span><span class='lparen'>(</span><span class='symbol'>:timeline</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id tweet'>tweet</span><span class='op'>|</span>
+  <span class='kw'>if</span> <span class='id tweet'>tweet</span><span class='period'>.</span><span class='id raw'>raw</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>user</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>screen_name</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span> <span class='op'>==</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>unnali</span><span class='tstring_end'>&quot;</span></span>
+    <span class='ivar'>@twitter</span><span class='period'>.</span><span class='id reply'>reply</span> <span class='id tweet'>tweet</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Is HaeSeun OSS yet? :O</span><span class='tstring_end'>&quot;</span></span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span>
+</pre>
+
+<h3>Start an unprompted conversation with an XMPP user</h3>
+
+<pre class="code"><span class='ivar'>@xmpp</span><span class='period'>.</span><span class='id on'>on</span><span class='lparen'>(</span><span class='symbol'>:ready</span><span class='rparen'>)</span> <span class='kw'>do</span>
+  <span class='ivar'>@xmpp</span><span class='period'>.</span><span class='id tell'>tell</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>^_^@jabber.org</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>You'd best be maintaining safubot!</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span>
+<span class='kw'>end</span>
+</pre>
 </div></div>
     
     <div id="footer">
-  Generated on Mon Nov 28 20:20:03 2011 by 
+  Generated on Tue Nov 29 11:44:04 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.7.3 (ruby-1.9.2).
 </div>

data/doc/index.html

@@ -54,7 +54,7 @@
     
     <iframe id="search_frame"></iframe>
     
-    <div id="content"><div id='filecontents'><h1>safubot - an evented chatbot framework for Ruby</h1>
+    <div id="content"><div id='filecontents'><h1>safubot - an event-driven chatbot framework for Ruby</h1>
 
 <h2><a name="overview">Overview</a></h2>
 
@@ -73,7 +73,7 @@
 
 <p><a href="http://rdoc.info/gems/safubot">http://rdoc.info/gems/safubot</a></p>
 
-<h2><a name="example">Example Usage</a></h2>
+<h2><a name="example">Sample Usage</a></h2>
 
 <pre class="code"><span class='id require'>require</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>safubot</span><span class='tstring_end'>'</span></span>
 
@@ -124,14 +124,52 @@
   <span class='kw'>end</span>
 <span class='kw'>end</span>
 
-<span class='comment'># You can run this from inside another EventMachine loop if
-</span><span class='comment'># you don't want it to block indefinitely.
+<span class='comment'># This will fork the Twitter/XMPP streaming processes as needed
+</span><span class='comment'># and then wait for them. You can call run_nowait if you want
+</span><span class='comment'># a non-blocking form.
 </span><span class='const'>NiftyBot</span><span class='period'>.</span><span class='id new'>new</span><span class='period'>.</span><span class='id run'>run</span>
 </pre>
+
+<h2><a name="logging">Logging</a></h2>
+
+<p>Safubot::Log behaves as a Logger instance and will write to stdout by default. You can also tell it to write to a file:</p>
+
+<pre class="code"><span class='const'>Safubot</span><span class='op'>::</span><span class='const'>Log</span><span class='period'>.</span><span class='id path'>path</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>/some/cool/logfile</span><span class='tstring_end'>&quot;</span></span>
+</pre>
+
+<h2><a name="example">Specific Examples</a></h2>
+
+<h3>Find the last processed request from a user</h3>
+
+<pre class="code"><span class='id on'>on</span><span class='lparen'>(</span><span class='symbol'>:request</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id req'>req</span><span class='op'>|</span>
+  <span class='id req'>req</span><span class='period'>.</span><span class='id user'>user</span><span class='period'>.</span><span class='id requests'>requests</span><span class='period'>.</span><span class='id where'>where</span><span class='lparen'>(</span><span class='symbol'>:processed</span> <span class='op'>=&gt;</span> <span class='kw'>true</span><span class='rparen'>)</span><span class='period'>.</span><span class='id sort'>sort</span><span class='lparen'>(</span><span class='symbol'>:created_at</span><span class='period'>.</span><span class='id desc'>desc</span><span class='rparen'>)</span><span class='period'>.</span><span class='id first'>first</span>
+<span class='kw'>end</span>
+</pre>
+
+<h3>Update our twitter account</h3>
+
+<pre class="code"><span class='ivar'>@twitter</span><span class='period'>.</span><span class='id client'>client</span><span class='period'>.</span><span class='id update'>update</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Hello there, wonderful, scary world of Twitter! I am so *not* a spambot.</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span>
+</pre>
+
+<h3>Reply to a non-request timeline tweet</h3>
+
+<pre class="code"><span class='ivar'>@twitter</span><span class='period'>.</span><span class='id on'>on</span><span class='lparen'>(</span><span class='symbol'>:timeline</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id tweet'>tweet</span><span class='op'>|</span>
+  <span class='kw'>if</span> <span class='id tweet'>tweet</span><span class='period'>.</span><span class='id raw'>raw</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>user</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>screen_name</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span> <span class='op'>==</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>unnali</span><span class='tstring_end'>&quot;</span></span>
+    <span class='ivar'>@twitter</span><span class='period'>.</span><span class='id reply'>reply</span> <span class='id tweet'>tweet</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Is HaeSeun OSS yet? :O</span><span class='tstring_end'>&quot;</span></span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span>
+</pre>
+
+<h3>Start an unprompted conversation with an XMPP user</h3>
+
+<pre class="code"><span class='ivar'>@xmpp</span><span class='period'>.</span><span class='id on'>on</span><span class='lparen'>(</span><span class='symbol'>:ready</span><span class='rparen'>)</span> <span class='kw'>do</span>
+  <span class='ivar'>@xmpp</span><span class='period'>.</span><span class='id tell'>tell</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>^_^@jabber.org</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>You'd best be maintaining safubot!</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span>
+<span class='kw'>end</span>
+</pre>
 </div></div>
     
     <div id="footer">
-  Generated on Mon Nov 28 20:20:03 2011 by 
+  Generated on Tue Nov 29 11:44:04 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.7.3 (ruby-1.9.2).
 </div>

data/doc/method_list.html

@@ -89,14 +89,6 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Request.html#callback-instance_method" title="Safubot::Request#callback (method)">#callback</a></span>
-    
-      <small>Safubot::Request</small>
-    
-  </li>
-  
-
-  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Test.html#clean_environment-class_method" title="Safubot::Test.clean_environment (method)">clean_environment</a></span>
     
       <small>Safubot::Test</small>
@@ -104,7 +96,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#client-instance_method" title="Safubot::Twitter::Bot#client (method)">#client</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -112,7 +104,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/XMPP/Bot.html#client-instance_method" title="Safubot::XMPP::Bot#client (method)">#client</a></span>
     
       <small>Safubot::XMPP::Bot</small>
@@ -120,16 +112,8 @@
   </li>
   
 
-  <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Bot.html#concurrently-instance_method" title="Safubot::Bot#concurrently (method)">#concurrently</a></span>
-    
-      <small>Safubot::Bot</small>
-    
-  </li>
-  
-
   <li class="r2 ">
-    <span class='object_link'><a href="Safubot/Bot.html#cycle-instance_method" title="Safubot::Bot#cycle (method)">#cycle</a></span>
+    <span class='object_link'><a href="Safubot/Bot.html#concurrently-instance_method" title="Safubot::Bot#concurrently (method)">#concurrently</a></span>
     
       <small>Safubot::Bot</small>
     
@@ -169,30 +153,38 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/XMPP/Message.html#from-class_method" title="Safubot::XMPP::Message.from (method)">from</a></span>
+    <span class='object_link'><a href="Safubot.html#error_report-instance_method" title="Safubot#error_report (method)">#error_report</a></span>
     
-      <small>Safubot::XMPP::Message</small>
+      <small>Safubot</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#from-class_method" title="Safubot::Twitter::Tweet.from (method)">from</a></span>
+    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#from-class_method" title="Safubot::Twitter::DirectMessage.from (method)">from</a></span>
     
-      <small>Safubot::Twitter::Tweet</small>
+      <small>Safubot::Twitter::DirectMessage</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#from-class_method" title="Safubot::Twitter::DirectMessage.from (method)">from</a></span>
+    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#from-class_method" title="Safubot::Twitter::Tweet.from (method)">from</a></span>
     
-      <small>Safubot::Twitter::DirectMessage</small>
+      <small>Safubot::Twitter::Tweet</small>
     
   </li>
   
 
   <li class="r2 ">
+    <span class='object_link'><a href="Safubot/XMPP/Message.html#from-class_method" title="Safubot::XMPP::Message.from (method)">from</a></span>
+    
+      <small>Safubot::XMPP::Message</small>
+    
+  </li>
+  
+
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#handle_message-instance_method" title="Safubot::Twitter::Bot#handle_message (method)">#handle_message</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -200,7 +192,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#handle_request-instance_method" title="Safubot::Twitter::Bot#handle_request (method)">#handle_request</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -208,7 +200,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#handle_tweet-instance_method" title="Safubot::Twitter::Bot#handle_tweet (method)">#handle_tweet</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -216,7 +208,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Twitter/Tweet.html#header_mentions-instance_method" title="Safubot::Twitter::Tweet#header_mentions (method)">#header_mentions</a></span>
     
       <small>Safubot::Twitter::Tweet</small>
@@ -224,23 +216,23 @@
   </li>
   
 
-  <li class="r2 ">
-    <span class='object_link'><a href="Safubot/Bot.html#initialize-instance_method" title="Safubot::Bot#initialize (method)">#initialize</a></span>
+  <li class="r1 ">
+    <span class='object_link'><a href="Safubot/XMPP/Bot.html#init_blather-instance_method" title="Safubot::XMPP::Bot#init_blather (method)">#init_blather</a></span>
     
-      <small>Safubot::Bot</small>
+      <small>Safubot::XMPP::Bot</small>
     
   </li>
   
 
-  <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Twitter/Bot.html#initialize-instance_method" title="Safubot::Twitter::Bot#initialize (method)">#initialize</a></span>
+  <li class="r2 ">
+    <span class='object_link'><a href="Safubot/Twitter/Bot.html#init_stream-instance_method" title="Safubot::Twitter::Bot#init_stream (method)">#init_stream</a></span>
     
       <small>Safubot::Twitter::Bot</small>
     
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/XMPP/Bot.html#initialize-instance_method" title="Safubot::XMPP::Bot#initialize (method)">#initialize</a></span>
     
       <small>Safubot::XMPP::Bot</small>
@@ -248,26 +240,34 @@
   </li>
   
 
+  <li class="r2 ">
+    <span class='object_link'><a href="Safubot/Twitter/Bot.html#initialize-instance_method" title="Safubot::Twitter::Bot#initialize (method)">#initialize</a></span>
+    
+      <small>Safubot::Twitter::Bot</small>
+    
+  </li>
+  
+
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/XMPP/Bot.html#jid-instance_method" title="Safubot::XMPP::Bot#jid (method)">#jid</a></span>
+    <span class='object_link'><a href="Safubot/Bot.html#initialize-instance_method" title="Safubot::Bot#initialize (method)">#initialize</a></span>
     
-      <small>Safubot::XMPP::Bot</small>
+      <small>Safubot::Bot</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Safubot/XMPP/Message.html#make_request-instance_method" title="Safubot::XMPP::Message#make_request (method)">#make_request</a></span>
+    <span class='object_link'><a href="Safubot/XMPP/Bot.html#jid-instance_method" title="Safubot::XMPP::Bot#jid (method)">#jid</a></span>
     
-      <small>Safubot::XMPP::Message</small>
+      <small>Safubot::XMPP::Bot</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Query.html#make_request-instance_method" title="Safubot::Query#make_request (method)">#make_request</a></span>
+    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#make_request-instance_method" title="Safubot::Twitter::DirectMessage#make_request (method)">#make_request</a></span>
     
-      <small>Safubot::Query</small>
+      <small>Safubot::Twitter::DirectMessage</small>
     
   </li>
   
@@ -281,14 +281,22 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#make_request-instance_method" title="Safubot::Twitter::DirectMessage#make_request (method)">#make_request</a></span>
+    <span class='object_link'><a href="Safubot/XMPP/Message.html#make_request-instance_method" title="Safubot::XMPP::Message#make_request (method)">#make_request</a></span>
     
-      <small>Safubot::Twitter::DirectMessage</small>
+      <small>Safubot::XMPP::Message</small>
     
   </li>
   
 
   <li class="r2 ">
+    <span class='object_link'><a href="Safubot/Query.html#make_request-instance_method" title="Safubot::Query#make_request (method)">#make_request</a></span>
+    
+      <small>Safubot::Query</small>
+    
+  </li>
+  
+
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/KnownUser.html#merge-instance_method" title="Safubot::KnownUser#merge (method)">#merge</a></span>
     
       <small>Safubot::KnownUser</small>
@@ -296,7 +304,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Log.html#method_missing-class_method" title="Safubot::Log.method_missing (method)">method_missing</a></span>
     
       <small>Safubot::Log</small>
@@ -304,7 +312,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot.html#mode-class_method" title="Safubot.mode (method)">mode</a></span>
     
       <small>Safubot</small>
@@ -312,7 +320,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Evented.html#on-instance_method" title="Safubot::Evented#on (method)">#on</a></span>
     
       <small>Safubot::Evented</small>
@@ -320,7 +328,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Evented.html#once-instance_method" title="Safubot::Evented#once (method)">#once</a></span>
     
       <small>Safubot::Evented</small>
@@ -328,7 +336,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Bot.html#opts-instance_method" title="Safubot::Bot#opts (method)">#opts</a></span>
     
       <small>Safubot::Bot</small>
@@ -336,7 +344,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#opts-instance_method" title="Safubot::Twitter::Bot#opts (method)">#opts</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -344,7 +352,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Twitter/Tweet.html#original_tweet-instance_method" title="Safubot::Twitter::Tweet#original_tweet (method)">#original_tweet</a></span>
     
       <small>Safubot::Twitter::Tweet</small>
@@ -352,7 +360,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Log.html#path-class_method" title="Safubot::Log.path (method)">path</a></span>
     
       <small>Safubot::Log</small>
@@ -360,7 +368,23 @@
   </li>
   
 
+  <li class="r2 ">
+    <span class='object_link'><a href="Safubot/Twitter/Bot.html#pid-instance_method" title="Safubot::Twitter::Bot#pid (method)">#pid</a></span>
+    
+      <small>Safubot::Twitter::Bot</small>
+    
+  </li>
+  
+
   <li class="r1 ">
+    <span class='object_link'><a href="Safubot/XMPP/Bot.html#pid-instance_method" title="Safubot::XMPP::Bot#pid (method)">#pid</a></span>
+    
+      <small>Safubot::XMPP::Bot</small>
+    
+  </li>
+  
+
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Twitter/Tweet.html#posted_at-instance_method" title="Safubot::Twitter::Tweet#posted_at (method)">#posted_at</a></span>
     
       <small>Safubot::Twitter::Tweet</small>
@@ -368,7 +392,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Bot.html#process-instance_method" title="Safubot::Bot#process (method)">#process</a></span>
     
       <small>Safubot::Bot</small>
@@ -376,7 +400,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Bot.html#process_request-instance_method" title="Safubot::Bot#process_request (method)">#process_request</a></span>
     
       <small>Safubot::Bot</small>
@@ -384,7 +408,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Bot.html#pull-instance_method" title="Safubot::Bot#pull (method)">#pull</a></span>
     
       <small>Safubot::Bot</small>
@@ -392,7 +416,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#pull-instance_method" title="Safubot::Twitter::Bot#pull (method)">#pull</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -400,7 +424,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Bot.html#push-instance_method" title="Safubot::Bot#push (method)">#push</a></span>
     
       <small>Safubot::Bot</small>
@@ -408,7 +432,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#reply-instance_method" title="Safubot::Twitter::Bot#reply (method)">#reply</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -416,7 +440,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#reply_header-instance_method" title="Safubot::Twitter::Bot#reply_header (method)">#reply_header</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -424,7 +448,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Test.html#request-class_method" title="Safubot::Test.request (method)">request</a></span>
     
       <small>Safubot::Test</small>
@@ -432,7 +456,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Bot.html#request_error-instance_method" title="Safubot::Bot#request_error (method)">#request_error</a></span>
     
       <small>Safubot::Bot</small>
@@ -440,7 +464,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Bot.html#respond-instance_method" title="Safubot::Bot#respond (method)">#respond</a></span>
     
       <small>Safubot::Bot</small>
@@ -448,7 +472,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Bot.html#respond_now-instance_method" title="Safubot::Bot#respond_now (method)">#respond_now</a></span>
     
       <small>Safubot::Bot</small>
@@ -456,6 +480,14 @@
   </li>
   
 
+  <li class="r2 ">
+    <span class='object_link'><a href="Safubot/Twitter/Bot.html#run-instance_method" title="Safubot::Twitter::Bot#run (method)">#run</a></span>
+    
+      <small>Safubot::Twitter::Bot</small>
+    
+  </li>
+  
+
   <li class="r1 ">
     <span class='object_link'><a href="Safubot/XMPP/Bot.html#run-instance_method" title="Safubot::XMPP::Bot#run (method)">#run</a></span>
     
@@ -473,7 +505,23 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Twitter/Bot.html#run-instance_method" title="Safubot::Twitter::Bot#run (method)">#run</a></span>
+    <span class='object_link'><a href="Safubot/XMPP/Bot.html#run_blather-instance_method" title="Safubot::XMPP::Bot#run_blather (method)">#run_blather</a></span>
+    
+      <small>Safubot::XMPP::Bot</small>
+    
+  </li>
+  
+
+  <li class="r2 ">
+    <span class='object_link'><a href="Safubot/Bot.html#run_nowait-instance_method" title="Safubot::Bot#run_nowait (method)">#run_nowait</a></span>
+    
+      <small>Safubot::Bot</small>
+    
+  </li>
+  
+
+  <li class="r1 ">
+    <span class='object_link'><a href="Safubot/Twitter/Bot.html#run_stream-instance_method" title="Safubot::Twitter::Bot#run_stream (method)">#run_stream</a></span>
     
       <small>Safubot::Twitter::Bot</small>
     
@@ -521,23 +569,23 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#targetless_text-instance_method" title="Safubot::Twitter::Tweet#targetless_text (method)">#targetless_text</a></span>
+    <span class='object_link'><a href="Safubot/Twitter/Bot.html#stop-instance_method" title="Safubot::Twitter::Bot#stop (method)">#stop</a></span>
     
-      <small>Safubot::Twitter::Tweet</small>
+      <small>Safubot::Twitter::Bot</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#text-instance_method" title="Safubot::Twitter::DirectMessage#text (method)">#text</a></span>
+    <span class='object_link'><a href="Safubot/Twitter/Bot.html#stream-instance_method" title="Safubot::Twitter::Bot#stream (method)">#stream</a></span>
     
-      <small>Safubot::Twitter::DirectMessage</small>
+      <small>Safubot::Twitter::Bot</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#text-instance_method" title="Safubot::Twitter::Tweet#text (method)">#text</a></span>
+    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#targetless_text-instance_method" title="Safubot::Twitter::Tweet#targetless_text (method)">#targetless_text</a></span>
     
       <small>Safubot::Twitter::Tweet</small>
     
@@ -545,46 +593,54 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Safubot/KnownUser.html#tweets-instance_method" title="Safubot::KnownUser#tweets (method)">#tweets</a></span>
+    <span class='object_link'><a href="Safubot/XMPP/Bot.html#tell-instance_method" title="Safubot::XMPP::Bot#tell (method)">#tell</a></span>
     
-      <small>Safubot::KnownUser</small>
+      <small>Safubot::XMPP::Bot</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Bot.html#twitter-instance_method" title="Safubot::Bot#twitter (method)">#twitter</a></span>
+    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#text-instance_method" title="Safubot::Twitter::Tweet#text (method)">#text</a></span>
     
-      <small>Safubot::Bot</small>
+      <small>Safubot::Twitter::Tweet</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Safubot/Evented.html#unbind-instance_method" title="Safubot::Evented#unbind (method)">#unbind</a></span>
+    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#text-instance_method" title="Safubot::Twitter::DirectMessage#text (method)">#text</a></span>
     
-      <small>Safubot::Evented</small>
+      <small>Safubot::Twitter::DirectMessage</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#user-instance_method" title="Safubot::Twitter::Tweet#user (method)">#user</a></span>
+    <span class='object_link'><a href="Safubot/KnownUser.html#tweets-instance_method" title="Safubot::KnownUser#tweets (method)">#tweets</a></span>
     
-      <small>Safubot::Twitter::Tweet</small>
+      <small>Safubot::KnownUser</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#user-instance_method" title="Safubot::Twitter::DirectMessage#user (method)">#user</a></span>
+    <span class='object_link'><a href="Safubot/Bot.html#twitter-instance_method" title="Safubot::Bot#twitter (method)">#twitter</a></span>
     
-      <small>Safubot::Twitter::DirectMessage</small>
+      <small>Safubot::Bot</small>
     
   </li>
   
 
   <li class="r1 ">
+    <span class='object_link'><a href="Safubot/Evented.html#unbind-instance_method" title="Safubot::Evented#unbind (method)">#unbind</a></span>
+    
+      <small>Safubot::Evented</small>
+    
+  </li>
+  
+
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/XMPP/Message.html#user-instance_method" title="Safubot::XMPP::Message#user (method)">#user</a></span>
     
       <small>Safubot::XMPP::Message</small>
@@ -592,23 +648,23 @@
   </li>
   
 
-  <li class="r2 ">
-    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#username-instance_method" title="Safubot::Twitter::DirectMessage#username (method)">#username</a></span>
+  <li class="r1 ">
+    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#user-instance_method" title="Safubot::Twitter::DirectMessage#user (method)">#user</a></span>
     
       <small>Safubot::Twitter::DirectMessage</small>
     
   </li>
   
 
-  <li class="r1 ">
-    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#username-instance_method" title="Safubot::Twitter::Tweet#username (method)">#username</a></span>
+  <li class="r2 ">
+    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#user-instance_method" title="Safubot::Twitter::Tweet#user (method)">#user</a></span>
     
       <small>Safubot::Twitter::Tweet</small>
     
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/XMPP/Message.html#username-instance_method" title="Safubot::XMPP::Message#username (method)">#username</a></span>
     
       <small>Safubot::XMPP::Message</small>
@@ -616,7 +672,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Safubot/Twitter/Bot.html#username-instance_method" title="Safubot::Twitter::Bot#username (method)">#username</a></span>
     
       <small>Safubot::Twitter::Bot</small>
@@ -624,7 +680,23 @@
   </li>
   
 
+  <li class="r1 ">
+    <span class='object_link'><a href="Safubot/Twitter/Tweet.html#username-instance_method" title="Safubot::Twitter::Tweet#username (method)">#username</a></span>
+    
+      <small>Safubot::Twitter::Tweet</small>
+    
+  </li>
+  
+
   <li class="r2 ">
+    <span class='object_link'><a href="Safubot/Twitter/DirectMessage.html#username-instance_method" title="Safubot::Twitter::DirectMessage#username (method)">#username</a></span>
+    
+      <small>Safubot::Twitter::DirectMessage</small>
+    
+  </li>
+  
+
+  <li class="r1 ">
     <span class='object_link'><a href="Safubot/Bot.html#xmpp-instance_method" title="Safubot::Bot#xmpp (method)">#xmpp</a></span>
     
       <small>Safubot::Bot</small>