lita-onewheel-aqi 2.0.12 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bb25daba37a89da7727f14156565d3f0a703619
-  data.tar.gz: 9f1d9c790e73bf8f8969cb2db3fbc8e44fa4fbb4
+  metadata.gz: 18a828b5b2257a136b9266c7a8156bb528980302
+  data.tar.gz: b624f8d89a548f2114fb37f1815024cfb1ed3d76
 SHA512:
-  metadata.gz: 62c9aaa6cefe4671a67cc30628a18431347d36752225d6a6c5acb197bccd427e8297ce96ab5f6b20a52eb71e98b9c9ccc6f1ed83e16c29e49365423c3a0ee27c
-  data.tar.gz: 0aa1952f3b2a42dd02587e9a791b103e9c674c63fa53311f0fda8b8fda3200d4237840e521d69a33f033ab75e210304bf6ccbb4dfe81896a4a75cce044e3f4f7
+  metadata.gz: 7376eaeb124011ddaf21330d44aa656bd789cfdb3c6f68962d07c9689ae6b4623ba3a2d28b2193f61680d82784bbdd1013078d9c9eb89f8176aef56824db6d83
+  data.tar.gz: 49b4cb8dfcd24c89acd95802fe1d6629f5699758879abe981cfb14aa3827c07d424e9427f83fee9c079a0fcd2db26f97b353d00b0612b9fc471cc0f3b275852d

data/lib/lita/handlers/onewheel_aqi.rb

@@ -8,6 +8,8 @@ module Lita
       config :distance
       config :mode, default: :irc
 
+      REDIS_KEY = 'onewheel-aqi'
+
       route /^aqi\s+(.*)$/i,
             :get_aqi,
             command: true,
@@ -81,18 +83,47 @@ module Lita
           301..500 => '🚫☣🚫' }
       end
 
-      def get_location(response)
-        location = if response.matches[0][0].to_s.length == 1
-                     ''
-                   else
-                     response.matches[0][0]
-                   end
+      # Perform a geocoder lookup based on a) the query or b) the user's serialized state.
+      # If neither of those exist, default to config location.
+      def get_location(response, persist = true)
+        user = response.user
+        query = nil
+        if response.matches[0].is_a?(Array) and response.matches[0].empty?
+          query = response.matches[0][0]
+        end
+
+        Lita.logger.debug "Performing geolookup for '#{user.name}' for '#{query}'"
+
+        if query.nil? or query.empty?
+          Lita.logger.debug "No query specified, pulling from redis #{REDIS_KEY}, #{user.name}"
+          serialized_geocoded = redis.hget(REDIS_KEY, user.name)
+          unless serialized_geocoded == 'null' or serialized_geocoded.nil?
+            geocoded = JSON.parse(serialized_geocoded)
+          end
+          Lita.logger.debug "Cached location: #{geocoded.inspect}"
+        end
+
+        query = (query.nil?)? 'Portland, OR' : query
+        Lita.logger.debug "q & g #{query.inspect} #{geocoded.inspect}"
+
+        unless geocoded
+          Lita.logger.debug "Redis hget failed, performing lookup for #{query}"
+          geocoded = optimistic_geo_wrapper query
+          Lita.logger.debug "Geolocation found.  '#{geocoded.inspect}' failed, performing lookup"
+          if persist
+            redis.hset(REDIS_KEY, user.name, geocoded.to_json)
+          end
+        end
+
+        Lita.logger.debug "geocoded: '#{geocoded}'"
+        loc = {
+          name: geocoded['formatted_address'],
+          lat: geocoded['geometry']['location']['lat'],
+          lng: geocoded['geometry']['location']['lng']
+        }
 
-        puts "get_location: '#{location}'"
-        location = 'Portland, OR' if location.nil? || location.empty?
+        Lita.logger.debug "loc: '#{loc}'"
 
-        loc = geo_lookup(location)
-        puts loc.inspect
         loc
       end
 
@@ -220,17 +251,6 @@ module Lita
         geocoded
       end
 
-      def geo_lookup(query)
-        puts "Location lookup #{query.inspect}"
-        geocoded = optimistic_geo_wrapper query
-
-        query = 'Portland, OR' if (query.nil? || query.empty?) && geocoded.nil?
-
-        { name: geocoded['formatted_address'],
-          lat: geocoded['geometry']['location']['lat'],
-          lng: geocoded['geometry']['location']['lng'] }
-      end
-
       # Particulate Matter 2.5 to micrograms per cubic meter
       def pm25_to_ugm3(pm25)
         ranges = {

data/lita-onewheel-aqi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-aqi'
-  spec.version       = '2.0.12'
+  spec.version       = '2.1.0'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = 'AQI data retrieval bot'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-aqi
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrew Kreps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita