lita-onewheel-aqi 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5429d8a42c910188d126792e6f213d9758f950af
-  data.tar.gz: f422efbd03ed8949ec5de5a8dfae42b851935136
+  metadata.gz: 4ee27af471c241b1c0447e1f9b79801575ecdf41
+  data.tar.gz: 6de061db874e5abb3d21b07ba9e0954f215f56b8
 SHA512:
-  metadata.gz: 13e8f26fad285dbdd7562f00eda382d0bf5257c862c1f98056a52c1b49df08512d173480a52dde958e4d55896bd9061930ef352fad2ad16482b46562cf338e93
-  data.tar.gz: '08761236735f81bbae79b3fe47ff7388ddb81127f1c276ce72657ef379c499741250c237608c983e2b109c2343e94e8a10cfb880c0681ab07699210e8eb84152'
+  metadata.gz: 1974772b9eedf6d118c58e5d6f79f6ccc2f086b36274215dd25f08031ae518f427c7ec3e6b85cc6092c2a42e0abae2c4ad15ab20977bb3c80712e15b37df38d9
+  data.tar.gz: 7db2c3b9952cea643791290a0b10c4814b76f50cef3e27e262f4890e88fb4da17f5cd9a08be4e7a33a6ae19303b4325046778fc4cb8db12a948e4472309241a3

data/lib/lita/handlers/onewheel_aqi.rb

@@ -50,35 +50,17 @@ module Lita
         loc = geo_lookup(location)
         puts loc.inspect
 
-        parameters = {
-          latitude: loc[:lat],
-          longitude: loc[:lng],
-          api_key: config.api_key,
-          format: 'application/json'
-        }
-
-        query_string = (parameters.map { |k, v| "#{k}=#{v}" }).join '&'
-        uri = 'http://airnowapi.org/aq/forecast/latLong/?' + query_string
+        api_key = 'd4d71949d26fcaa48783808fdba32fbdc8d367eb'
+        uri = "http://api.waqi.info/feed/geo:#{loc[:lat]};#{loc[:lng]}/?token=#{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
 
-        uri = 'http://airnowapi.org/aq/observation/latLong/current/?' + query_string
-        Lita.logger.debug "Getting aqi observed from #{uri}"
         observed_response = RestClient.get(uri)
         observed_aqi = JSON.parse(observed_response)
         Lita.logger.debug 'Observed response: ' + observed_aqi.inspect
 
-        if observed_aqi.nil? # forecasted_aqi.nil? and
-          response.reply "No AQI data for #{loc[:name]}."
-          Lita.logger.info "No data found for #{response.matches[0][0]}"
-          return
-        end
-
-        # [{"DateObserved":"2015-08-23 ","HourObserved":14,"LocalTimeZone":"PST","ReportingArea":"Portland","StateCode":"OR","Latitude":45.538,"Longitude":-122.656,"ParameterName":"O3","AQI":49,"Category":{"Number":1,"Name":"Good"}},{"DateObserved":"2015-08-23 ","HourObserved":14,"LocalTimeZone":"PST","ReportingArea":"Portland","StateCode":"OR","Latitude":45.538,"Longitude":-122.656,"ParameterName":"PM2.5","AQI":167,"Category":{"Number":4,"Name":"Unhealthy"}}]
-        # todo: extract today's forecast, not tomorrow's.
-        # forecasted_aqi = extract_pmtwofive(forecasted_aqi)
         observed_aqi = extract_pmtwofive(observed_aqi)
 
         reply = "AQI for #{loc[:name]}, "
@@ -86,7 +68,7 @@ module Lita
         #   reply += "Forecasted: #{(forecasted_aqi['ActionDay'] == 'true')? 'Action Day! ' : ''}#{forecasted_aqi['AQI']} #{forecasted_aqi['Category']['Name']}  "
         # end
         unless observed_aqi == []
-          reply += "Observed: #{color_str(observed_aqi['AQI'])} #{observed_aqi['Category']['Name']} at #{observed_aqi['DateObserved']}#{observed_aqi['HourObserved']}00 hours."
+          reply += "Observed: #{color_str(observed_aqi)}"
         end
         response.reply reply
       end
@@ -102,11 +84,7 @@ module Lita
       end
 
       def extract_pmtwofive(aqi)
-        returned_aqi = aqi
-        aqi.each do |a|
-          returned_aqi = a if a['ParameterName'] == 'PM2.5'
-        end
-        returned_aqi
+        aqi['data']['iaqi']['pm25']['v']
       end
 
       # Geographical stuffs

data/lita-onewheel-aqi.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-aqi'
-  spec.version       = '0.2.2'
+  spec.version       = '1.0.0'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = 'AQI data retrieval bot'
-  spec.summary       = 'Reads the current AQI from aqinowapi.org and displays it.'
+  spec.summary       = 'Reads the current AQI from aqicn.org and displays it.'
   spec.homepage      = 'https://github.com/onewheelskyward/lita-onewheel-aqi'
   spec.license       = 'MIT'
   spec.metadata      = { 'lita_plugin_type' => 'handler'}

data/spec/lita/handlers/onewheel_aqi_spec.rb

@@ -29,6 +29,6 @@ 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: \u000307118\u0003 Unhealthy for Sensitive Groups at 2017-08-09 1100 hours.")
+    expect(replies.last).to include("AQI for Portland, OR, USA, Observed: \u00030876\u0003")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-aqi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Kreps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -177,7 +177,7 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Reads the current AQI from aqinowapi.org and displays it.
+summary: Reads the current AQI from aqicn.org and displays it.
 test_files:
 - spec/lita/handlers/onewheel_aqi_spec.rb
 - spec/spec_helper.rb