whois 3.3.1 → 3.4.0

data/data/tld.json

@@ -720,7 +720,7 @@
     "host": "whois.nic.md"
   },
   ".me": {
-    "host": "whois.meregistry.net"
+    "host": "whois.nic.me"
   },
   ".mg": {
     "host": "whois.nic.mg"
@@ -803,7 +803,7 @@
     "adapter": "none"
   },
   ".nf": {
-    "host": "whois.nic.net.nf"
+    "host": "whois.nic.nf"
   },
   ".ng": {
     "host": "whois.nic.net.ng"
@@ -830,7 +830,7 @@
     "url": "http://www.cenpac.net.nr/dns/whois.html"
   },
   ".nu": {
-    "host": "whois.nic.nu"
+    "host": "whois.iis.nu"
   },
   ".nz": {
     "host": "whois.srs.net.nz"
@@ -935,7 +935,7 @@
     "adapter": "none"
   },
   ".se": {
-    "host": "whois.nic-se.se"
+    "host": "whois.iis.se"
   },
   ".sg": {
     "host": "whois.sgnic.sg"
@@ -1198,6 +1198,12 @@
   ".xn--80ao21a": {
     "host": "whois.nic.kz"
   },
+  ".xn--80asehdb": {
+    "host": "whois.online.rs.corenic.net"
+  },
+  ".xn--80aswg": {
+    "host": "whois.online.rs.corenic.net"
+  },
   ".xn--90a3ac": {
     "host": null,
     "adapter": "none"
@@ -1227,7 +1233,7 @@
     "adapter": "none"
   },
   ".xn--j1amh": {
-    "host": "whois.ua"
+    "host": "whois.dotukr.com"
   },
   ".xn--j6w193g": {
     "host": "whois.hkirc.hk"
@@ -1244,6 +1250,9 @@
   ".xn--mgb9awbf": {
     "host": "whois.registry.om"
   },
+  ".xn--mgba3a4f16a": {
+    "host": "whois.nic.ir"
+  },
   ".xn--mgbaam7a8h": {
     "host": "whois.aeda.net.ae"
   },
@@ -1266,6 +1275,9 @@
   ".xn--mgbx4cd0ab": {
     "host": "whois.domainregistry.my"
   },
+  ".xn--ngbc5azd": {
+    "host": "whois.xn--ngbc5azd.aridnrs.net.au"
+  },
   ".xn--o3cw4h": {
     "host": "whois.thnic.co.th"
   },
@@ -1284,6 +1296,9 @@
     "host": null,
     "adapter": "none"
   },
+  ".xn--unup4y": {
+    "host": "whois.donuts.co"
+  },
   ".xn--wgbh1c": {
     "host": "whois.dotmasr.eg"
   },

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

@@ -30,7 +30,7 @@ module Whois
 
 
         property_supported :domain do
-          node('domain:name', &:downcase)
+          node('Domain Name', &:downcase)
         end
 
         property_supported :domain_id do
@@ -46,6 +46,8 @@ module Whois
             else
               :registered
             end
+          else
+            status
           end
         end
 
@@ -103,7 +105,7 @@ module Whois
 
         property_supported :nameservers do
           Array.wrap(node('Name Server') || node('Name Servers')).reject(&:empty?).map do |name|
-            Nameserver.new(:name => name.downcase)
+            Nameserver.new(name: name.downcase)
           end
         end
 
@@ -113,22 +115,22 @@ module Whois
         def build_contact(element, type)
           node("#{element} Name") do
             Record::Contact.new(
-                :type         => type,
-                :id           => node("Registry #{element} ID"),
-                :name         => value_for_property(element, 'Name'),
-                :organization => value_for_property(element, 'Organization'),
-                :address      => value_for_property(element, 'Street'),
-                :city         => value_for_property(element, 'City'),
-                :zip          => value_for_property(element, 'Postal Code'),
-                :state        => value_for_property(element, 'State/Province'),
-                :country_code => value_for_property(element, 'Country'),
-                :phone        =>  [ value_for_property(element, 'Phone'),
-                                    value_for_property(element, 'Phone Ext')
-                                  ].reject(&:empty?).join(' ext: '),
-                :fax          =>  [ value_for_property(element, 'Fax'),
-                                    value_for_property(element, 'Fax Ext')
-                                  ].reject(&:empty?).join(' ext: '),
-                :email        => value_for_property(element, 'Email')
+                type:         type,
+                id:           node("Registry #{element} ID"),
+                name:         value_for_property(element, 'Name'),
+                organization: value_for_property(element, 'Organization'),
+                address:      value_for_property(element, 'Street'),
+                city:         value_for_property(element, 'City'),
+                zip:          value_for_property(element, 'Postal Code'),
+                state:        value_for_property(element, 'State/Province'),
+                country_code: value_for_property(element, 'Country'),
+                phone:        [ value_for_property(element, 'Phone'),
+                                  value_for_property(element, 'Phone Ext')
+                              ].reject(&:empty?).join(' ext: '),
+                fax:          [ value_for_property(element, 'Fax'),
+                                  value_for_property(element, 'Fax Ext')
+                              ].reject(&:empty?).join(' ext: '),
+                email:        value_for_property(element, 'Email')
             )
           end
         end

data/lib/whois/record/parser/{whois.nic-se.se.rb → base_iisse.rb}

@@ -8,22 +8,18 @@
 
 
 require 'whois/record/parser/base'
-require 'whois/record/scanners/whois.nic-se.se.rb'
+require 'whois/record/scanners/base_iisse'
+
 
 module Whois
   class Record
     class Parser
 
-      # Parser for the whois.nic-se.se server.
-      #
-      # @author Simone Carletti <weppos@weppos.net>
-      # @author Mikkel Kristensen <mikkel@tdx.dk>
-      # @author Pieter Agten <pieter.agten@gmail.com>
-      #
-      class WhoisNicSeSe < Base
+      # Base parser for IIS.se servers.
+      class BaseIisse < Base
         include Scanners::Scannable
 
-        self.scanner = Scanners::WhoisNicSeSe
+        self.scanner = Scanners::BaseIisse
 
 
         property_supported :disclaimer do
@@ -31,6 +27,13 @@ module Whois
         end
 
 
+        property_supported :domain do
+          node("domain")
+        end
+
+        property_not_supported :domain_id
+
+
         property_supported :status do
           if available?
             :available
@@ -57,12 +60,12 @@ module Whois
         end
 
         property_supported :updated_on do
-          node("modified") { |value| Time.parse(value) unless value == '-' }
+          node("modified") { |value| Time.parse(value) unless value == "-" }
         end
 
 
         property_supported :registrar do
-          node("registrar") { |name| Record::Registrar.new(:name => name) unless name == '-' }
+          node("registrar") { |name| Record::Registrar.new(name: name) unless name == "-" }
         end
 
 
@@ -79,16 +82,14 @@ module Whois
         end
 
 
-        # Nameservers are listed in the following formats:
-        #
-        #   nserver:  ns2.loopia.se
-        #   nserver:  ns2.loopia.se 93.188.0.21
+        # nserver:  ns2.loopia.se
+        # nserver:  ns2.loopia.se 93.188.0.21
         #
         property_supported :nameservers do
           node("nserver") do |values|
             values.map do |line|
               name, ipv4 = line.split(/\s+/)
-              Record::Nameserver.new(:name => name, :ipv4 => ipv4)
+              Record::Nameserver.new(name: name, ipv4: ipv4)
             end
           end
         end

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

@@ -0,0 +1,198 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+require 'whois/record/scanners/whois.ascio.com'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.ascio.com server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      # @author Simone Carletti
+      # @author Igor Dolzhikov <bluesriverz@gmail.com>
+      #
+      class WhoisAscioCom < Base
+        include Scanners::Scannable
+
+        self.scanner = Scanners::WhoisAscioCom
+
+
+        property_supported :disclaimer do
+          node("field:disclaimer")
+        end
+
+
+        property_supported :domain do
+          if content_for_scanner =~ /Domain name: (.+)\n/
+            $1.downcase
+          end
+        end
+
+        property_not_supported :domain_id
+
+
+        property_supported :available? do
+          !!(content_for_scanner =~ /^Object not found/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          if content_for_scanner =~ /Record created: (.+)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :updated_on do
+          if content_for_scanner =~ /Record last updated: (.+)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :expires_on do
+          if content_for_scanner =~ /Record expires: (.+)\n/
+            Time.parse($1)
+          end
+        end
+
+
+        property_supported :registrar do
+          return unless registered?
+          Record::Registrar.new(
+              id:           "ASCIOTEC1364",
+              name:         "Ascio Technologies",
+              organization: "Ascio Technologies, Inc",
+              url:          "http://www.ascio.com/"
+          )
+        end
+
+
+        property_supported :registrant_contacts do
+          build_contact('Registrant:', Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_supported :admin_contacts do
+          if content_for_scanner =~ /Administrative and Technical contact:/
+            build_contact('Administrative and Technical contact:', Record::Contact::TYPE_ADMINISTRATIVE)
+          else
+            build_contact('Administrative contact:', Record::Contact::TYPE_ADMINISTRATIVE)
+          end
+        end
+
+        property_supported :technical_contacts do
+          if content_for_scanner =~ /Administrative and Technical contact:/
+            build_contact('Administrative and Technical contact:', Record::Contact::TYPE_TECHNICAL)
+          else
+            build_contact('Technical contact:', Record::Contact::TYPE_TECHNICAL)
+          end
+        end
+
+
+        property_supported :nameservers do
+          if content_for_scanner =~ /Domain servers in listed order:\n((?:[^\n]+\n)+)/
+            $1.split("\n").map do |line|
+              # ns1.ascio.net (NSASCION521)
+              name  = line.strip.split(" ").first
+              Record::Nameserver.new(name: name.downcase)
+            end
+          end
+        end
+
+
+        private
+
+        def build_contact(element, type)
+          match = content_for_scanner.slice(/#{element}.*\n((.*\n){8})/, 1)
+          return unless match
+
+          lines = match.split("\n").map(&:strip)
+
+          # Registrant:
+          # 0 ASCIO Technologies Inc. (ASCIOTEC1364)    | Dacentec BVBA (DACENTEC94997)
+          # 1 Islands Brygge 55                         | Antwerpsesteenweg 19
+          # 2                                           |
+          # 3 Copenhagen, S, 2300                       | Lochristi, , 9080
+          # 4 DK                                        | BE
+
+          # Administrative and Technical contact:
+          # 0 Hostmaster, Netnames (NH323743)           | Fossen, Arvid (AF05750)
+          # 1 Group NBT                                 | Dacentec BVBA
+          # 2 3rd Floor Prospero House                  | Antwerpsesteenweg 19
+          # 3 241 Borough High St.                      |
+          # 4 London, SE1 1GA                           | Lochristi, 9080
+          # 5 GB                                        | BE
+          # 6 hostmaster@netnames.net                   | arvid@dacentec.com
+          # 7 +44.2070159370 Fax: +44.2070159375        | +32.093242050 Fax:
+
+          phone, fax, email = nil
+
+          # (id) check on the end of the line
+          if lines[0].to_s =~ /(.+) \((.+)\)/
+            name, id = lines.shift.to_s.scan(/(.+) \((.+)\)/).first.map(&:strip)
+          else
+            name, id = lines.shift.strip, nil
+          end
+
+          if type == Record::Contact::TYPE_REGISTRANT
+            organization, name = name, nil
+          else
+
+            # name reverse in right order without comma
+            name = name.split(',').map(&:strip).reverse.join(' ') if name
+            organization = lines.shift
+
+            # Does the last line contains the word fax, or has >9 digits
+            if lines[-1].to_s =~ / [Ff]ax: [\d\+\.]+/
+              phone, fax  = lines.pop.to_s.scan(/^(.+) [Ff]ax: (.+)$/).first.map(&:strip)
+            elsif lines[-1].to_s.gsub!(/ [Ff]ax:/, '').gsub(/[^\d]+/, '').length > 9
+              phone = lines.pop
+            end
+
+            email = lines.pop
+          end
+
+          address = lines[0..1].join(' ').strip
+          if lines[2].to_s =~ /^(.+), (.*), (.+)$/
+            city, state, zip = lines[2].scan(/^(.+), (.*), (.+)$/).first.map(&:strip)
+            state = nil if state.empty?
+          else
+            state = nil
+            city, zip = lines[2].scan(/^(.+), (.+)$/).first.map(&:strip)
+          end
+          country_code = lines[3]
+          Record::Contact.new(
+              type:         type,
+              id:           id,
+              name:         name,
+              organization: organization,
+              address:      address,
+              city:         city,
+              state:        state,
+              zip:          zip,
+              country_code: country_code,
+              email:        email,
+              phone:        phone,
+              fax:          fax
+          )
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -88,9 +88,9 @@ module Whois
         property_supported :registrar do
           node("Registrar") do |hash|
             Record::Registrar.new(
-              :id           => hash["Number"],
-              :name         => hash["Name"],
-              :organization => hash["Name"]
+              id:           hash["Number"],
+              name:         hash["Name"],
+              organization: hash["Name"]
             )
           end
         end
@@ -166,7 +166,7 @@ module Whois
         end
 
 
-      private
+        private
 
         def build_contact(element, type)
           node(element) do |hash|

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

@@ -46,11 +46,6 @@ module Whois
           !reserved? && !available?
         end
 
-        # NEWPROPERTY
-        def reserved?
-          !!node("status:reserved")
-        end
-
 
         property_supported :created_on do
           node("Registration Date") { |value| Time.parse(value) }
@@ -90,7 +85,13 @@ module Whois
         end
 
 
-      private
+        # NEWPROPERTY
+        def reserved?
+          !!node("status:reserved")
+        end
+
+
+        private
 
         def build_contact(element, type)
           node("#{element}") do |value|