Finish implementing Limiter and add tests.

plugins/Limiter.py

@@ -40,7 +40,9 @@ __contributors__ = {}
 
 import supybot.conf as conf
 import supybot.utils as utils
+import supybot.ircmsgs as ircmsgs
 import supybot.plugins as plugins
+import supybot.ircutils as ircutils
 import supybot.privmsgs as privmsgs
 import supybot.registry as registry
 import supybot.callbacks as callbacks
@@ -69,6 +71,10 @@ conf.registerChannelValue(conf.supybot.plugins.Limiter, 'maximumExcess',
     larger than supybot.plugins.Limiter.limit.minimumExcess."""))
 
 class Limiter(callbacks.Privmsg):
+    def _enforce(self, irc, limit):
+        irc.queueMsg(limit)
+        irc.noReply()
+
     def _enforceLimit(self, irc, channel):
         if self.registryValue('enable', channel):
             maximum = self.registryValue('maximumExcess', channel)
@@ -79,7 +85,7 @@ class Limiter(callbacks.Privmsg):
             if currentLimit - currentUsers < minimum:
                 self._enforce(irc, ircmsgs.limit(channel,currentUsers+maximum))
             elif currentLimit - currentUsers > maximum:
-                self._enforce(irc, ircmsgs.limit(channel,currentUsers+minimum))
+                self._enforce(irc, ircmsgs.limit(channel,currentUsers-minimum))
 
     def doJoin(self, irc, msg):
         if not ircutils.strEqual(msg.nick, irc.nick):

test/test_Limiter.py

@@ -0,0 +1,60 @@
+###
+# Copyright (c) 2002-2004, 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 testsupport import *
+
+import supybot.ircmsgs as ircmsgs
+
+class LimiterTestCase(ChannelPluginTestCase):
+    plugins = ('Limiter',)
+    config = {'supybot.plugins.Limiter.enable': True}
+    def testEnforceLimit(self):
+        origMin = conf.supybot.plugins.Limiter.minimumExcess()
+        origMax = conf.supybot.plugins.Limiter.maximumExcess()
+        try:
+            conf.supybot.plugins.Limiter.minimumExcess.setValue(5)
+            conf.supybot.plugins.Limiter.maximumExcess.setValue(10)
+            self.irc.feedMsg(ircmsgs.join('#foo', prefix='foo!root@host'))
+            m = self.irc.takeMsg()
+            self.assertEqual(m, ircmsgs.limit('#foo', 1+10))
+            self.irc.feedMsg(ircmsgs.join('#foo', prefix='bar!root@host'))
+            m = self.irc.takeMsg()
+            self.failIf(m is not None)
+            conf.supybot.plugins.Limiter.maximumExcess.setValue(7)
+            self.irc.feedMsg(ircmsgs.part('#foo', prefix='bar!root@host'))
+            m = self.irc.takeMsg()
+            self.assertEqual(m, ircmsgs.limit('#foo', 1-5))
+        finally:
+            conf.supybot.plugins.Limiter.minimumExcess.setValue(origMin)
+            conf.supybot.plugins.Limiter.maximumExcess.setValue(origMax)
+
+
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
+