lita-wolfram-alpha 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25305ff0dfbb1bdaee1124d6fcdff9fd2f3d5a9c
-  data.tar.gz: f3e634e4a6b4954ce0532f6172bda36be9d76689
+  metadata.gz: 1de85e0695441eee310926d81fa4c45c6610883d
+  data.tar.gz: 4aa9fffde8f4ca63934fdf72c1842624b0692090
 SHA512:
-  metadata.gz: babb79e4ee75e6bf621ae413a0e3c732850a002833e229fcdbbae956208062bac14047a602ceedcaa5b18d47beab01147294ce97f50f716999b163115575beba
-  data.tar.gz: 74c83bc1481b2e6614cf1c5f64824da78aa3f57cdec2fb3d4358c538baf47673b484b682daf45184a8cc20fc1bd1a8614da36f9868d3fdee880bd924325cc95d
+  metadata.gz: fbd8e1caf7eb4f9457b217b56be8d518f540df621bed7de50ec596926ee3c58590e3ae516c96c7a77872475d1344a4cae95394961571241004c4b602bc62c998
+  data.tar.gz: b4bdfd7da310d9d88068e78e7f6e6599c4255fc64be14e12cf3f0a7bf4b8297f7300c53757fd38d6d1a0f585b231e4b343056efb56def465ec76608b24add92c

data/README.md

@@ -24,7 +24,7 @@ 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.
+* `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|

data/lib/lita/handlers/wolfram_alpha.rb

@@ -22,16 +22,16 @@ module Lita
           appid: config.app_id
         )
         return if http_response.status != 200
-        link = "Learn more: http://www.wolframalpha.com/input/?i=#{CGI.escape(input)}"
+        link = "http://www.wolframalpha.com/input/?i=#{CGI.escape(input)}"
         xml = Nokogiri::XML(http_response.body)
         primary = xml.at_xpath("//pod[@primary='true']//plaintext[string-length(text()) > 0]")
         if primary
-          response.reply primary.content
+          response.reply format_reply(primary)
           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 format_reply(secondary)
             response.reply link unless config.hide_link
           else
             response.reply "¯\\_(ツ)_/¯"
@@ -39,6 +39,23 @@ module Lita
         end
       end
 
+      private
+
+      # pod: plaintext
+      # pod -> subpod: plaintext
+      # subpod: plaintext
+      # plaintext
+      def format_reply(node)
+        subpod = node.parent
+        subpod_title = subpod.attribute("title").content
+        pod = subpod.parent
+        pod_title = pod.attribute("title").content
+        title = [pod_title, subpod_title].select {|t| t.length > 0 && t !~ /^Results?$/}.join(" -> ")
+        colon = title.length > 0 ? ":" : ""
+        whitespace = node.content =~ /\n/ ? "\n" : " "
+        "#{title}#{colon}#{whitespace}#{node.content}".strip
+      end
+
     end
 
     Lita.register_handler(WolframAlpha)

data/lita-wolfram-alpha.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-wolfram-alpha"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   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,32 +10,46 @@ describe Lita::Handlers::WolframAlpha, lita_handler: true do
 
   describe "#query" do
 
-    it "returns the primary pod's plaintext" do
+    it "returns the primary pod's title and plaintext" do
       send_command "wa pi"
       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$/)
+      expect(replies.first).to match(/^Decimal approximation: 3\.14159/)
+      expect(replies.last).to match(/^http:\/\/www\.wolframalpha\.com\/input\/\?i=pi$/)
     end
 
-    it "returns the first subpod containing plaintext when the primary pod has multiple subpods" do
+    it "returns the title and plaintext of the first subpod containing plaintext when the primary pod has multiple subpods, omitting the pod's title when it contains 'Result'" 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$/)
+      expect(replies.first).to match(/^Local sidereal time: \d+\^h \d+\^m [\d\.]+\^s$/)
+      expect(replies.last).to match(/^http:\/\/www\.wolframalpha\.com\/input\/\?i=sky\+chart$/)
     end
 
-    it "returns the first non-input, non-empty pod's plaintext when no primary pod exists" do
+    it "returns the first non-input, non-empty pod's title and plaintext when no primary pod exists" do
       send_command "wa U+00F8"
       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$/)
+      expect(replies.first).to match(/^Name: Latin small letter o with stroke/)
+      expect(replies.last).to match(/^http:\/\/www\.wolframalpha\.com\/input\/\?i=U%2B00F8$/)
+    end
+
+    it "returns the concatenated pod and subpod titles when they exist, separating the titles from the answer with a newline when the answer contains multiple lines" do
+      send_command "wa weather forecast for san francisco"
+      expect(replies.count).to eq 2
+      expect(replies.first).to match(/^Weather forecast for San Francisco, California -> \w+:\nbetween/)
+      expect(replies.last).to match(/^http:\/\/www\.wolframalpha\.com\/input\/\?i=weather\+forecast\+for\+san\+francisco$/)
+      end
+
+    it "returns only the plaintext when the pod and subpod titles contain 'Result' or do not exist" do
+      send_command "wa warp speed"
+      expect(replies.count).to eq 2
+      expect(replies.first).to match(/^speed/)
+      expect(replies.last).to match(/^http:\/\/www\.wolframalpha\.com\/input\/\?i=warp\+speed$/)
     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/)
+      expect(replies.first).to match(/^Decimal approximation: 3\.14159/)
     end
 
     it "returns a shrug emoticon for an unrecognized query" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-wolfram-alpha
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tristan Chong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita