whois 3.1.3 → 3.2.0

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+
+## Release 3.2.0
+
+- SERVER: Added .JP.NET (GH-240), XN--J1AMH TLD definition.
+
+- NEW: Added #domain_id to CoCCA parsers.
+
+- NEW: Added full whois.srs.net.nz parser.
+
+- NEW: Added full whois.fi parser.
+
+- NEW: whois.dns.pl parser now recognizes throttled responses.
+
+- CHANGED: Updated whois.nic.ac, whois.nic.io, and whois.nic.sh parsers to the new response format (GH-238).
+
+- CHANGED: Updated whois1.nic.bi parser to the new response format.
+
+- CHANGED: Updated whois.norid.no parser to the new response format.
+
+- FIXED: whois.jprs.jp crashes when status is `reserved` for ne.jp SLD.
+
+- FIXED: Arin adapter is incorrectly passing an Arin flag to referral queries.
+
+
 ## Release 3.1.3
 
 - SERVER: Updated .GD (GH-227), .TC (GH-228) TLD definitions.
@@ -106,7 +130,7 @@
 
 - CHANGED: Dropped support for Ruby 1.8
 
-- CHANGED: Renamed Whois::Record::Scanners::Ast to Renamed Whois::Record::Scanners::Nodable
+- CHANGED: Renamed Whois::Record::Scanners::Ast to Renamed Whois::Record::Scanners::Scannable
 
 - CHANGED: Definitions are now stored as JSON.
 
@@ -197,7 +221,7 @@
 
 - Removed compatibility with Ruby 1.8
 
-- Renamed Whois::Record::Scanners::Ast to Renamed Whois::Record::Scanners::Nodable
+- Renamed Whois::Record::Scanners::Ast to Renamed Whois::Record::Scanners::Scannable
 
 - Whois::Server#query has been renamed to Whois::Server#lookup
 

data/data/tld.json

@@ -32,6 +32,9 @@
   ".hu.com": {
     "host": "whois.centralnic.com"
   },
+  ".jp.net": {
+    "host": "whois.centralnic.com"
+  },
   ".jpn.com": {
     "host": "whois.centralnic.com"
   },
@@ -1141,7 +1144,7 @@
   ".vn": {
     "host": null,
     "adapter": "web",
-    "url": "http://en.vnnic.vn/"
+    "url": "http://www.vnnic.vn/en/domain"
   },
   ".vu": {
     "host": null,
@@ -1226,6 +1229,9 @@
     "host": null,
     "adapter": "none"
   },
+  ".xn--j1amh": {
+    "host": "whois.ua"
+  },
   ".xn--j6w193g": {
     "host": "whois.hkirc.hk"
   },
@@ -1300,4 +1306,4 @@
   ".xn--ygbi2ammx": {
     "host": "whois.pnina.ps"
   }
-}
+}

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/scanners/nodable'
+require 'whois/record/scanners/scannable'
 
 
 module Whois

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

@@ -19,7 +19,9 @@ module Whois
       #
       # @abstract
       class BaseAfilias < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::BaseAfilias
 
 
         property_supported :disclaimer do
@@ -101,16 +103,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::Afilias} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::BaseAfilias.new(content_for_scanner).parse
-        end
-
-
         private
 
         def build_contact(element, type)

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

@@ -20,11 +20,12 @@ module Whois
       class BaseCocca2 < Base
 
         property_supported :domain do
-          content_for_scanner =~ /Domain Name: (.+)\n/
-          $1 || Whois.bug!(ParserError, "Unable to parse domain.")
+          content_for_scanner.slice(/Domain Name: (.+)\n/, 1)
         end
 
-        property_not_supported :domain_id
+        property_supported :domain_id do
+          content_for_scanner.slice(/Domain ID: (.+)\n/, 1)
+        end
 
         # TODO: /pending delete/ => :redemption
         # TODO: /pending purge/  => :redemption

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

@@ -0,0 +1,95 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+
+
+module Whois
+  class Record
+    class Parser
+
+      class BaseIcb < Base
+
+        property_not_supported :disclaimer
+
+
+        property_supported :domain do
+          if registered?
+            content_for_scanner.match(/^Domain : (.+)\n/)[1]
+          elsif available?
+            content_for_scanner.match(/^Domain (.+) is available/)[1]
+          end
+        end
+
+        property_not_supported :domain_id
+
+
+        property_supported :status do
+          if available?
+            :available
+          else
+            :registered
+          end
+        end
+
+        property_supported :available? do
+          !!(content_for_scanner =~ /^Domain (.+?) is available/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_not_supported :created_on
+
+        property_not_supported :updated_on
+
+        property_supported :expires_on do
+          if content_for_scanner =~ /Expiry : (.+?)\n/
+            Time.parse($1)
+          end
+        end
+
+
+        property_not_supported :registrar
+
+        property_supported :registrant_contacts do
+          textblock = content_for_scanner.slice(/Owner((?:\s*: .+\n)+)/, 1)
+          return unless textblock
+
+          lines = textblock.scan(/^\s+: (.+)\n/).flatten
+          Record::Contact.new(
+            type:         Record::Contact::TYPE_REGISTRANT,
+            name:         lines[0],
+            organization: lines[1],
+            address:      lines[2],
+            zip:          nil,
+            state:        lines[4],
+            city:         lines[3],
+            country:      lines[5]
+          )
+        end
+
+        property_not_supported :admin_contacts
+
+        property_not_supported :technical_contacts
+
+
+        property_supported :nameservers do
+          content_for_scanner.scan(/^NS \d\s+: (.+)/).flatten.map do |name|
+            Record::Nameserver.new(name: name)
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -19,7 +19,10 @@ module Whois
       #
       # @abstract
       class BaseShared1 < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::BaseShared1
+
 
         property_not_supported :disclaimer
 
@@ -83,16 +86,6 @@ module Whois
         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)

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

@@ -19,7 +19,10 @@ module Whois
       #
       # @abstract
       class BaseShared2 < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::BaseShared2
+
 
         # Actually the :disclaimer is supported,
         # but extracting it with the current scanner
@@ -92,16 +95,6 @@ module Whois
         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)

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

@@ -19,7 +19,10 @@ module Whois
       #
       # @abstract
       class BaseShared3 < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::BaseShared3
+
 
         property_supported :disclaimer do
           node("field:disclaimer")
@@ -96,17 +99,7 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::BaseShared3} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::BaseShared3.new(content_for_scanner).parse
-        end
-
-
-        private
+      private
 
         def build_contact(element, type)
           node("#{element}-contact") do |raw|

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

@@ -18,10 +18,11 @@ module Whois
       # Base parser for Whoisd servers.
       #
       # @abstract
-      #
-      # @since  2.6.4
       class BaseWhoisd < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::BaseWhoisd
+
 
         class_attribute :status_mapping
         self.status_mapping = {
@@ -113,16 +114,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::Whoisd} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::BaseWhoisd.new(content_for_scanner).parse
-        end
-
-
       private
 
         def node_nsset

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

@@ -16,8 +16,15 @@ module Whois
     class Parser
 
       # Parser for the jobswhois.verisign-grs.com server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
       class JobswhoisVerisignGrsCom < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::Verisign
+
 
         property_supported :disclaimer do
           node("Disclaimer")
@@ -86,16 +93,6 @@ module Whois
           node("Referral URL")
         end
 
-
-        # Initializes a new {Scanners::Verisign} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::Verisign.new(content_for_scanner).parse
-        end
-
       end
 
     end

data/lib/whois/record/parser/whois.ati.tn.rb

@@ -20,9 +20,11 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since  2.6.0
       class WhoisAtiTn < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisAtiTn
+
 
         property_supported :disclaimer do
           node("field:disclaimer")
@@ -63,15 +65,14 @@ module Whois
 
 
         property_supported :registrar do
-          node("Registrar") do |str|
+          node("Registrar") do |value|
             Record::Registrar.new(
               :id           => nil,
-              :name         => node("Registrar")
+              :name         => value
             )
           end
         end
 
-
         property_supported :registrant_contacts do
           build_contact("Owner", Whois::Record::Contact::TYPE_REGISTRANT)
         end
@@ -93,16 +94,6 @@ module Whois
         end
 
 
-        # Initializes a new {Scanners::WhoisAtiTn} instance
-        # passing the {#content_for_scanner}
-        # and calls +parse+ on it.
-        #
-        # @return [Hash]
-        def parse
-          Scanners::WhoisAtiTn.new(content_for_scanner).parse
-        end
-
-
       private
 
         def build_contact(element, type)

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

@@ -20,9 +20,11 @@ module Whois
       # @see Whois::Record::Parser::Example
       #   The Example parser for the list of all available methods.
       #
-      # @since  2.5.0
       class WhoisAudnsNetAu < Base
-        include Scanners::Nodable
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisAudnsNetAu
+
 
         property_not_supported :disclaimer
 
@@ -91,16 +93,6 @@ module Whois
         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)