lita-hashtag 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 996a89b7c3ab87863f179b919cb8421a1da24e3f
-  data.tar.gz: 0aeba2b201c49c7c3a7ea1056c8dd5274ff99690
+  metadata.gz: 41c386c0cddede38a39a826d8ce75df1cbda0c65
+  data.tar.gz: 3e51493b50558ec69043d92243f833d7dba1b178
 SHA512:
-  metadata.gz: 7ba17fd5aa0794283536cbe9b2229d9edcdcd9659863b7207a79238a61f934432218668305c750c47388ad54362e889677035dfb0ce6040c9811a760cc676fc4
-  data.tar.gz: 9d8dd45a7d723af11e8787e479579a8f8124f499e80d9ad927b2e6aad4e9a44cc06081bcc4b957cee1efd7e1a21828f5d3d6623c18398878a168b293b2b8a898
+  metadata.gz: c86fd2b4749303444ac1ef0739e65b4c7fd7eee20b12ee0ebd60e595dd24bcf31fd1f538b0756bb6b096ff9eb1067b1b5f38bab463509fa0920478f3546daaea
+  data.tar.gz: 2138c0a1eb520d96c74519b73ef46e5b9b226f5c4564d250471b0111271bdd5a16877513039638c5713a3b204fc4ecc540c170017fd9db121195e8cc7eeb51ed

data/README.md

@@ -21,12 +21,25 @@ gem "lita-hashtag"
 ### Optional
 
 * `config.handlers.hashtag.safe_search` - (String, Symbol) - The safe search
-  setting to use when querying for images. Possible values are `:active`,
-  `:moderate`, and `:off`. **Default:** `:active`.
+  setting to use when querying for images. Possible values are `:high`,
+  `:medium`, and `:off`. **Default:** `:medium`.
+* `config.handlers.hashtag.google_cse_id` - String - search engine id (see
+  below)
+* `config.handlers.hashtag.google_cse_key` - String - api key (see below)
 * `config.handlers.hashtag.giphy_api_key` - String - Your Giphy API key. You can
   either email the devs for a personal API key, or you can use the default
   public beta key-- dc6zaTOxFJmzC. **Default:** `dc6zaTOxFJmzC`
 
+## Important note about google custom search
+
+Since google has shutdown their free image search API, you'll need to create an
+google custom search engine (https://cse.google.com/) allows 100 search per day
+free and fill in the `google_cse_key` with the 'search engine ID' (can be found
+under 'Basic'->'Details'->'Search engine ID'). Then you need to go create an
+api key from Google Developers Console (instructions here:
+https://developers.google.com/custom-search/json-api/v1/introduction) and fill
+that into the `google_cse_id`.
+
 ## Usage
 
 ```

data/lib/lita/handlers/hashtag.rb

@@ -1,18 +1,21 @@
 module Lita
   module Handlers
     class Hashtag < Handler
-      URL = "https://ajax.googleapis.com/ajax/services/search/images"
+      URL = "https://www.googleapis.com/customsearch/v1"
       GIF_URL = "http://api.giphy.com/v1/gifs/search"
-      VALID_SAFE_VALUES = %w(active moderate off)
+      VALID_SAFE_VALUES = %w(high medium off)
 
-      config :safe_search, types: [String, Symbol], default: :active do
+      config :safe_search, types: [String, Symbol], default: :medium do
         validate do |value|
           unless VALID_SAFE_VALUES.include?(value.to_s.strip)
-            "valid values are :active, :moderate, or :off"
+            "valid values are :high, :medium, or :off"
           end
         end
       end
 
+      config :google_cse_id, type: String, required: true
+      config :google_cse_key, type: String, required: true
+
       config :giphy_api_key, type: String, default: 'dc6zaTOxFJmzC'
 
       route(/^#(.+)/, :fetch, command: false, help: {
@@ -24,31 +27,36 @@ module Lita
         query = response.matches[0][0]
 
         if query[0] == '#'
-          response.reply get_gif(query)
+          response.reply get_gif(query[1..-1])
         else
           http_response = http.get(
             URL,
             v: "1.0",
+            searchType: 'image',
             q: query,
             safe: config.safe_search,
-            rsz: 8
+            fields: 'items(link)',
+            rsz: 8,
+            cx: config.google_cse_id,
+            key: config.google_cse_key
           )
 
           data = MultiJson.load(http_response.body)
 
-          if data["responseStatus"] == 200
-            choice = data["responseData"]["results"].sample
+          if http_response.status == 200
+            choice = data["items"].sample if data["items"]
             if choice
-              response.reply ensure_extension(choice["unescapedUrl"])
+              response.reply ensure_extension(choice["link"])
             else
-              response.reply %{No images found for "#{query}".}
+              response.reply %{What the hell is "#{query}"? Try something else.}
             end
           else
-            reason = data["responseDetails"] || "unknown error"
+            reason = data["error"]["message"] || "unknown error"
             Lita.logger.warn(
               "Couldn't get image from Google: #{reason}"
             )
           end
+
         end
       end
 

data/lita-hashtag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-hashtag"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Richard Li"]
   spec.email         = ["evilcat@wisewolfsolutions.com"]
   spec.description   = %q{Let lita bot respond to #'s}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-hashtag
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Richard Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -126,3 +126,4 @@ summary: 'Let lita bot respond to #''s'
 test_files:
 - spec/lita/handlers/hashtag_spec.rb
 - spec/spec_helper.rb
+has_rdoc: