mlightner-universal_ruby_whois 1.2.6 → 1.2.7

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 7/24/09
+  * Added support for .br domain names by Ruy Rocha
+
+== 2/17/09
+  * Included enhancements for .co.nz domains as provided by Matt Thompson
+
 == 12/1/08
   * Included atourino's fix for .mobi domains.
   * Updated Rakefile to publish to RubyForge.

data/lib/universal_ruby_whois/domain.rb

@@ -125,6 +125,20 @@ module Whois
     def to_s
       domain.to_s rescue nil
     end
+    def to_hash
+      {
+        :status => self.status,
+        :creation_date => self.creation_date,
+        :expiration_date => self.expiration_date,
+        :output => self.whois_output
+      }
+    end
+    def to_json
+      self.to_hash.to_json
+    end
+    def to_xml
+      self.to_hash.to_xml
+    end
   end
 
 end

data/lib/universal_ruby_whois/server.rb

@@ -13,10 +13,10 @@ module Whois
 
     # The default regular expressions used when defining a new server if none are supplied.
     DEFAULT_WHOIS_REGULAR_EXPRESSIONS = {
-        :free => /(avail|free|no match|no entr|not taken|not registered|not found)/im,
-        :registered => /(registered|Domain ID|domain name\s*\:|is active|is not available|exists|\bregistrant\b|Created on)/im,
-        :creation_date => /(Creation date|created on|created at|Commencement Date|Registration Date)\s*[\:\.\]]*\s*([\w\-\:\ \/]+)[^\n\r]*[\n\r]/im,
-        :expiration_date => /(expiration date|expires on|registered through|Renewal date)\s*[\:\.\]]*\s*([\w\-\:\ \/]+)[^\n\r]*[\n\r]/im,
+        :free => /(avail|free|no match|no entr|not taken|Available|Status\:\sNot\sRegistered|not registered|not found|No match for domain)/im,
+        :registered => /(registered|Domain ID|domain name\s*\:|is active|Status\:\sActive|Not available|is not available|exists|\bregistrant\b|Created on|created\:)/im,
+        :creation_date => /(Creation date|created on|created at|Commencement Date|Registration Date|domain_dateregistered|created\:)\s*[\:\.\]]*\s*([\w\-\:\ \/]+)[^\n\r]*[\n\r]/im,
+        :expiration_date => /(expiration date|expires on|registered through|Renewal date|domain_datebilleduntil|expires\:)\s*[\:\.\]]*\s*([\w\-\:\ \/]+)[^\n\r]*[\n\r]/im,
         :error => /(error)/im,
         :server_unavailable => /(Sorry\. Server busy\.|too many requests|been blocked)/im
       }
@@ -24,7 +24,7 @@ module Whois
     # The location of the 'whois' binary utility.
     WHOIS_BIN = '/usr/bin/env whois'
 
-    attr_reader :tld, :nic_server, :regexes, :port, :unavailable, :unavailable_response
+    attr_reader :tld, :nic_server, :regexes, :port, :server_unavailable, :unavailable_response
 
     # === Whois Server Definition
     #
@@ -145,7 +145,7 @@ module Whois
     end
 
     def unavailable?
-      @unavailable ? true : false
+      @server_unavailable ? true : false
     end
 
     # Retrieve the raw WHOIS server output for a domain.
@@ -243,4 +243,3 @@ module Whois
   end
 
 end
-

data/lib/universal_ruby_whois/server_list.rb

@@ -12,6 +12,7 @@ Whois::Server.define('at', 'whois.nic.at')
 Whois::Server.define('bg', 'whois.digsys.bg')
 Whois::Server.define('bi', 'whois.nic.bi')
 Whois::Server.define('bj', 'www.nic.bj')
+Whois::Server.define('br', 'whois.nic.br')
 Whois::Server.define('bz', 'whois.belizenic.bz')
 Whois::Server.define('cc', 'whois.nic.cc')
 Whois::Server.define('cd', 'whois.nic.cd')
@@ -27,22 +28,22 @@ Whois::Server.define('hm', 'webhst1.capital.hm')
 Whois::Server.define('hu', 'whois.nic.hu')
 Whois::Server.define('id', 'whois.idnic.net.id')
 Whois::Server.define('in', 'whois.inregistry.net')
+Whois::Server.define('io', 'whois.nic.io')
 Whois::Server.define('ir', 'whois.nic.ir')
 Whois::Server.define('kz', 'whois.nic.kz')
 Whois::Server.define('la', 'whois2.afilias-grs.net')
 Whois::Server.define('ly', 'whois.lydomains.com')
 Whois::Server.define('mc', 'whois.ripe.net')
-Whois::Server.define('ms', 'whois.ms')
+Whois::Server.define('ms', 'whois.nic.ms')
 Whois::Server.define('mx', 'whois.nic.mx')
 Whois::Server.define('my', 'whois.mynic.net.my')
-Whois::Server.define('nu', 'whois.nic.nu')
 Whois::Server.define('pl', 'whois.dns.pl')
 Whois::Server.define('pm', 'whois.nic.pm')
 Whois::Server.define('pro', 'whois.registrypro.pro')
 Whois::Server.define('pt', 'whois.nic.pt')
 Whois::Server.define('sa', 'saudinic.net.sa')
 Whois::Server.define('sb', 'whois.nic.net.sb')
-Whois::Server.define('se', 'whois.nic-se.se')
+Whois::Server.define('sh', 'whois.nic.sh')
 Whois::Server.define('si', 'whois.arnes.si')
 Whois::Server.define('sk', 'whois.sk-nic.sk')
 Whois::Server.define('sm', 'whois.ripe.net')
@@ -61,30 +62,31 @@ Whois::Server.define('wf', 'whois.nic.wf')
 Whois::Server.define('ws', 'whois.tld.ws')
 Whois::Server.define('yt', 'whois.nic.yt')
 Whois::Server.define('us', 'whois.nic.us')
-Whois::Server.define('at',"whois.nic.at")
-Whois::Server.define('ca',"whois.cira.ca")
-Whois::Server.define('cc',"whois.nic.cc")
-Whois::Server.define('ch',"whois.nic.ch")
-Whois::Server.define('cn',"whois.cnnic.net.cn")
-Whois::Server.define('cz',"whois.nic.cz")
-Whois::Server.define('ee',"whois.eenet.ee")
-Whois::Server.define('gr',"https://grweb.ics.forth.gr/")
-Whois::Server.define('it',"whois.nic.it")
-Whois::Server.define('li',"whois.nic.li")
-Whois::Server.define('lt',"whois.domreg.lt")
-Whois::Server.define('lu',"whois.dns.lu")
-Whois::Server.define('lv',"whois.ripe.net")
-Whois::Server.define('ms',"whois.adamsnames.tc")
-Whois::Server.define('co.nz',"whois.domainz.net.nz")
-Whois::Server.define('nu',"whois.nic.nu")
-Whois::Server.define('pl',"whois.dns.pl")
-Whois::Server.define('ro',"whois.rotld.ro")
-Whois::Server.define('ru',"whois.ripn.net")
-Whois::Server.define('se',"whois.nic-se.se")
-Whois::Server.define('sk',"whois.ripe.net")
-Whois::Server.define('tc',"whois.adamsnames.tc")
-Whois::Server.define('vg',"whois.adamsnames.tc")
-Whois::Server.define('ws',"whois.worldsite.ws")
+Whois::Server.define('at', 'whois.nic.at')
+Whois::Server.define('ca', 'whois.cira.ca')
+Whois::Server.define('cc', 'whois.nic.cc')
+Whois::Server.define('ch', 'whois.nic.ch')
+Whois::Server.define('cn', 'whois.cnnic.net.cn')
+Whois::Server.define('cz', 'whois.nic.cz')
+Whois::Server.define('ee', 'whois.eenet.ee')
+Whois::Server.define('gr', 'https://grweb.ics.forth.gr/')
+Whois::Server.define('it', 'whois.nic.it')
+Whois::Server.define('li', 'whois.nic.li')
+Whois::Server.define('lt', 'whois.domreg.lt')
+Whois::Server.define('lu', 'whois.dns.lu')
+Whois::Server.define('lv', 'whois.ripe.net')
+Whois::Server.define('ms', 'whois.adamsnames.tc')
+Whois::Server.define('co.nz', 'whois.domainz.net.nz')
+Whois::Server.define('nu', 'whois.nic.nu')
+Whois::Server.define('pl', 'whois.dns.pl')
+Whois::Server.define('ro', 'whois.rotld.ro')
+Whois::Server.define('ru', 'whois.ripn.net')
+Whois::Server.define('se', 'whois.iis.se')
+Whois::Server.define('sk', 'whois.ripe.net')
+Whois::Server.define('tc', 'whois.adamsnames.tc')
+Whois::Server.define('vg', 'whois.adamsnames.tc')
+Whois::Server.define('ws', 'whois.worldsite.ws')
+Whois::Server.define('gd', 'whois.adamsnames.tc')
 
 #Whois::Server.define('es',"https://www.nic.es/esnic/servlet/BuscarDomSolAlta?dominio=%DOMAIN%")
 #Whois::Server.define('com.es',"https://www.nic.es/esnic/servlet/BuscarDomSolAlta?dominio=%DOMAIN%")
@@ -104,7 +106,6 @@ Whois::Server.define(
   :free => [%q{%DOMAIN% </a> </th> <td class="disp"> <img src="../images/icon_disp_yes.gif" alt="si" />}, 'im']
 )
 
-
 # By leaving out the whois server, we force it to follow the internic redirection.
 Whois::Server.define(
   [ 'com', 'net', 'edu' ], nil,
@@ -118,10 +119,13 @@ Whois::Server.define(
   :free => /Status:\s*Active/im.invert!
 )
 
-Whois::Server.define(%w(asn.au com.au id.au net.au org.au), 'whois.aunic.net',
+Whois::Server.define(
+  %w(asn.au com.au id.au net.au org.au), 
+  'whois.ausregistry.net.au',
   :free => /No Data Found/im,
-  :registered => /No Data Found/im.invert!,
-  :error => /BLACKLISTED/m )
+  :registered => /Last Modified/im,
+  :error => /BLACKLISTED/m
+)
 
 Whois::Server.define(
  %w(hk com.hk net.hk edu.hk org.hk gov.hk idv.hk),
@@ -177,9 +181,9 @@ Whois::Server.define(
 )
 Whois::Server.define(
   'eu',
-  'http://www.whois.eu/whois/GetDomainStatus.htm?domainName=%DOMAIN%',
-  :free => /AVAILABLE/im,
-  :registered => /REGISTERED/im,
+  'whois.eu',
+  :free => /Nameservers\:/im.invert!,
+  :registered => /Nameservers\:/im,
   :pending => /APPLICATION PENDING/im,
   :error => /NOT ALLOWED/im
 )
@@ -193,23 +197,23 @@ Whois::Server.define(
 Whois::Server.define(
   'name',
   'whois.nic.name',
-  :registered => /Not available for registration./im,
+  :registered => /Not available for second level registration./im,
   :preserved => /Not available for second level registration./im,
   :free => /No match./im
 )
-Whois::Server.define(
-  'net',
-  'whois.verisign-grs.com',
-  :registered => /Domain Name:/im,
-  :free => /No match for/im
-)
+# Whois::Server.define(
+#   'net',
+#   'whois.verisign-grs.com',
+#   :registered => /Domain Name:/im,
+#   :free => /No match for/im
+# )
 Whois::Server.define(
   'nl',
   'whois.domain-registry.nl',
-  :registered => /ims active/im,
-  :free => /ims free/im,
-  :error => /imnvalid name/im,
-  :preserved => /ims excluded/im
+  :registered => /active/im,
+  :free => /free/im,
+  :error => /invalid domain/im,
+  :preserved => /excluded/im
 )
 Whois::Server.define(
   'org',
@@ -247,9 +251,10 @@ Whois::Server.define(
 )
 Whois::Server.define(
   'mobi',
-  'whois.corenic.net',
-  :registered => /Domain ID:/im,
-  :free => /NOT FOUND/m
+#  'whois.corenic.net',
+  'whois.dotmobiregistry.net',
+  :registered => /is not registered/im.invert!,
+  :free => /is not registered/im
 )
 Whois::Server.define(
   'ca',
@@ -257,13 +262,38 @@ Whois::Server.define(
   :registered => /EXIST/im,
   :free => /AVAIL/im
 )
-Whois::Server.define('asia', 'whois.nic.asia',
+Whois::Server.define(
+  'asia', 
+  'whois.nic.asia',
   :registered => /Domain ID/im,
   :free => /NOT FOUND/im
 )
 Whois::Server.define(
- '.co.il',
- 'whois.isoc.org.il',
- :registered => /validity:/im,
- :free => /No data was found to match the request criteria./im
+  'co.il',
+  'whois.isoc.org.il',
+  :registered => /validity:/im,
+  :free => /No data was found to match the request criteria./im
+)
+Whois::Server.define(
+  'ac.uk',
+  'whois.ja.net',
+  :registered => /Domain:/im,
+  :free => /No such domain/im
+)
+Whois::Server.define(
+  %w(cx cm ht ki mu nf sb tl),
+  'whois.nic.cx',
+  :registered => //im,
+  :free => /(Not Registered|No Applications Pending)/im
+)Whois::Server.define(
+  %w(gd tc vg ms),
+  'whois.adamsnames.tc',
+  :free => /is not registered/im,
+  :registered => /is registered/im
+)
+Whois::Server.define(
+  'nu', 
+  'whois.nic.nu',
+  :free => /NO MATCH.*/,
+  :registered => /Domain Name/
 )

data/test/whois.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../lib/universal_ruby_whois'
 
 class WhoisTest < Test::Unit::TestCase
 
-  TEST_TLDS = %w(com org co.uk eu.com ru info jp)
+  TEST_TLDS = %w(com org co.uk eu.com ru info jp eu tc nu co.nz)
   REGISTERED_DOMAIN = "google"
   AVAILABLE_DOMAIN = "asdfasdfasdfcvr3rwsdc2e"
 
@@ -41,7 +41,7 @@ class WhoisTest < Test::Unit::TestCase
 
   def test_expiration_date
     domain = find_and_assert_domain("google.com")
-    assert_equal Time.local(*ParseDate.parsedate("2011-09-13")), domain.expiration_date
+    assert_equal Time.local(*ParseDate.parsedate("2011-09-14")), domain.expiration_date
 
     TEST_TLDS.each do |tld|
       domain = find_and_assert_domain("#{REGISTERED_DOMAIN}.#{tld}")
@@ -50,6 +50,11 @@ class WhoisTest < Test::Unit::TestCase
     end
   end
 
+  def test_mobi_domain
+    domain = find_and_assert_domain("google.mobi")
+    assert domain.expiration_date_known?
+  end
+
   protected
 
   def find_and_assert_domain(domain)

data/universal_ruby_whois.gemspec

@@ -1,5 +1,5 @@
 PKG_NAME      = 'universal_ruby_whois'
-PKG_VERSION   = '1.2.6'
+PKG_VERSION   = '1.2.7'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'universalwhois'
 RUBY_FORGE_USER    = 'mlightner'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mlightner-universal_ruby_whois
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - Matt Lightner
@@ -9,11 +9,12 @@ autorequire: name
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: