Use unescaped URL and unescape HTML entities.

jimmycuadra · Feb 27, 2014 · 14d3ee1 · 14d3ee1
1 parent 09d2754
commit 14d3ee1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/lita/handlers/google.rb b/lib/lita/handlers/google.rb
@@ -1,3 +1,6 @@
+require "cgi"
+require "uri"
+
 require "lita"
 
 module Lita
@@ -28,7 +31,9 @@ def search(response)
           result = data["responseData"]["results"].first
 
           if result
-            response.reply("#{result["titleNoFormatting"]} - #{result["url"]}")
+            response.reply(
+              "#{CGI.unescapeHTML(result["titleNoFormatting"])} - #{result["unescapedUrl"]}"
+            )
           else
             response.reply("No search results for query: #{query}")
           end

diff --git a/spec/lita/handlers/google_spec.rb b/spec/lita/handlers/google_spec.rb
@@ -23,8 +23,8 @@
 {
   "responseData": {
     "results": [{
-      "url": "https://www.ruby-lang.org/",
-      "titleNoFormatting": "Ruby Programming Language"
+      "unescapedUrl": "http://www.youtube.com/watch?v=EwTZ2xpQwpA",
+      "titleNoFormatting": "&quot;Chocolate Rain&quot; Original Song by Tay Zonday"
     }]
   }
 }
@@ -34,7 +34,7 @@
       send_command("google ruby")
 
       expect(replies.last).to eq(
-        "Ruby Programming Language - https://www.ruby-lang.org/"
+        %{"Chocolate Rain" Original Song by Tay Zonday - http://www.youtube.com/watch?v=EwTZ2xpQwpA}
       )
     end