whois 3.3.1 → 3.4.0

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

@@ -43,11 +43,6 @@ module Whois
           !available?
         end
 
-        # NEWPROPERTY
-        def reserved?
-          !!(content_for_scanner =~ /^Domain is not available or is reserved by the registry/)
-        end
-
 
         property_supported :created_on do
           if content_for_scanner =~ /date_approved:\s+(.+)\n/
@@ -70,6 +65,12 @@ module Whois
           end
         end
 
+
+        # NEWPROPERTY
+        def reserved?
+          !!(content_for_scanner =~ /^Domain is not available or is reserved by the registry/)
+        end
+
       end
 
     end

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

@@ -150,7 +150,7 @@ module Whois
         end
 
 
-      private
+        private
 
         def build_contact(element, type)
           node(element) do |raw|

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

@@ -33,10 +33,16 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
             case $1.downcase
-            when "available"        then :available
-            when "not available"    then :registered
-            when "quarantine"       then :redemption
-            when "out of service"   then :redemption
+            when "available"
+              :available
+            when "not available"
+              :registered
+            when "quarantine"
+              :redemption
+            when "out of service"
+              :redemption
+            when "not allowed"
+              :invalid
             else
               Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -46,11 +52,11 @@ module Whois
         end
 
         property_supported :available? do
-          (status == :available)
+          !invalid? && (status == :available)
         end
 
         property_supported :registered? do
-          !available?
+          !invalid? && !available?
         end
 
 
@@ -101,6 +107,14 @@ module Whois
           !!(content_for_scanner =~ /^-3: IP address blocked/)
         end
 
+
+        # NEWPROPERTY
+        def invalid?
+          cached_properties_fetch(:invalid?) do
+            status == :invalid
+          end
+        end
+
       end
 
     end

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

@@ -16,6 +16,9 @@ module Whois
 
       # Parser for the whois.enom.com server.
       class WhoisEnomCom < BaseIcannCompliant
+        self.scanner = Scanners::BaseIcannCompliant, {
+            pattern_available: /^Domain not found\.\n/
+        }
       end
 
     end

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

@@ -7,8 +7,8 @@
 #++
 
 
+require 'yaml'
 require 'whois/record/parser/base'
-require 'whois/record/scanners/whois.gandi.net'
 
 
 module Whois
@@ -26,12 +26,8 @@ module Whois
       class WhoisGandiNet < Base
         include Scanners::Scannable
 
-        self.scanner = Scanners::WhoisGandiNet
 
-
-        property_supported :disclaimer do
-          node("field:disclaimer")
-        end
+        property_not_supported :disclaimer
 
 
         property_supported :domain do
@@ -59,22 +55,22 @@ module Whois
 
 
         property_supported :created_on do
-          node("created") { |str| Time.parse(str) }
+          node("created")
         end
 
         property_supported :updated_on do
-          node("changed") { |str| Time.parse(str) }
+          node("changed")
         end
 
         property_supported :expires_on do
-          node("expires") { |str| Time.parse(str) }
+          node("expires")
         end
 
 
         property_supported :registrar do
           Record::Registrar.new(
-              :name         => 'GANDI Registrar',
-              :organization => 'GANDI Registrar',
+              name:         "GANDI Registrar",
+              organization: "GANDI Registrar",
           )
         end
 
@@ -95,17 +91,26 @@ module Whois
         property_supported :nameservers do
           content_for_scanner.scan(/^ns\d{1}:\s(.*)/).flatten.map do |line|
             name, ipv4 = line.strip.split(" ")
-            Record::Nameserver.new(:name => name.downcase, :ipv4 => ipv4)
+            Record::Nameserver.new(name: name.downcase, ipv4: ipv4)
           end
         end
 
 
         private
 
-        def build_contact(element, type)
-          match = content_for_scanner.slice(/#{element}:\n((\s\s.+\n)*)/, 1)
-          return unless match
+        def parse
+          patched = content_for_scanner.dup
+          patched.gsub!(/(zipcode|phone|fax): (.+)/, %Q{\\1: "\\2"})
+
+          result = YAML.load(patched)
+          unless result
+            result = {}
+            result["status:available"] = true
+          end
+          result
+        end
 
+        def build_contact(element, type)
           # nic-hdl: NG270-GANDI
           # organisation: GANDI SAS
           # person: NOC GANDI
@@ -117,20 +122,23 @@ module Whois
           # fax: +33.143731851
           # email: 12e7da77f638acdf8d9f4d0b828ca80c-248842@contact.gandi.net
           # lastupdated: 2013-04-04 15:53:42
-          Record::Contact.new(
-              :type         => type,
-              :id           => match.slice(/nic-hdl: (.*)/, 1),
-              :name         => match.slice(/person: (.*)/, 1),
-              :organization => match.slice(/organisation: (.*)/, 1),
-              :address      => match.slice(/address: (.*)/, 1),
-              :zip          => match.slice(/zipcode: (.*)/, 1),
-              :city         => match.slice(/city: (.*)/, 1),
-              :country      => match.slice(/country: (.*)/, 1),
-              :phone        => match.slice(/phone: (.*)/, 1),
-              :fax          => match.slice(/fax: (.*)/, 1),
-              :email        => match.slice(/email: (.*)/, 1),
-              :updated_on   => Time.parse(match.slice(/lastupdated: (.*)/, 1)),
-          )
+
+          node(element) do |section|
+            Record::Contact.new(
+                type:         type,
+                id:           section["nic-hdl"],
+                name:         section["person"],
+                organization: section["organisation"],
+                address:      section["address"],
+                zip:          section["zipcode"],
+                city:         section["city"],
+                country:      section["country"],
+                phone:        section["phone"],
+                fax:          section["fax"],
+                email:        section["email"],
+                updated_on:   section["lastupdated"],
+            )
+          end
         end
 
       end

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

@@ -57,8 +57,8 @@ module Whois
 
         property_supported :registrar do
           Record::Registrar.new(
-            :name => content_for_scanner[/Registrar: (.+)\n/, 1],
-            :url => "http://www.godaddy.com/"
+              name:         content_for_scanner[/Registrar: (.+)\n/, 1],
+              url:          "http://www.godaddy.com/"
           )
         end
 
@@ -76,7 +76,7 @@ module Whois
 
         property_supported :nameservers do
           content_for_scanner.scan(/Name Server: (.+)\n/).map do |line|
-            Record::Nameserver.new(:name => line[0].strip)
+            Record::Nameserver.new(name: line[0].strip)
           end
         end
 
@@ -84,18 +84,18 @@ module Whois
 
         def build_contact(element, type)
           Record::Contact.new(
-            :type         => type,
-            :id           => nil,
-            :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      => value_for_property(element, 'Country'),
-            :phone        => value_for_property(element, 'Phone'),
-            :fax          => value_for_property(element, 'Fax'),
-            :email        => value_for_property(element, 'Email')
+              type:         type,
+              id:           nil,
+              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:      value_for_property(element, 'Country'),
+              phone:        value_for_property(element, 'Phone'),
+              fax:          value_for_property(element, 'Fax'),
+              email:        value_for_property(element, 'Email')
           )
         end
 

data/lib/whois/record/parser/whois.iis.nu.rb

@@ -0,0 +1,28 @@
+#--
+# 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/parser/base_iisse'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.iis.nu server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisIisNu < BaseIisse
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/whois.iis.se.rb

@@ -0,0 +1,28 @@
+#--
+# 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/parser/base_iisse'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.iis.se server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisIisSe < BaseIisse
+      end
+
+    end
+  end
+end

data/lib/whois/record/parser/whois.jprs.jp.rb

@@ -63,11 +63,6 @@ module Whois
           !available?
         end
 
-        # NEWPROPERTY
-        def reserved?
-          status == :reserved
-        end
-
 
         # TODO: timezone ('Asia/Tokyo')
         property_supported :created_on do
@@ -97,6 +92,12 @@ module Whois
           end
         end
 
+
+        # NEWPROPERTY
+        def reserved?
+          status == :reserved
+        end
+
       end
 
     end

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

@@ -48,19 +48,19 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /\s+Registered:\s+(.*)\n/
+          if content_for_scanner =~ /\s+Registered:\s+(.+)\n/
             Time.parse($1)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /\s+Last modified:\s+(.*)\n/
+          if content_for_scanner =~ /\s+Last modified:\s+(.+)\n/
             Time.parse($1)
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /\s+Expires:\s+(.*)\n/
+          if content_for_scanner =~ /\s+Expires:\s+(.+)\n/
             Time.parse($1)
           end
         end

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

@@ -15,6 +15,10 @@ module Whois
     class Parser
 
       # Parser for the whois.nic.asia server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
       class WhoisNicAsia < BaseAfilias
 
         property_supported :status do

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

@@ -0,0 +1,128 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base_afilias'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.nic.bj server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisNicBj < Base
+
+
+        property_not_supported :disclaimer
+
+
+        property_supported :domain do
+          if section =~ /Domain Name:\s+(.+)\n/
+            $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 =~ /^No records matching/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          if section =~ /Created:\s+(.+)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_supported :updated_on do
+          if section =~ /Updated:\s+(.+)\n/
+            Time.parse($1)
+          end
+        end
+
+        property_not_supported :expires_on
+
+
+        property_not_supported :registrar
+
+
+        property_supported :registrant_contacts do
+          if section =~ /Name:\s+(.+)\n/
+            Record::Contact.new(
+                type:         Whois::Record::Contact::TYPE_REGISTRANT,
+                name:         $1
+            )
+          end
+        end
+
+        property_not_supported :admin_contacts
+
+        property_not_supported :technical_contacts
+
+
+        property_supported :nameservers do
+          (1..4).map do |i|
+            section =~ /Name Server #{i}:\s+(.+)\n/ ? Record::Nameserver.new(name: $1) : nil
+          end.compact
+        end
+
+
+        private
+
+        def build_contact(element, type)
+          node("#{element} ID") do
+            address = ["", "2", "3"].
+                map { |i| node("#{element} Address#{i}") }.
+                delete_if(&:empty?).
+                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_code => node("#{element} Country/Economy"),
+                :phone        => node("#{element} Phone"),
+                :fax          => node("#{element} FAX"),
+                :email        => node("#{element} E-mail")
+            )
+          end
+        end
+
+        def section
+          return @section if @section
+          @section = content_for_scanner =~ /((?:Domain:.+\n)(?:.+:.+\n)+)\n/ ? $1 : ""
+        end
+
+      end
+
+    end
+  end
+end