whois 2.4.0 → 2.5.0

data/.rspec

@@ -1,2 +1 @@
---format Fuubar
 --colour

data/Rakefile

@@ -33,9 +33,27 @@ spec = Gem::Specification.new do |s|
   s.require_paths     = %w( lib )
 
   s.add_development_dependency "rake",  "~> 0.9"
-  s.add_development_dependency "rspec", "~> 2.8.0"
+  s.add_development_dependency "rspec", "~> 2.9.0"
   s.add_development_dependency "mocha"
   s.add_development_dependency "yard"
+
+  s.post_install_message = <<EOS
+********************************************************************************
+
+  Thank you for installing the whois gem!
+
+  If you like this gem, please support the project.
+  http://pledgie.com/campaigns/11383
+
+  Does your project or organization use this gem? Add it to the apps wiki.
+  https://github.com/weppos/whois/wiki/apps
+
+  Are you looking for a quick and convenient way to perform WHOIS queries?
+  Check out RoboWhois WHOIS API.
+  http://www.robowhois.com/
+
+********************************************************************************
+EOS
 end
 
 
@@ -64,9 +82,15 @@ task :package => [:gemspec]
 
 
 require 'rspec/core/rake_task'
+begin
+  require 'fuubar'
+rescue LoadError
+end
 
 RSpec::Core::RakeTask.new do |t|
   t.verbose = !!ENV["VERBOSE"]
+  t.rspec_opts  = []
+  t.rspec_opts << ['--format', 'Fuubar'] if defined?(Fuubar)
 end
 
 

data/lib/whois/definitions/tlds.rb

@@ -84,7 +84,7 @@ 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, ".by", nil, { :web => "http://www.tld.by/indexeng.html", :adapter => Whois::Server::Adapters::Web }
+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, ".co.ca", "whois.co.ca"

data/lib/whois/record/parser/base.rb

@@ -11,7 +11,7 @@ require 'time'
 require 'whois/record/contact'
 require 'whois/record/registrar'
 require 'whois/record/nameserver'
-require 'whois/record/parser/scanners/ast'
+require 'whois/record/scanners/ast'
 
 
 module Whois

data/lib/whois/record/parser/base_afilias.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/afilias'
+require 'whois/record/scanners/afilias'
 
 
 module Whois
@@ -24,7 +24,7 @@ module Whois
 
 
         property_supported :disclaimer do
-          node("property:disclaimer")
+          node("field:disclaimer")
         end
 
 

data/lib/whois/record/parser/jobswhois.verisign-grs.com.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/verisign'
+require 'whois/record/scanners/verisign'
 
 
 module Whois

data/lib/whois/record/parser/whois.audns.net.au.rb

@@ -8,24 +8,36 @@
 
 
 require 'whois/record/parser/base'
+require 'whois/record/scanners/whois.audns.net.au.rb'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.audns.net.au parser
-      #
       # Parser for the whois.audns.net.au server.
+      # 
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
-      # NOTE: This parser is just a stub and provides only a few basic methods
-      # to check for domain availability and get domain status.
-      # Please consider to contribute implementing missing methods.
-      # See WhoisNicIt parser for an explanation of all available methods
-      # and examples.
-      #
+      # @since 2.5.0
       class WhoisAudnsNetAu < Base
+        include Scanners::Ast
+
+        property_not_supported :disclaimer
+
+
+        property_supported :domain do
+          node("Domain Name")
+        end
+
+        property_not_supported :domain_id
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
 
         # == Values for Status
         #
@@ -33,11 +45,11 @@ module Whois
         # @see http://www.auda.org.au/policies/auda-2006-07/
         #
         property_supported :status do
-          content_for_scanner.scan(/Status:\s+(.+?)\n/).flatten
+          Array.wrap(node("Status"))
         end
 
         property_supported :available? do
-          (content_for_scanner.strip == "No Data Found")
+          !!node("status:available")
         end
 
         property_supported :registered? do
@@ -48,17 +60,70 @@ module Whois
         property_not_supported :created_on
 
         property_supported :updated_on do
-          if content_for_scanner =~ /Last Modified:\s+(.+)\n/
-            Time.parse($1)
-          end
+          node("Last Modified") { |value| Time.parse(value) }
         end
 
         property_not_supported :expires_on
 
 
+        property_supported :registrar do
+          node("Registrar ID") do |str|
+            Record::Registrar.new(
+              :id   => str,
+              :name => node("Registrar Name")
+            )
+          end
+        end
+
+
+        property_supported :registrant_contacts do
+          contact = build_contact("Registrant Contact", Record::Contact::TYPE_REGISTRANT)
+          contact.organization = node("Registrant") if contact
+          contact
+        end
+
+        property_not_supported :admin_contacts
+
+        property_supported :technical_contacts do
+          build_contact("Tech Contact", Record::Contact::TYPE_TECHNICAL)
+        end
+
+
         property_supported :nameservers do
-          content_for_scanner.scan(/Name Server:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(name)
+          Array.wrap(node("Name Server")).map do |name|
+            Record::Nameserver.new(:name => name)
+          end
+        end
+
+
+        # Initializes a new {Scanners::WhoisAudnsNetAu} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::WhoisAudnsNetAu.new(content_for_scanner).parse
+        end
+
+
+      private
+
+        def build_contact(element, type)
+          node("#{element} ID") do |str|
+            Record::Contact.new(
+              :type         => type,
+              :id           => str,
+              :name         => node("#{element} Name"),
+              :organization => nil,
+              :address      => nil,
+              :city         => nil,
+              :zip          => nil,
+              :state        => nil,
+              :country      => nil,
+              :phone        => nil,
+              :fax          => nil,
+              :email        => nil
+            )
           end
         end
 

data/lib/whois/record/parser/whois.biz.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/whois.biz.rb'
+require 'whois/record/scanners/whois.biz.rb'
 
 
 module Whois

data/lib/whois/record/parser/whois.cctld.by.rb

@@ -0,0 +1,107 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+require 'whois/record/parser/base'
+require 'whois/record/scanners/whois.cctld.by.rb'
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.cctld.by server.
+      # 
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      # @author Aliaksei Kliuchnikau <aliaksei.kliuchnikau@gmail.com>
+      # @since  2.5.0
+      class WhoisCctldBy < Base
+        include Scanners::Ast
+
+        property_not_supported :disclaimer
+
+
+        property_supported :domain do
+          node("Domain Name", &:downcase)
+        end
+
+        property_not_supported :domain_id
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
+
+        property_supported :status do
+          if available?
+            :available
+          else
+            :registered
+          end
+        end
+
+        property_supported :available? do
+          !!node("status:available")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          node("Creation Date") { |value| Time.parse(value) }
+        end
+
+        property_supported :updated_on do
+          node("Updated Date") { |value| Time.parse(value) }
+        end
+
+        property_supported :expires_on do
+          node("Expiration Date") { |value| Time.parse(value) }
+        end
+
+
+        property_supported :registrar do
+          node("Registrar") do |registrar|
+            Record::Registrar.new(
+              :id => registrar,
+              :name => registrar,
+              :organization => registrar
+            )
+          end
+        end
+
+        property_not_supported :registrant_contacts
+
+        property_not_supported :admin_contacts
+
+        property_not_supported :technical_contacts
+
+
+        property_supported :nameservers do
+          Array.wrap(node("Name Server")).map do |name|
+            Nameserver.new(:name => name.downcase)
+          end
+        end
+
+
+        # Initializes a new {Scanners::WhoisCctldBy} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::WhoisCctldBy.new(content_for_scanner).parse
+        end
+
+      end
+    end
+  end
+end

data/lib/whois/record/parser/whois.centralnic.com.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/whois.centralnic.com.rb'
+require 'whois/record/scanners/whois.centralnic.com.rb'
 
 
 module Whois

data/lib/whois/record/parser/whois.cira.ca.rb

@@ -8,40 +8,56 @@
 
 
 require 'whois/record/parser/base'
+require 'whois/record/scanners/whois.cira.ca.rb'
 
 
 module Whois
   class Record
     class Parser
 
-      #
-      # = whois.cira.ca parser
-      #
       # Parser for the whois.cira.ca server.
+      # 
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
-      # NOTE: This parser is just a stub and provides only a few basic methods
-      # to check for domain availability and get domain status.
-      # Please consider to contribute implementing missing methods.
-      # See WhoisNicIt parser for an explanation of all available methods
-      # and examples.
-      #
+      # @since 2.5.0
       class WhoisCiraCa < Base
+        include Scanners::Ast
+
+        property_supported :disclaimer do
+           node("field:disclaimer")
+        end
+
+
+        property_supported :domain do
+          node("Domain name")
+        end
+
+        property_not_supported :domain_id
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
 
         property_supported :status do
-          if content_for_scanner =~ /Domain status:\s+(.*?)\n/
-            case $1.downcase
-              # schema-2
-              when "registered"       then :registered
-              when "redemption"       then :registered
-              when "auto-renew grace" then :registered
-              when "to be released"   then :registered
-              when "available"        then :available
-              when "unavailable"      then :invalid
-              # schema-1
-              when "exist"      then :registered
-              when "avail"      then :available
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+          if content_for_scanner =~ /Domain status:\s+(.+?)\n/
+            case node("Domain status", &:downcase)
+            when "registered"
+              :registered
+            when "redemption"
+              :registered
+            when "auto-renew grace"
+              :registered
+            when "to be released"
+              :registered
+            when "available"
+              :available
+            when "unavailable"
+              :invalid
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             Whois.bug!(ParserError, "Unable to parse status.")
@@ -58,39 +74,46 @@ module Whois
 
 
         property_supported :created_on do
-          # schema-2
-          if content_for_scanner =~ /Creation date:\s+(.*?)\n/
-            Time.parse($1)
-          # schema-1
-          elsif content_for_scanner =~ /Approval date:\s+(.*?)\n/
-            Time.parse($1)
-          end
+          node("Creation date") { |str| Time.parse(str) }
         end
 
-        # TODO: Not supported in schema-2?
         property_supported :updated_on do
-          if content_for_scanner =~ /Updated date:\s+(.*?)\n/
-            Time.parse($1)
-          end
+          node("Updated date") { |str| Time.parse(str) }
         end
 
         property_supported :expires_on do
-          # schema-2
-          if content_for_scanner =~ /Expiry date:\s+(.*?)\n/
-            Time.parse($1)
-          # schema-1
-          elsif content_for_scanner =~ /Renewal date:\s+(.*?)\n/
-            Time.parse($1)
-          end
+          node("Expiry date") { |str| Time.parse(str) }
         end
 
 
         property_supported :registrar do
-          if content_for_scanner =~ /^Registrar:\n(.*\n?)^\n/m
-            match = $1
-            id    = match =~ /Number:\s+(.*)$/ ? $1.strip : nil
-            name  = match =~ /Name:\s+(.*)$/   ? $1.strip : nil
-            Whois::Record::Registrar.new(:id => id, :name => name, :organization => name)
+          node("Registrar") do |hash|
+            Record::Registrar.new(
+              :id           => hash["Number"],
+              :name         => hash["Name"],
+              :organization => hash["Name"]
+            )
+          end
+        end
+
+
+        property_supported :registrant_contacts do
+          build_contact("Registrant", Whois::Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_supported :admin_contacts do
+          build_contact("Administrative contact", Whois::Record::Contact::TYPE_ADMIN)
+        end
+
+        property_supported :technical_contacts do
+          build_contact("Technical contact", Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
+        property_supported :nameservers do
+          Array.wrap(node("nserver")).map do |line|
+            name, ipv4 = line.split(/\s+/)
+            Record::Nameserver.new(:name => name, :ipv4 => ipv4)
           end
         end
 
@@ -104,11 +127,9 @@ module Whois
         #   ns2.google.com  216.239.34.10
         #
         property_supported :nameservers do
-          if content_for_scanner =~ /Name servers:\n((?:\s+([^\s]+)\s+([^\s]+)\n)+)/
-            $1.split("\n").map do |line|
-              name, ipv4 = line.strip.split(/\s+/)
-              Record::Nameserver.new(name, ipv4)
-            end
+          Array.wrap(node("field:nameservers")).map do |line|
+            name, ipv4 = line.strip.split(/\s+/)
+            Record::Nameserver.new(:name => name, :ipv4 => ipv4)
           end
         end
 
@@ -143,6 +164,37 @@ module Whois
         end
 
 
+        # Initializes a new {Scanners::WhoisCiraCa} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::WhoisCiraCa.new(content_for_scanner).parse
+        end
+
+
+      private
+
+        def build_contact(element, type)
+          node(element) do |hash|
+            Record::Contact.new(
+              :type         => type,
+              :id           => nil,
+              :name         => hash["Name"],
+              :organization => nil,
+              :address      => hash["Postal address"],
+              :city         => nil,
+              :zip          => nil,
+              :state        => nil,
+              :country      => nil,
+              :phone        => hash["Phone"],
+              :fax          => hash["Fax"],
+              :email        => hash["Email"]
+            )
+          end
+        end
+
       end
 
     end

data/lib/whois/record/parser/whois.cnnic.cn.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/whois.cnnic.cn.rb'
+require 'whois/record/scanners/whois.cnnic.cn.rb'
 
 
 module Whois

data/lib/whois/record/parser/whois.crsnic.net.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/verisign'
+require 'whois/record/scanners/verisign'
 
 
 module Whois

data/lib/whois/record/parser/whois.denic.de.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/whois.denic.de.rb'
+require 'whois/record/scanners/whois.denic.de.rb'
 
 
 module Whois

data/lib/whois/record/parser/whois.dns.hr.rb

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/parser/scanners/whois.dns.hr.rb'
+require 'whois/record/scanners/whois.dns.hr.rb'
 
 
 module Whois
@@ -20,7 +20,7 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since RELEASE
+      # @since 2.4.0
       class WhoisDnsHr < Base
         include Scanners::Ast