lita-onewheel-aqi 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13823ee556bbd908e18efa0011f9d44e90c383e6
-  data.tar.gz: e21fcd064eb874cda6684ee11135cf808525af38
+  metadata.gz: 0b1e16da0378b4492653b530898b80e4213d242e
+  data.tar.gz: bcaf8cfbdcc28de7dbdb47d4f4c8b45c35d43ba9
 SHA512:
-  metadata.gz: 66f020d2df9500bbe13e528ff6ab7985416a81a8c28068934a591fa14d1f8e40c70ffb6626bd7236ad55946bf8f00dd6891d8a17a96095a204cf661ef40d5276
-  data.tar.gz: 7dabe75aa72ab43f7848e365fbee2bc37069935073919d30657f19cde9fcd692dd1d3c05abee65c76795bae1453d7856aa6f887efdcf3fa69febf5a47ae1fb7a
+  metadata.gz: 113c8c581db65ce671dfe0b24f039b8f62a4d1ad5fcf1beabc16a0f06b0ab75599f7a774f0c885d02b9ff4590757cf4f366ddfbd8e4107aa85a2757dc1848a82
+  data.tar.gz: 3eedcc7a4d0ab8f4e42b39f801e88e558cc113735abb3a56012875907c6e4d1395fe008d40bd12667aa22d97206f724edd7b2b3a34fe85b3934276b17b318d1c

data/lib/lita/handlers/onewheel_aqi.rb

@@ -6,7 +6,7 @@ module Lita
     class OnewheelAqi < Handler
       config :api_key
       config :distance
-      config :colors, default: true
+      config :mode, default: :irc
 
       route /^aqi\s+(.*)$/i,
             :get_aqi,
@@ -54,6 +54,24 @@ module Lita
           301..500 => :pink }
       end
 
+      def aqi_range_labels
+        { 0..50 => 'Good',
+          51..100 => 'Moderate',
+          101..150 => 'Unhealthy for Sensitive Groups',
+          151..200 => 'Unhealthy for All',
+          201..300 => 'Very Unhealthy',
+          301..500 => 'Hazardous' }
+      end
+
+      def aqi_slack_emoji
+        { 0..50 => ':deciduous_tree:',
+          51..100 => ':warning:',
+          101..150 => ':large_orange_diamond:',
+          151..200 => ':no_entry_sign:',
+          201..300 => ':radioactive_sign:',
+          301..500 => ':no_entry_sign: :radioactive_sign: :no_entry_sign:' }
+      end
+
       def get_location(response)
         location = if response.matches[0].to_s.casecmp('aqi').zero?
                      ''
@@ -83,8 +101,16 @@ module Lita
         loc = get_location(response)
         aqi = get_observed_aqi(loc)
 
+        banner_str = "(#{aqi['data']['city']['url']})"
+
         reply = "AQI for #{loc[:name]}, "
 
+        if config.mode == :irc
+          reply += color_str_with_value(range_str: aqi_range_labels, range_value: aqi['data']['iaqi']['pm25']['v'].to_s)
+          banner_str = "\x03#{colors[:grey]}#{banner_str}\x03"
+        end
+
+
         if aqi['data']['iaqi']['pm10']
           reply += 'pm10: ' + color_str(aqi['data']['iaqi']['pm10']['v'].to_s) + '  '
         end
@@ -92,9 +118,6 @@ module Lita
           reply += 'pm25: ' + color_str(aqi['data']['iaqi']['pm25']['v'].to_s) + '  '
         end
 
-        banner_str = "(#{aqi['data']['city']['url']})"
-        banner_str = "\x03#{colors[:grey]}#{banner_str}\x03" if config.colors
-
         reply += banner_str
 
         response.reply reply
@@ -107,7 +130,10 @@ module Lita
         reply = "AQI for #{loc[:name]}, "
 
         banner_str = "(#{aqi['data']['city']['url']})"
-        banner_str = "\x03#{colors[:grey]}#{banner_str}\x03" if config.colors
+
+        if config.mode == :irc
+          banner_str = "\x03#{colors[:grey]}#{banner_str}\x03"
+        end
 
         if aqi['data']['iaqi']['co']
           reply += 'co: ' + aqi['data']['iaqi']['co']['v'].to_s + '  '
@@ -132,10 +158,14 @@ module Lita
         response.reply reply
       end
 
-      def color_str(str)
-        if config.colors
+      def color_str(str, value = nil)
+        if config.mode == :irc
+          if value.nil?
+            value = str.to_i
+          end
+
           aqi_range_colors.keys.each do |color_key|
-            if color_key.cover? str.to_i # Super secred cover sauce
+            if color_key.cover? value # Super secred cover sauce
               color = colors[aqi_range_colors[color_key]]
               str = "\x03#{color}#{str}\x03"
             end
@@ -145,6 +175,22 @@ module Lita
         str
       end
 
+      def color_str_with_value(range_str:, range_value:)
+        str = nil
+        aqi_range_colors.keys.each do |color_key|
+          if color_key.cover? range_value.to_i # Super secred cover sauce
+            color = colors[aqi_range_colors[color_key]]
+            if config.mode == :irc
+              str = "\x03#{color}#{range_str[color_key]}\x03 "
+            elsif config.mode == :slack
+              str = "#{range_str[color_key]} "
+            end
+          end
+        end
+
+        str
+      end
+
       def extract_pmtwofive(aqi)
         Lita.logger.debug "extract_pmtwofive with #{aqi}"
         pm25 = ''

data/lita-onewheel-aqi.gemspec

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

data/spec/lita/handlers/onewheel_aqi_spec.rb

@@ -31,11 +31,11 @@ describe Lita::Handlers::OnewheelAqi, lita_handler: true do
 
   it 'queries the aqi' do
     send_command 'aqi'
-    expect(replies.last).to include("AQI for Portland, OR, USA, pm10: \u00030340\u0003  pm25: \u00030876\u0003  \u000314(http://aqicn.org/city/usa/oregon/government-camp-multorpor-visibility/)\u0003")
+    expect(replies.last).to include("AQI for Portland, OR, USA, \u000308Moderate\u0003 pm10: \u00030340\u0003  pm25: \u00030876\u0003  \u000314(http://aqicn.org/city/usa/oregon/government-camp-multorpor-visibility/)\u0003")
   end
 
   it 'queries the aqideets' do
     send_command 'aqideets'
-    expect(replies.last).to eq("AQI for Portland, OR, USA, humidity: 11%  pressure: 1014mb  pm10: \u00030340\u0003  pm25: \u00030876\u0003  temp: 34.65C  \u000314(http://aqicn.org/city/usa/oregon/government-camp-multorpor-visibility/)\u0003")
+    expect(replies.last).to eq("AQI for Portland, OR, USA, \u00030Moderate\u0003 humidity: 11%  pressure: 1014mb  pm10: \u00030340\u0003  pm25: \u00030876\u0003  temp: 34.65C  \u000314(http://aqicn.org/city/usa/oregon/government-camp-multorpor-visibility/)\u0003")
   end
 end

metadata

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