lita-wikipedia 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72e591050c1024e2dc4b514a9187cd59e415d395
-  data.tar.gz: f32aa2df972accca079eafeb969c2fa64783fe02
+  metadata.gz: 2d9cb26b2791815d29c0b9fef782392ae751e19a
+  data.tar.gz: e22d2d03d1092036ba43290daca935e8ea390bbd
 SHA512:
-  metadata.gz: 680a12419842dc1c8a4bd83e69fa3da774c55365e25d11ca1996bf9e8c505dfac83d1ca154ef255e59ea9c31cd1b0806512c0b119a201fc3a4388194fd858320
-  data.tar.gz: 23a9e12371f4726dcd18210a03ef7b48b22f6a463784abc345730576ae77390fb34e66bedb4fdd27e54a7465abea1f6511fa06b5f9a22863faa066620b5a6ec7
+  metadata.gz: 990e981768a235d23bbc3a65cd0a82577763982ff06f4977c5f89c2df61c9102fbee8f5147f63c612223d74dae8fff007bca00f02706e785ebe18c0a35580b85
+  data.tar.gz: 2325bd1cff15074b518a15da708db111a1b66f2cd5606e4363ef7c5bb914d44a54057a639dfa4d805fe7b916449027136cb4d2fdf6b086f142622a495aa69cd2

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Tristan Chong
+Copyright (c) 2015 Tristan Chong
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,8 @@
 # lita-wikipedia
 
+[![Build Status](https://travis-ci.org/tristaneuan/lita-wikipedia.png?branch=master)](https://travis-ci.org/tristaneuan/lita-wikipedia)
+[![Coverage Status](https://coveralls.io/repos/tristaneuan/lita-wikipedia/badge.png)](https://coveralls.io/r/tristaneuan/lita-wikipedia)
+
 **lita-wikipedia** is a handler for [Lita](https://github.com/jimmycuadra/lita) that returns a requested Wikipedia article.
 
 ## Installation
@@ -15,9 +18,9 @@ gem "lita-wikipedia"
 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)
+<me>   lita: wiki ruby language
+<lita> 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.
+<lita> Source: https://en.wikipedia.org/wiki/Ruby_(programming_language)
 ```
 
 ## License

data/lib/lita/handlers/wikipedia.rb

@@ -1,31 +1,41 @@
-require "json"
 require "nokogiri"
-require "open-uri"
 require "sanitize"
 
 module Lita
   module Handlers
     class Wikipedia < Handler
+
+      API_URL = "https://en.wikipedia.org/w/api.php"
+
       route(/^(?:wiki|wikipedia)\s+(.*)/i, :wikipedia, command: true,
             help: { t("help.wikipedia_key") => t("help.wikipedia_value")})
 
       def wikipedia(response)
-        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
+        term = response.matches[0][0]
+        search = http.get(
+          API_URL,
+          search: term,
+          action: "opensearch",
+          format: "json"
+        )
+        titles = MultiJson.load(search.body)[1]
+        return response.reply("No Wikipedia entry found for '#{term}'") if titles.empty?
+        query = http.get(
+          API_URL,
+          titles: titles[0],
+          action: "query",
+          prop: "extracts|info",
+          exintro: nil,
+          inprop: "url",
+          redirects: nil,
+          format: "json"
+        )
+        page = MultiJson.load(query.body)["query"]["pages"].values[0]
+        html = Nokogiri::HTML(page["extract"])
+        extract = Sanitize.fragment(html.xpath("//p[1]")[0]).strip
+        url = page["fullurl"]
+        response.reply(extract)
+        response.reply("Source: #{url}")
       end
 
     end

data/lita-wikipedia.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-wikipedia"
-  spec.version       = "0.0.4"
+  spec.version       = "0.1.0"
   spec.authors       = ["Tristan Chong"]
   spec.email         = ["ong@tristaneuan.ch"]
-  spec.description   = %q{A Lita handler that returns a requested Wikipedia article.}
-  spec.summary       = %q{A Lita handler that returns a requested Wikipedia article.}
+  spec.description   = "A Lita handler that returns a requested Wikipedia article."
+  spec.summary       = "A Lita handler that returns a requested Wikipedia article."
   spec.homepage      = "https://github.com/tristaneuan/lita-wikipedia"
   spec.license       = "MIT"
   spec.metadata      = { "lita_plugin_type" => "handler" }

data/spec/lita/handlers/wikipedia_spec.rb

@@ -1,36 +1,45 @@
 require "spec_helper"
 
 describe Lita::Handlers::Wikipedia, lita_handler: true do
+
   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
       send_command "wikipedia ruby language"
+      expect(replies.count).to eq 2
       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)'
+      expect(replies[1]).to match "Source: https://en.wikipedia.org/wiki/Ruby_(programming_language)"
     end
 
     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'
+      expect(replies.count).to eq 2
+      expect(replies[1]).to match 'Source: https://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'
+      expect(replies.count).to eq 2
+      expect(replies[0]).not_to include "redirects here"
+      expect(replies[1]).to match "Source: https://en.wikipedia.org/wiki/Gabriola_Island"
     end
 
     it "responds with the disambiguation page on appropriate queries" do
       send_command "wiki 12th man"
-      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'
+      expect(replies.count).to eq 2
+      expect(replies[0]).to match "The phrase 12th Man or Twelfth Man can refer to:"
+      expect(replies[1]).to match "Source: https://en.wikipedia.org/wiki/12th_Man"
     end
 
     it "returns an error message if no article is found" do
       send_command "wiki asdfasdfa"
+      expect(replies.count).to eq 1
       expect(replies.first).to match "No Wikipedia entry found for 'asdfasdfa'"
     end
+
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-wikipedia
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Tristan Chong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -129,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile