lita-wolfram-alpha 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 029b9f75239f83d7717398c8198484f52e00da24
-  data.tar.gz: 873c6649cf95241dd05bcf57aab5d8d116cd64d9
+  metadata.gz: 25305ff0dfbb1bdaee1124d6fcdff9fd2f3d5a9c
+  data.tar.gz: f3e634e4a6b4954ce0532f6172bda36be9d76689
 SHA512:
-  metadata.gz: 5381aab861a29ae760833b5072a6cad5da40ee642bac7c5a028eae9a2365407a0c95a25186be20bd8d237a5f997a5d58167cb5142b6b991efe84e72eaffc610b
-  data.tar.gz: 3e45858162b3b772c3ad1283ba730cf2226e3420d1de390cfefd9558c533048c9fb2e0fb9bcb2d3ae5bf3bf5304e90e1a132a4fa495aa1db05148dd5899aa0fa
+  metadata.gz: babb79e4ee75e6bf621ae413a0e3c732850a002833e229fcdbbae956208062bac14047a602ceedcaa5b18d47beab01147294ce97f50f716999b163115575beba
+  data.tar.gz: 74c83bc1481b2e6614cf1c5f64824da78aa3f57cdec2fb3d4358c538baf47673b484b682daf45184a8cc20fc1bd1a8614da36f9868d3fdee880bd924325cc95d

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/tristaneuan/lita-wolfram-alpha.png?branch=master)](https://travis-ci.org/tristaneuan/lita-wolfram-alpha)
 [![Coverage Status](https://coveralls.io/repos/tristaneuan/lita-wolfram-alpha/badge.png)](https://coveralls.io/r/tristaneuan/lita-wolfram-alpha)
 
-**lita-wolfram-alpha** is a handler for [Lita](https://github.com/jimmycuadra/lita) that performs Wolfram Alpha queries. [Wolfram Alpha](http://www.wolframalpha.com/) is a computational knowledge engine that draws upon a comprehensive knowledge base of curated structured data to answer a wide variety of questions.
+**lita-wolfram-alpha** is a handler for [Lita](https://github.com/jimmycuadra/lita) that performs Wolfram Alpha queries. [Wolfram Alpha](http://www.wolframalpha.com/) is a computational knowledge engine that draws upon a comprehensive knowledge base of curated structured data to answer questions spanning a wide variety of topics.
 
 ## Installation
 
@@ -23,6 +23,15 @@ Lita.configure do |config|
 end
 ```
 
+### Optional attributes
+* `hide_link` (boolean) - By default, Lita returns a Wolfram Alpha link containing additional information after providing the best answer. If `hide_link` is set to true, this link is omitted.
+
+``` ruby
+Lita.configure do |config|
+  config.handlers.wolfram_alpha.hide_link = true
+end
+```
+
 ## Usage
 
 Specify a [Wolfram Alpha query](http://www.wolframalpha.com/examples/?src=input) using the `wa` command.
@@ -35,6 +44,7 @@ Specify a [Wolfram Alpha query](http://www.wolframalpha.com/examples/?src=input)
 <lita> Tagalog | 765033 people
 <lita> Vietnamese | 512456 people
 <lita> (2008-2012 American Community Survey 5-year estimates)
+<lita> Learn more: http://www.wolframalpha.com/input/?i=most+commonly+spoken+languages+in+california
 ```
 
 ## License

data/lib/lita/handlers/wolfram_alpha.rb

@@ -1,3 +1,4 @@
+require "cgi"
 require "nokogiri"
 
 module Lita
@@ -7,6 +8,7 @@ module Lita
       API_URL = "http://api.wolframalpha.com/v2/query"
 
       config :app_id, type: String, required: true
+      config :hide_link, types: [TrueClass, FalseClass], default: false
 
       route(/^wa\s+(.+)/i, :query, command: true,
                     help: {t("help.query_key") => t("help.query_value")})
@@ -20,11 +22,21 @@ module Lita
           appid: config.app_id
         )
         return if http_response.status != 200
+        link = "Learn more: http://www.wolframalpha.com/input/?i=#{CGI.escape(input)}"
         xml = Nokogiri::XML(http_response.body)
-        result = xml.at_xpath("//pod[@primary='true']//plaintext")
-        return response.reply result.content if result
-        result = xml.at_xpath("//pod[not(@title='Input interpretation')]//plaintext[string-length(text()) > 0]")
-        response.reply result ? result.content : "¯\\_(ツ)_/¯"
+        primary = xml.at_xpath("//pod[@primary='true']//plaintext[string-length(text()) > 0]")
+        if primary
+          response.reply primary.content
+          response.reply link unless config.hide_link
+        else
+          secondary = xml.at_xpath("//pod[not(@id='Input')]//plaintext[string-length(text()) > 0]")
+          if secondary
+            response.reply secondary.content
+            response.reply link unless config.hide_link
+          else
+            response.reply "¯\\_(ツ)_/¯"
+          end
+        end
       end
 
     end

data/lita-wolfram-alpha.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-wolfram-alpha"
-  spec.version       = "0.1.0"
+  spec.version       = "0.1.1"
   spec.authors       = ["Tristan Chong"]
   spec.email         = ["ong@tristaneuan.ch"]
   spec.description   = "A Lita handler that performs Wolfram Alpha queries."

data/spec/lita/handlers/wolfram_alpha_spec.rb

@@ -10,16 +10,32 @@ describe Lita::Handlers::WolframAlpha, lita_handler: true do
 
   describe "#query" do
 
-    it "returns the primary pod's plaintext for a valid query" do
+    it "returns the primary pod's plaintext" do
       send_command "wa pi"
-      expect(replies.count).to eq 1
+      expect(replies.count).to eq 2
       expect(replies.first).to match(/^3\.14159/)
+      expect(replies.last).to match(/^Learn more: http:\/\/www\.wolframalpha\.com\/input\/\?i=pi$/)
+    end
+
+    it "returns the first subpod containing plaintext when the primary pod has multiple subpods" do
+      send_command "wa sky chart"
+      expect(replies.count).to eq 2
+      expect(replies.first).to match(/^\d+\^h \d+\^m [\d\.]+\^s$/)
+      expect(replies.last).to match(/^Learn more: http:\/\/www\.wolframalpha\.com\/input\/\?i=sky\+chart$/)
     end
 
-    it "returns the first non-input, non-empty pod's plaintext for a valid query when no primary pod exists" do
+    it "returns the first non-input, non-empty pod's plaintext when no primary pod exists" do
       send_command "wa U+00F8"
-      expect(replies.count).to eq 1
+      expect(replies.count).to eq 2
       expect(replies.first).to match(/^Latin small letter o with stroke/)
+      expect(replies.last).to match(/^Learn more: http:\/\/www\.wolframalpha\.com\/input\/\?i=U%2B00F8$/)
+    end
+
+    it "does not return a link if hide_link is true" do
+      registry.config.handlers.wolfram_alpha.hide_link = true
+      send_command "wa pi"
+      expect(replies.count).to eq 1
+      expect(replies.first).to match(/^3\.14159/)
     end
 
     it "returns a shrug emoticon for an unrecognized query" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-wolfram-alpha
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tristan Chong