Use URI::DEFAULT_PARSER.unescape() instead of CGI.unescape()

It never felt quite right using CGI and it incorrectly changes '+' to space.

Author: njh

lib/mqtt/client.rb

@@ -1,6 +1,5 @@
 autoload :OpenSSL, 'openssl'
 autoload :URI, 'uri'
-autoload :CGI, 'cgi'
 
 # Client class for talking to an MQTT server
 module MQTT
@@ -592,8 +591,8 @@ def parse_uri(uri)
       {
         :host => uri.host,
         :port => uri.port || nil,
-        :username => uri.user ? CGI.unescape(uri.user) : nil,
-        :password => uri.password ? CGI.unescape(uri.password) : nil,
+        :username => uri.user ? URI::DEFAULT_PARSER.unescape(uri.user) : nil,
+        :password => uri.password ? URI::DEFAULT_PARSER.unescape(uri.password) : nil,
         :ssl => ssl
       }
     end