zetabot 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24c2b1f1f7f0864b8d29fa1956542e1354eba3bb924505c3ea2b04a7acbf25dc
-  data.tar.gz: df10c4c2335805d7e27d15dcc96add74c73d8e8c81b7195669392c5ea3a6d247
+  metadata.gz: 36b57e6ff16c98c38ea3c9030b4117ae756f014c801c5ae3bda4337f0fde5357
+  data.tar.gz: 2e9de7aae7a9dbf84910a4802b2994443efb8927fff89f5ab203da59e801f996
 SHA512:
-  metadata.gz: b5f8bf97a42a36a0229a8f7b746bcadee0667cd198210658cb448a7dad8180166c07fd70b0aa67845c1e23221feed8f5d0c7b0add6bf2c8d10d1208ddea1974f
-  data.tar.gz: 8a179ea68669fa62ea1c14130da734bfba740d4287b3ebbc0a690e9f8e8a83f4af89ce83de0cd385f61ee82b7e53a1b0770734f24c75546ed559620ff0f3ad71
+  metadata.gz: ee301d2f5ad8919a5f1433cc1ccd246fc77d13032f8fa75e1435fe832536dcd0cae1f511baccbaab8748905f32679a6031dbda5ee9b7c559ee057d07e31eb4fc
+  data.tar.gz: a037bd7354fa2984dec90982077e17875b3cd35c4415e794a13d20483d4c5bbe8df993bba23f91d0b881351562852036fdae1b6805bd2a5de99f235b05cc49ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (2.0.2)
+    zetabot (2.0.3)
       actionview
       chronic
       chronic_duration
@@ -42,19 +42,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+      zeitwerk (~> 2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
     ansi (1.5.0)
     ast (2.4.0)
@@ -81,7 +82,7 @@ GEM
     connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    crass (1.0.5)
     daemons (1.3.1)
     debugging (1.1.1)
       binding.repl (~> 3.0)
@@ -90,7 +91,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     destructor (0.1.0)
     diff-lcs (1.3)
-    discourse_api (0.36.0)
+    discourse_api (0.38.0)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       rack (>= 1.6)
@@ -100,18 +101,18 @@ GEM
     dronebl.rb (0.1.0.0)
       httparty (~> 0.13)
       nokogiri (~> 1.6)
-    erubi (1.8.0)
+    erubi (1.9.0)
     every_day_irb (2.1.0)
       cd (~> 1.0)
-    fancy_irb (1.1.0)
+    fancy_irb (1.2.1)
       paint (>= 0.9, < 3.0)
       unicode-display_width (~> 1.1)
-    faraday (0.15.4)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.11.1)
-    geocoder (1.5.1)
+    ffi (1.11.3)
+    geocoder (1.5.2)
     gist (5.0.0)
     github_api (0.18.2)
       addressable (~> 2.4)
@@ -125,26 +126,28 @@ GEM
     hashery (2.1.2)
     hashie (3.6.0)
     hirb (0.7.3)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.17.0)
+    httparty (0.17.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     humanize-bytes (2.2.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     interactive_editor (0.0.11)
       spoon (>= 0.0.1)
     ipaddress (0.8.3)
-    irb (1.0.0)
-    irbtools (3.0.0)
+    irb (1.1.0)
+      reline (>= 0.0.1)
+    irbtools (3.0.1)
       binding.repl (~> 3.0)
       clipboard (~> 1.3)
       code (>= 0.9.2, < 2.0)
       coderay (~> 1.1)
       debugging (~> 1.1)
       every_day_irb (~> 2.0)
-      fancy_irb (~> 1.1)
+      fancy_irb (~> 1.2, >= 1.2.1)
       hirb (~> 0.7, >= 0.7.3)
       interactive_editor (~> 0.0, >= 0.0.10)
       irb (>= 0.9.6)
@@ -160,7 +163,7 @@ GEM
     iso8601 (0.9.1)
     jwt (2.2.1)
     liner (0.2.4)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mechanize (2.7.6)
@@ -176,13 +179,13 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.9.2)
     methodfinder (2.2.1)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.13.0)
     mkfifo (0.1.1)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     net-http-digest_auth (1.4.1)
@@ -190,12 +193,12 @@ GEM
       connection_pool (~> 2.2)
     net_http_timeout_errors (0.3.5)
     netrc (0.11.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
     numerizer (0.1.1)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -206,41 +209,43 @@ GEM
       ruby-ll (~> 2.1)
     ori (0.1.0)
     os (1.0.1)
-    paint (2.1.0)
+    paint (2.1.1)
     parslet (1.8.2)
-    pdf-reader (2.2.1)
+    pdf-reader (2.4.0)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
     persist (1.0.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rack (2.0.7)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rake (10.5.0)
     recursive-open-struct (1.1.0)
-    rest-client (2.0.2)
+    reline (0.0.7)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     ruby-ll (2.1.2)
       ansi
       ast
@@ -253,9 +258,9 @@ GEM
     spoon (0.0.6)
       ffi
     tag_formatter (0.0.3)
-    temple (0.8.1)
+    temple (0.8.2)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     time-lord (1.0.1)
     ttfunk (1.5.1)
     tzinfo (1.2.5)
@@ -274,12 +279,13 @@ GEM
       net_http_timeout_errors (~> 0.3.0)
       oga (~> 2.7)
     webrobots (0.1.2)
-    wirb (2.1.2)
+    wirb (2.2.0)
       paint (>= 0.9, < 3.0)
     wolfram (0.2.1)
       nokogiri (>= 1.4.3)
     wolfram-alpha (0.3.1)
       nokogiri
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

data/lib/Zeta/plugins/weather.rb

@@ -15,8 +15,8 @@ module Plugins
     enable_acl
 
     set(
-        plugin_name: "Weather",
-        help: "Get the Weather?.\nUsage: `?weather`\nUsage: `?wx zip` `?w zip` `?setw zip` `?forecast zip`",
+      plugin_name: "Weather",
+      help: "Get the Weather?.\nUsage: `?weather`\nUsage: `?wx zip` `?w zip` `?setw zip` `?forecast zip`",
     )
 
     match /w (.+)/, method: :weather
@@ -35,7 +35,7 @@ module Plugins
     end
 
     # ?w <location>
-    def weather(msg, query=nil)
+    def weather(msg, query = nil)
       # Pull data source and scrub query
       # Lookup user from pstore
       if !@store[msg.user.to_s].nil? && query.nil?
@@ -53,7 +53,9 @@ module Plugins
         true_src = @api_src.include?(src) ? src : 'darksky'
         data = send("#{true_src}_src", query)
       end
+
       return msg.reply "No results found for #{query} with #{true_src} source." if data.nil?
+
       # return msg.reply 'Problem getting data. Try again later.' if data.nil?
       msg.reply(data.reply)
     end
@@ -82,23 +84,24 @@ module Plugins
 
     # Open Weather map - https://openweathermap.org/api
     def owm_src(location)
+      location = CGI.escape(location)
+
       ac = JSON.parse(
-          open(URI.encode("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}")).read,
-          object_class: OpenStruct
+        open(
+          "https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}"
+        ).read, object_class: OpenStruct
       )
 
       return nil if ac.results.nil? ## Unable to locate
 
       ac = ac.results[0]
-      lat = ac.geometry.location.lat
-      lon = ac.geometry.location.lng
+      lat = CGI.escape(ac.geometry.location.lat)
+      lon = CGI.escape(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]}")
-          ).read,
-          object_class: OpenStruct
+        open("https://api.openweathermap.org/data/2.5/weather?lat=#{lat}&lon=#{lon}&APPID=#{Config.secrets[:owm]}"
+        ).read, object_class: OpenStruct
       )
 
       temp = Unitwise(data.main.temp, 'K') # Data is given in kelvin
@@ -106,34 +109,33 @@ module Plugins
       wind = Unitwise(data.wind.speed, 'kilometer')
 
       data.reply = "OWM ∴ #{ac.formatted_address} " \
-                  "≈ #{(Time.now.utc + data.timezone.seconds).strftime("%c") } " \
+                  "≈ #{(Time.now.utc + data.timezone.seconds).strftime("%c")} " \
                   "≈ #{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}% " \
+                  "≈ Humidity: #{data.main.humidity.to_i.round(2)}% " \
                   "≈ Pressure: #{pressure.convert_to('[in_i\'Hg]').to_f.round(2)} in/Hg " \
                   "(#{pressure.convert_to("kPa").to_f.round(2)} kPa) " \
                   "≈ Wind: #{wind.convert_to('mile').to_i.round(2)} mph (#{wind.to_i.round(2)} km/h) ∴"
 
       return data
-
     end
 
     # DarkSky - https://darksky.net/dev
     def darksky_src(location)
+      location = CGI.escape(location)
+
       ac = JSON.parse(
-          open(URI.encode("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}")).read,
-          object_class: OpenStruct
+        open("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").read,
+        object_class: OpenStruct
       )
       return nil if ac.results.nil? ## Unable to locate
 
       ac = ac.results[0]
-      lat = ac.geometry.location.lat
-      lon = ac.geometry.location.lng
+      lat = CGI.escape(ac.geometry.location.lat)
+      lon = CGI.escape(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("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}").read,
+        object_class: OpenStruct
       )
       data.ac = ac
       current = data.currently
@@ -146,45 +148,46 @@ module Plugins
       tempstring = "#{current.temperature.to_i} F (#{c} C)"
 
       data.reply = "DS ∴ #{ac.formatted_address} " \
-                  "≈ #{ TZInfo::Timezone.get(data.timezone).now.strftime("%c") } " \
+                  "≈ #{TZInfo::Timezone.get(data.timezone).now.strftime("%c")} " \
                   "≈ #{current.summary} #{tempstring} " \
-                  "≈ Humidity: #{current.humidity * 100}% " \
+                  "≈ Humidity: #{(current.humidity * 100).round(2)}% " \
                   "≈ Pressure: #{p.convert_to('[in_i\'Hg]').to_f.round(2)} in/Hg " \
                   "(#{p.convert_to("kPa").to_f.round(2)} kPa) " \
                   "≈ Wind: gusts upto #{current.windGust} mph (#{gusts} km/h) ≈ Alerts: #{alerts} ∴"
 
-        return data
+      return data
       # rescue
       #   return nil
     end
 
     # NOAA - https://graphical.weather.gov/xml/
     def noaa_src(location)
+      location = CGI.escape(location)
+
       ac = JSON.parse(
-          open(URI.encode("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}")).read,
-          object_class: OpenStruct
+        open("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").read,
+        object_class: OpenStruct
       )
       return nil if ac.results.nil? ## Unable to locate
 
       ac = ac.results[0]
-      lat = ac.geometry.location.lat
-      lon = ac.geometry.location.lng
+      lat = CGI.escape(ac.geometry.location.lat)
+      lon = CGI.escape(ac.geometry.location.lng)
 
       stations = JSON.parse(
-          open(URI.encode("https://api.weather.gov/points/#{lat},#{lon}/stations/")).read
+        open(URI.encode("https://api.weather.gov/points/#{lat},#{lon}/stations/")).read
       ) rescue nil
 
       return nil if stations.nil? ## Unable to find station. probably not in the USA
 
       parsed = JSON.parse(
-          open(URI.encode("#{stations['observationStations'][0]}/observations/current")).read,
-          object_class: OpenStruct
+        open("#{CGI.escape(stations['observationStations'][0])}/observations/current").read,
+        object_class: OpenStruct
       )
 
-
       data = parsed.properties
       data.ac = ac
-      f = data.temperature.value * 9/5
+      f = data.temperature.value * 9 / 5
       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"
@@ -198,13 +201,11 @@ module Plugins
                   "(#{pressure.convert_to("kPa").to_f.round(2)} kPa) " \
                   "≈ Wind: #{wind} ≈ Alerts:  ∴"
       return data
-    # rescue
-    #   data.reply = "Error fetching data"
+      # rescue
+      #   data.reply = "Error fetching data"
     end
-
   end
 end
 
-
 # AutoLoad
 Bot.config.plugins.plugins.push Plugins::Weather

data/lib/Zeta/plugins/wolfram.rb

@@ -1,4 +1,5 @@
 require 'crack'
+require 'cgi'
 
 module Plugins
   class Wolfram
@@ -18,8 +19,8 @@ module Plugins
     def calculate(m, query)
       # Rescue incase something goes wrong
       begin
-        debug 'Query: ' + query
-        url = URI.encode "http://api.wolframalpha.com/v2/query?input=#{query}&appid=#{Config.secrets[:wolfram]}&primary=true&format=plaintext"
+        debug 'Query: ' + Cgi.escape(query)
+        url = "http://api.wolframalpha.com/v2/query?input=#{CGI.escape(query)}&appid=#{Config.secrets[:wolfram]}&primary=true&format=plaintext"
         request = open(url).read
         data = Crack::XML.parse(request)
         pod0 = data['queryresult']['pod'][0]['subpod']['plaintext'].strip
@@ -37,8 +38,6 @@ module Plugins
         m.reply 'Unable to get a results'
       end
     end
-
-  ####
   end
 end
 

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Liothen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler