whois 3.5.4 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d13d589dc72c41ce59b3a1efddf28d37c1ceb407
-  data.tar.gz: ad650564c13834a800b3c36a879415da5d7ee29e
+  metadata.gz: 133907446387f7270b62a6eabb38c74f4811553a
+  data.tar.gz: 04c7491c8ca5574250478e947ac8f0252e9a51d5
 SHA512:
-  metadata.gz: b5e27e531a9153c8201e2f36d2484c3e22b384383b93f21317e4e870f11bfef3ce99b19c0c2f217b0989a1b8627137b535eec9a8bd97ccc687e64dcf802b7d60
-  data.tar.gz: 7c429d5a1785ff03fec3924044a4f63eb4338e737c1d79cdb0079bc8b80e33e1f7cca7db7fda243ce1271ab0f6578c86b96ca347f674582e90945760f006ef72
+  metadata.gz: e7406e3946918780f42ace027b0234bb9e9c1b39dd90c39c6e368f21f2de68c0ddfe7b1eea8c3b3569bee88fb775d5d623c1432f2c2ad04c6bc3aa7b48e5cbfc
+  data.tar.gz: df4a50076cbb1c168e437198abf31e62c43f7ef6ff811d6aa4a966e6c990d26c8cecd25f05309335a3fd287fba45d4c103798fce30c9e5b01aca259b68eb5daa

data/CHANGELOG.md

@@ -1,7 +1,21 @@
 # Changelog
 
+#### Release 3.5.5
 
-#### master
+- NEW: Added registrar and contact support for whois.dns.lu (GH-329). [Thanks @huyphan]
+
+- CHANGED: Updated whois.iis.se and whois.iis.nu to the new response format (GH-328).
+
+- FIXED: whois.fi parser crashes when the domain is reserved (GH-339). [Thanks @case]
+
+- FIXED: whois.whois.nic.asia parser crashes when the status is reserved (GH-340). [Thanks @case]
+
+- FIXED: whois.netcom.cm parser crashes when the status is suspended (GH-333). [Thanks @case]
+
+- FIXED: whois.nic.gd parser crashes when the domain is reserved (GH-335). [Thanks @case]
+
+
+#### Release 3.5.4
 
 - SERVER: Created .QUEBEC, .COLLEGE, .DESI, .FEEDBACK, .ROCKS, .XN, .ASSOCIATES, .CAPITAL, .CAREER, .ENGINEERING, .EUS, .GAL, .GRIPE, .LEASE, .MEDIA, .PICTURES, .REISEN, .SERVICES, .TOWN, .TOYS, .UNIVERSITY, .XN, .FOO, .FROGANS, .PARIS, .SOY, .BLACKFRIDAY, .CLINIC, .FITNESS, .SCHULE, .CARE, .CASH, .DENTAL, .DISCOUNT, .EXCHANGE, .FAIL, .FINANCIAL, .FUND, .FURNITURE, .GRATIS, .INVESTMENTS, .LIMITED, .SURGERY, .TAX, .WTF, .MOSCOW, .XN, .CREDITCARD, .FINANCE, .INSURE, .WTC, .AIRFORCE, .BAYERN, .GLOBO, .ACCOUNTANTS, .CLAIMS, .CREDIT, .DIGITAL
 

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

@@ -37,7 +37,9 @@ module Whois
 
 
         property_supported :status do
-          if available?
+          if respond_to?(:reserved?) && reserved?
+            :reserved
+          elsif available?
             :available
           else
             :registered
@@ -45,7 +47,7 @@ module Whois
         end
 
         property_supported :available? do
-          !!node("status:available")
+          !(respond_to?(:reserved?) && reserved?) && !!node("status:available")
         end
 
         property_supported :registered? do

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

@@ -28,9 +28,10 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /domaintype:\s+(.+)\n/
             case $1.downcase
-              when "active" then :registered
-              else
-                Whois.bug!(ParserError, "Unknown status `#{$1}'.")
+            when "active"
+              :registered
+            else
+              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
           else
             :available
@@ -58,18 +59,70 @@ module Whois
         property_not_supported :expires_on
 
 
+        property_supported :registrar do
+          if name = value_for_key('registrar-name')
+            Record::Registrar.new(
+                name:         name,
+                url:          value_for_key('registrar-url'),
+            )
+          end
+        end
+
+        property_supported :registrant_contacts do
+          build_contact('org', Record::Contact::TYPE_REGISTRANT)
+        end
+
+        property_supported :admin_contacts do
+          build_contact('adm', Record::Contact::TYPE_ADMINISTRATIVE)
+        end
+
+        property_supported :technical_contacts do
+          build_contact('tec', Record::Contact::TYPE_TECHNICAL)
+        end
+
+
         property_supported :nameservers do
-          content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |line|
+          values_for_key('nserver').map do |line|
             if line =~ /(.+) \[(.+)\]/
-              Record::Nameserver.new(:name => $1, :ipv4 => $2)
+              Record::Nameserver.new(name: $1, ipv4: $2)
             else
-              Record::Nameserver.new(:name => line)
+              Record::Nameserver.new(name: line)
             end
           end
         end
 
-      end
 
+        private
+
+        def build_contact(element, type)
+          if name = value_for_key('%s-name' % element)
+            Record::Contact.new(
+                type:         type,
+                id:           nil,
+                name:         name,
+                address:      value_for_key('%s-address' % element),
+                city:         value_for_key('%s-city' % element),
+                zip:          value_for_key('%s-zipcode' % element),
+                country_code: value_for_key('%s-country' % element),
+                email:        value_for_key('%s-email' % element)
+            )
+          end
+        end
+
+        def value_for_key(key)
+          values = values_for_key(key)
+          if values.size > 1
+            values.join(', ')
+          else
+            values.first
+          end
+        end
+
+        def values_for_key(key)
+          content_for_scanner.scan(/#{key}:\s+(.+)\n/).flatten
+        end
+
+      end
     end
   end
-end
+end

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

@@ -39,7 +39,9 @@ module Whois
 
 
         property_supported :status do
-          if registered?
+          if reserved?
+            :reserved
+          elsif registered?
             case node("status", &:downcase)
             when "granted"
               :registered
@@ -76,11 +78,11 @@ module Whois
 
 
         property_not_supported :registrar
-        
+
         property_supported :registrant_contacts do
           node("descr") do |array|
             address = node("address")
-            
+
             Record::Contact.new(
               type:         Record::Contact::TYPE_REGISTRANT,
               id:           array[1],
@@ -105,6 +107,11 @@ module Whois
           end
         end
 
+        # NEWPROPERTY
+        def reserved?
+          !!content_for_scanner.match(/Domain not available/)
+        end
+
       end
 
     end

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

@@ -20,6 +20,7 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisMarkmonitorCom < BaseIcannCompliant
+
         self.scanner = Scanners::BaseIcannCompliant, {
             pattern_available: /^No match for/,
             pattern_throttled: /^You have exceeded your quota of queries\./,

data/lib/whois/record/parser/whois.netcom.cm.rb

@@ -16,6 +16,11 @@ module Whois
 
       # Parser for the whois.netcom.cm server.
       class WhoisNetcomCm < BaseCocca
+
+        self.status_mapping.merge!({
+            "suspended" => :registered
+        })
+
       end
 
     end

data/lib/whois/record/parser/whois.nic.asia.rb

@@ -21,8 +21,17 @@ module Whois
       #
       class WhoisNicAsia < BaseAfilias
 
+        self.scanner = Scanners::BaseAfilias, {
+            pattern_reserved: /^Reserved by DotAsia\n/,
+        }
+
+
         property_supported :status do
-          Array.wrap(node("Domain Status"))
+          if reserved?
+            :reserved
+          else
+            Array.wrap(node("Domain Status"))
+          end
         end
 
 
@@ -61,6 +70,12 @@ module Whois
         end
 
 
+        # NEWPROPERTY
+        def reserved?
+          !!node("status:reserved")
+        end
+
+
       private
 
         def build_contact(element, type)

data/lib/whois/record/parser/whois.nic.gd.rb

@@ -20,6 +20,12 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisNicGd < BaseShared3
+
+        # NEWPROPERTY
+        def reserved?
+          !!content_for_scanner.match(/RESTRICTED/)
+        end
+
       end
 
     end

data/lib/whois/record/parser/whois.nic.xxx.rb

@@ -18,7 +18,8 @@ module Whois
       class WhoisNicXxx < BaseAfilias2
 
         self.scanner = Scanners::BaseAfilias, {
-            pattern_disclaimer: /^Access to/
+            pattern_disclaimer: /^Access to/,
+            pattern_reserved: /^Reserved by ICM Registry\n/,
         }
 
 

data/lib/whois/record/parser/whois.registrypro.pro.rb

@@ -20,6 +20,20 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisRegistryproPro < BaseAfilias
+
+        property_supported :status do
+          if reserved?
+            :reserved
+          else
+            super()
+          end
+        end
+
+        # NEWPROPERTY
+        def reserved?
+          !!content_for_scanner.match(/Governmental Reserved Name/)
+        end
+
       end
 
     end

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

@@ -33,9 +33,8 @@ module Whois
           end
         end
 
-        # .XXX
         tokenizer :scan_reserved do
-          if @input.scan(/^Reserved by ICM Registry\n/)
+          if settings[:pattern_reserved] && @input.scan(settings[:pattern_reserved])
             @ast["status:reserved"] = true
           end
         end

data/lib/whois/record/scanners/base_iisse.rb

@@ -34,10 +34,9 @@ module Whois
         tokenizer :scan_disclaimer do
           if @input.match?(/# Copyright/)
             lines = []
-            while !@input.match?(/# Result of/) && @input.scan(/#?(.*)\n/)
+            while @input.scan(/#(.*)\n\n?/)
               lines << @input[1].strip unless @input[1].strip == ""
             end
-            @input.skip_until(/# printed with .+ bits\.\n/m)
             @ast["field:disclaimer"] = lines.join(" ")
           end
         end

data/lib/whois/record/scanners/whois.fi.rb

@@ -22,6 +22,7 @@ module Whois
             :scan_available,
             :scan_disclaimer,
             :scan_keyvalue,
+            :scan_reserved
         ]
 
 
@@ -31,6 +32,12 @@ module Whois
           end
         end
 
+        tokenizer :scan_reserved do
+          if @input.skip(/^Domain not available/)
+            @ast["status:reserved"] = true
+          end
+        end
+
         tokenizer :scan_disclaimer do
           if @input.match?(/^More information/)
             @ast["field:disclaimer"] = @input.scan_until(/(.*)\n\n/).strip

data/lib/whois/version.rb

@@ -13,7 +13,7 @@ module Whois
   module Version
     MAJOR = 3
     MINOR = 5
-    PATCH = 4
+    PATCH = 5
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/whois.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: whois 3.5.3 ruby lib
+# stub: whois 3.5.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "whois"
-  s.version = "3.5.3"
+  s.version = "3.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Simone Carletti"]
-  s.date = "2014-06-04"
+  s.date = "2014-06-22"
   s.description = "Whois is an intelligent WHOIS client and parser written in pure Ruby. It can query registry data for IPv4, IPv6 and top level domains, parse and convert responses into easy-to-use Ruby objects."
   s.email = ["weppos@weppos.net"]
   s.executables = ["ruby-whois"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whois
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.5.5
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport