Added tests, fixed the bugs the tests found.

plugins/URLSnarfer.py

@@ -141,12 +141,18 @@ class URLSnarfer(callbacks.Privmsg, ChannelDBHandler):
         channel = privmsgs.getChannel(msg, args)
         db = self.getDb(channel)
         cursor = db.cursor()
-        cursor.execute("""SELECT * FROM urls ORDER BY random() LIMIT 1""")
+        cursor.execute("""SELECT id, url, added, added_by
-        (id, url, added, addedBy, _, _, _, _, _, _) = cursor.fetchone()
+                          FROM urls
-        when = time.strftime(conf.humanTimestampFormat,
+                          ORDER BY random()
-                             time.localtime(int(added)))
+                          LIMIT 1""")
-        s = '<%s> (added by %s at %s)' % (id, url, addedBy, when)
+        if cursor.rowcount == 0:
-        irc.reply(msg, s)
+            irc.reply(msg, 'I have no URLs in my database for %s' % channel)
+        else:
+            (id, url, added, addedBy) = cursor.fetchone()
+            when = time.strftime(conf.humanTimestampFormat,
+                                 time.localtime(int(added)))
+            s = '<%s> (added by %s at %s)' % (url, addedBy, when)
+            irc.reply(msg, s)
 
     def numurls(self, irc, msg, args):
         """[<channel>]
@@ -182,6 +188,8 @@ class URLSnarfer(callbacks.Privmsg, ChannelDBHandler):
                 criteria.append('added_by LIKE %s')
                 formats.append(argument)
             elif option == 'with':
+                if '%' not in argument and '_' not in argument:
+                    argument = '%%%s%%' % argument
                 criteria.append('url LIKE %s')
                 formats.append(argument)
             elif option == 'at':

test/test_URLSnarfer.py

@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+
+###
+# Copyright (c) 2002, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+from test import *
+
+urls = """
+http://www.ureg.ohio-state.edu/courses/book3.asp
+http://wwwsearch.sourceforge.net/ClientForm/
+http://slashdot.org/comments.pl?sid=75443&cid=6747654
+http://baseball-almanac.com/rb_menu.shtml
+http://www.linuxquestions.org/questions/showthread.php?postid=442905#post442905
+http://games.slashdot.org/comments.pl?sid=76027&cid=6785588'
+http://games.slashdot.org/comments.pl?sid=76027&cid=6785588
+http://www.census.gov/ftp/pub/tiger/tms/gazetteer/zcta5.zip
+http://slashdot.org/~Strike
+http://lambda.weblogs.com/xml/rss.xml'
+http://lambda.weblogs.com/xml/rss.xml
+http://www.sourcereview.net/forum/index.php?showforum=8
+http://www.sourcereview.net/forum/index.php?showtopic=291
+http://www.sourcereview.net/forum/index.php?showtopic=291&st=0&#entry1778
+http://dhcp065-024-059-168.columbus.rr.com:81/~jfincher/old-supybot.tar.gz
+http://www.sourcereview.net/forum/index.php?
+http://www.joelonsoftware.com/articles/BuildingCommunitieswithSo.html
+http://gameknot.com/stats.pl?ddipaolo
+http://slashdot.org/slashdot.rss
+http://slashdot.org/slashdot.rss
+http://gameknot.com/chess.pl?bd=1038943
+http://gameknot.com/chess.pl?bd=1038943
+http://gameknot.com/chess.pl?bd=1038943
+http://codecentral.sleepwalkers.org/
+http://gameknot.com/chess.pl?bd=1037471&r=327
+http://gameknot.com/chess.pl?bd=1037471&r=327
+http://gameknot.com/chess.pl?bd=1037471&r=327
+http://gameknot.com/chess.pl?bd=1037471&r=327
+http://dhcp065-024-059-168.columbus.rr.com:81/~jfincher/angryman.py
+https://sourceforge.net/projects/pyrelaychecker/
+http://gameknot.com/tsignup.pl
+http://lambda.weblogs.com/xml/rss.xml
+""".strip().splitlines()
+    
+
+class URLSnarferTestCase(ChannelPluginTestCase):
+    plugins = ('URLSnarfer',)
+    def test(self):
+        counter = 0
+        self.assertNotError('randomurl')
+        for url in urls:
+            self.assertRegexp('numurls', str(counter))
+            self.feedMsg(url)
+            counter += 1
+        self.assertRegexp('numurls', str(counter))
+        self.assertRegexp('lasturl', re.escape(urls[-1]))
+        self.assertRegexp('lasturl --proto https', re.escape(urls[-3]))
+        self.assertRegexp('lasturl --at gameknot.com', re.escape(urls[-2]))
+        self.assertRegexp('lasturl --with dhcp', re.escape(urls[-4]))
+        self.assertRegexp('lasturl --from alsdkjf', '^No')
+        self.assertNotError('randomurl')
+            
+
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+