jm81-whois 0.5.0 → 0.6.0

data/lib/whois/domain/pro.rb

@@ -1,24 +1,24 @@
-class Whois::Domain::Pro < Whois::Domain::Base
-  HOST = "whois.registrypro.pro"
-  ATTR_MATCH = /^([^:]+):\W*(.*)\r$/
-  responds_to :pro
-  
-  ATTR_NAMES = {
-    :registrar_name => "Sponsoring Registrar",
-    :created_on => "Created On",
-    :updated_on => "Last Updated On",
-    :expires_on => "Expiration Date"
-  }
-  
-  def status
-    attrs["Status"] ? attrs["Status"][0].split(",").collect{|d| d.strip} : nil
-  end
-  
-  def register_url
-    "http://www.registrypro.pro/partners_findaregistrar.htm"
-  end
-
-  def available?
-    @raw =~ /^No match/
-  end
+class Whois::Domain::Pro < Whois::Domain::Base
+  HOST = "whois.registrypro.pro"
+  ATTR_MATCH = /^([^:]+):\W*(.*)\r$/
+  responds_to :pro
+  
+  ATTR_NAMES = {
+    :registrar_name => "Sponsoring Registrar",
+    :created_on => "Created On",
+    :updated_on => "Last Updated On",
+    :expires_on => "Expiration Date"
+  }
+  
+  def status
+    attrs["Status"] ? attrs["Status"][0].split(",").collect{|d| d.strip} : nil
+  end
+  
+  def register_url
+    "http://www.registrypro.pro/partners_findaregistrar.htm"
+  end
+
+  def available?
+    @raw =~ /^No match/
+  end
 end

data/lib/whois/domain/public_interest.rb

@@ -1,15 +1,15 @@
-class Whois::Domain::PublicInterest < Whois::Domain::Base
-  HOST = "whois.pir.org"
-  ATTR_MATCH = /^([^:]+):(\S.*)\r$/
-  responds_to :org
-
-  ATTR_NAMES = {
-    :registrar_name => "Sponsoring Registrar",
-    :created_on => "Created On",
-    :updated_on => "Last Updated On"
-  }
-  
-  def available?
-    @raw =~ /NOT FOUND/
-  end
+class Whois::Domain::PublicInterest < Whois::Domain::Base
+  HOST = "whois.pir.org"
+  ATTR_MATCH = /^([^:]+):(\S.*)\r$/
+  responds_to :org
+
+  ATTR_NAMES = {
+    :registrar_name => "Sponsoring Registrar",
+    :created_on => "Created On",
+    :updated_on => "Last Updated On"
+  }
+  
+  def available?
+    @raw =~ /NOT FOUND/
+  end
 end

data/lib/whois/domain/ru.rb

@@ -0,0 +1,17 @@
+class Whois::Domain::Ru < Whois::Domain::Base
+  HOST = "whois.ripn.net"
+  ATTR_MATCH = /\s*([^:]+):\s+(.*)$/
+  responds_to :ru
+
+  ATTR_NAMES = {
+    :registrar_name => "Registrar Name",
+    :whois_server => "Registrar Whois",
+    :created_on => "Domain Created",
+    :updated_on => "Domain Last Updated",
+    :expires_on => "Domain Currently Expires"
+  }
+  
+  def available?
+    @raw =~ /NOT FOUND/
+  end
+end

data/lib/whois/domain/su.rb

@@ -0,0 +1,17 @@
+class Whois::Domain::Su < Whois::Domain::Base
+  HOST = "whois.ripn.net"
+  ATTR_MATCH = /\s*([^:]+):\s+(.*)$/
+  responds_to :su
+
+  ATTR_NAMES = {
+    :registrar_name => "Registrar Name",
+    :whois_server => "Registrar Whois",
+    :created_on => "Domain Created",
+    :updated_on => "Domain Last Updated",
+    :expires_on => "Domain Currently Expires"
+  }
+  
+  def available?
+    @raw =~ /NOT FOUND/
+  end
+end

data/lib/whois/domain/verisign_grs.rb

@@ -1,29 +1,63 @@
-class Whois::Domain::VerisignGrs < Whois::Domain::Base
-  HOST = "whois.verisign-grs.com"
-  ATTR_MATCH = /^   ([^:]+):\W*(.*)$/
-  responds_to :com, :net, :jobs, :tv
-  
-  def host
-    case @name.match(/.*\.([^\.]+)$/)[1]
-    when 'jobs' then "jobswhois.verisign-grs.com"
-    when 'tv'   then "tvwhois.verisign-grs.com"  
-    else             "whois.verisign-grs.com"
-    end
-  end
-  
-  # For best results, this use object = name format.
-  # e.g. domain = john.smith.name
-  def query_string
-    "domain = #{@name}\n"
-  end
-  
-  def database_updated_at
-    if(@raw =~ /Last update of whois database: ([^<]*)/)
-      Time.parse($1)
-    end
-  end
-  
-  def available?
-    @raw =~ /^No match for/
-  end
-end
+class Whois::Domain::VerisignGrs < Whois::Domain::Base
+  HOST = "whois.verisign-grs.com"
+  ATTR_MATCH = /^   ([^:]+):\W*(.*)$/
+  responds_to :com, :net, :jobs, :tv
+  
+  def initialize(name)
+    @name = name
+    @host = nil
+
+    query
+
+    # Requery if the whois_server is different from HOST (or whois.iana.org
+    # which doesn't appear to return much data). Check that the whois_server
+    # does in fact return data before using.
+    unless ( whois_server.empty? || [HOST, 'whois.iana.org'].include?(whois_server) )
+      @host = whois_server
+      old_raw = @raw
+      query
+      @raw = old_raw if (@raw =~ /not available/)
+    end
+  end
+  
+  def host
+    return @host unless @host.nil?
+
+    case @name.match(/.*\.([^\.]+)$/)[1]
+      when 'jobs' then "jobswhois.verisign-grs.com"
+      when 'tv'   then "tvwhois.verisign-grs.com"
+      else             "whois.verisign-grs.com"
+    end
+  end
+
+  DATABASE_UPDATED_AT_REGEXES = [
+    /Last update of whois database: ([^<]*)/,
+    /Record last updated on ([^\.]*)/
+  ]
+  
+  def database_updated_at
+    DATABASE_UPDATED_AT_REGEXES.each do |regex|
+      if (match_data = @raw.match(regex))
+        return Time.parse(match_data[1])
+      end
+    end
+    
+    return nil
+  end
+  
+  def available?
+    @raw =~ /^No match for/
+  end
+
+  def registrant_id
+    found = false
+    @raw.each_line do |l|
+      if l =~ /^Organisation Contact/
+        found = true
+      elsif found && l =~ /^ID\.+:\s+(.+)/
+        return $1
+      end
+    end
+    ''
+  end
+end

data/lib/whois/domain/ws.rb

@@ -1,30 +1,34 @@
-class Whois::Domain::Ws < Whois::Domain::Base
-  HOST = "whois.website.ws"
-  ATTR_MATCH = /\s*([^:]+):\s+(.*)$/
-  responds_to :ws
-
-  ATTR_NAMES = {
-    :registrar_name => "Registrar Name",
-    :whois_server => "Registrar Whois",
-    :created_on => "Domain Created",
-    :updated_on => "Domain Last Updated",
-    :expires_on => "Domain Currently Expires"
-  }
-  
-  def available?
-    @raw =~ /^No match/
-  end
-  
-  def name_servers
-    found = false
-    ns_ary = []
-    @raw.each_line do |l|
-      if l =~ /Current Nameservers:/
-        found = true
-      elsif found && l =~ /^\s*(\S+)/
-        ns_ary << $1
-      end
-    end
-    ns_ary
-  end
-end
+class Whois::Domain::Ws < Whois::Domain::Base
+  HOST = "whois.website.ws"
+  ATTR_MATCH = /\s*([^:]+):\s+(.*)$/
+  responds_to :ws
+
+  ATTR_NAMES = {
+    :registrar_name => "Registrar Name",
+    :whois_server => "Registrar Whois",
+    :created_on => "Domain Created",
+    :updated_on => "Domain Last Updated",
+    :expires_on => "Domain Currently Expires"
+  }
+  
+  def available?
+    @raw =~ /^No match/
+  end
+
+  def lookup_restricted?
+    @raw =~ /You exceeded the maximum allowable number of whois lookups/
+  end
+  
+  def name_servers
+    found = false
+    ns_ary = []
+    @raw.each_line do |l|
+      if l =~ /Current Nameservers:/
+        found = true
+      elsif found && l =~ /^\s*(\S+)/
+        ns_ary << $1
+      end
+    end
+    ns_ary
+  end
+end

data/lib/whois/domain.rb

@@ -1,18 +1,18 @@
-module Whois::Domain
-  @@tlds = {}
-
-  def self.tlds
-    @@tlds
-  end
-
-  def self.new(domain_name)
-    tld = domain_name.match(/.*\.([^\.]+)$/)[1].to_sym
-    class_name = @@tlds.find{|c, tlds_ary| tlds_ary.include?(tld)}[0]
-    const_get(class_name).new(domain_name)
-  end
-end
-
-require 'whois/domain/base.rb'
-Dir.new(File.dirname(__FILE__) + '/domain').each do |file|
-  require('whois/domain/' + File.basename(file)) if File.extname(file) == ".rb"
-end
+module Whois::Domain
+  @@tlds = {}
+
+  def self.tlds
+    @@tlds
+  end
+
+  def self.new(domain_name)
+    tld = domain_name.match(/.*\.([^\.]+)$/)[1].to_sym
+    class_name = @@tlds.find{|c, tlds_ary| tlds_ary.include?(tld)}[0]
+    const_get(class_name).new(domain_name)
+  end
+end
+
+require 'whois/domain/base.rb'
+Dir.new(File.dirname(__FILE__) + '/domain').each do |file|
+  require('whois/domain/' + File.basename(file)) if File.extname(file) == ".rb"
+end

data/lib/whois/version.rb

@@ -0,0 +1,3 @@
+module Whois
+  VERSION = '0.6.0'.freeze
+end

data/lib/whois.rb

@@ -1,9 +1,11 @@
-require 'socket'
-require 'date'
-require 'time'
-
-module Whois
-  VERSION = '0.5.0'
-end
-
-require 'whois/domain'
+require 'socket'
+require 'date'
+require 'time'
+
+module Whois
+  class LookupRestricted < StandardError
+  end
+end
+
+require 'whois/version'
+require 'whois/domain'

data/test/whois/domain/aero_test.rb

@@ -1,24 +1,24 @@
-require 'test_helper'
-
-class Whois::Domain::AeroTest < Test::Unit::TestCase
-
-  def test_whois  
-    assert_whois_data(EXP_DATA)
-    assert Whois::Domain.new("not-reg-1234.aero").available?
-  end
-
-  EXP_DATA = {
-    :name => "information.aero",
-    :kind => "Aero",
-    :created_on => "2002-02-19",
-    :updated_on => "2009-02-20",
-    :expires_on => "2010-02-19",
-    :database_updated_at => false,
-    :registrar_name => "SITA (9999)",
-    :whois_server => "whois.aero",
-    :raw_match => "Domain Name:INFORMATION.AERO",
-    :status => ['OK'],
-    :name_servers => ['NS01.AFILIAS.INFO', 'NS02.AFILIAS.INFO']
-  }
-
-end
+require 'test_helper'
+
+class Whois::Domain::AeroTest < Test::Unit::TestCase
+
+  def test_whois  
+    assert_whois_data(EXP_DATA)
+    assert Whois::Domain.new("not-reg-1234.aero").available?
+  end
+
+  EXP_DATA = {
+    :name => 'information.aero',
+    :kind => 'Aero',
+    :created_on => '2002-02-19',
+    :updated_on => '2010-02-20',
+    :expires_on => '2011-02-19',
+    :database_updated_at => false,
+    :registrar_name => "SITA (9999)",
+    :whois_server => "whois.aero",
+    :raw_match => "Domain Name:INFORMATION.AERO",
+    :status => ['OK'],
+    :name_servers => ['NS01.AFILIAS.INFO', 'NS02.AFILIAS.INFO']
+  }
+
+end

data/test/whois/domain/afilias_test.rb

@@ -1,24 +1,24 @@
-require 'test_helper'
-
-class Whois::Domain::AfiliasTest < Test::Unit::TestCase
-
-  def test_whois  
-    assert_whois_data(EXP_DATA)
-    assert Whois::Domain.new("not-reg-1234.info").available?
-  end
-
-  EXP_DATA = {
-    :name => "nic.info",
-    :kind => "Afilias",
-    :created_on => "2001-07-27",
-    :updated_on => "2002-06-10",
-    :expires_on => "2011-07-27",
-    :database_updated_at => false,
-    :registrar_name => "Afilias Ltd. (R145-LRMS)",
-    :whois_server => "whois.afilias.net",
-    :raw_match => "Domain Name:NIC.INFO",
-    :status => ['DELETE PROHIBITED', 'RENEW PROHIBITED', 'TRANSFER PROHIBITED', 'UPDATE PROHIBITED'],
-    :name_servers => ['NS01.AFILIAS.INFO', 'NS02.AFILIAS.INFO']
-  }
-
-end
+require 'test_helper'
+
+class Whois::Domain::AfiliasTest < Test::Unit::TestCase
+
+  def test_whois  
+    assert_whois_data(EXP_DATA)
+    assert Whois::Domain.new("not-reg-1234.info").available?
+  end
+
+  EXP_DATA = {
+    :name => "nic.info",
+    :kind => "Afilias",
+    :created_on => "2001-07-27",
+    :updated_on => "2002-06-10",
+    :expires_on => "2011-07-27",
+    :database_updated_at => false,
+    :registrar_name => "Afilias Ltd. (R145-LRMS)",
+    :whois_server => "whois.afilias.net",
+    :raw_match => "Domain Name:NIC.INFO",
+    :status => ['DELETE PROHIBITED', 'RENEW PROHIBITED', 'TRANSFER PROHIBITED', 'UPDATE PROHIBITED'],
+    :name_servers => ['NS01.AFILIAS.INFO', 'NS02.AFILIAS.INFO']
+  }
+
+end

data/test/whois/domain/cat_test.rb

@@ -1,28 +1,28 @@
-require 'test_helper'
-
-class Whois::Domain::CatTest < Test::Unit::TestCase
-
-  def test_whois  
-    assert_whois_data(EXP_DATA)
-    assert Whois::Domain.new("not-reg-1234.cat").available?
-  end
-  
-  def test_register_url
-    assert_equal "http://domini.cat/en_registrar.html", Whois::Domain.new("domini.cat").register_url
-  end
-
-  EXP_DATA = {
-    :name => "domini.cat",
-    :kind => "Cat",
-    :created_on => "2006-05-05",
-    :updated_on => "2009-06-19",
-    :expires_on => "2010-05-05",
-    :database_updated_at => false,
-    :registrar_name => "R-906 (puntCAT Administrative Account)",
-    :whois_server => "whois.cat",
-    :raw_match => "Domain Name: domini.cat",
-    :status => ['ok'],
-    :name_servers => nil # I can't figure out a stable test. The order changes and they may have some weird space-like character at the end.
-  }
-
-end
+require 'test_helper'
+
+class Whois::Domain::CatTest < Test::Unit::TestCase
+
+  def test_whois  
+    assert_whois_data(EXP_DATA)
+    assert Whois::Domain.new("not-reg-1234.cat").available?
+  end
+  
+  def test_register_url
+    assert_equal "http://domini.cat/en_registrar.html", Whois::Domain.new("domini.cat").register_url
+  end
+
+  EXP_DATA = {
+    :name => 'domini.cat',
+    :kind => 'Cat',
+    :created_on => '2006-05-05',
+    :updated_on => '2010-06-19',
+    :expires_on => '2011-05-05',
+    :database_updated_at => false,
+    :registrar_name => "R-906 (puntCAT Administrative Account)",
+    :whois_server => "whois.cat",
+    :raw_match => "Domain Name: domini.cat",
+    :status => ['ok'],
+    :name_servers => nil # I can't figure out a stable test. The order changes and they may have some weird space-like character at the end.
+  }
+
+end

data/test/whois/domain/coop_test.rb

@@ -1,28 +1,28 @@
-require 'test_helper'
-
-class Whois::Domain::CoopTest < Test::Unit::TestCase
-
-  def test_coop
-    assert_whois_data(EXP_COOP)
-    assert Whois::Domain.new("not-reg-0987.coop").available?
-  end
-  
-  def test_register_url
-    assert_equal "http://domains.coop/", Whois::Domain.new("domains.coop").register_url
-  end
-
-  EXP_COOP = {
-    :name => "domains.coop",
-    :kind => "Coop",
-    :created_on => "2002-07-09",
-    :updated_on => "2007-01-17",
-    :expires_on => "2011-07-09",
-    :database_updated_at => false,
-    :registrar_name => "domains.coop",
-    :whois_server => "whois.nic.coop",
-    :raw_match => "Domain Name:             domains.coop",
-    :status => ['ok'],
-    :name_servers => ['ns2.mydyndns.org', 'ns3.mydyndns.org', 'ns4.mydyndns.org', 'ns5.mydyndns.org', 'ns1.mydyndns.org']
-  }
-  
-end
+require 'test_helper'
+
+class Whois::Domain::CoopTest < Test::Unit::TestCase
+
+  def test_coop
+    assert_whois_data(EXP_COOP)
+    assert Whois::Domain.new("not-reg-0987.coop").available?
+  end
+  
+  def test_register_url
+    assert_equal "http://domains.coop/", Whois::Domain.new("domains.coop").register_url
+  end
+
+  EXP_COOP = {
+    :name => "domains.coop",
+    :kind => "Coop",
+    :created_on => "2002-07-09",
+    :updated_on => "2007-01-17",
+    :expires_on => "2011-07-09",
+    :database_updated_at => false,
+    :registrar_name => "domains.coop",
+    :whois_server => "whois.nic.coop",
+    :raw_match => "Domain Name:             domains.coop",
+    :status => ['ok'],
+    :name_servers => ['ns2.mydyndns.org', 'ns3.mydyndns.org', 'ns4.mydyndns.org', 'ns5.mydyndns.org', 'ns1.mydyndns.org']
+  }
+  
+end

data/test/whois/domain/educause_test.rb

@@ -1,24 +1,24 @@
-require 'test_helper'
-
-class Whois::Domain::EducauseTest < Test::Unit::TestCase
-
-  def test_whois  
-    assert_whois_data(EXP_DATA)
-    assert Whois::Domain.new("not-reg-1234.edu").available?
-  end
-
-  EXP_DATA = {
-    :name => "educause.edu",
-    :kind => "Educause",
-    :created_on => "1998-03-11",
-    :updated_on => "2009-08-01",
-    :expires_on => "2010-07-31",
-    :database_updated_at => false,
-    :registrar_name => "Educause",
-    :whois_server => "whois.educause.edu",
-    :raw_match => "Domain Name: EDUCAUSE.EDU",
-    :status => [],
-    :name_servers => ['NS3.EDUCAUSE.EDU', 'NS4.EDUCAUSE.EDU', 'NS5.EDUCAUSE.EDU']
-  }
-
-end
+require 'test_helper'
+
+class Whois::Domain::EducauseTest < Test::Unit::TestCase
+
+  def test_whois  
+    assert_whois_data(EXP_DATA)
+    assert Whois::Domain.new('not-reg-1234.edu').available?
+  end
+
+  EXP_DATA = {
+    :name => 'educause.edu',
+    :kind => 'Educause',
+    :created_on => '1998-03-11',
+    :updated_on => '2010-08-04',
+    :expires_on => '2010-07-31',
+    :database_updated_at => false,
+    :registrar_name => 'Educause',
+    :whois_server => 'whois.educause.edu',
+    :raw_match => 'Domain Name: EDUCAUSE.EDU',
+    :status => [],
+    :name_servers => ['NS3.EDUCAUSE.EDU','NS01.ENG01.DATA393.NET', 'NS5.EDUCAUSE.EDU', 'NS02.ENG01.DATA393.NET']
+  }
+
+end

data/test/whois/domain/gov_test.rb

@@ -1,28 +1,28 @@
-require 'test_helper'
-
-class Whois::Domain::GovTest < Test::Unit::TestCase
-
-  def test_whois  
-    assert_whois_data(EXP_DATA)
-    assert Whois::Domain.new("not-reg-1234.gov").available?
-  end
-  
-  def test_register_url
-    assert_equal "http://www.dotgov.gov/help_how.aspx", Whois::Domain.new("not-reg-1234.gov").register_url
-  end
-
-  EXP_DATA = {
-    :name => "dotgov.gov",
-    :kind => "Gov",
-    :created_on => nil,
-    :updated_on => nil,
-    :expires_on => nil,
-    :database_updated_at => false,
-    :registrar_name => nil,
-    :whois_server => "whois.nic.gov",
-    :raw_match => "Domain Name: dotgov.gov",
-    :status => ['Active'],
-    :name_servers => []
-  }
-
-end
+require 'test_helper'
+
+class Whois::Domain::GovTest < Test::Unit::TestCase
+
+  def test_whois  
+    assert_whois_data(EXP_DATA)
+    assert Whois::Domain.new("not-reg-1234.gov").available?
+  end
+  
+  def test_register_url
+    assert_equal "http://www.dotgov.gov/help_how.aspx", Whois::Domain.new("not-reg-1234.gov").register_url
+  end
+
+  EXP_DATA = {
+    :name => "dotgov.gov",
+    :kind => "Gov",
+    :created_on => nil,
+    :updated_on => nil,
+    :expires_on => nil,
+    :database_updated_at => false,
+    :registrar_name => nil,
+    :whois_server => "whois.nic.gov",
+    :raw_match => "Domain Name: dotgov.gov",
+    :status => ['Active'],
+    :name_servers => []
+  }
+
+end