zetabot 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147e2c128ff44a016567129f0ce7a01348379ff8
-  data.tar.gz: 715df00d50bd68934a67bcb5bfa83ff0b5f0cad0
+  metadata.gz: 0efc452957163d009f8a24a3518abdfdadf9fa66
+  data.tar.gz: e2800b1af4d5766614cd99233e58ce13efd7e4f8
 SHA512:
-  metadata.gz: dd0b11cb0e6cae2bf916a297fd204236a2179c0bc0bb67822266132add149d696e5fa826bc2694f1c336b0d00e5c49652033bd5ec96a5532f0a091920644ee83
-  data.tar.gz: 23b301230233e16a0049d0e4f961d9b276485b2cad70038f790087b73a0caf29e2fee1d976b01f936aa0576d2918ea7c544233cfba8d88ec54939a925223fecb
+  metadata.gz: b5449a4aa4e51d97fd552f398752f4a0fea592d4c1ee258355428f55230d2eb8b45fc6858f229bf3efb63201e0bbe6eb62cbdba1fc7bb1dd3f5c160163fa6a83
+  data.tar.gz: f7d139957d49f59f597ac498e483699bb54733063f61d0ab9219af651de21c96ec0301e9cb0acf3e72d0859fad2711629b44b20459bdebfc3b0024de5cb13016

data/Gemfile.lock

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

data/lib/Zeta/plugins/snooper.rb

@@ -26,6 +26,7 @@
 require 'video_info'
 require 'mechanize'
 require 'action_view'
+require 'timeout'
 
 module Plugins
   class Snooper
@@ -121,7 +122,17 @@ module Plugins
 
     def match_other(msg,url)
       begin
-        html = Mechanize.start { |m| Nokogiri::HTML(m.get(url).content, nil, 'utf-8') }
+        html = Mechanize.start { |m|
+          # Timeout longwinded pages
+          m.max_history = 1
+          m.read_timeout = 4
+          m.max_file_buffer = 2_097_152
+
+          # Parse the HTML
+          Timeout::timeout(10) { Nokogiri::HTML(m.get(url).content, nil, 'utf-8') }
+        }
+
+        # Reply Blocks
         if node = html.at_xpath("html/head/title")
           msg.reply("‡ #{node.text.lstrip.gsub(/\r|\n|\n\r/, ' ')[0..300]}")
         end
@@ -131,9 +142,13 @@ module Plugins
         end
 
         info "[200] #{msg.user} - #{url}"
+      rescue Timeout::Error
+        error "[408] #{msg.user} - #{url}"
+        msg.reply 'URL was forced Timed out'
       rescue => e
         error e
         error "[404] #{msg.user} - #{url}"
+        msg.safe_reply 'I am unable to load that URL'
       end
     end
 

data/lib/Zeta/plugins/wolfram.rb

@@ -19,7 +19,7 @@ module Plugins
       # Rescue incase something goes wrong
       begin
         debug 'Query: ' + query
-        url = URI.encode "http://api.wolframalpha.com/v2/query?input=#{query}&appid=#{ENV['ZETA_WOLFRAM']}&primary=true&format=plaintext"
+        url = URI.encode "http://api.wolframalpha.com/v2/query?input=#{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
@@ -31,7 +31,7 @@ module Plugins
         elsif pod0.length > 400
           m.user.send("#{pod0} #{pod1}", true)
         else
-          m.reply "#{pod0} #{pod1}"
+          m.reply "#{pod0} = #{pod1}"
         end
       rescue
         m.reply 'Unable to get a results'

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Liothen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler