lita-wikipedia 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f1d142cd1b10e672409e74011f685d5216eccc
-  data.tar.gz: 9f3f55d0747dafdb7dcafeb67637f603f1a69e9b
+  metadata.gz: 1d7a4b0b1a9e02e1cd16d926732544161225143c
+  data.tar.gz: 7c58e5072db8990a2bbf1a992c6aa0747544a102
 SHA512:
-  metadata.gz: 4c9ba9a065c9112b74c57390241d7fa0257b06e560089be1ba6d3a4d70c531cd73d6850bcb4681b31d33277233c98b58c52c34135b7f549be4776b95780221e8
-  data.tar.gz: 84bc302f77a9a0b3d5a059c8eee25abe6743301aaf7415206151d4a6e77e7deb031cf06b58c19b6a728e438bd4887d5159be953dd98b8a89861cf3f263072b6f
+  metadata.gz: f193331786e2a15fdf77aa2a8a9c0ca4dd3555a5c14025d36d113514cb9122aa496460acab713109b7cbe0f7a28b9c8ea6624a9c8f76055fc356ca9da242ef55
+  data.tar.gz: b3542a293b98b39fca8dd8fe6ce30b25ee0433739f4dc278064857e7ab3d20eb8221b31459af380bc0226b2a8abffca0663c096bc499ef422c037b3697a558db

data/lib/lita/handlers/wikipedia.rb

@@ -1,7 +1,21 @@
-require "cgi"
 require "json"
 require "open-uri"
 
+def disambiguate(term)
+  url = "http://en.wikipedia.org/w/api.php?action=query&prop=extracts|info|links|pageprops&format=json&exintro=&explaintext=&inprop=url&ppprop=disambiguation&titles=#{term}&redirects="
+  result = JSON.parse(open(URI.parse(URI.encode(url.strip))).read)
+  page = result['query']['pages'].first[1]
+  extract = page['extract'].split("\n").first
+  if page.fetch('pageprops', {}).has_key? 'disambiguation'
+    links = page['links'].map {
+      |x| x['title'] if not x['title'].downcase.include? 'disambiguation'}
+    links = links.select {|x| x != nil}
+    return disambiguate(links.sample)
+  end
+  url = page['fullurl']
+  [extract, url]
+end
+
 module Lita
   module Handlers
     class Wikipedia < Handler
@@ -9,11 +23,9 @@ module Lita
             help: { t("help.wikipedia_key") => t("help.wikipedia_value")})
 
       def wikipedia(response)
-        url = "http://en.wikipedia.org/w/api.php?action=query&prop=extracts|info&format=json&exintro=&explaintext=&inprop=url&titles=#{CGI.escape(response.matches.first.first)}&redirects="
-        result = JSON.parse(open(URI.parse(URI.encode(url.strip))).read)
-        page = result['query']['pages'].first[1]
-        response.reply(page['extract'].split("\n").first)
-        response.reply("Source: #{page['fullurl']}")
+        extract, url = disambiguate(response.matches.first.first)
+        response.reply(extract)
+        response.reply("Source: #{url}")
       end
     end
 

data/lita-wikipedia.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-wikipedia"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Tristan Chong"]
   spec.email         = ["ong@tristaneuan.ch"]
   spec.description   = %q{A Lita handler that returns a requested Wikipedia article.}

data/spec/lita/handlers/wikipedia_spec.rb

@@ -10,5 +10,29 @@ describe Lita::Handlers::Wikipedia, lita_handler: true do
       expect(replies[0]).to match 'Ruby is a dynamic, reflective, object-oriented, general-purpose programming language. It was designed and developed in the mid-1990s by Yukihiro "Matz" Matsumoto in Japan.'
       expect(replies[1]).to match 'Source: http://en.wikipedia.org/wiki/Ruby_(programming_language)'
     end
+
+    it "responds with a random matching article when disambiguation occurs" do
+      send_command "wiki 12th man"
+      responses = [
+        "Source: http://en.wikipedia.org/wiki/The_Twelfth_Man",
+        "Source: http://en.wikipedia.org/wiki/The_12th_Man_(album)",
+        "Source: http://en.wikipedia.org/wiki/12th_man_(football)",
+        "Source: http://en.wikipedia.org/wiki/Glossary_of_cricket_terms"
+      ]
+      expect(responses).to include(replies[1])
+    end
+  end
+
+  describe "#disambiguate" do
+    it "resolves disambiguation by returning a random matching article" do
+      extract, url = disambiguate('12th man')
+      urls = [
+        "http://en.wikipedia.org/wiki/The_Twelfth_Man",
+        "http://en.wikipedia.org/wiki/The_12th_Man_(album)",
+        "http://en.wikipedia.org/wiki/12th_man_(football)",
+        "http://en.wikipedia.org/wiki/Glossary_of_cricket_terms"
+      ]
+      expect(urls).to include(url)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-wikipedia
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tristan Chong