whois 2.6.3 → 2.6.4

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## Release 2.6.4
+
+* SERVER: Added .CW TLD server.
+
+* SERVER: Updated .GR, .ORG (GH-176), .FO (GH-177) TLD server.
+
+* SERVER: Added .XN--MGBA3A4F16A (ایران., Iran) IDN TLD server.
+
+* NEW: Ability to specify a custom :adapter passing a Symbol instead of an instance of Class.
+
+* NEW: Added full whois.nic.fo parser (GH-177).
+
+* NEW: whois.nic.cz is now a full parser.
+
+* NEW: whois.tld.ee is now a full parser.
+
+* NEW: whois.tznic.or.tz is now a full parser.
+
+* FIXED: whois.neworksolutions.com parser crashes when the contact name is blank.
+
+* FIXED: whois.rnids.rs parser should support statuses Locked, Expired, and In Transfer.
+
+* FIXED: whois.nic.gs parser should support status `Excluded - Pending Delete - Restorable` (GH-180). [Thanks @smith]
+
+* CHANGED: Deprecated options[:web] for :web adapter in favor of options[:url].
+
+* CHANGED: Removed Pir adaper, the registry is a thick whois server.
+
+* CHANGED: Changed whois.publicinterestregistry.com to whois.pir.org (GH-176).
+
+* CHANGED: whois.tcinet.ru parser learned how to parse contact URLs (GH-150).
+
+* CHANGED: Removed support for .gemtest and removed /spec folder from the packaged gem.
+
 
 ## Release 2.6.3
 
@@ -1381,7 +1415,7 @@ WARNING: Whois >= 1.5.0 requires Ruby 1.8.7 or newer.
 
 * FIXED: ./bin/ruby-whois uses the Gem instead of current version (closes REDMINE-344)
 
-* FIXED: Whois::Client doesn't cast qstring to_s (closes REDMINE-339)
+* FIXED: Whois::Client doesn't cast query to_s (closes REDMINE-339)
 
 * FIXED: Whois::Parser doesn't detect preloaded parsers. Improved performances skipping unnecessary 'require'. (closes REDMINE-340)
 

data/bin/ruby-whois

@@ -18,7 +18,7 @@ OptionParser.new do |opts|
   opts.separator    ""
   opts.separator    "Options:"
 
-  opts.on("-t", "--timeout [SECONDS]", Integer, "Specify the timeout value") do |seconds|
+  opts.on("-t", "--timeout [SECONDS]", Integer, "specify the timeout value") do |seconds|
     options.timeout = seconds
   end
 
@@ -27,7 +27,7 @@ OptionParser.new do |opts|
     exit
   end
 
-  opts.on_tail("-v", "--version", "Show version") do
+  opts.on_tail("-v", "--version", "show version") do
     puts "#{Whois::NAME} #{Whois::VERSION}"
     exit
   end
@@ -45,11 +45,11 @@ OptionParser.new do |opts|
   end
 end
 
-qstring = ARGV.shift
+object = ARGV.shift
 
 begin
   @client = Whois::Client.new(:timeout => options.timeout)
-  puts @client.query(qstring)
+  puts @client.query(object)
 rescue Whois::Error => e
   abort(e.message)
 rescue Timeout::Error => e

data/lib/whois.rb

@@ -24,10 +24,10 @@ module Whois
 
   class << self
 
-    # Queries the WHOIS server for <tt>qstring</tt> and returns
+    # Queries the WHOIS server for <tt>object</tt> and returns
     # the response from the server.
     #
-    # @param  [String] qstring The string to be sent as query parameter.
+    # @param  [String] object The string to be sent as query parameter.
     # @return [Whois::Record] The record containing the response from the WHOIS server.
     #
     # @example
@@ -37,23 +37,23 @@ module Whois
     #   # Equivalent to
     #   Whois::Client.new.query("google.com")
     #
-    def query(qstring)
-      Client.new.query(qstring)
+    def query(object)
+      Client.new.query(object)
     end
 
     alias_method :whois, :query
 
 
-    # Checks whether the object represented by <tt>qstring</tt> is available.
+    # Checks whether the object represented by <tt>object</tt> is available.
     #
     # Warning: this method is only available if a Whois parser exists
-    # for the top level domain of <tt>qstring</tt>.
-    # If no parser exists for <tt>qstring</tt>, you'll receive a
+    # for the top level domain of <tt>object</tt>.
+    # If no parser exists for <tt>object</tt>, you'll receive a
     # warning message and the method will return <tt>nil</tt>.
     # This is a technical limitation. Browse the lib/whois/record/parsers
     # folder to view all available parsers.
     #
-    # @param  [String] qstring The string to be sent as query parameter.
+    # @param  [String] object The string to be sent as query parameter.
     #         It is intended to be a domain name, otherwise this method
     #         may return unexpected responses.
     # @return [Boolean]
@@ -66,25 +66,25 @@ module Whois
     #   Whois.available?("google-is-not-available-try-again-later.com")
     #   # => true
     #
-    def available?(qstring)
-      result = query(qstring).available?
+    def available?(object)
+      result = query(object).available?
       if result.nil?
         warn  "This method is not supported for this kind of object.\n" +
-              "Use Whois.query('#{qstring}') instead."
+              "Use Whois.query('#{object}') instead."
       end
       result
     end
 
-    # Checks whether the object represented by <tt>qstring</tt> is registered.
+    # Checks whether the object represented by <tt>object</tt> is registered.
     #
     # Warning: this method is only available if a Whois parser exists
-    # for the top level domain of <tt>qstring</tt>.
-    # If no parser exists for <tt>qstring</tt>, you'll receive a warning message
+    # for the top level domain of <tt>object</tt>.
+    # If no parser exists for <tt>object</tt>, you'll receive a warning message
     # and the method will return <tt>nil</tt>.
     # This is a technical limitation. Browse the lib/whois/record/parsers folder
     # to view all available parsers.
     #
-    # @param  [String] qstring The string to be sent as query parameter.
+    # @param  [String] string The string to be sent as query parameter.
     #         It is intended to be a domain name, otherwise this method
     #         may return unexpected responses.
     # @return [Boolean]
@@ -97,11 +97,11 @@ module Whois
     #   Whois.registered?("google-is-not-available-try-again-later.com")
     #   # => false
     #
-    def registered?(qstring)
-      result = query(qstring).registered?
+    def registered?(object)
+      result = query(object).registered?
       if result.nil?
         warn  "This method is not supported for this kind of object.\n" +
-              "Use Whois.query('#{qstring}') instead."
+              "Use Whois.query('#{object}') instead."
       end
       result
     end

data/lib/whois/definitions/tlds.rb

@@ -23,26 +23,26 @@ Whois::Server.define :tld, ".us.com", "whois.centralnic.com"
 Whois::Server.define :tld, ".us.org", "whois.centralnic.com"
 Whois::Server.define :tld, ".uy.com", "whois.centralnic.com"
 Whois::Server.define :tld, ".za.com", "whois.centralnic.com"
-Whois::Server.define :tld, ".com", "whois.crsnic.net", { :adapter => Whois::Server::Adapters::Verisign}
+Whois::Server.define :tld, ".com", "whois.crsnic.net", { :adapter => :verisign }
 Whois::Server.define :tld, ".za.net", "whois.za.net"
-Whois::Server.define :tld, ".net", "whois.crsnic.net", { :adapter => Whois::Server::Adapters::Verisign}
+Whois::Server.define :tld, ".net", "whois.crsnic.net", { :adapter => :verisign }
 Whois::Server.define :tld, ".eu.org", "whois.eu.org"
 Whois::Server.define :tld, ".za.org", "whois.za.org"
-Whois::Server.define :tld, ".org", "whois.publicinterestregistry.net", { :adapter => Whois::Server::Adapters::Pir}
+Whois::Server.define :tld, ".org", "whois.pir.org"
 Whois::Server.define :tld, ".edu", "whois.educause.edu"
 Whois::Server.define :tld, ".gov", "whois.nic.gov"
 Whois::Server.define :tld, ".int", "whois.iana.org"
-Whois::Server.define :tld, ".mil", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".mil", nil, { :adapter => :none }
 Whois::Server.define :tld, ".e164.arpa", "whois.ripe.net"
-Whois::Server.define :tld, ".in-addr.arpa", nil, { :adapter => Whois::Server::Adapters::Arpa}
+Whois::Server.define :tld, ".in-addr.arpa", nil, { :adapter => :arpa }
 Whois::Server.define :tld, ".arpa", "whois.iana.org"
 Whois::Server.define :tld, ".aero", "whois.aero"
 Whois::Server.define :tld, ".asia", "whois.nic.asia"
 Whois::Server.define :tld, ".biz", "whois.biz"
-Whois::Server.define :tld, ".cat", "whois.cat", { :adapter => Whois::Server::Adapters::Formatted, :format => "-C US-ASCII ace %s"}
+Whois::Server.define :tld, ".cat", "whois.cat", { :adapter => :formatted, :format => "-C US-ASCII ace %s" }
 Whois::Server.define :tld, ".coop", "whois.nic.coop"
 Whois::Server.define :tld, ".info", "whois.afilias.info"
-Whois::Server.define :tld, ".jobs", "jobswhois.verisign-grs.com", { :adapter => Whois::Server::Adapters::Verisign}
+Whois::Server.define :tld, ".jobs", "jobswhois.verisign-grs.com", { :adapter => :verisign }
 Whois::Server.define :tld, ".mobi", "whois.dotmobiregistry.net"
 Whois::Server.define :tld, ".museum", "whois.museum"
 Whois::Server.define :tld, ".name", "whois.nic.name"
@@ -50,49 +50,49 @@ Whois::Server.define :tld, ".pro", "whois.registrypro.pro"
 Whois::Server.define :tld, ".tel", "whois.nic.tel"
 Whois::Server.define :tld, ".travel", "whois.nic.travel"
 Whois::Server.define :tld, ".ac", "whois.nic.ac"
-Whois::Server.define :tld, ".ad", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".ad", nil, { :adapter => :none }
 Whois::Server.define :tld, ".ae", "whois.aeda.net.ae"
 Whois::Server.define :tld, ".af", "whois.nic.af"
 Whois::Server.define :tld, ".ag", "whois.nic.ag"
 Whois::Server.define :tld, ".ai", "whois.ai"
-Whois::Server.define :tld, ".al", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".al", nil, { :adapter => :none }
 Whois::Server.define :tld, ".am", "whois.nic.am"
-Whois::Server.define :tld, ".an", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".ao", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".aq", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".ar", nil, { :web => "http://www.nic.ar/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".an", nil, { :adapter => :none }
+Whois::Server.define :tld, ".ao", nil, { :adapter => :none }
+Whois::Server.define :tld, ".aq", nil, { :adapter => :none }
+Whois::Server.define :tld, ".ar", nil, { :adapter => :web, :url => "http://www.nic.ar/" }
 Whois::Server.define :tld, ".as", "whois.nic.as"
 Whois::Server.define :tld, ".priv.at", "whois.nic.priv.at"
 Whois::Server.define :tld, ".at", "whois.nic.at"
 Whois::Server.define :tld, ".au", "whois.audns.net.au"
-Whois::Server.define :tld, ".aw", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".ax", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".az", nil, { :web => "http://www.nic.az/AzCheck.htm", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".ba", nil, { :web => "http://www.nic.ba/stream/whois/", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".bb", nil, { :web => "http://whois.telecoms.gov.bb/search_domain.php", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".bd", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://whois.btcl.net.bd/"}
+Whois::Server.define :tld, ".aw", nil, { :adapter => :none }
+Whois::Server.define :tld, ".ax", nil, { :adapter => :none }
+Whois::Server.define :tld, ".az", nil, { :adapter => :web, :url => "http://www.nic.az/AzCheck.htm" }
+Whois::Server.define :tld, ".ba", nil, { :adapter => :web, :url => "http://www.nic.ba/stream/whois/" }
+Whois::Server.define :tld, ".bb", nil, { :adapter => :web, :url => "http://whois.telecoms.gov.bb/search_domain.php" }
+Whois::Server.define :tld, ".bd", nil, { :adapter => :web, :url => "http://whois.btcl.net.bd/"}
 Whois::Server.define :tld, ".be", "whois.dns.be"
-Whois::Server.define :tld, ".bf", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".bf", nil, { :adapter => :none }
 Whois::Server.define :tld, ".bg", "whois.register.bg"
-Whois::Server.define :tld, ".bh", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".bi", nil, { :web => "https://whois.nic.bi/whois.php", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".bh", nil, { :adapter => :none }
+Whois::Server.define :tld, ".bi", nil, { :adapter => :web, :url => "https://whois.nic.bi/whois.php" }
 Whois::Server.define :tld, ".bj", "whois.nic.bj"
-Whois::Server.define :tld, ".bm", nil, { :web => "http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".bn", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".bm", nil, { :adapter => :web, :url => "http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO" }
+Whois::Server.define :tld, ".bn", nil, { :adapter => :none }
 Whois::Server.define :tld, ".bo", "whois.nic.bo"
 Whois::Server.define :tld, ".br", "whois.registro.br"
-Whois::Server.define :tld, ".bs", nil, { :web => "http://www.nic.bs/cgi-bin/search.pl", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".bt", nil, { :web => "http://www.nic.bt/", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".bv", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".bs", nil, { :adapter => :web, :url => "http://www.nic.bs/cgi-bin/search.pl" }
+Whois::Server.define :tld, ".bt", nil, { :adapter => :web, :url => "http://www.nic.bt/" }
+Whois::Server.define :tld, ".bv", nil, { :adapter => :none }
 Whois::Server.define :tld, ".by", 'whois.cctld.by'
-Whois::Server.define :tld, ".bw", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".bz", "whois.afilias-grs.info", { :adapter => Whois::Server::Adapters::Afilias }
+Whois::Server.define :tld, ".bw", nil, { :adapter => :none }
+Whois::Server.define :tld, ".bz", "whois.afilias-grs.info", { :adapter => :afilias }
 Whois::Server.define :tld, ".co.ca", "whois.co.ca"
 Whois::Server.define :tld, ".ca", "whois.cira.ca"
-Whois::Server.define :tld, ".cc", "whois.nic.cc", { :adapter => Whois::Server::Adapters::Verisign }
+Whois::Server.define :tld, ".cc", "whois.nic.cc", { :adapter => :verisign }
 Whois::Server.define :tld, ".cd", "whois.nic.cd"
-Whois::Server.define :tld, ".cf", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".cg", nil, { :web => "http://www.nic.cg/cgi-bin/whois.pl", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".cf", nil, { :adapter => :none }
+Whois::Server.define :tld, ".cg", nil, { :adapter => :web, :url => "http://www.nic.cg/cgi-bin/whois.pl" }
 Whois::Server.define :tld, ".ch", "whois.nic.ch"
 Whois::Server.define :tld, ".ci", "whois.nic.ci"
 Whois::Server.define :tld, ".ck", "whois.nic.ck"
@@ -101,30 +101,31 @@ Whois::Server.define :tld, ".cm", "whois.netcom.cm"
 Whois::Server.define :tld, ".edu.cn", "whois.edu.cn"
 Whois::Server.define :tld, ".cn", "whois.cnnic.cn"
 Whois::Server.define :tld, ".co", "whois.nic.co"
-Whois::Server.define :tld, ".cr", nil, { :web => "http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".cu", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.nic.cu/" }
-Whois::Server.define :tld, ".cv", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.dns.cv/" }
+Whois::Server.define :tld, ".cr", nil, { :adapter => :web, :url => "http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do" }
+Whois::Server.define :tld, ".cu", nil, { :adapter => :web, :url => "http://www.nic.cu/" }
+Whois::Server.define :tld, ".cv", nil, { :adapter => :web, :url => "http://www.dns.cv/" }
+Whois::Server.define :tld, ".cw", nil, { :adapter => :none }
 Whois::Server.define :tld, ".cx", "whois.nic.cx"
-Whois::Server.define :tld, ".cy", nil, { :web => "http://www.nic.cy/nslookup/online_database.php", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".cy", nil, { :adapter => :web, :url => "http://www.nic.cy/nslookup/online_database.php" }
 Whois::Server.define :tld, ".cz", "whois.nic.cz"
-Whois::Server.define :tld, ".de", "whois.denic.de", { :adapter => Whois::Server::Adapters::Formatted, :format => "-T dn,ace %s"}
-Whois::Server.define :tld, ".dj", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.nic.dj/whois.php" }
-Whois::Server.define :tld, ".dk", "whois.dk-hostmaster.dk", { :adapter => Whois::Server::Adapters::Formatted, :format => "--show-handles %s" }
+Whois::Server.define :tld, ".de", "whois.denic.de", { :adapter => :formatted, :format => "-T dn,ace %s" }
+Whois::Server.define :tld, ".dj", nil, { :adapter => :web, :url => "http://www.nic.dj/whois.php" }
+Whois::Server.define :tld, ".dk", "whois.dk-hostmaster.dk", { :adapter => :formatted, :format => "--show-handles %s" }
 Whois::Server.define :tld, ".dm", "whois.nic.dm"
-Whois::Server.define :tld, ".do", nil, { :web => "http://www.nic.do/whois-h.php3", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".do", nil, { :adapter => :web, :url => "http://www.nic.do/whois-h.php3" }
 Whois::Server.define :tld, ".dz", "whois.nic.dz"
 Whois::Server.define :tld, ".ec", "whois.nic.ec"
 Whois::Server.define :tld, ".ee", "whois.tld.ee"
-Whois::Server.define :tld, ".eg", nil, { :web => "http://lookup.egregistry.eg/english.aspx", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".er", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".es", nil, { :web => "https://www.nic.es/", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".et", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".eg", nil, { :adapter => :web, :url => "http://lookup.egregistry.eg/english.aspx" }
+Whois::Server.define :tld, ".er", nil, { :adapter => :none }
+Whois::Server.define :tld, ".es", nil, { :adapter => :web, :url => "https://www.nic.es/" }
+Whois::Server.define :tld, ".et", nil, { :adapter => :none }
 Whois::Server.define :tld, ".eu", "whois.eu"
 Whois::Server.define :tld, ".fi", "whois.fi"
 Whois::Server.define :tld, ".fj", "whois.usp.ac.fj"
-Whois::Server.define :tld, ".fk", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".fm", nil, { :web => "http://www.dot.fm/whois.html", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".fo", "whois.ripe.net"
+Whois::Server.define :tld, ".fk", nil, { :adapter => :none }
+Whois::Server.define :tld, ".fm", nil, { :adapter => :web, :url => "http://www.dot.fm/whois.html" }
+Whois::Server.define :tld, ".fo", "whois.nic.fo"
 Whois::Server.define :tld, ".aeroport.fr", "whois.smallregistry.net"
 Whois::Server.define :tld, ".avocat.fr", "whois.smallregistry.net"
 Whois::Server.define :tld, ".chambagri.fr", "whois.smallregistry.net"
@@ -137,28 +138,28 @@ Whois::Server.define :tld, ".pharmacien.fr", "whois.smallregistry.net"
 Whois::Server.define :tld, ".port.fr", "whois.smallregistry.net"
 Whois::Server.define :tld, ".veterinaire.fr", "whois.smallregistry.net"
 Whois::Server.define :tld, ".fr", "whois.nic.fr"
-Whois::Server.define :tld, ".ga", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".gb", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".ga", nil, { :adapter => :none }
+Whois::Server.define :tld, ".gb", nil, { :adapter => :none }
 Whois::Server.define :tld, ".gd", "whois.adamsnames.tc"
-Whois::Server.define :tld, ".ge", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.registration.ge/" }
-Whois::Server.define :tld, ".gf", nil, { :adapter => Whois::Server::Adapters::Web, :web => "https://www.dom-enic.com/whois.html" }
+Whois::Server.define :tld, ".ge", nil, { :adapter => :web, :url => "http://www.registration.ge/" }
+Whois::Server.define :tld, ".gf", nil, { :adapter => :web, :url => "https://www.dom-enic.com/whois.html" }
 Whois::Server.define :tld, ".gg", "whois.gg"
-Whois::Server.define :tld, ".gh", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.nic.gh/customer/search_c.htm" }
-Whois::Server.define :tld, ".gi", "whois.afilias-grs.info", { :adapter => Whois::Server::Adapters::Afilias }
+Whois::Server.define :tld, ".gh", nil, { :adapter => :web, :url => "http://www.nic.gh/customer/search_c.htm" }
+Whois::Server.define :tld, ".gi", "whois.afilias-grs.info", { :adapter => :afilias }
 Whois::Server.define :tld, ".gl", "whois.nic.gl"
-Whois::Server.define :tld, ".gm", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.nic.gm/htmlpages/whois.htm" }
-Whois::Server.define :tld, ".gn", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".gp", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".gq", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".gr", nil, { :adapter => Whois::Server::Adapters::Web, :web => "https://grweb.ics.forth.gr/whois_en.jsp" }
+Whois::Server.define :tld, ".gm", nil, { :adapter => :web, :url => "http://www.nic.gm/htmlpages/whois.htm" }
+Whois::Server.define :tld, ".gn", nil, { :adapter => :none }
+Whois::Server.define :tld, ".gp", nil, { :adapter => :none }
+Whois::Server.define :tld, ".gq", nil, { :adapter => :none }
+Whois::Server.define :tld, ".gr", nil, { :adapter => :web, :url => "https://grweb.ics.forth.gr/Whois?lang=en" }
 Whois::Server.define :tld, ".gs", "whois.nic.gs"
-Whois::Server.define :tld, ".gt", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.gt/whois.html" }
-Whois::Server.define :tld, ".gu", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://gadao.gov.gu/domainsearch.htm" }
-Whois::Server.define :tld, ".gw", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".gt", nil, { :adapter => :web, :url => "http://www.gt/whois.html" }
+Whois::Server.define :tld, ".gu", nil, { :adapter => :web, :url => "http://gadao.gov.gu/domainsearch.htm" }
+Whois::Server.define :tld, ".gw", nil, { :adapter => :none }
 Whois::Server.define :tld, ".gy", "whois.registry.gy"
 Whois::Server.define :tld, ".hk", "whois.hkirc.hk"
 Whois::Server.define :tld, ".hm", "whois.registry.hm"
-Whois::Server.define :tld, ".hn", "whois.afilias-grs.info", { :adapter => Whois::Server::Adapters::Afilias }
+Whois::Server.define :tld, ".hn", "whois.afilias-grs.info", { :adapter => :afilias }
 Whois::Server.define :tld, ".hr", "whois.dns.hr"
 Whois::Server.define :tld, ".ht", "whois.nic.ht"
 Whois::Server.define :tld, ".hu", "whois.nic.hu"
@@ -168,32 +169,32 @@ Whois::Server.define :tld, ".il", "whois.isoc.org.il"
 Whois::Server.define :tld, ".im", "whois.nic.im"
 Whois::Server.define :tld, ".in", "whois.registry.in"
 Whois::Server.define :tld, ".io", "whois.nic.io"
-Whois::Server.define :tld, ".iq", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".iq", nil, { :adapter => :none }
 Whois::Server.define :tld, ".ir", "whois.nic.ir"
 Whois::Server.define :tld, ".is", "whois.isnic.is"
 Whois::Server.define :tld, ".it", "whois.nic.it"
 Whois::Server.define :tld, ".je", "whois.je"
-Whois::Server.define :tld, ".jm", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".jo", nil, { :web => "http://www.dns.jo/Whois.aspx", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".jp", "whois.jprs.jp", { :adapter => Whois::Server::Adapters::Formatted, :format => "%s/e"}
+Whois::Server.define :tld, ".jm", nil, { :adapter => :none }
+Whois::Server.define :tld, ".jo", nil, { :adapter => :web, :url => "http://www.dns.jo/Whois.aspx" }
+Whois::Server.define :tld, ".jp", "whois.jprs.jp", { :adapter => :formatted, :format => "%s/e" }
 Whois::Server.define :tld, ".ke", "whois.kenic.or.ke"
 Whois::Server.define :tld, ".kg", "whois.domain.kg"
-Whois::Server.define :tld, ".kh", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".kh", nil, { :adapter => :none }
 Whois::Server.define :tld, ".ki", "whois.nic.ki"
-Whois::Server.define :tld, ".km", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".kn", nil, { :web => "http://www.nic.kn/", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".kp", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".km", nil, { :adapter => :none }
+Whois::Server.define :tld, ".kn", nil, { :adapter => :web, :url => "http://www.nic.kn/" }
+Whois::Server.define :tld, ".kp", nil, { :adapter => :none }
 Whois::Server.define :tld, ".kr", "whois.nic.or.kr"
-Whois::Server.define :tld, ".kw", nil, { :web => "http://www.kw/", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".ky", nil, { :web => "http://kynseweb.messagesecure.com/kywebadmin/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".kw", nil, { :adapter => :web, :url => "http://www.kw/" }
+Whois::Server.define :tld, ".ky", nil, { :adapter => :web, :url => "http://kynseweb.messagesecure.com/kywebadmin/" }
 Whois::Server.define :tld, ".kz", "whois.nic.kz"
 Whois::Server.define :tld, ".la", "whois.nic.la"
-Whois::Server.define :tld, ".lb", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.aub.edu.lb/lbdr/"}
-Whois::Server.define :tld, ".lc", "whois.afilias-grs.info", { :adapter => Whois::Server::Adapters::Afilias }
+Whois::Server.define :tld, ".lb", nil, { :adapter => :web, :url => "http://www.aub.edu.lb/lbdr/"}
+Whois::Server.define :tld, ".lc", "whois.afilias-grs.info", { :adapter => :afilias }
 Whois::Server.define :tld, ".li", "whois.nic.li"
 Whois::Server.define :tld, ".lk", "whois.nic.lk"
-Whois::Server.define :tld, ".lr", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".ls", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.co.ls/co.asp"}
+Whois::Server.define :tld, ".lr", nil, { :adapter => :none }
+Whois::Server.define :tld, ".ls", nil, { :adapter => :web, :url => "http://www.co.ls/co.asp"}
 Whois::Server.define :tld, ".lt", "whois.domreg.lt"
 Whois::Server.define :tld, ".lu", "whois.dns.lu"
 Whois::Server.define :tld, ".lv", "whois.nic.lv"
@@ -203,162 +204,163 @@ Whois::Server.define :tld, ".mc", "whois.ripe.net"
 Whois::Server.define :tld, ".md", "whois.nic.md"
 Whois::Server.define :tld, ".me", "whois.meregistry.net"
 Whois::Server.define :tld, ".mg", "whois.nic.mg"
-Whois::Server.define :tld, ".mh", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".mk", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://dns.marnet.net.mk/registar.php" }
-Whois::Server.define :tld, ".ml", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".mm", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".mn", "whois.afilias-grs.info", { :adapter => Whois::Server::Adapters::Afilias }
-Whois::Server.define :tld, ".mo", nil, { :web => "http://www.monic.net.mo/", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".mp", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".mq", nil, { :adapter => Whois::Server::Adapters::Web, :web => "https://www.dom-enic.com/whois.html" }
-Whois::Server.define :tld, ".mr", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".mh", nil, { :adapter => :none }
+Whois::Server.define :tld, ".mk", nil, { :adapter => :web, :url => "http://dns.marnet.net.mk/registar.php" }
+Whois::Server.define :tld, ".ml", nil, { :adapter => :none }
+Whois::Server.define :tld, ".mm", nil, { :adapter => :none }
+Whois::Server.define :tld, ".mn", "whois.afilias-grs.info", { :adapter => :afilias }
+Whois::Server.define :tld, ".mo", nil, { :adapter => :web, :url => "http://www.monic.net.mo/" }
+Whois::Server.define :tld, ".mp", nil, { :adapter => :none }
+Whois::Server.define :tld, ".mq", nil, { :adapter => :web, :url => "https://www.dom-enic.com/whois.html" }
+Whois::Server.define :tld, ".mr", nil, { :adapter => :none }
 Whois::Server.define :tld, ".ms", "whois.nic.ms"
-Whois::Server.define :tld, ".mt", nil, { :web => "https://www.nic.org.mt/dotmt/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".mt", nil, { :adapter => :web, :url => "https://www.nic.org.mt/dotmt/" }
 Whois::Server.define :tld, ".mu", "whois.nic.mu"
-Whois::Server.define :tld, ".mv", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".mw", nil, { :web => "http://www.registrar.mw/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".mv", nil, { :adapter => :none }
+Whois::Server.define :tld, ".mw", nil, { :adapter => :web, :url => "http://www.registrar.mw/" }
 Whois::Server.define :tld, ".mx", "whois.nic.mx"
 Whois::Server.define :tld, ".my", "whois.domainregistry.my"
-Whois::Server.define :tld, ".mz", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".mz", nil, { :adapter => :none }
 Whois::Server.define :tld, ".na", "whois.na-nic.com.na"
 Whois::Server.define :tld, ".nc", "whois.nc"
-Whois::Server.define :tld, ".ne", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".ne", nil, { :adapter => :none }
 Whois::Server.define :tld, ".nf", "whois.nic.net.nf"
 Whois::Server.define :tld, ".ng", "whois.nic.net.ng"
-Whois::Server.define :tld, ".ni", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.nic.ni/"}
+Whois::Server.define :tld, ".ni", nil, { :adapter => :web, :url => "http://www.nic.ni/"}
 Whois::Server.define :tld, ".nl", "whois.domain-registry.nl"
 Whois::Server.define :tld, ".no", "whois.norid.no"
-Whois::Server.define :tld, ".np", nil, { :web => "http://register.mos.com.np/userSearchInc.asp", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".nr", nil, { :web => "http://www.cenpac.net.nr/dns/whois.html", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".np", nil, { :adapter => :web, :url => "http://register.mos.com.np/userSearchInc.asp" }
+Whois::Server.define :tld, ".nr", nil, { :adapter => :web, :url => "http://www.cenpac.net.nr/dns/whois.html" }
 Whois::Server.define :tld, ".nu", "whois.nic.nu"
 Whois::Server.define :tld, ".nz", "whois.srs.net.nz"
 Whois::Server.define :tld, ".om", "whois.registry.om"
-Whois::Server.define :tld, ".pa", nil, { :web => "http://www.nic.pa/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".pa", nil, { :adapter => :web, :url => "http://www.nic.pa/" }
 Whois::Server.define :tld, ".pe", "kero.yachay.pe"
-Whois::Server.define :tld, ".pf", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".pg", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".ph", nil, { :web => "http://www.dot.ph/", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".pk", nil, { :web => "http://www.pknic.net.pk/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".pf", nil, { :adapter => :none }
+Whois::Server.define :tld, ".pg", nil, { :adapter => :none }
+Whois::Server.define :tld, ".ph", nil, { :adapter => :web, :url => "http://www.dot.ph/" }
+Whois::Server.define :tld, ".pk", nil, { :adapter => :web, :url => "http://www.pknic.net.pk/" }
 Whois::Server.define :tld, ".co.pl", "whois.co.pl"
 Whois::Server.define :tld, ".pl", "whois.dns.pl"
 Whois::Server.define :tld, ".pm", "whois.nic.fr"
-Whois::Server.define :tld, ".pn", nil, { :web => "http://www.pitcairn.pn/PnRegistry/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".pn", nil, { :adapter => :web, :url => "http://www.pitcairn.pn/PnRegistry/" }
 Whois::Server.define :tld, ".pr", "whois.nic.pr"
 Whois::Server.define :tld, ".ps", "whois.pnina.ps"
 Whois::Server.define :tld, ".pt", "whois.dns.pt"
-Whois::Server.define :tld, ".pw", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".py", nil, { :web => "http://www.nic.py/consultas.html", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".pw", nil, { :adapter => :none }
+Whois::Server.define :tld, ".py", nil, { :adapter => :web, :url => "http://www.nic.py/consultas.html" }
 Whois::Server.define :tld, ".qa", "whois.registry.qa"
 Whois::Server.define :tld, ".re", "whois.nic.fr"
 Whois::Server.define :tld, ".ro", "whois.rotld.ro"
 Whois::Server.define :tld, ".rs", "whois.rnids.rs"
 Whois::Server.define :tld, ".edu.ru", "whois.informika.ru"
 Whois::Server.define :tld, ".ru", "whois.tcinet.ru"
-Whois::Server.define :tld, ".rw", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.nic.rw/cgi-bin/whois.pl"}
+Whois::Server.define :tld, ".rw", nil, { :adapter => :web, :url => "http://www.nic.rw/cgi-bin/whois.pl"}
 Whois::Server.define :tld, ".sa", "saudinic.net.sa"
 Whois::Server.define :tld, ".sb", "whois.nic.net.sb"
-Whois::Server.define :tld, ".sc", "whois.afilias-grs.info", { :adapter => Whois::Server::Adapters::Afilias }
-Whois::Server.define :tld, ".sd", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".sc", "whois.afilias-grs.info", { :adapter => :afilias }
+Whois::Server.define :tld, ".sd", nil, { :adapter => :none }
 Whois::Server.define :tld, ".se", "whois.nic-se.se"
 Whois::Server.define :tld, ".sg", "whois.sgnic.sg"
 Whois::Server.define :tld, ".sh", "whois.nic.sh"
 Whois::Server.define :tld, ".si", "whois.arnes.si"
-Whois::Server.define :tld, ".sj", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".sj", nil, { :adapter => :none }
 Whois::Server.define :tld, ".sk", "whois.sk-nic.sk"
 Whois::Server.define :tld, ".sl", "whois.nic.sl"
 Whois::Server.define :tld, ".sm", "whois.nic.sm"
 Whois::Server.define :tld, ".sn", "whois.nic.sn"
 Whois::Server.define :tld, ".so", "whois.nic.so"
-Whois::Server.define :tld, ".sr", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".sr", nil, { :adapter => :none }
 Whois::Server.define :tld, ".st", "whois.nic.st"
 Whois::Server.define :tld, ".su", "whois.tcinet.ru"
-Whois::Server.define :tld, ".sv", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://www.uca.edu.sv/dns/" }
+Whois::Server.define :tld, ".sv", nil, { :adapter => :web, :url => "http://www.uca.edu.sv/dns/" }
 Whois::Server.define :tld, ".sx", "whois.sx"
-Whois::Server.define :tld, ".sy", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".sz", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".sy", nil, { :adapter => :none }
+Whois::Server.define :tld, ".sz", nil, { :adapter => :none }
 Whois::Server.define :tld, ".tc", "whois.adamsnames.tc"
-Whois::Server.define :tld, ".td", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".td", nil, { :adapter => :none }
 Whois::Server.define :tld, ".tf", "whois.nic.fr"
-Whois::Server.define :tld, ".tg", nil, { :web => "http://www.nic.tg/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".tg", nil, { :adapter => :web, :url => "http://www.nic.tg/" }
 Whois::Server.define :tld, ".th", "whois.thnic.co.th"
-Whois::Server.define :tld, ".tj", nil, { :web => "http://www.nic.tj/whois.html", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".tj", nil, { :adapter => :web, :url => "http://www.nic.tj/whois.html" }
 Whois::Server.define :tld, ".tk", "whois.dot.tk"
 Whois::Server.define :tld, ".tl", "whois.nic.tl"
 Whois::Server.define :tld, ".tm", "whois.nic.tm"
 Whois::Server.define :tld, ".tn", "whois.ati.tn"
 Whois::Server.define :tld, ".to", "whois.tonic.to"
-Whois::Server.define :tld, ".tp", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".tp", nil, { :adapter => :none }
 Whois::Server.define :tld, ".tr", "whois.nic.tr"
-Whois::Server.define :tld, ".tt", nil, { :web => "http://www.nic.tt/cgi-bin/search.pl", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".tv", "whois.nic.tv", { :adapter => Whois::Server::Adapters::Verisign}
+Whois::Server.define :tld, ".tt", nil, { :adapter => :web, :url => "http://www.nic.tt/cgi-bin/search.pl" }
+Whois::Server.define :tld, ".tv", "whois.nic.tv", { :adapter => :verisign }
 Whois::Server.define :tld, ".tw", "whois.twnic.net.tw"
 Whois::Server.define :tld, ".tz", "whois.tznic.or.tz"
 Whois::Server.define :tld, ".in.ua", "whois.in.ua"
 Whois::Server.define :tld, ".ua", "whois.ua"
 Whois::Server.define :tld, ".ug", "whois.co.ug"
 Whois::Server.define :tld, ".ac.uk", "whois.ja.net"
-Whois::Server.define :tld, ".bl.uk", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".british-library.uk", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".bl.uk", nil, { :adapter => :none }
+Whois::Server.define :tld, ".british-library.uk", nil, { :adapter => :none }
 Whois::Server.define :tld, ".gov.uk", "whois.ja.net"
-Whois::Server.define :tld, ".icnet.uk", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".jet.uk", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".mod.uk", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".nhs.uk", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".nls.uk", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".parliament.uk", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".police.uk", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".icnet.uk", nil, { :adapter => :none }
+Whois::Server.define :tld, ".jet.uk", nil, { :adapter => :none }
+Whois::Server.define :tld, ".mod.uk", nil, { :adapter => :none }
+Whois::Server.define :tld, ".nhs.uk", nil, { :adapter => :none }
+Whois::Server.define :tld, ".nls.uk", nil, { :adapter => :none }
+Whois::Server.define :tld, ".parliament.uk", nil, { :adapter => :none }
+Whois::Server.define :tld, ".police.uk", nil, { :adapter => :none }
 Whois::Server.define :tld, ".uk", "whois.nic.uk"
 Whois::Server.define :tld, ".us", "whois.nic.us"
-Whois::Server.define :tld, ".com.uy", nil, { :web => "https://nic.anteldata.com.uy/dns/", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".com.uy", nil, { :adapter => :web, :url => "https://nic.anteldata.com.uy/dns/" }
 Whois::Server.define :tld, ".uy", "whois.nic.org.uy"
 Whois::Server.define :tld, ".uz", "whois.cctld.uz"
-Whois::Server.define :tld, ".va", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".vc", "whois.afilias-grs.info", { :adapter => Whois::Server::Adapters::Afilias }
+Whois::Server.define :tld, ".va", nil, { :adapter => :none }
+Whois::Server.define :tld, ".vc", "whois.afilias-grs.info", { :adapter => :afilias }
 Whois::Server.define :tld, ".ve", "whois.nic.ve"
 Whois::Server.define :tld, ".vg", "whois.adamsnames.tc"
-Whois::Server.define :tld, ".vi", nil, { :web => "http://www.nic.vi/whoisform.htm", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".vn", nil, { :web => "http://www.vnnic.vn/english/", :adapter => Whois::Server::Adapters::Web }
-Whois::Server.define :tld, ".vu", nil, { :web => "http://www.vunic.vu/whois.html", :adapter => Whois::Server::Adapters::Web }
+Whois::Server.define :tld, ".vi", nil, { :adapter => :web, :url => "http://www.nic.vi/whoisform.htm" }
+Whois::Server.define :tld, ".vn", nil, { :adapter => :web, :url => "http://www.vnnic.vn/english/" }
+Whois::Server.define :tld, ".vu", nil, { :adapter => :web, :url => "http://www.vunic.vu/whois.html" }
 Whois::Server.define :tld, ".wf", "whois.nic.fr"
 Whois::Server.define :tld, ".ws", "whois.samoanic.ws"
-Whois::Server.define :tld, ".ye", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".ye", nil, { :adapter => :none }
 Whois::Server.define :tld, ".yt", "whois.nic.fr"
 Whois::Server.define :tld, ".ac.za", "whois.ac.za"
 Whois::Server.define :tld, ".co.za", "whois.coza.net.za"
 Whois::Server.define :tld, ".gov.za", "whois.gov.za"
 Whois::Server.define :tld, ".org.za", "whois.org.za"
-Whois::Server.define :tld, ".za", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".zm", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".zw", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".za", nil, { :adapter => :none }
+Whois::Server.define :tld, ".zm", nil, { :adapter => :none }
+Whois::Server.define :tld, ".zw", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xxx", "whois.nic.xxx"
 Whois::Server.define :tld, ".xn--3e0b707e", "whois.kr"
-Whois::Server.define :tld, ".xn--45brj9c", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--45brj9c", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xn--80ao21a", "whois.nic.kz"
-Whois::Server.define :tld, ".xn--90a3ac", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--90a3ac", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xn--clchc0ea0b2g2a9gcd", "whois.sgnic.sg"
 Whois::Server.define :tld, ".xn--fiqs8s", "cwhois.cnnic.cn"
 Whois::Server.define :tld, ".xn--fiqz9s", "cwhois.cnnic.cn"
-Whois::Server.define :tld, ".xn--fpcrj9c3d", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--fpcrj9c3d", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xn--fzc2c9e2c", "whois.nic.lk"
-Whois::Server.define :tld, ".xn--gecrj9c", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".xn--h2brj9c", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--gecrj9c", nil, { :adapter => :none }
+Whois::Server.define :tld, ".xn--h2brj9c", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xn--j6w193g", "whois.hkirc.hk"
 Whois::Server.define :tld, ".xn--kprw13d", "whois.twnic.net.tw"
 Whois::Server.define :tld, ".xn--kpry57d", "whois.twnic.net.tw"
 Whois::Server.define :tld, ".xn--lgbbat1ad8j", "whois.nic.dz"
+Whois::Server.define :tld, ".xn--mgba3a4f16a", "whois.nic.ir"
 Whois::Server.define :tld, ".xn--mgbaam7a8h", "whois.aeda.net.ae"
-Whois::Server.define :tld, ".xn--mgbayh7gpa", nil, { :adapter => Whois::Server::Adapters::Web, :web => "http://idn.jo/whois_a.aspx" }
-Whois::Server.define :tld, ".xn--mgbbh1a71e", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".xn--mgbc0a9azcg", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--mgbayh7gpa", nil, { :adapter => :web, :url => "http://idn.jo/whois_a.aspx" }
+Whois::Server.define :tld, ".xn--mgbbh1a71e", nil, { :adapter => :none }
+Whois::Server.define :tld, ".xn--mgbc0a9azcg", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xn--mgberp4a5d4ar", "whois.nic.net.sa"
 Whois::Server.define :tld, ".xn--o3cw4h", "whois.thnic.co.th"
-Whois::Server.define :tld, ".xn--ogbpf8fl", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--ogbpf8fl", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xn--p1ai", "whois.tcinet.ru"
-Whois::Server.define :tld, ".xn--pgbs0dh", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".xn--s9brj9c", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--pgbs0dh", nil, { :adapter => :none }
+Whois::Server.define :tld, ".xn--s9brj9c", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xn--wgbh1c", "whois.dotmasr.eg"
 Whois::Server.define :tld, ".xn--wgbl6a", "whois.registry.qa"
 Whois::Server.define :tld, ".xn--xkc2al3hye2a", "whois.nic.lk"
-Whois::Server.define :tld, ".xn--xkc2dl3a5ee0h", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--xkc2dl3a5ee0h", nil, { :adapter => :none }
 Whois::Server.define :tld, ".xn--yfro4i67o", "whois.sgnic.sg"
 Whois::Server.define :tld, ".xn--ygbi2ammx", "whois.pnina.ps"