urban: updated pattern

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / urban.rb

diff --git a/data/rbot/plugins/urban.rb b/data/rbot/plugins/urban.rb
index 24c11dd7f3167272225e417ad3abcf88e4247bc6..a15b36224e05be4586ae82b876555df537a65d58 100644 (file)
--- a/data/rbot/plugins/urban.rb
+++ b/data/rbot/plugins/urban.rb
@@ -17,14 +17,16 @@ class UrbanPlugin < Plugin
     u = URBAN + URI.escape(word)
     u += '&page=' + p.to_s if p > 1
     s = @bot.httputil.get(u)
-    return m.reply "Couldn't get the urban dictionary definition for #{word}" if s.nil?
+    return m.reply("Couldn't get the urban dictionary definition for #{word}") if s.nil?
 
-    notfound = s.match %r{<div style="color: #669FCE"><i>.*?</i> isn't defined}
+    notfound = s.match %r{<i>.*?</i> isn't defined}
 
-    numpages = s[%r{<div id='paginator'>.*?</div>}m].scan(/\d+/).collect {|x| x.to_i}.max || 1
+    numpages = if s[%r{<div id='paginator'>.*?</div>}m]
+      $&.scan(/\d+/).collect {|x| x.to_i}.max || 1
+    else 1 end
 
     rv = Array.new
-    s.scan(%r{<td class='index'[^>]*>.*?(\d+)\..*?</td>.*?<td class='word'>(?:<a.*?>)?([^>]+)(?:</a>)?</td>.*?<div class='definition'>(.+?)</div>.*?<div class='example'>(.+?)</div>}m) do |num, wrd, desc, ex|
+    s.scan(%r{<div class='word'[^>]*>.*?<a class="index"[^>]*>.*?(\d+)\..*?</a>.*?<span>(.*?)</span>.*?<div class="definition">(.+?)</div>.*?<div class="example">(.+?)</div>}m) do |num, wrd, desc, ex|
       rv << [num.to_i, wrd.strip, desc.strip, ex.strip]
     end
 
@@ -32,7 +34,7 @@ class UrbanPlugin < Plugin
     return m.reply("#{Bold}#{word}#{Bold} not found") if rv.empty?
 
     if notfound
-      suggestions = rv.map { |s| Underline + s[1] + Underline }.uniq.join ', '
+      suggestions = rv.map { |str| Underline + str[1] + Underline }.uniq.join ', '
       m.reply "#{Bold}#{word}#{Bold} not found. maybe you mean #{suggestions}?"
       return
     end
@@ -48,7 +50,7 @@ class UrbanPlugin < Plugin
       resp = @bot.httputil.head('http://www.urbandictionary.com/random.php',
                                :max_redir => -1,
                                :cache => false)
-      return m.reply "Couldn't get a random urban dictionary word" if resp.nil?
+      return m.reply("Couldn't get a random urban dictionary word") if resp.nil?
       if resp.code == "302" && (loc = resp['location'])
         words = URI.unescape(loc.match(/define.php\?term=(.*)$/)[1]) rescue nil
       end