whois 2.6.4 → 2.7.0

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## Release 2.7.0
+
+* SERVER: Added .IQ TLD server (GH-171).
+
+* SERVER: Added .XN--MGB9AWBF (عمان, Oman) IDN TLD server.
+
+* SERVER: Added .BI TLD server (GH-113).
+
+* SERVER: Added .DM TLD server (GH-43).
+
+* SERVER: Added .MO TLD server.
+
+* NEW: Added full whois.register.com parser.
+
+* NEW: whois.networksolutions.com parser now recognizes throttled responses (GH-182). [Thanks @JustinCampbell]
+
+* NEW: Added full whois.cmc.iq parser (GH-171).
+
+* NEW: Added full whois1.nic.bi parser (GH-113).
+
+* NEW: Added full whois.nic.dm parser (GH-43).
+
+* NEW: Added full whois.nic.co parser.
+
+* NEW: Added full whois.monic.mo parser.
+
+* FIXED: Fixed whois.register.com parser for enom formats (GH-181). [Thanks @JustinCampbell]
+
+* FIXED: whois.jprs.js parser should support status `Suspended`.
+
+* FIXED: whois.dk-hostmaster.dk parser should support status `Deactivated`.
+
+* FIXED: whois.domain-registry.nl parser should support status `Inactive`.
+
+* CHANGED: Changed .NAME to a formatted adapter to fetch additional properties.
+
+* CHANGED: whois.dns.pl now supports expires_on (GH-185). [Thanks @y3ti]
+
+
 ## Release 2.6.4
 
 * SERVER: Added .CW TLD server.

data/LICENSE

@@ -1,7 +1,7 @@
-The MIT License
-
 Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 
+MIT License
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including

data/README.md

@@ -6,7 +6,7 @@
 
 *Whois* is a OS-independent library and doesn't require any external binaries or C libraries: it is a 100% Ruby software.
 
-This library was developed to power [RoboDomain](https://www.robodomain.com/) and [RoboWhois](http://www.robowhois.com/). It has been performing queries in production since July 2009.
+This library was developed to power [RoboWhois](https://www.robowhois.com/) and [RoboDomain](https://www.robodomain.com/). It has been performing queries in production since July 2009.
 
 An extensive test suite is available to verify the library correctness but you must be aware that registrant might change WHOIS interfaces without notice and at any time causing queries to specific hosts to stop working.
 

data/lib/whois/definitions/tlds.rb

@@ -45,7 +45,7 @@ Whois::Server.define :tld, ".info", "whois.afilias.info"
 Whois::Server.define :tld, ".jobs", "jobswhois.verisign-grs.com", { :adapter => :verisign }
 Whois::Server.define :tld, ".mobi", "whois.dotmobiregistry.net"
 Whois::Server.define :tld, ".museum", "whois.museum"
-Whois::Server.define :tld, ".name", "whois.nic.name"
+Whois::Server.define :tld, ".name", "whois.nic.name", { :adapter => :formatted, :format => "domain=%s" }
 Whois::Server.define :tld, ".pro", "whois.registrypro.pro"
 Whois::Server.define :tld, ".tel", "whois.nic.tel"
 Whois::Server.define :tld, ".travel", "whois.nic.travel"
@@ -75,7 +75,7 @@ Whois::Server.define :tld, ".be", "whois.dns.be"
 Whois::Server.define :tld, ".bf", nil, { :adapter => :none }
 Whois::Server.define :tld, ".bg", "whois.register.bg"
 Whois::Server.define :tld, ".bh", nil, { :adapter => :none }
-Whois::Server.define :tld, ".bi", nil, { :adapter => :web, :url => "https://whois.nic.bi/whois.php" }
+Whois::Server.define :tld, ".bi", "whois1.nic.bi"
 Whois::Server.define :tld, ".bj", "whois.nic.bj"
 Whois::Server.define :tld, ".bm", nil, { :adapter => :web, :url => "http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO" }
 Whois::Server.define :tld, ".bn", nil, { :adapter => :none }
@@ -169,7 +169,7 @@ Whois::Server.define :tld, ".il", "whois.isoc.org.il"
 Whois::Server.define :tld, ".im", "whois.nic.im"
 Whois::Server.define :tld, ".in", "whois.registry.in"
 Whois::Server.define :tld, ".io", "whois.nic.io"
-Whois::Server.define :tld, ".iq", nil, { :adapter => :none }
+Whois::Server.define :tld, ".iq", "whois.cmc.iq"
 Whois::Server.define :tld, ".ir", "whois.nic.ir"
 Whois::Server.define :tld, ".is", "whois.isnic.is"
 Whois::Server.define :tld, ".it", "whois.nic.it"
@@ -209,7 +209,7 @@ Whois::Server.define :tld, ".mk", nil, { :adapter => :web, :url => "http://dns.m
 Whois::Server.define :tld, ".ml", nil, { :adapter => :none }
 Whois::Server.define :tld, ".mm", nil, { :adapter => :none }
 Whois::Server.define :tld, ".mn", "whois.afilias-grs.info", { :adapter => :afilias }
-Whois::Server.define :tld, ".mo", nil, { :adapter => :web, :url => "http://www.monic.net.mo/" }
+Whois::Server.define :tld, ".mo", "whois.monic.mo"
 Whois::Server.define :tld, ".mp", nil, { :adapter => :none }
 Whois::Server.define :tld, ".mq", nil, { :adapter => :web, :url => "https://www.dom-enic.com/whois.html" }
 Whois::Server.define :tld, ".mr", nil, { :adapter => :none }
@@ -347,6 +347,7 @@ 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--mgb9awbf", "whois.registry.om"
 Whois::Server.define :tld, ".xn--mgba3a4f16a", "whois.nic.ir"
 Whois::Server.define :tld, ".xn--mgbaam7a8h", "whois.aeda.net.ae"
 Whois::Server.define :tld, ".xn--mgbayh7gpa", nil, { :adapter => :web, :url => "http://idn.jo/whois_a.aspx" }

data/lib/whois/record/parser/NOTES.txt

@@ -1,12 +1,6 @@
 # Scanners
 
 
-## Types
-
-- verisign : indented keyvalue with text
-- cnnic : keyvalue
-- biz : keyvalue + lastupdate + disclaimer
-
 ---
 
 # afilias
@@ -25,9 +19,7 @@
 
 
 .us
-.biz
 .travel
-whois.nic.co
 
 whois.museum
 whois.cat

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

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/scanners/afilias'
+require 'whois/record/scanners/base_afilias'
 
 
 module Whois
@@ -18,7 +18,6 @@ module Whois
       # Base parser for Afilias servers.
       #
       # @abstract
-      #
       class BaseAfilias < Base
         include Scanners::Ast
 
@@ -113,7 +112,7 @@ module Whois
         #
         # @return [Hash]
         def parse
-          Scanners::Afilias.new(content_for_scanner).parse
+          Scanners::BaseAfilias.new(content_for_scanner).parse
         end
 
 

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

@@ -17,7 +17,6 @@ module Whois
       # Base parser for CoCCA servers.
       #
       # @abstract
-      #
       class BaseCocca < Base
 
         property_supported :domain do
@@ -31,9 +30,12 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-            when "active"         then :registered
-            when "delegated"      then :registered
-            when "not registered" then :available
+            when "active"
+              :registered
+            when "delegated"
+              :registered
+            when "not registered"
+              :available
             else
               Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

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

@@ -0,0 +1,120 @@
+#--
+# 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/base_shared1'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Shared parser 1.
+      #
+      # @abstract
+      #
+      # @since  RELEASE
+      class BaseShared1 < 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
+
+
+        property_supported :status do
+          Array.wrap(node("Status"))
+        end
+
+        property_supported :available? do
+          !!node('status:available')
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_not_supported :created_on
+
+        property_not_supported :updated_on
+
+        property_not_supported :expires_on
+
+
+        property_supported :registrar do
+          node('Registrar Name') do |name|
+            Record::Registrar.new(
+                :id           => node('Registrar ID'),
+                :name         => node('Registrar Name'),
+                :organization => node('Registrar Name')
+            )
+          end
+        end
+
+
+        property_supported :registrant_contacts do
+          build_contact('Registrant', Whois::Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_not_supported :admin_contacts
+
+        property_supported :technical_contacts do
+          build_contact('Tech', Whois::Record::Contact::TYPE_TECHNICAL)
+        end
+
+
+        property_supported :nameservers do
+          node('Name Server') do |value|
+            ipv4s = node('Name Server IP') || Array.new(value.size)
+            value.zip(ipv4s).map do |name, ipv4|
+              Nameserver.new(:name => name, :ipv4 => ipv4)
+            end
+          end
+        end
+
+
+        # Initializes a new {Scanners::BaseShared1} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::BaseShared1.new(content_for_scanner).parse
+        end
+
+
+      private
+
+        def build_contact(element, type)
+          node("#{element} Contact ID") do
+            Record::Contact.new(
+                :type         => type,
+                :id           => node("#{element} Contact ID"),
+                :name         => node("#{element} Contact Name"),
+                :email        => node("#{element} Contact Email")
+            )
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,143 @@
+#--
+# 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/base_shared2'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Shared parser 2.
+      #
+      # @abstract
+      #
+      # @since  RELEASE
+      class BaseShared2 < Base
+        include Scanners::Ast
+
+        # Actually the :disclaimer is supported,
+        # but extracting it with the current scanner
+        # would require too much effort.
+        # property_supported :disclaimer
+
+
+        property_supported :domain do
+          node("Domain Name", &:downcase)
+        end
+
+        property_supported :domain_id do
+          node("Domain ID")
+        end
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
+
+        property_supported :status do
+          node("Domain Status")
+        end
+
+        property_supported :available? do
+          !!node("status:available")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          node("Domain Registration Date") { |value| Time.parse(value) }
+        end
+
+        property_supported :updated_on do
+          node("Domain Last Updated Date") { |value| Time.parse(value) }
+        end
+
+        property_supported :expires_on do
+          node("Domain Expiration Date") { |value| Time.parse(value) }
+        end
+
+
+        property_supported :registrar do
+          node("Sponsoring Registrar") do |str|
+            Record::Registrar.new(
+              :id           => node("Sponsoring Registrar IANA ID"),
+              :name         => node("Sponsoring Registrar")
+            )
+          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("Name Server")).map do |name|
+            Nameserver.new(:name => name.downcase)
+          end
+        end
+
+
+        # Initializes a new {Scanners::BaseShared2} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::BaseShared2.new(content_for_scanner).parse
+        end
+
+
+      private
+
+        def build_contact(element, type)
+          node("#{element} ID") do |str|
+            address = (1..3).
+                map { |i| node("#{element} Address#{i}") }.
+                delete_if(&:nil?).
+                join("\n")
+
+            Record::Contact.new(
+              :type         => type,
+              :id           => node("#{element} ID"),
+              :name         => node("#{element} Name"),
+              :organization => node("#{element} Organization"),
+              :address      => address,
+              :city         => node("#{element} City"),
+              :zip          => node("#{element} Postal Code"),
+              :state        => node("#{element} State/Province"),
+              :country      => node("#{element} Country"),
+              :country_code => node("#{element} Country Code"),
+              :phone        => node("#{element} Phone Number"),
+              :fax          => node("#{element} Facsimile Number"),
+              :email        => node("#{element} Email")
+            )
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -8,7 +8,7 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/scanners/whoisd.rb'
+require 'whois/record/scanners/base_whoisd'
 
 
 module Whois
@@ -19,7 +19,7 @@ module Whois
       #
       # @abstract
       #
-      # @since  RELEASE
+      # @since  2.6.4
       class BaseWhoisd < Base
         include Scanners::Ast
 
@@ -116,7 +116,7 @@ module Whois
         #
         # @return [Hash]
         def parse
-          Scanners::Whoisd.new(content_for_scanner).parse
+          Scanners::BaseWhoisd.new(content_for_scanner).parse
         end