lita-wikipedia 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40b8f40a3e943e471aecad7d9b0456a23f8ea769
-  data.tar.gz: bc09c63e6a5c07ad198289c638aafbfb2fa8cd1b
+  metadata.gz: 72e591050c1024e2dc4b514a9187cd59e415d395
+  data.tar.gz: f32aa2df972accca079eafeb969c2fa64783fe02
 SHA512:
-  metadata.gz: 487aa8c98c6f40fc139f3b4bf5cfa9a3bf93dece4b6c0114c53e3e782809ce999f8cf0be008bd326848aedfaf5d28101a51bf3fb1ed3f27497be1d4b2fc6efaf
-  data.tar.gz: cac8d98a51381107bb6c17822144b4b117a5eac31591fd4a84c60cb9de437fb3ab1ac80cee93f0b856d4a29242da0164156ca98df6ed2a849a8ee312c1afba68
+  metadata.gz: 680a12419842dc1c8a4bd83e69fa3da774c55365e25d11ca1996bf9e8c505dfac83d1ca154ef255e59ea9c31cd1b0806512c0b119a201fc3a4388194fd858320
+  data.tar.gz: 23a9e12371f4726dcd18210a03ef7b48b22f6a463784abc345730576ae77390fb34e66bedb4fdd27e54a7465abea1f6511fa06b5f9a22863faa066620b5a6ec7

data/README.md

@@ -17,6 +17,7 @@ To request a Wikipedia article:
 ```
 Lita: wiki ruby language
 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.
+Source: http://en.wikipedia.org/wiki/Ruby_(programming_language)
 ```
 
 ## License

data/lib/lita/handlers/wikipedia.rb

@@ -1,23 +1,7 @@
 require "json"
+require "nokogiri"
 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]
-  if not page.has_key? 'extract'
-    return ["No Wikipedia entry found for '#{term}'.", nil]
-  end
-  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
+require "sanitize"
 
 module Lita
   module Handlers
@@ -26,12 +10,24 @@ module Lita
             help: { t("help.wikipedia_key") => t("help.wikipedia_value")})
 
       def wikipedia(response)
-        extract, url = disambiguate(response.matches.first.first)
-        response.reply(extract)
-        if url != nil
+        term = response.matches.first.first
+        search_url = "http://en.wikipedia.org/w/api.php?action=opensearch&search=#{term}&format=json"
+        search_result = JSON.parse(open(URI.parse(URI.encode(search_url.strip))).read)
+        titles = search_result[1]
+        if titles.empty?
+          response.reply("No Wikipedia entry found for '#{term}'")
+        else
+          query_url = "http://en.wikipedia.org/w/api.php?action=query&prop=extracts|info&format=json&exintro=&inprop=url&titles=#{titles.first}&redirects="
+          query_result = JSON.parse(open(URI.parse(URI.encode(query_url.strip))).read)
+          page = query_result['query']['pages'].first[1]
+          html = Nokogiri::HTML(page['extract'])
+          extract = Sanitize.fragment(html.xpath('//p[1]').first).strip
+          url = page['fullurl']
+          response.reply(extract)
           response.reply("Source: #{url}")
         end
       end
+
     end
 
     Lita.register_handler(Wikipedia)

data/lita-wikipedia.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-wikipedia"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Tristan Chong"]
   spec.email         = ["ong@tristaneuan.ch"]
   spec.description   = %q{A Lita handler that returns a requested Wikipedia article.}
@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "lita", ">= 3.1"
+  spec.add_runtime_dependency "nokogiri", ">= 1.6.6"
+  spec.add_runtime_dependency "sanitize", ">= 3.1.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/lita/handlers/wikipedia_spec.rb

@@ -1,8 +1,8 @@
 require "spec_helper"
 
 describe Lita::Handlers::Wikipedia, lita_handler: true do
-  it { routes_command("wikipedia ruby language").to(:wikipedia) }
-  it { routes_command("wiki ruby language").to(:wikipedia) }
+  it { is_expected.to route_command("wikipedia ruby language").to(:wikipedia) }
+  it { is_expected.to route_command("wiki ruby language").to(:wikipedia) }
 
   describe "#wikipedia" do
     it "returns the 1st paragraph & link to the Wikipedia entry for a query" do
@@ -11,33 +11,26 @@ describe Lita::Handlers::Wikipedia, lita_handler: true do
       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
+    it "handles commas in queries correctly" do
+      send_command "wiki indio, ca"
+      expect(replies[1]).to match 'Source: http://en.wikipedia.org/wiki/Indio,_California'
+    end
+
+    it "handles lowercase queries and articles with templates correctly" do
+      send_command "wiki gabriola island"
+      expect(replies[0]).not_to include 'redirects here'
+      expect(replies[1]).to match 'Source: http://en.wikipedia.org/wiki/Gabriola_Island'
+    end
+
+    it "responds with the disambiguation page on appropriate queries" 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])
+      expect(replies[0]).to match 'The phrase 12th Man or Twelfth Man can refer to:'
+      expect(replies[1]).to match 'Source: http://en.wikipedia.org/wiki/12th_Man'
     end
 
     it "returns an error message if no article is found" do
       send_command "wiki asdfasdfa"
-      expect(replies.first).to match "No Wikipedia entry found for 'asdfasdfa'."
-    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)
+      expect(replies.first).to match "No Wikipedia entry found for 'asdfasdfa'"
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,3 +8,4 @@ SimpleCov.start { add_filter "/spec/" }
 
 require "lita-wikipedia"
 require "lita/rspec"
+Lita.version_3_compatibility_mode = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-wikipedia
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tristan Chong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+- !ruby/object:Gem::Dependency
+  name: sanitize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement