whois 2.3.0 → 2.4.0

data/spec/fixtures/responses/whois.twnic.net.tw/status_registered.expected

@@ -9,25 +9,25 @@
 
 
 #created_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2000-08-29")
 
 #updated_on
   should: %s raise_error(Whois::PropertyNotSupported)
 
 #expires_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2011-11-09")
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(4).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(4)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns1.google.com"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns2.google.com"
-  should: %s[2] (nameserver)
+  should: %s[2] CLASS(nameserver)
   should: %s[2].name == "ns3.google.com"
-  should: %s[3] (nameserver)
+  should: %s[3] CLASS(nameserver)
   should: %s[3].name == "ns4.google.com"

data/spec/fixtures/responses/whois.tznic.or.tz/status_available.expected

@@ -19,5 +19,5 @@
 
 
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/whois.tznic.or.tz/status_registered.expected

@@ -9,22 +9,22 @@
 
 
 #created_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2009-07-27 11:01:10")
 
 #updated_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2010-08-30 15:47:56")
 
 #expires_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2011-07-27")
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(2).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(2)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns1213.hostgator.com"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns1214.hostgator.com"

data/spec/fixtures/responses/whois.ua/property_nameservers_uppercase.expected

@@ -0,0 +1,9 @@
+#nameservers
+  should: %s CLASS(array)
+  should: %s SIZE(3)
+  should: %s[0] CLASS(nameserver)
+  should: %s[0].name == "ns10.uadns.com"
+  should: %s[1] CLASS(nameserver)
+  should: %s[1].name == "ns11.uadns.com"
+  should: %s[2] CLASS(nameserver)
+  should: %s[2].name == "ns12.uadns.com"

data/spec/fixtures/responses/{whois.ficora.fi → whois.ua}/status_available.expected

@@ -9,15 +9,15 @@
 
 
 #created_on
-  should: %s == nil
+  should: %s raise_error(Whois::PropertyNotSupported)
 
 #updated_on
-  should: %s raise_error(Whois::PropertyNotSupported)
+  should: %s == nil
 
 #expires_on
   should: %s == nil
 
 
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/{whois.net.ua → whois.ua}/status_registered.expected

@@ -12,22 +12,22 @@
   should: %s raise_error(Whois::PropertyNotSupported)
 
 #updated_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2010-11-01 17:35:34")
 
 #expires_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2011-12-04 00:00:00")
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(4).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(4)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns2.google.com"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns4.google.com"
-  should: %s[2] (nameserver)
+  should: %s[2] CLASS(nameserver)
   should: %s[2].name == "ns3.google.com"
-  should: %s[3] (nameserver)
+  should: %s[3] CLASS(nameserver)
   should: %s[3].name == "ns1.google.com"

data/spec/fixtures/responses/whois.usp.ac.fj/status_available.expected

@@ -19,5 +19,5 @@
 
 
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/whois.usp.ac.fj/status_registered.expected

@@ -15,14 +15,14 @@
   should: %s raise_error(Whois::PropertyNotSupported)
 
 #expires_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2011-04-28")
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(2).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(2)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns1.google.com"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns2.google.com"

data/spec/fixtures/responses/whois.za.net/status_available.expected

@@ -19,5 +19,5 @@
 
 
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/whois.za.net/status_registered.expected

@@ -9,11 +9,11 @@
 
 
 #created_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2002-03-29 22:03:53 UTC")
 
 #updated_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2002-03-29 22:03:53 UTC")
 
 #expires_on
@@ -21,9 +21,9 @@
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(2).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(2)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns3.zoneedit.com"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns5.zoneedit.com"

data/spec/fixtures/responses/whois.za.org/status_available.expected

@@ -19,5 +19,5 @@
 
 
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/whois.za.org/status_registered.expected

@@ -9,11 +9,11 @@
 
 
 #created_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2000-11-05 14:03:48 UTC")
 
 #updated_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2005-08-15 12:15:10")
 
 #expires_on
@@ -21,11 +21,11 @@
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(3).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(3)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "blade.wcic.co.za"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "sabertooth.wcic.co.za"
-  should: %s[2] (nameserver)
+  should: %s[2] CLASS(nameserver)
   should: %s[2].name == "ns2.iafrica.com"

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ end
 # The fixtures are UTF-8 encoded.
 # Make sure Ruby uses the proper encoding.
 if RUBY_VERSION < '1.9'
-  $KCODE='u'
+  $KCODE = 'u'
 else
   Encoding.default_external = Encoding::UTF_8
   Encoding.default_internal = Encoding::UTF_8

data/spec/support/helpers/connectivity_helper.rb

@@ -1,4 +1,4 @@
-module ConnectivityHelper
+module RSpecSupportConnectivityHelpers
   def need_connectivity
     if connectivity_available?
       yield
@@ -11,5 +11,5 @@ module ConnectivityHelper
 end
 
 RSpec.configure do |config|
-  config.extend ConnectivityHelper
+  config.extend RSpecSupportConnectivityHelpers
 end

data/spec/support/helpers/spec_helper.rb

@@ -1,4 +1,4 @@
-module Helper
+module RSpecSupportSpecHelpers
 
   # Gets the currently described class.
   # Conversely to +subject+, it returns the class
@@ -11,38 +11,33 @@ module Helper
     File.join(SPEC_ROOT, "fixtures", *names)
   end
 
-end
-
-module SpecHelper
-
   private
 
-    # Temporary resets Server @@definitions
-    # to let the test setup a custom definition list.
-    def with_definitions
-      definitions_setup
-      yield
-    ensure
-      definitions_teardown
-    end
+  # Temporary resets Server @@definitions
+  # to let the test setup a custom definition list.
+  def with_definitions
+    definitions_setup
+    yield
+  ensure
+    definitions_teardown
+  end
 
-    def definitions_setup
-      @_definitions = Whois::Server.definitions
-      Whois::Server.send :class_variable_set, :@@definitions, { :tld => [], :ipv4 =>[], :ipv6 => [] }
-    end
+  def definitions_setup
+    @_definitions = Whois::Server.definitions
+    Whois::Server.send :class_variable_set, :@@definitions, { :tld => [], :ipv4 =>[], :ipv6 => [] }
+  end
 
-    def definitions_teardown
-      Whois::Server.send :class_variable_set, :@@definitions, @_definitions
-    end
+  def definitions_teardown
+    Whois::Server.send :class_variable_set, :@@definitions, @_definitions
+  end
 
 
-    def nameserver(*params)
-      Whois::Record::Nameserver.new(*params)
-    end
+  def nameserver(*params)
+    Whois::Record::Nameserver.new(*params)
+  end
 
 end
 
 RSpec.configure do |config|
-  config.include Helper
-  config.include SpecHelper
+  config.include RSpecSupportSpecHelpers
 end

data/spec/tlds

@@ -1,11 +1,3 @@
-#Whois::Server.define :tld, ".ac.za", "whois.ac.za"
-#Whois::Server.define :tld, ".bj", "whois.nic.bj"
-#Whois::Server.define :tld, ".co.pl", "whois.co.pl"
-#Whois::Server.define :tld, ".dm", "whois.nic.dm"
-#Whois::Server.define :tld, ".edu.cn", "whois.edu.cn"
-#Whois::Server.define :tld, ".edu.ru", "whois.informika.ru"
-#Whois::Server.define :tld, ".gp", "whois.nic.gp"
-#Whois::Server.define :tld, ".kp", "whois.kcce.kp"
 ac.uk;whois.ja.net;lboro.ac.uk;u34jedzcq.ac.uk
 ac;whois.nic.ac;google.ac;u34jedzcq.ac
 ad;;;
@@ -39,6 +31,7 @@ bg;whois.register.bg;google.bg;u34jedzcq.bg
 bh;;;
 bi;;;
 biz;whois.biz;google.biz;u34jedzcq.biz
+bj;;;
 bl.uk;;;
 bm;;;
 bn;;;
@@ -83,9 +76,12 @@ de.com;whois.centralnic.com;boerse.de.com;u34jedzcq.de.com
 de;whois.denic.de;google.de;u34jedzcq.de
 dj;;;
 dk;whois.dk-hostmaster.dk;google.dk;u34jedzcq.dk
+dm;;;
 do;;;
 dz;whois.nic.dz;google.dz;u34jedzcq.dz
 ec;whois.nic.ec;google.ec;u34jedzcq.ec
+edu.cn;;;
+edu.ru;;;
 edu;whois.educause.edu;google.edu;u34jedzcq.edu
 ee;whois.tld.ee;google.ee;u34jedzcq.ee
 eg;;;
@@ -95,7 +91,7 @@ et;;;
 eu.com;whois.centralnic.com;walkabout.eu.com;u34jedzcq.eu.com
 eu.org;whois.eu.org;google.eu.org;u34jedzcq.eu.org
 eu;whois.eu;google.eu;u34jedzcq.eu
-fi;whois.ficora.fi;google.fi;u34jedzcq.fi
+fi;whois.fi;google.fi;u34jedzcq.fi
 fi;whois.usp.ac.fj;google.com.fj;u34jedzcq.fj
 fk;;;
 fm;;;
@@ -117,9 +113,10 @@ gn;;;
 gov.uk;whois.ja.net;lboro.gov.uk;u34jedzcq.gov.uk
 gov.za;whois.gov.za;dha.gov.za;u34jedzcq.gov.za
 gov;whois.nic.gov;gsa.gov;u34jedzcq.gov
+gp;;;
 gq;;;
-gr;;;
 gr.com;whois.centralnic.com;google.gr.com;u34jedzcq.gr.com
+gr;;;
 gs;whois.nic.gs;google.gs;u34jedzcq.gs
 gt;;;
 gu;;;
@@ -128,7 +125,7 @@ gy;whois.registry.gy;google.gy;u34jedzcq.gy
 hk;whois.hkirc.hk;google.hk;u34jedzcq.hk
 hm;whois.registry.hm;google.hm;u34jedzcq.hm
 hn;whois.afilias-grs.info;google.hn;u34jedzcq.hn
-hr;;;
+hr;whois.dns.hr;google.hr;u34jedzcq.hr
 ht;whois.nic.ht;google.ht;u34jedzcq.ht
 hu.com;whois.centralnic.com;xxx.hu.com;u34jedzcq.hu.com
 hu;whois.nic.hu;google.hu;u34jedzcq.hu
@@ -159,6 +156,7 @@ kh;;;
 ki;whois.nic.ki;google.ki;u34jedzcq.ki
 km;;;
 kn;;;
+kp;;;
 kr.com;whois.centralnic.com;academyart.kr.com;u34jedzcq.kr.com
 kr;whois.kr;google.kr;u34jedzcq.kr
 kw;;;
@@ -168,7 +166,7 @@ la;whois.nic.la;google.la;u34jedzcq.la
 lb;;;
 lc;whois.afilias-grs.info;nic.lc;u34jedzcq.lc
 li;whois.nic.li;google.li;u34jedzcq.li
-lk;;;
+lk;whois.nic.lk;google.lk;u34jedzcq.lk
 lr;;;
 ls;;;
 lt;whois.domreg.lt;google.lt;u34jedzcq.lt
@@ -203,7 +201,7 @@ my;whois.domainregistry.my;google.my;u34jedzcq.my
 mz;;;
 na;whois.na-nic.com.na;google.na;u34jedzcq.na
 name;whois.nicc.name;carletti.name;u34jedzcq.name
-nc;;;
+nc;whois.nc;domaine.nc;u34jedzcq.nc
 ne;;;
 net;whois.crsnic.net;google.net;u34jedzcq.net
 nf;whois.nic.net.nf;google.nf;u34jedzcq.nf
@@ -242,7 +240,7 @@ qa.com;whois.registry.qa;qtel.com.qa;u34jedzcq.qa
 qc.com;whois.centralnic.com;ceo.qc.com;u34jedzcq.qc.com
 re;whois.nic.fr;nic.re;u34jedzcq.re
 ro;whois.rotld.ro;google.ro;u34jedzcq.ro
-rs;;;
+rs;whois.rnids.rs;google.rs;u34jedzcq.rs
 ru.com;whois.centralnic.com;srk.ru.com;u34jedzcq.ru.com
 ru;whois.ripn.net;google.ru;u34jedzcq.ru
 rw;;;
@@ -289,7 +287,7 @@ tt;;;
 tv;whois.nic.tv;thinkcode.tv;u34jedzcq.tv
 tw;whois.twnic.net.tw;google.com.tw;u34jedzcq.com.tw
 tz;whois.tznic.or.tz;dailynews.co.tz;u34jedzcq.co.tz
-ua;whois.net.ua;google.com.ua;u34jedzcq.com.ua
+ua;whois.ua;google.com.ua;u34jedzcq.com.ua
 ug;whois.co.ug;google.co.ug;u34jedzcq.co.ug
 uk.com;whois.centralnic.com;history.uk.com;u34jedzcq.uk.com
 uk.net;whois.centralnic.com;paramount.uk.net;u34jedzcq.uk.net
@@ -310,31 +308,37 @@ vu;;;
 wf;whois.nic.fr;nic.wf;u34jedzcq.wf
 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--80ao21a", "whois.nic.kz"
+Whois::Server.define :tld, ".xn--90a3ac", nil, { :adapter => Whois::Server::Adapters::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--fzc2c9e2c", nil, { :adapter => Whois::Server::Adapters::None }
 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--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--mgbaam7a8h", "whois.aeda.net.ae"
 Whois::Server.define :tld, ".xn--mgbayh7gpa", nil, { :adapter => Whois::Server::Adapters::None }
 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--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--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--wgbh1c", "whois.dotmasr.eg"
-Whois::Server.define :tld, ".xn--wgbl6a", nil, { :adapter => Whois::Server::Adapters::None }
-Whois::Server.define :tld, ".xn--xkc2al3hye2a", nil, { :adapter => Whois::Server::Adapters::None }
+Whois::Server.define :tld, ".xn--wgbl6a", "whois.registry.qa"
 Whois::Server.define :tld, ".xn--xkc2dl3a5ee0h", nil, { :adapter => Whois::Server::Adapters::None }
 Whois::Server.define :tld, ".xn--yfro4i67o", "whois.sgnic.sg"
 Whois::Server.define :tld, ".xn--ygbi2ammx", "whois.pnina.ps"
 ws;whois.samoanic.ws;google.ws;u34jedzcq.ws
 xn--p1ai;whois.ripn.net;xn----8sbc3ahklcs4adf.xn--p1ai;u34jedzcq.xn--p1ai
+xn--xkc2al3hye2a;whois.nic.lk;xn--4kcolx4fsa0gdt6j.xn--xkc2al3hye2a;u34jedzcq.xn--xkc2al3hye2a
+xn--fzc2c9e2c;whois.nic.lk;xn--fzc3a2azd8dsa2ktat.xn--fzc2c9e2c;u34jedzcq.xn--fzc2c9e2c
 xxx;whois.nic.xxx;nic.xxx;u34jedzcq.xxx
 ye;;;
 yt;whois.nic.fr;nic.yt;u34jedzcq.yt