lita-imgflip-memes 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 111e1704b68a53ad432849f6735c19a15fc40ac0
-  data.tar.gz: 4f79a56c43bc1739f386c958f49ddfe25a02f92a
+  metadata.gz: d1bb029dfb75f302b33b7f55b85f625def044860
+  data.tar.gz: e82ea6c2d832a59824d24b958f5f50575d3b5980
 SHA512:
-  metadata.gz: 72f30536a93b039091b9ea8b9e2581a176985c96038f9f3cadc07c0e6338e6af59c01f734e03b422e31dd87bd70d7fcd0aec000bfcaa013f819c57e6c1456da2
-  data.tar.gz: 31fbc151b6d0034ba43675b77199a3d4199710d74d44f1d229f04a5c8b6619ea5754ad492d4a65ee507e60718009672adbfb4ec239ae6ce9a120a02e8ffd377a
+  metadata.gz: 522ea81eaf4c6a9ebe2a9df08803907cfbba59bb51ae62e66cb1d301d3dc24303e1c6b4c9180624c9e75a905ea0d52675a9554ad45469ce618ed7550c6ecd397
+  data.tar.gz: 540c81fe39be7571ca53d0a181f03716b2b9512caf6dbf705a99ca17a9561738246f5791247a26aa2f0e6fc5f490fcfa25b2e986b28f290f5658af3eba0e6ebb

data/README.md

@@ -3,7 +3,9 @@
 [![Build Status](https://travis-ci.org/dpritchett/lita-imgflip-memes.svg?branch=master)](https://travis-ci.org/dpritchett/lita-imgflip-memes)
 [![Coverage Status](https://coveralls.io/repos/dpritchett/lita-imgflip-memes/badge.svg)](https://coveralls.io/r/dpritchett/lita-imgflip-memes)
 
-TODO: Add a description of the plugin.
+Add imgflip meme generation to your Lita bot!
+
+![ancient aliens guy saying 'chat bots'](http://i.imgur.com/FxGSzjVl.jpg)
 
 ## Installation
 
@@ -14,10 +16,23 @@ gem "lita-imgflip-memes"
 ```
 
 ## Configuration
+The 'lita way' to do this is to open up your `lita_config.rb` and set up file-based configuration:
+
+```rb
+config.handlers.imgflip_memes.api_user = 'myusername'
+config.handlers.imgflip_memes.api_password = 'mypassword'
+```
 
-TODO: Describe any configuration attributes the plugin exposes.
+I have set up this gem to deafult to the following environment variables if the config entries aren't set in `lita_config.rb`:
 
-## Usage
+```rb
+  ENV['IMGFLIP_API_USER']
+  ENV['IMGFLIP_API_PASSWORD']
+```
 
-TODO: Describe the plugin's features and how to use them.
+## Usage
 
+```
+Lita > lita aliens chatbots
+http://i.imgflip.com/1tzqwt.jpg
+```

data/lib/lita/handlers/imgflip_memes.rb

@@ -1,12 +1,16 @@
 require 'pry'
+
 module Lita
   module Handlers
-    class ImgflipApiError < Error; end
-
     class ImgflipMemes < Handler
+      class ImgflipApiError < StandardError; end
+      class ConnectionError < StandardError; end
+
       config :api_user, default: ENV['IMGFLIP_API_USER']
       config :api_password, default: ENV['IMGFLIP_API_PASSWORD']
 
+      API_URL = 'https://api.imgflip.com/caption_image'
+
       TEMPLATES = [
         { template_id: 101470, pattern: /^aliens()\s+(.+)/i, help: 'Ancient aliens guy' },
         { template_id: 61579, pattern: /(one does not simply) (.*)/i, help: 'one does not simply walk into mordor' },
@@ -20,7 +24,13 @@ module Lita
         line1, line2 = extract_meme_text(message.match_data)
 
         template = find_template(message.pattern)
-        image = pull_image(template.fetch(:template_id), line1, line2)
+
+        begin
+          image = pull_image(template.fetch(:template_id), line1, line2)
+        rescue ConnectionError, ImgflipApiError => err
+          Lita.logger.error(err.message)
+          return message.reply 'Bummer - can\'t connect to Imgflip.'
+        end
 
         message.reply image
       end
@@ -40,19 +50,22 @@ module Lita
         username = config.api_user
         password = config.api_password
 
-        api_url = 'https://api.imgflip.com/caption_image'
-        result = http.post api_url, { 
-          template_id: template_id,
-          username: username,
-          password: password,
-          text0: line1,
-          text1: line2
-        } 
+        begin
+          result = http.post API_URL, { 
+            template_id: template_id,
+            username: username,
+            password: password,
+            text0: line1,
+            text1: line2
+          } 
+        rescue Faraday::Error => err
+          raise ConnectionError, err.message
+        end
 
         # clean me up
         parsed = JSON.parse(result.body)
         raise(ImgflipApiError, parsed['error_message']) if parsed.keys.include?('error_message')
-        image = parsed.fetch('data').fetch('url')
+        image = parsed.fetch('data', {}).fetch('url')
       end
 
       Lita.register_handler(self)

data/lita-imgflip-memes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-imgflip-memes"
-  spec.version       = "1.0.0"
+  spec.version       = "1.0.1"
   spec.authors       = ["Daniel J. Pritchett"]
   spec.email         = ["dpritchett@gmail.com"]
   spec.description   = "Turns chatbot input text into meme images"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-imgflip-memes
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel J. Pritchett