zetabot 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8db9cc936475a5e7e21340224aa39b92ff76577124d1471f87fd7f8c7c1dc47e
-  data.tar.gz: bd331a8c2bc1e2ea13c9d92bcae1a9941d8a573a3c35e7ea22a47f12105a1227
+  metadata.gz: 5ca813b62e8520169331f3e978e82d7ae782c96727362bc21125cd973e164b8a
+  data.tar.gz: f34bf6917e3015268b7dfd16684731a79ba27f987810b1fcd2ad59a9d4609071
 SHA512:
-  metadata.gz: 0c357cc89ea106c23fd46062583bd4b1940b0ee507baa001f7847839bdda3c938cdd069f2cd075a37d618f5d9d3cb5f1bfbd57f0c814dc67814548b15085ed1d
-  data.tar.gz: 75fa53a200ac74e00c32ea2042c89aac7e30d18d5cc4540eb328b8fd06e61bb001e0aa1f58c44028986eba4312b8a1b4a387f4319080d0ac036412b4238687b8
+  metadata.gz: 2965b9a7c3858b703d606cb444bf76ce707a105dda0c2a51335d255b209264cf94abe44e626658d55baab6da14e4274764edda230da117c2a7a60dedd6ab67fb
+  data.tar.gz: b632e398611d098b88ac692f88c0c7833900a1117e773685c8c869926b0c4832c14b1052904a235677b65aea85131851d1b9b85ab224d12fab62f6c1c1e8d86b

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (2.0.7)
+    zetabot (2.0.9)
       actionview
       chronic
       chronic_duration
@@ -205,7 +205,6 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mini_portile2 (2.8.0)
     minitest (5.15.0)
     mkfifo (0.1.1)
     multi_json (1.15.0)
@@ -216,8 +215,7 @@ GEM
       connection_pool (~> 2.2)
     net_http_timeout_errors (0.3.5)
     netrc (0.11.0)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
     numerizer (0.1.1)
     oauth2 (1.4.9)
@@ -318,7 +316,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.11)
+  bundler (~> 2.3)
   irbtools
   rake (~> 10.0)
   rspec (~> 3.0)

data/Zeta.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "irbtools"

data/lib/Zeta/plugins/fml.rb

@@ -23,7 +23,7 @@ module Plugins
     def fetch_random_fml
       url = 'http://www.fmylife.com/random'
       # fml_story = Nokogiri.HTML(RestClient.get(url)).at('div.article').text.strip
-      fml_story = Nokogiri.HTML(open(url).read).at('div.article').text.strip
+      fml_story = Nokogiri.HTML(RestClient.get(url).body).at('div.article').text.strip
       fml_story[/^Today, (.+) FML/]
     rescue => e
       e.message

data/lib/Zeta/plugins/gif.rb

@@ -33,8 +33,10 @@ module Plugins
     private
 
     def search(query)
-      url = URI.encode "http://www.gifbin.com/search/#{query}/"
-      doc = Nokogiri::HTML( open(url) )
+      parser = URI::Parser.new
+      url = parser.escape "http://www.gifbin.com/search/#{query}/"
+
+      doc = Nokogiri::HTML( RestClient.get(url).body )
       e = doc.css('.thumbs li').length
       return "No Results Found" if e == 0
       result = doc.css('.thumbs li')[rand(e)].css('a img').attribute('src').text.gsub(/tn_/, '')
@@ -42,16 +44,20 @@ module Plugins
     end
 
     def gifbin
-      url = URI.encode 'http://www.gifbin.com/random'
-      doc = Nokogiri.HTML(open url)
+      parser = URI::Parser.new
+
+      url = parser.escape 'http://www.gifbin.com/random'
+      doc = Nokogiri.HTML(RestClient.get(url).body)
       doc.css('div#gifcontainer a img').attribute('src').text
     end
 
     def imgur
       # Cache results for 1 hour
       if @imgurray.empty? || @last_update >= (Time.now + 3600)
-        url = URI.encode('http://reddit.com/r/gifs.json')
-        doc = JSON.load(open(url))
+        parser = URI::Parser.new
+
+        url = parser.escape('http://reddit.com/r/gifs.json')
+        doc = JSON.load(RestClient.get(url).body)
 
         doc['data']['children'].each_with_index do |post, index|
           if doc['data']['children'][index]['data']['url'].to_s =~ /imgur/

data/lib/Zeta/plugins/movie.rb

@@ -25,11 +25,14 @@ module Plugins
 
     private
     def query_movie(m)
+      parser = URI::Parser.new
+
       year = m[/:\d+/].gsub(/:/, '') if m[/:\d+/]
-      movie = URI.encode(m.gsub(/:\d+/, ''))
+      movie = parser.escape(m.gsub(/:\d+/, ''))
+
       data = JSON.parse(
           # RestClient.get("http://www.omdbapi.com/?t=#{movie}&y=#{year}")
-          open("http://www.omdbapi.com/?t=#{movie}&y=#{year}&apikey=#{Config.secrets[:omdb]}").read
+        RestClient.get("http://www.omdbapi.com/?t=#{movie}&y=#{year}&apikey=#{Config.secrets[:omdb]}").body
       )
       OpenStruct.new(
           title:       data['Title'],

data/lib/Zeta/plugins/snooper.rb

@@ -51,8 +51,9 @@ module Plugins
           react_on: :channel
 
     def execute(msg, url)
+      parser = URI::Parser.new
       url = "http://#{url}" unless url=~/^https?:\/\//
-      url = URI.encode(url)
+      url = parser.escape(url)
 
       # Ignore items on blacklist
       # blacklist = DEFAULT_BLACKLIST.dup

data/lib/Zeta/plugins/urban.rb

@@ -23,10 +23,11 @@ module Plugins
 
 
     def wotd(m)
-      url = URI.encode "http://www.urbandictionary.com/"
+      parser = URI::Parser.new
+      url = parser.escape("http://www.urbandictionary.com/")
+
       doc = Nokogiri.HTML(
-          # RestClient.get(url)
-          open(url)
+          RestClient.get(url).body
       )
       word = doc.at_css('.word').text.strip[0..40]
       meaning = doc.at_css('.meaning').text.strip[0..450] + "... \u263A"
@@ -35,13 +36,12 @@ module Plugins
 
     private
     def search(query)
-      url = URI.encode "http://api.urbandictionary.com/v0/define?term=#{query}"
-      # Nokogiri.HTML(open url).at_css('.meaning').text.strip[0..500]
+      parser = URI::Parser.new
+      url = parser.escape "http://api.urbandictionary.com/v0/define?term=#{query}"
 
       # Load API data
       data = JSON.parse(
-          #RestClient.get(url)
-          open(url).read
+          RestClient.get(url).body
       )
 
       # Return if nothing is found

data/lib/Zeta/plugins/weather.rb

@@ -87,9 +87,9 @@ module Plugins
       location = CGI.escape(location)
 
       ac = JSON.parse(
-        open(
+        RestClient.get(
           "https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}"
-        ).read, object_class: OpenStruct
+        ).body, object_class: OpenStruct
       )
 
       return nil if ac.results.nil? ## Unable to locate
@@ -100,8 +100,8 @@ module Plugins
 
       # Get Data
       data = JSON.parse(
-        open("https://api.openweathermap.org/data/2.5/weather?lat=#{lat}&lon=#{lon}&APPID=#{Config.secrets[:owm]}"
-        ).read, object_class: OpenStruct
+        RestClient.get("https://api.openweathermap.org/data/2.5/weather?lat=#{lat}&lon=#{lon}&APPID=#{Config.secrets[:owm]}"
+        ).body, object_class: OpenStruct
       )
 
       temp = Unitwise(data.main.temp, 'K') # Data is given in kelvin
@@ -124,7 +124,7 @@ module Plugins
       location = CGI.escape(location)
 
       ac = JSON.parse(
-        open("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").read,
+        RestClient.get("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").body,
         object_class: OpenStruct
       )
       return nil if ac.results.nil? ## Unable to locate
@@ -134,7 +134,7 @@ module Plugins
       lon = ac.geometry.location.lng
 
       data = JSON.parse(
-        open("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}").read,
+        RestClient.get("https://api.darksky.net/forecast/#{Config.secrets[:darksky]}/#{lat},#{lon}").body,
         object_class: OpenStruct
       )
       data.ac = ac
@@ -165,7 +165,7 @@ module Plugins
       location = CGI.escape(location)
 
       ac = JSON.parse(
-        open("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").read,
+        RestClient.get("https://maps.googleapis.com/maps/api/geocode/json?address=#{location}&key=#{Config.secrets[:google]}").body,
         object_class: OpenStruct
       )
       return nil if ac.results.nil? ## Unable to locate
@@ -175,13 +175,13 @@ module Plugins
       lon = ac.geometry.location.lng
 
       stations = JSON.parse(
-        open("https://api.weather.gov/points/#{lat},#{lon}/stations/").read
+        RestClient.get("https://api.weather.gov/points/#{lat},#{lon}/stations/").body
       ) rescue nil
 
       return nil if stations.nil? ## Unable to find station. probably not in the USA
 
       parsed = JSON.parse(
-        open("#{CGI.escape(stations['observationStations'][0])}/observations/current").read,
+        RestClient.get("#{CGI.escape(stations['observationStations'][0])}/observations/current").body,
         object_class: OpenStruct
       )
 

data/lib/Zeta/plugins/wolfram.rb

@@ -20,7 +20,7 @@ module Plugins
       # Rescue in case something goes wrong
       begin
         url = "http://api.wolframalpha.com/v2/query?input=#{CGI.escape(query)}&appid=#{Config.secrets[:wolfram]}&primary=true&format=plaintext"
-        request = open(url).read
+        request = RestClient.get(url).body
 
         data = Crack::XML.parse(request)
 

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Liothen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -566,6 +566,7 @@ extra_rdoc_files: []
 files:
 - ".bundle/config"
 - ".gitignore"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt