lita-google 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4079fc2e7915b16fec653ee9d7d7a4cc66a5ede
-  data.tar.gz: 0119e80fa94736073a9739433cddbe58419d1cb3
+  metadata.gz: 71adaf250d1a9a8e8e61d384bcf354bb27dacf0b
+  data.tar.gz: ef3dab0c4ba35d7d8893726b26b86e1428d29f22
 SHA512:
-  metadata.gz: 64ac5a07542ac85e256a5630fa8490e3bfad184e95d47a1d3cda5073ba73da97c8649cebf654a74040848da945a1a35252b3032960dc27933c6db277e743ba2b
-  data.tar.gz: de3541305ed634f5ddea55afcbd13156f19d4fa46233ee367a5b5e5d3028662eab0475d57d9d33f7d4fe623d2754a3c709e77978c00c303e2b3c183f58851419
+  metadata.gz: a1484e9c7199cb39f54b4e73cddeb6cf5234cf1bfef80032d0b0ce9050452852745c354fb79bbc964561ca04ddf8eb852d6ba9e3e5bdc4a1bb6656448364e853
+  data.tar.gz: 09324813ab5b0f012851fa68dd8faf33f56a9cab74a96ec5a543dedb5abca722d959044da5d12aa736e22286416d055242ad5825a4b56b8482cb7856d3b188ea

data/README.md

@@ -20,11 +20,14 @@ gem "lita-google"
 
 * `safe_search` (String, Symbol) - The safe search setting to use. Possible values are `:active`, `:moderate`, and `:off`. Default: `:active`.
 
+* `excluded_domains` (Array<String>) - Domains from which you never want to see results.
+
 ### Example
 
 ```
 Lita.configure do |config|
   config.handlers.google.safe_search = :off
+  config.excluded_domains = ["gawker.com", "funnyjunk.com", "dailymail.co.uk"]
 end
 ```
 

data/lib/lita/handlers/google.rb

@@ -17,12 +17,15 @@ module Lita
         end
       end
 
+      config :excluded_domains, type: Array
+
       route(/^(?:google|g)\s+(.+)/i, :search, command: true, help: {
         "google QUERY" => "Return the first Google search result for QUERY."
       })
 
       def search(response)
         query = response.matches[0][0]
+        result = nil
 
         http_response = http.get(
           URL,
@@ -33,7 +36,12 @@ module Lita
 
         if http_response.status == 200
           data = MultiJson.load(http_response.body)
-          result = data["responseData"]["results"].first
+
+          if config.excluded_domains
+            result = check_for_excluded_domains(data)
+          else
+            result = data["responseData"]["results"].first
+          end
 
           if result
             response.reply(
@@ -48,6 +56,22 @@ module Lita
           )
         end
       end
+      private
+
+      def check_for_excluded_domains(data)
+        data["responseData"]["results"].find do |response|
+          begin
+            uri = URI.parse(response["unescapedUrl"])
+            if uri && uri.host
+              response if config.excluded_domains.none? { |domain| uri.host.include?(domain) }
+            else
+              response
+            end
+          rescue URI::InvalidURIError
+            nil
+          end
+        end
+      end
     end
 
     Lita.register_handler(Google)

data/lita-google.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-google"
-  spec.version       = "1.0.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{A Lita handler for returning Google search results.}

data/spec/lita/handlers/google_spec.rb

@@ -62,5 +62,59 @@ JSON
 
       send_command("google ruby")
     end
+
+    it "skips over domains that are blacklisted config" do
+      registry.config.handlers.google.excluded_domains = ['funnyjunk.com' ,'gawker.com']
+
+      allow(response).to receive(:body).and_return(
+<<-JSON.chomp
+{
+  "responseData": {
+    "results": [
+      {
+        "unescapedUrl": "http://www.funnyjunk.com",
+        "titleNoFormatting": "Funny pictures blah blah"
+      },
+      {
+        "unescapedUrl": "http://theoatmeal.com/blog/funnyjunk2",
+        "titleNoFormatting": "An update on the FunnyJunk situation"
+      }
+  ]
+  }
+}
+JSON
+      )
+
+      send_command("google funnyjunk")
+
+      expect(replies.last).to eq(
+        "An update on the FunnyJunk situation - http://theoatmeal.com/blog/funnyjunk2"
+      )
+    end
+    it "fails gracefully if URI.parse raises an error" do
+      registry.config.handlers.google.excluded_domains = ['dailmail.co.uk']
+
+      allow(response).to receive(:body).and_return(
+<<-JSON.chomp
+{
+  "responseData": {
+    "results": [
+      {
+        "unescapedUrl": "555-867-5309",
+        "titleNoFormatting": "Funny pictures blah blah"
+      }
+  ]
+  }
+}
+JSON
+      )
+
+      send_command("google funnyjunk")
+
+      expect(replies.last).to eq(
+        "Funny pictures blah blah - 555-867-5309"
+      )
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-google
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Lita handler for returning Google search results.