jm81-whois 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWQxOGEyMzFkYzIzNzUzNDUxOTllZGMxMTg5M2MwNWU4NWRiMTI5MQ==
+  data.tar.gz: !binary |-
+    OTcxZWE4ZjAwOTYwNjI0NjcxMDI3ODAzM2M2ODRmZGI5MjhiOTg5OA==
+SHA512:
+  metadata.gz: !binary |-
+    YTRiZjNhOWNmNDY4ZTk3YjE2YTA3MDZkMzYyMDhlYTUxZTQ2MTExYWIzYTBj
+    Y2U0YjM4YjQ3ZTdmMDRkMDcxZjM4ZTI1ZDc2Mjc2ZDMyNTg3ZmQwMmYwZTk1
+    ZDQwMDFhNTZhYTNmMzE3NmEyNTAzMTA4NjJiMDgyMjc4Y2EwOTQ=
+  data.tar.gz: !binary |-
+    MjBhNWM0ODEyZThkY2Q3N2IxZmQ5NTdmMDJmOGY5NDZhMmIyYWJlYjA3N2Ew
+    YTdhOGRjMjZmNzE4NzcwNGE4ZTBhYmUxZTYxMDdhNjVkNzU2NjEwZjA2NDA0
+    NzM5NTNlNjI2NDhhZjcxYmRmNmYyMDEzZTE4ODc1YzlhN2Y3NGM=

data/README.md

@@ -9,6 +9,9 @@ sudo gem install jm81-whois
 
 ##Example
 
+    require 'whois'
+    domain = Whois::Domain.new('example.com')
+
     domain.name         #=> "example.com"
     domain.expires_on   #=> 2011-08-13 <Date>
     domain.created_on   #=> 1995-08-14 <Date>
@@ -27,11 +30,11 @@ sudo gem install jm81-whois
     domain.to_s # Key value pairs of anything that looks like an attribute.
                 # Especially useful for non-API information, such as registrant
                 # data.
-    
+
 ##Code layout
 
 Since pretty much every TLD has a different whois format, the various classes
-(which inherit from Domain::Base) in the Domain module (files in domain folder) 
+(which inherit from Domain::Base) in the Domain module (files in domain folder)
 have the following:
 
 - HOST constant: the host name of the whois server
@@ -50,7 +53,7 @@ insufficient (particular likely for lists of values, such as *status* and
 
 ##Note on Tests
 
-Tests are against actual whois data and thus are somewhat brittle, especially 
+Tests are against actual whois data and thus are somewhat brittle, especially
 *expires_at* and *updated_at*.
 
 ##TODO

data/Rakefile

@@ -1,29 +1,9 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rubygems'
 require File.join(File.dirname(__FILE__), 'lib', 'whois', 'version')
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "jm81-whois"
-    gem.version = Whois::VERSION.dup
-    gem.summary = %Q{Ruby library for accessing Whois information}
-    gem.description = <<EOF
-This library presents whois information for domains in a variety of TLD's 
-through a standardized API.
-EOF
-    gem.email = "jmorgan@morgancreative.net"
-    gem.homepage = "http://github.com/jm81/whois"
-    gem.authors = ["Jared Morgan"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
 desc 'Default: run unit tests.'
 task :default => :test
 
@@ -40,7 +20,7 @@ Rake::RDocTask.new do |rdoc|
   else
     version = ""
   end
-  
+
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Whois #{version}'
   rdoc.options << '--line-numbers' << '--inline-source'

data/lib/whois/domain/base.rb

@@ -1,6 +1,6 @@
 class Whois::Domain::Base
   attr_reader :name, :raw
-  
+
   # Default keys for pairs in raw whois data.
   # :method_name => 'Default Key Text'
   ATTR_NAMES = {
@@ -14,7 +14,7 @@ class Whois::Domain::Base
     :registrant_id => "Registrant",
     :administrative_id => "Administrative"
   }
-  
+
   # Inherited classes call class method +responds_to+ to say for which TLDs
   # that class is responsible.
   #
@@ -23,7 +23,7 @@ class Whois::Domain::Base
   def self.responds_to(*ary)
     Whois::Domain::tlds[self.name.split(":").last] = ary
   end
-  
+
   # Initialize and run query for the given domain.
   #
   # ==== Parameters
@@ -32,29 +32,29 @@ class Whois::Domain::Base
     @name = name
     query
   end
-  
+
   # retun HOST constant for the running class
   def host
     self.class::HOST
   end
-  
+
   # A merge of the ATTR_NAMES for the running class and the Base class. This
-  # allows child classes to only define keys that are different from the 
+  # allows child classes to only define keys that are different from the
   # default.
   def attr_names
     @attr_names ||= ATTR_NAMES.merge(self.class::ATTR_NAMES)
   end
-  
+
   # The string to use in +query+. This is generally just the domain name
   # followed by a new line, but some servers have a different format.
   def query_string
     "#{@name}\n"
   end
-  
+
   # Query the whois server and return all lines in +@raw+. Called by initialize.
   # Based on Michael Neumann's library.
   def query
-    s = TCPsocket.open(host, 43)
+    s = TCPSocket.open(host, 43)
     s.write(query_string)
     @raw = s.gets(nil)
     raise(Whois::LookupRestricted, @raw) if lookup_restricted?
@@ -66,10 +66,10 @@ class Whois::Domain::Base
   # checking for this is server-specific.
   def lookup_restricted?
     false
-  end  
-  
+  end
+
   private :attr_names, :query_string, :query
-  
+
   # Get Hash of attributes, by iterating through each line of +@raw+. If the
   # line matches the class's ATTR_MATCH constant, it is added to the +@attrs+
   # Hash. Each elements of +attrs+  is an Array, to allow for multiple lines
@@ -78,26 +78,26 @@ class Whois::Domain::Base
   # based on Michael Neumann's library
   def attrs
     return @attrs if @attrs
-    
+
     @attrs = Hash.new { |hsh, key| hsh[key] = [] }
-    raw.each do |line|
+    raw.each_line do |line|
       m = self.class::ATTR_MATCH.match(line)
       @attrs[m[1]] << m[2] if m
     end
     return @attrs
   end
-  
+
   # Return attributes as newline separated key value pairs ("key: value")
   def to_s
     s = ""
-    raw.each do |line|
+    raw.each_line do |line|
       m = self.class::ATTR_MATCH.match(line)
       s << "#{m[1]}: #{m[2]}\n" if m
     end
     s
   end
-  
-  # Return the value of an attribute as a single String or nil. This returns 
+
+  # Return the value of an attribute as a single String or nil. This returns
   # only the first element of the attribute value (see +attr_array+). It is
   # preferred not to use this method directly.
   #
@@ -106,7 +106,7 @@ class Whois::Domain::Base
   def attr_single(attr_name)
     attrs[attr_names[attr_name]] ? attrs[attr_names[attr_name]][0] : nil
   end
-  
+
   # Return the value of an attribute converted to a Date object. This returns
   # only the first element of the attribute value. It is
   # preferred not to use this method directly.
@@ -114,20 +114,20 @@ class Whois::Domain::Base
   # ==== Parameters
   # attr_name<Symbol>:: Matches the method name
   def attr_date(attr_name)
-    attrs[attr_names[attr_name]] ? Date.parse(attrs[attr_names[attr_name]][0]) : nil
+    attrs[attr_names[attr_name]][0] ? Date.parse(attrs[attr_names[attr_name]][0]) : nil
   end
-  
+
   # Return all values of an attribute as an Array. It is
   # preferred not to use this method directly.
   #
   # ==== Parameters
   # attr_name<Symbol>:: Matches the method name
   def attr_array(attr_name)
-    attrs[attr_names[attr_name]] || []
+    (attrs[attr_names[attr_name]] || []).select { |val| val && val != '' }
   end
-  
+
   private :attr_single, :attr_date, :attr_array
-  
+
   # Return the whois_server used for getting details for this domain. For many
   # TLD's, all data is served from the primary whois server. A few TLD's have
   # details on separate servers. Return +host+ unless a whois_server is included
@@ -135,37 +135,37 @@ class Whois::Domain::Base
   def whois_server
     attr_single(:whois_server) || host
   end
-  
+
   # Name of this domain's Registrar
   def registrar_name
     attr_single(:registrar_name)
   end
-  
+
   # Date of domain registration
   def created_on
     attr_date(:created_on)
   end
-  
+
   # Last time the domain's whois information was updated (I think)
   def updated_on
     attr_date(:updated_on)
   end
-  
+
   # Date domain's registration expires
   def expires_on
     attr_date(:expires_on)
   end
-  
+
   # Array of status entries for domain
   def status
     attr_array(:status)
   end
-  
+
   # Array of name servers for domain
   def name_servers
     attr_array(:name_servers)
   end
-  
+
   # ID of this domain's Registrant
   def registrant_id
     attr_single(:registrant_id)
@@ -180,17 +180,17 @@ class Whois::Domain::Base
   def ns
     name_servers
   end
-  
+
   # Is this domain expired (assuming it's registered)?
   def expired?
     expires_on && (expires_on < Date.today)
   end
-  
+
   # Is this domain registered?
   def registered?
     !available?
   end
-  
+
   # Some whois servers include the time of the last update to this domain in
   # the database. For those that do not, this returns nil.
   #
@@ -199,7 +199,7 @@ class Whois::Domain::Base
   def database_updated_at
     nil
   end
-  
+
   # A url for registering this domain.
   def register_url
     "https://www.securepaynet.net/gdshop/registrar/search.asp?prog_id=morgancr&domainToCheck=#{name}&checkAvail=1"

data/lib/whois/domain/gov.rb

@@ -3,7 +3,7 @@
 # with more detail.
 class Whois::Domain::Gov < Whois::Domain::Base
   HOST = "whois.nic.gov"
-  ATTR_MATCH = /^([^:]+):\s(.*)\r$/
+  ATTR_MATCH = /^\s*([^:]+):\s(.*)$/
   responds_to :gov
 
   ATTR_NAMES = {

data/lib/whois/domain/int.rb

@@ -8,15 +8,15 @@ class Whois::Domain::Int < Whois::Domain::Base
     :updated_on => 'changed',
     :name_servers => 'nserver'
   }
-  
+
   def registrar_name
     ".int Domain Registry (IANA)"
   end
-  
+
   def available?
-     @raw =~ /domain:       INT/
+     @raw =~ /returned 0 objects/
   end
-  
+
   def name_servers
     # Remove IP address.
     super.collect{ |ns| ns.match(/\A([\S]*)\s/)[1] }

data/lib/whois/domain/jobs.rb

@@ -0,0 +1,12 @@
+require 'whois/domain/verisign_grs'
+
+class Whois::Domain::Jobs < Whois::Domain::VerisignGrs
+  HOST = "whois.verisign-grs.com"
+  ATTR_MATCH = /^   ([^:]+):\W*(.*)$/
+  responds_to :jobs, :tv
+
+  ATTR_NAMES = {
+    :status => 'Domain Status',
+    :registrar_name => 'Sponsoring Registrar'
+  }
+end

data/lib/whois/domain/museum.rb

@@ -9,11 +9,11 @@ class Whois::Domain::Museum < Whois::Domain::Base
     :updated_on => "Last Updated On",
     :expires_on => "Expiration Date"
   }
-  
+
   def available?
     @raw =~ /NOT FOUND/
   end
-  
+
   def register_url
     "http://about.museum/register/"
   end

data/lib/whois/domain/name.rb

@@ -1,6 +1,6 @@
 class Whois::Domain::Name < Whois::Domain::Base
   HOST = "whois.nic.name"
-  ATTR_MATCH = /^([^:]+):\s(.*)$/
+  ATTR_MATCH = /^\s+([^:]+):\s(.*)$/
   responds_to :name
 
   ATTR_NAMES = {
@@ -10,11 +10,11 @@ class Whois::Domain::Name < Whois::Domain::Base
     :expires_on => "Expires On",
     :status => "Domain Status"
   }
-  
+
   def available?
     @raw =~ /No match/
   end
-  
+
   # whois.nic.name uses a query in the format
   # object = name. e.g. domain = john.smith.name
   def query_string

data/lib/whois/domain/pro.rb

@@ -2,23 +2,23 @@ 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/
+    @raw =~ /^NOT FOUND/
   end
 end

data/lib/whois/domain/public_interest.rb

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

data/lib/whois/domain/verisign_grs.rb

@@ -1,8 +1,8 @@
 class Whois::Domain::VerisignGrs < Whois::Domain::Base
   HOST = "whois.verisign-grs.com"
   ATTR_MATCH = /^   ([^:]+):\W*(.*)$/
-  responds_to :com, :net, :jobs, :tv
-  
+  responds_to :com, :net
+
   def initialize(name)
     @name = name
     @host = nil
@@ -19,7 +19,7 @@ class Whois::Domain::VerisignGrs < Whois::Domain::Base
       @raw = old_raw if (@raw =~ /not available/)
     end
   end
-  
+
   def host
     return @host unless @host.nil?
 
@@ -30,21 +30,29 @@ class Whois::Domain::VerisignGrs < Whois::Domain::Base
     end
   end
 
+  def query_string
+    if host == "whois.verisign-grs.com"
+      "domain #{@name.upcase}\n"
+    else
+      "#{@name.upcase}\n"
+    end
+  end
+
   DATABASE_UPDATED_AT_REGEXES = [
-    /Last update of whois database: ([^<]*)/,
-    /Record last updated on ([^\.]*)/
+    /Last update of whois database: ([^<]*)/i,
+    /Record last updated on ([^\.]*)/i
   ]
-  
+
   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