httputil: remove obsolete version_1_2 declaration

[user/henk/code/ruby/rbot.git] / lib / rbot / core / utils / httputil.rb

diff --git a/lib/rbot/core/utils/httputil.rb b/lib/rbot/core/utils/httputil.rb
index f7871e5be7dfb34d28a7d84a2c669c6efcff4a5e..fb275547169efefce78632b9eb62d3efc0daf39c 100644 (file)
--- a/lib/rbot/core/utils/httputil.rb
+++ b/lib/rbot/core/utils/httputil.rb
@@ -13,20 +13,9 @@ require 'net/http'
 require 'cgi'
 
 begin
-  require 'net/https'
+  require 'nokogiri'
 rescue LoadError => e
-  error "Couldn't load 'net/https':  #{e}"
-  error "Secured HTTP connections will fail"
-  # give a nicer error than "undefined method `use_ssl='"
-  ::Net::HTTP.class_eval <<-EOC
-    define_method :use_ssl= do |val|
-      # does anybody really set it to false?
-      break if !val
-      raise _("I can't do secure HTTP, sorry (%{msg})") % {
-        :msg => e.message
-      }
-    end
-  EOC
+  error "No nokogiri library found, some features might not be available!"
 end
 
 # To handle Gzipped pages
@@ -163,11 +152,18 @@ module ::Net
 
       return self.body_to_utf(self.decompress_body(partial))
     end
+
+    def xpath(path)
+      document = Nokogiri::HTML.parse(self.body)
+      document.xpath(path)
+    end
+
+    def to_json
+      JSON::parse(self.body)
+    end
   end
 end
 
-Net::HTTP.version_1_2
-
 module ::Irc
 module Utils
 
@@ -649,7 +645,11 @@ class HttpUtil
       resp = get_response(uri, options, &block)
       raise "http error: #{resp}" unless Net::HTTPOK === resp ||
         Net::HTTPPartialContent === resp
-      return resp.body
+      if options[:resp]
+        return resp
+      else
+        return resp.body
+      end
     rescue Exception => e
       error e
     end