lib/awesome_bot/result.rb in awesome_bot-1.9.1 vs lib/awesome_bot/result.rb in awesome_bot-1.10.0

@@ -19,40 +19,48 @@
       return if @w.nil?
       @links_white_listed,
       @links = links.partition { |u| AwesomeBot.white_list @w, u }
     end
 
-    def statuses_issues(allow_redirects = false, allow_timeouts = false)
+    def statuses_issues(options=nil)
+      options = {
+        'timeout'=>false,
+        'ssl'=>false,
+        'redirect'=>false
+      } if options.nil?
+
       s = status.select { |x| x['status'] != 200 }
-      r = s.reject { |x| AwesomeBot.status_is_redirected? x['status'] }
-      t = s.reject do |x|
-        (x['status'] == STATUS_ERROR) && ((x['error'].message == 'Net::ReadTimeout') || (x['error'].message == 'execution expired'))
+
+      if options['timeout']
+        s = s.reject do |x|
+          ( (x['error'].message == 'Net::ReadTimeout') || (x['error'].message == 'execution expired') || (x['error'].message.include? 'timed out') ) unless x['error'].nil?
+        end
       end
 
-      if (allow_redirects == false) && (allow_timeouts == false)
-        return s
-      elsif (allow_redirects == true) && (allow_timeouts == false)
-        return r
-      elsif (allow_redirects == false) && (allow_timeouts == true)
-        return t
-      else
-        return r.reject do |x|
-          (x['status'] == STATUS_ERROR) && ((x['error'].message == 'Net::ReadTimeout') || (x['error'].message == 'execution expired'))
+      if options['redirect']
+        s = s.reject { |x| AwesomeBot.status_is_redirected? x['status'] }
+      end
+
+      if options['ssl']
+        s =  s.reject do |x|
+          ( (x['error'].message.include? 'server certificate') || (x['error'].message.include? 'SSL_connect') ) unless x['error'].nil?
         end
       end
+
+      s
     end
 
-    def success(allow_redirects = false, allow_timeouts = false)
-      success_dupe && success_links(allow_redirects, allow_timeouts)
+    def success(options)
+      success_dupe && success_links(options)
     end
 
     def success_dupe
       return true if skip_dupe
       links.uniq.count == links.count
     end
 
-    def success_links(allow_redirects = false, allow_timeouts = false)
-      statuses_issues(allow_redirects, allow_timeouts).count == 0
+    def success_links(options)
+      statuses_issues(options).count==0
     end
 
     def white_listing
       !@w.nil?
     end