zetabot 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce1409371adb87fb83f3ae823892cfb68c8de02
-  data.tar.gz: 4802a3da4ff5988fff6671ca95109dae47a0daf7
+  metadata.gz: 6e927c6006c02faf5117ec11d11d0c5c6896d0cf
+  data.tar.gz: 391a22bac0fdafcc528ae60394cf4fde8def9c9d
 SHA512:
-  metadata.gz: '081b9aa9985ac373d577d9f348174d610a1f10b50e9e3e6c5aeefad250770b732dd0abf3c0ee5be30e96d25d9485d9ae38a2e3b95a9c930d008b2bb5fe441fad'
-  data.tar.gz: 77dc4cd3c3bd454f2fe7e1e5d0b6cd0b6d27ece912ef20e6a9daa632f4a1ee01588c8f29efab13cb1a2c58b79a0fd3a3e6164a08ba6ec80ef6d9c73397aef4bd
+  metadata.gz: 7b30608cb81f2a3d1bbf764bb87815e59de214f4ff146a0bd09721070ccf13f2bc64c072b6735f6c12039e49222c09fe7e1c96f81edc3edb2e53c4693444964e
+  data.tar.gz: 03466234cd8842f36e3f86ab48828077013cd9d8c33a4304b77e42ffbb0bbcf26959829a0c11e644750e9310d16e5ee4958fd7ab7b9eae45fc528389a42d5f44

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (1.0.0)
+    zetabot (1.0.1)
       actionview
       chronic
       chronic_duration

data/lib/Zeta/plugins/weather.rb

@@ -159,7 +159,7 @@ module Plugins
       data.ac = ac
       current = data.current_observation
       alerts = data.alerts.empty? ? 'none' : data.alerts.map {|l| l['type']}.join(',')
-      pressure_si = Unitwise(current.pressure_mb.to_i, '[psi]').convert_to('kPa').to_i.round(2)
+      pressure_si = Unitwise((current.pressure_in.to_f)+14.7, '[psi]').convert_to('kPa').to_f.round(2)
 
       data.reply = "WU ∴ #{ac.name}, #{ac.c} " \
                   "≈ #{current.weather} #{current.temperature_string} " \
@@ -184,6 +184,8 @@ module Plugins
       ac = ac.results[0]
       lat = ac.geometry.location.lat
       lon = ac.geometry.location.lng
+
+      # Get Data
       data = JSON.parse(
           open(
               URI.encode("https://api.openweathermap.org/data/2.5/weather?lat=#{lat}&lon=#{lon}&APPID=#{Config.secrets[:owm]}")
@@ -192,13 +194,13 @@ module Plugins
       )
 
       temp = Unitwise(data.main.temp, 'K') # Data is given in kelvin
-      pressure = Unitwise(data.main.pressure, '[psi]')
+      pressure = Unitwise((data.main.pressure.to_f/10)+101, 'kPa')
       wind = Unitwise(data.wind.speed, 'kilometer')
 
-      data.reply = "OWM ∴ #{ac.name}, #{ac.c} " \
+      data.reply = "OWM ∴ #{ac.formatted_address} " \
                   "≈ #{data.weather[0].description},  #{temp.convert_to('[degF]').to_i.round(2)} F (#{temp.convert_to('Cel').to_i.round(2)} C) " \
                   "≈ Humidity: #{data.main.humidity}% " \
-                  "≈ Pressure: #{pressure.to_i.round(2)} psi (#{pressure.convert_to('kPa').to_i.round(2)} kPa) " \
+                  "≈ Pressure: #{pressure.convert_to('[psi]').to_f.round(2)} psi (#{pressure.convert_to('kPa').to_f} kPa) " \
                   "≈ Wind: #{wind.convert_to('mile').to_i.round(2)} mph (#{wind.to_i.round(2)} km/h) ∴"
 
       return data
@@ -218,27 +220,27 @@ module Plugins
       lon = ac.geometry.location.lng
 
       data = JSON.parse(
-                     open(
-                         URI.encode("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}")
-                     ).read,
-                     object_class: OpenStruct
+          open(
+              URI.encode("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}")
+          ).read,
+          object_class: OpenStruct
       )
       data.ac = ac
       current = data.currently
       alerts = data.alerts.count rescue 0
       c = Unitwise(current.temperature, '[degF]').convert_to('Cel').to_i
       c_feels = Unitwise(current.apparentTemperature, '[degF]').convert_to('Cel').to_i
-      p = Unitwise(current.pressure, '[psi]').convert_to('kPa').to_i
+      p = Unitwise((current.pressure.to_f/10)+101, 'kPa')
       gusts = Unitwise(current.windGust, 'mile').convert_to('kilometer').to_i
 
       tempstring = "#{current.temperature.to_i} F (#{c} C)"
       feelslike = "#{current.apparentTemperature.to_i} F (#{c_feels} C)"
 
-      data.reply = "DS ∴ #{ac.name}, #{ac.c} " \
+      data.reply = "DS ∴ #{ac.formatted_address} " \
                   "≈ #{current.summary} #{tempstring} " \
                   "≈ Feels like #{feelslike} " \
                   "≈ Humidity: #{current.relative_humidity} " \
-                  "≈ Pressure: #{current.pressure} psi (#{p} kPa) " \
+                  "≈ Pressure: #{p.convert_to('[psi]').to_f.round(2)} psi (#{p.to_f} kPa) " \
                   "≈ Wind: gusts upto #{current.windGust} mph (#{gusts} km/h) ≈ Alerts: #{alerts} ∴"
 
         return data
@@ -276,14 +278,13 @@ module Plugins
       temp = "#{f.round(2)} F (#{data.temperature.value.to_i.round(2)} C) "
       wind = "Gusts: #{data.windGust.value} avg: #{data.windSpeed.value.to_i.round(2)}"
       feelslike = "#{data.windChill.value.to_i.round(2)} C"
-      pressure_in = ((data.barometricPressure.value.to_i * 0.00014503773773) * 100).round(2)
-      pressure = (data.barometricPressure.value.to_i / 100).round(2)
+      pressure = Unitwise(data.barometricPressure.value.to_f+101325, 'Pa')
 
-      data.reply = "NOAA ∴ #{ac.name} " \
+      data.reply = "NOAA ∴ #{ac.formatted_address} " \
                   "≈ #{data.textDescription} #{temp} " \
                   "≈ Feels like #{feelslike} " \
                   "≈ Humidity: #{data.relativeHumidity.value.round(2)} " \
-                  "≈ Pressure: #{pressure_in} psi (#{pressure} kPa) " \
+                  "≈ Pressure: #{pressure.convert_to('[psi]').to_f.round(2)} psi (#{pressure.convert_to('kPa').to_f} kPa) " \
                   "≈ Wind: #{wind} ≈ Alerts:  ∴"
       return data
     # rescue

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Liothen