lita-raindar 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a68d049f34c5463d1ee554288e7b3178915f49
-  data.tar.gz: ad7a43f2fe5e49777237efbc6ca0a2873d7184ae
+  metadata.gz: 5dfdc875f01c283bc64a7dfe4f3fa7fd3e7677bf
+  data.tar.gz: 4654a535057de064c04b8263118d51ba5ccebfda
 SHA512:
-  metadata.gz: d079cd0f62960e9b759e70eb219cc40046809cb9f050496fab198d2782ec3b4a8f395f8536476aa45e04a120391ecf9feda23d95dd222675b7a2b00000cad148
-  data.tar.gz: 5338bfc6faacc5de7d5e057dde973bb31a6521b93db965d17ef6ae8a58955b12659b98c00f9e7458b6e0c63bb595c4e1e6e4a0c6602a48303414a1c41241a4ee
+  metadata.gz: 550620e8885b7c670887ee29dd6c22f1ba2763e509f1c0526a014e5673785322c6b74df5f8a52e3327bbf457c7941778e9a8cdc9a19b0ca8fdb68219eb4f15aa
+  data.tar.gz: 815ce9588b3437188a488dbd80bba8d101edb217fc8fb215b2374e44495d13820027c8dc58c975e3ee400a5b887283a5c3af0f673146116e6f8ef359a4013af4

data/lib/imgur_gateway.rb

@@ -1,7 +1,6 @@
 require 'imgur'
 
 class ImgurGateway
-  IMGUR_API_KEY = ENV['IMGUR_API_KEY']
 
   attr_accessor :filename, :title, :url
 
@@ -12,11 +11,12 @@ class ImgurGateway
 
   def upload
     return false unless filename
-    client = Imgur.new(IMGUR_API_KEY)
+    client = Imgur.new(imgur_api_key)
     image = Imgur::LocalImage.new(filename, title: title)
     uploaded = client.upload(image)
     @url = uploaded.link
-  rescue
+  rescue Exception => e
+    puts "Error uploading to imgur #{e}"
     return false
   end
 
@@ -26,4 +26,8 @@ class ImgurGateway
     "Raindar #{Time.now.strftime('%A, %B %d, %Y')}"
   end
 
+  def imgur_api_key
+    Lita.config.handlers.raindar.imgur_api_key
+  end
+
 end

data/lib/lita-raindar.rb

@@ -4,8 +4,10 @@ require_relative "url_cache"
 module Lita
   module Handlers
     class Raindar < Handler
+      config :imgur_api_key
 
       route(/^weather ([a-zA-Z0-9\s]*)$/i, :radar, command: true, help: { "weather LOCATION" => "Returns GIF of recent weather radar" })
+      route(/^(radar locations)$/i, :radar_locations, command: true, help: { "radar locations" => "Returns list of available radar locations" })
 
       RADARS = {
         "melbourne" => "IDR023",
@@ -67,11 +69,27 @@ module Lita
         if code.nil?
           response.reply("Location not currently available")
         else
-          response.reply(UrlCache.cached_radar_url(code))
+          response.reply(url_cache.cached_radar_url(code))
         end
 
       end
 
+      def radar_locations(response)
+        response.reply(radar_list.join(", "))
+      end
+
+      private
+
+      def url_cache
+        UrlCache.new(redis)
+      end
+
+      def radar_list
+        RADARS.keys.sort.map do |location|
+         location.capitalize
+       end
+      end
+
       Lita.register_handler(self)
 
     end

data/lib/url_cache.rb

@@ -2,14 +2,17 @@ require 'redis'
 require_relative "radar_generator"
 
 class UrlCache
-  REDIS = Redis.new(url: URI.parse(ENV["REDISTOGO_URL"] || "redis://127.0.0.1"))
   CACHE_EXPIRY = 300 # seconds
 
-  def self.cached_radar_url(radar_code)
-    radar_url = REDIS.get("#{radar_code}_gif")
+  def initialize(redis)
+    @redis = redis
+  end
+
+  def cached_radar_url(radar_code)
+    radar_url = @redis.get("#{radar_code}_gif")
     unless radar_url
       radar_url = RadarGenerator.gif(radar_code)
-      REDIS.set("#{radar_code}_gif", radar_url, ex: CACHE_EXPIRY)
+      @redis.set("#{radar_code}_gif", radar_url, ex: CACHE_EXPIRY)
     end
     radar_url
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-raindar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Eleanor Kiefel Haggerty
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Response is limited to locations around Australia that have a radar
+description: Lita chatbot reponds to user requests of 'weather LOCATION' with a GIF
+  of the weather in specified location. Response is limited to Australian locations
+  with a radar listed on the Bureau of Meteorology
 email:
 - eleanorakh@gmail.com
 executables: []
@@ -144,6 +146,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A slackbot that posts a GIF of the most recent weather radar of a given location
-  in Australia
+summary: A lita plugin that responds to requests to check the weather in Australia
 test_files: []