lita-onewheel-aqi 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1718ac9cefb5363670b2ae7372a4c724cbd4a775
-  data.tar.gz: b4c06144a240f7e331cffdee4c584566466954b4
+  metadata.gz: 13823ee556bbd908e18efa0011f9d44e90c383e6
+  data.tar.gz: e21fcd064eb874cda6684ee11135cf808525af38
 SHA512:
-  metadata.gz: 0a0ab305267ae4221469f86efaf805203316955c05fd6df66f87e869f39ad457f23876b58dad71959b554ef9e74064824e853249a2b6468caccd11249c1ae16b
-  data.tar.gz: 4da4e27f04a59a770cfa99165831893e1770c4d86fe892619f1fb64aeb1b966c393c9d71f362c1d7c7a6f4fe9e8187189ac2796959d907875600449240795d4b
+  metadata.gz: 66f020d2df9500bbe13e528ff6ab7985416a81a8c28068934a591fa14d1f8e40c70ffb6626bd7236ad55946bf8f00dd6891d8a17a96095a204cf661ef40d5276
+  data.tar.gz: 7dabe75aa72ab43f7848e365fbee2bc37069935073919d30657f19cde9fcd692dd1d3c05abee65c76795bae1453d7856aa6f887efdcf3fa69febf5a47ae1fb7a

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.4
-  - 2.3.0
+  - 2.3.4
 script: bundle exec rake
 before_install:
   - gem update --system

data/README.md

@@ -0,0 +1,36 @@
+# lita-onewheel-aqi
+
+[![Build Status](https://travis-ci.org/onewheelskyward/lita-onewheel-aqi.svg?branch=master)](https://travis-ci.org/onewheelskyward/lita-onewheel-aqi)
+[![Coverage Status](https://coveralls.io/repos/github/onewheelskyward/lita-onewheel-aqi/badge.svg?branch=master)](https://coveralls.io/github/onewheelskyward/lita-onewheel-aqi?branch=master)
+
+I built this on a plane on day where wildfire smoke had caused Portland, OR's air quality to be worse than Hong Kong's.
+The next year, I upgraded it to use a newer, better API.
+
+http://airnowapi.org/aq101
+
+http://aqicn.org/city/usa/oregon/portland
+
+# Installation
+
+Add lita-onewheel-aqi to your Lita instance's Gemfile:
+
+`gem 'lita-onewheel-aqi'`
+
+# Configuration
+
+Add your API key to your lita_config.rb:
+
+`config.handlers.onewheel_aqi.api_key`
+
+It can be procured here: http://aqicn.org/api/
+
+If you're using this in slack, turn off the IRC color codes by using:
+
+`config.handlers.onewheel_aqi.colors = false`
+
+# Usage
+
+bot: aqi Portland, OR
+
+^^ should return your PM2.5 number.
+

data/lib/lita/handlers/onewheel_aqi.rb

@@ -8,10 +8,21 @@ module Lita
       config :distance
       config :colors, default: true
 
-      route /^aqi(.*)$/i,
+      route /^aqi\s+(.*)$/i,
             :get_aqi,
             command: true,
             help: { '!aqi [location]' => 'Gives you available data for air quality (PM2.5) forecast and latest observation.' }
+      route /^aqi$/i,
+            :get_aqi,
+            command: true
+      route /^aqideets\s*(.*)$/i,
+            :get_aqi_deets,
+            command: true,
+            help: { '!aqideets [location]' => 'Gives you moar datas.' }
+      route /^aqidetails\s*(.*)$/i,
+            :get_aqi_deets,
+            command: true,
+            help: { '!aqideets [location]' => 'Gives you moar datas.' }
 
       # IRC colors.
       def colors
@@ -43,48 +54,88 @@ module Lita
           301..500 => :pink }
       end
 
-      def get_aqi(response)
-        location = response.matches[0][0].to_s.strip
-        puts "'#{location}'"
-        location = 'Portland, OR' if location.empty?
+      def get_location(response)
+        location = if response.matches[0].to_s.casecmp('aqi').zero?
+                     ''
+                   else
+                     response.matches[0][0]
+                   end
+
+        puts "get_location: '#{location}'"
+        location = 'Portland, OR' if location.nil? || location.empty?
 
         loc = geo_lookup(location)
         puts loc.inspect
+        loc
+      end
 
-        api_key = 'd4d71949d26fcaa48783808fdba32fbdc8d367eb'
-        uri = "http://api.waqi.info/feed/geo:#{loc[:lat]};#{loc[:lng]}/?token=#{api_key}"
+      def get_observed_aqi(loc)
+        uri = "http://api.waqi.info/feed/geo:#{loc[:lat]};#{loc[:lng]}/?token=#{config.api_key}"
         Lita.logger.debug "Getting aqi from #{uri}"
-        # forecast_response = RestClient.get(uri)
-        # forecasted_aqi = JSON.parse(forecast_response)
-        # Lita.logger.debug 'Forecast response: ' + forecasted_aqi.inspect
 
         observed_response = RestClient.get(uri)
         observed_aqi = JSON.parse(observed_response)
         Lita.logger.debug 'Observed response: ' + observed_aqi.inspect
+        observed_aqi
+      end
 
-        observed_pm25 = extract_pmtwofive(observed_aqi)
+      def get_aqi(response)
+        loc = get_location(response)
+        aqi = get_observed_aqi(loc)
 
         reply = "AQI for #{loc[:name]}, "
-        # unless forecasted_aqi == []
-        #   reply += "Forecasted: #{(forecasted_aqi['ActionDay'] == 'true')? 'Action Day! ' : ''}#{forecasted_aqi['AQI']} #{forecasted_aqi['Category']['Name']}  "
-        # end
 
-        banner_str = "(#{observed_aqi['data']['city']['url']})"
-        if config.colors
-          banner_str = "\x03#{colors[:grey]}#{banner_str}\x03"
+        if aqi['data']['iaqi']['pm10']
+          reply += 'pm10: ' + color_str(aqi['data']['iaqi']['pm10']['v'].to_s) + '  '
+        end
+        if aqi['data']['iaqi']['pm25']
+          reply += 'pm25: ' + color_str(aqi['data']['iaqi']['pm25']['v'].to_s) + '  '
         end
 
-        unless observed_aqi == []
-          reply += "Observed PM25: #{color_str(observed_pm25)}  #{banner_str}"
+        banner_str = "(#{aqi['data']['city']['url']})"
+        banner_str = "\x03#{colors[:grey]}#{banner_str}\x03" if config.colors
+
+        reply += banner_str
+
+        response.reply reply
+      end
+
+      def get_aqi_deets(response)
+        loc = get_location(response)
+        aqi = get_observed_aqi(loc)
+
+        reply = "AQI for #{loc[:name]}, "
+
+        banner_str = "(#{aqi['data']['city']['url']})"
+        banner_str = "\x03#{colors[:grey]}#{banner_str}\x03" if config.colors
+
+        if aqi['data']['iaqi']['co']
+          reply += 'co: ' + aqi['data']['iaqi']['co']['v'].to_s + '  '
+        end
+        if aqi['data']['iaqi']['h']
+          reply += 'humidity: ' + aqi['data']['iaqi']['h']['v'].to_s + '%  '
         end
+        if aqi['data']['iaqi']['p']
+          reply += 'pressure: ' + aqi['data']['iaqi']['p']['v'].to_s + 'mb  '
+        end
+        if aqi['data']['iaqi']['pm10']
+          reply += 'pm10: ' + color_str(aqi['data']['iaqi']['pm10']['v'].to_s) + '  '
+        end
+        if aqi['data']['iaqi']['pm25']
+          reply += 'pm25: ' + color_str(aqi['data']['iaqi']['pm25']['v'].to_s) + '  '
+        end
+        if aqi['data']['iaqi']['t']
+          reply += 'temp: ' + aqi['data']['iaqi']['t']['v'].to_s + 'C  '
+        end
+
+        reply += banner_str
         response.reply reply
       end
 
       def color_str(str)
-
         if config.colors
           aqi_range_colors.keys.each do |color_key|
-            if color_key.cover? str.to_i    # Super secred cover sauce
+            if color_key.cover? str.to_i # Super secred cover sauce
               color = colors[aqi_range_colors[color_key]]
               str = "\x03#{color}#{str}\x03"
             end
@@ -95,7 +146,14 @@ module Lita
       end
 
       def extract_pmtwofive(aqi)
-        aqi['data']['iaqi']['pm25']['v']
+        Lita.logger.debug "extract_pmtwofive with #{aqi}"
+        pm25 = ''
+        pm25 = if aqi['data']['iaqi']['pm25']
+                 aqi['data']['iaqi']['pm25']['v']
+               else
+                 "No PM2.5 data for #{aqi['data']['city']['name']}"
+               end
+        pm25
       end
 
       # Geographical stuffs

data/lita-onewheel-aqi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-aqi'
-  spec.version       = '1.1.1'
+  spec.version       = '1.2.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

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Lita::Handlers::OnewheelAqi, lita_handler: true do
   it { is_expected.to route_command('aqi') }
+  it { is_expected.to route_command('aqidetails') }
+  it { is_expected.to route_command('aqideets') }
 
   before do
     mock = File.open('spec/fixtures/Output.json').read
@@ -29,6 +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, Observed 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, 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")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-aqi
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Kreps
@@ -146,7 +146,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- README.rst
+- README.md
 - Rakefile
 - lib/lita-onewheel-aqi.rb
 - lib/lita/handlers/onewheel_aqi.rb

data/README.rst

@@ -1,37 +0,0 @@
-lita-onewheel-aqi
-=================
-
-.. image:: https://coveralls.io/repos/onewheelskyward/lita-onewheel-aqi/badge.svg?branch=master&service=github :target: https://coveralls.io/github/onewheelskyward/lita-onewheel-aqi?branch=master
-.. image:: https://travis-ci.org/onewheelskyward/lita-onewheel-aqi.svg?branch=master :target: https://travis-ci.org/onewheelskyward/lita-onewheel-aqi
-
-I built this on a plane on day where wildfire smoke had caused Portland, OR's air quality to be worse than Hong Kong's.
-The data is a little spotty, but it worked good enough for an hour at the stick.
-
-http://airnowapi.org/aq101
-
-http://airnowapi.org/webservices
-
-http://airnowapi.org/forecastsbylatlon/docs
-
-Installation
-============
-Add lita-onewheel-aqi to your Lita instance's Gemfile:
-
-``gem 'lita-onewheel-aqi'``
-
-Configuration
-=============
-
-Add your API key to your lita_config.rb:
-
-``config.handlers.onewheel_aqi.api_key``
-
-It can be procured here: http://airnowapi.org/account/request/
-
-Usage
-=====
-
-bot: aqi Portland, OR
-
-^^ should return your PM2.5 number.
-