whois 2.3.0 → 2.4.0

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

@@ -32,6 +32,8 @@ module Whois
             case $1.downcase
               when "active"
                 :registered
+              when "delegated"
+                :registered
               when "not registered"
                 :available
               else

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

@@ -37,11 +37,17 @@ module Whois
         property_supported :status do
           if content_for_scanner =~ /\s+Registration status:\s+(.+?)\n/
             case $1.downcase
-              when "registered until renewal date."         then :registered
-              when "registration request being processed."  then :registered
-              when "renewal request being processed."       then :registered
+              when "registered until renewal date."
+                :registered
+              when "registration request being processed."
+                :registered
+              when "renewal request being processed."
+                :registered
+              when "no registration status listed."
+                :reserved
               # NEWSTATUS (redemption?)
-              when "renewal required."                      then :registered
+              when "renewal required."
+                :registered
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end
@@ -62,24 +68,25 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /\s+Registered on:\s+(.*)\n/
+          if content_for_scanner =~ /\s+Registered on:\s+(.+)\n/
             Time.parse($1)
           end
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /\s+Last updated:\s+(.*)\n/
+          if content_for_scanner =~ /\s+Last updated:\s+(.+)\n/
             Time.parse($1)
           end
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /\s+Renewal date:\s+(.*)\n/
+          if content_for_scanner =~ /\s+Renewal date:\s+(.+)\n/
             Time.parse($1)
           end
         end
 
 
+        # @see http://www.nic.uk/other/whois/instruct/
         property_supported :registrar do
           if content_for_scanner =~ /Registrar:\n(.+) \[Tag = (.+)\]\n\s*URL: (.+)\n/
             name, id, url = $1.strip, $2.strip, $3.strip
@@ -87,21 +94,34 @@ module Whois
 
             Record::Registrar.new(
               :id           => id,
-              :url          => url,
               :name         => (name || org),
-              :organization => org
+              :organization => org,
+              :url          => url
+            )
+          elsif content_for_scanner =~ /This domain is registered directly with Nominet/
+            Record::Registrar.new(
+              :id           => nil,
+              :name         => "Nominet",
+              :organization => "Nominet UK",
+              :url          => "http://www.nic.uk/"
             )
           end
         end
 
 
         property_supported :registrant_contacts do
-          if address_info = content_for_scanner[/Registrant's address:\n(.+)\n\n/m, 1]
-            address, city, state, zip, country = address_info.split("\n").map(&:strip)
+          if content_for_scanner =~ /Registrant's address:\n((.+\n)+)\n/
+            lines = $1.split("\n").map(&:strip)
+            address = lines[0..-5]
+            city    = lines[-4]
+            state   = lines[-3]
+            zip     = lines[-2]
+            country = lines[-1]
+            
             Record::Contact.new(
               :type => Record::Contact::TYPE_REGISTRANT,
               :name => content_for_scanner[/Registrant:\n\s*(.+)\n/, 1],
-              :address => address,
+              :address => address.join("\n"),
               :city => city,
               :state => state,
               :zip => zip,

data/lib/whois/record/parser/whois.registry.qa.rb

@@ -80,7 +80,8 @@ module Whois
 
         property_supported :nameservers do
           node("Name Server") do |value|
-            value.zip(node("Name Server IP")).map do |name, ipv4|
+            ipv4s = node("Name Server IP") || Array.new(value.size)
+            value.zip(ipv4s).map do |name, ipv4|
               Nameserver.new(:name => name, :ipv4 => ipv4)
             end
           end

data/lib/whois/record/parser/whois.rnids.rs.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/parser/scanners/whois.rnids.rs.rb'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.rnids.rs server.
+      # 
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      # @since RELEASE
+      class WhoisRnidsRs < Base
+        include Scanners::Ast
+
+        property_not_supported :disclaimer
+
+
+        property_supported :domain do
+          node("Domain name") { |str| str.chomp(".") }
+        end
+
+        property_not_supported :domain_id
+
+
+        property_not_supported :referral_whois
+
+        property_not_supported :referral_url
+
+
+        property_supported :status do
+          case s = node("Domain status") { |str| str.downcase }
+          when nil
+            :available
+          when "active"
+            :registered
+          else
+            Whois.bug!(ParserError, "Unknown status `#{s}'.")
+          end
+        end
+
+        property_supported :available? do
+          !!node("status:available")
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_supported :created_on do
+          node("Registration date") { |value| Time.parse(value) }
+        end
+
+        property_supported :updated_on do
+          node("Modification date") { |value| Time.parse(value) }
+        end
+
+        property_supported :expires_on do
+          node("Expiration date") { |value| Time.parse(value) }
+        end
+
+
+        property_supported :registrar do
+          node("Registrar") do |str|
+            Record::Registrar.new(
+              :id           => nil,
+              :name         => node("Registrar")
+            )
+          end
+        end
+
+
+        property_supported :registrant_contacts do
+          build_contact("Owner", 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("DNS")).map do |line|
+            name, ipv4 = line.split("-").map(&:strip)
+            name.chomp!(".")
+            Nameserver.new(:name => name, :ipv4 => ipv4)
+          end
+        end
+
+
+        # Initializes a new {Scanners::WhoisRnidsRs} instance
+        # passing the {#content_for_scanner}
+        # and calls +parse+ on it.
+        #
+        # @return [Hash]
+        def parse
+          Scanners::WhoisRnidsRs.new(content_for_scanner).parse
+        end
+
+
+      private
+
+        def build_contact(element, type)
+          node(element) do |hash|
+            Record::Contact.new(
+              :type         => type,
+              :id           => nil,
+              :name         => hash[element],
+              :organization => nil,
+              :address      => hash["Address"],
+              :city         => nil,
+              :zip          => nil,
+              :state        => nil,
+              :country      => nil,
+              :country_code => nil,
+              :phone        => nil,
+              :fax          => nil,
+              :email        => nil
+            )
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.ua server.
+      #
+      # @note This parser is just a stub and provides only a few basic methods
+      #   to check for domain availability and get domain status.
+      #   Please consider to contribute implementing missing methods.
+      #
+      # @since RELEASE
+      class WhoisUa < Base
+
+        property_supported :status do
+          if content_for_scanner =~ /status:\s+(.+?)\n/
+            case s = $1.downcase
+              when /^ok-until/
+                :registered
+              else
+                Whois.bug!(ParserError, "Unknown status `#{s}'.")
+            end
+          else
+            :available
+          end
+        end
+
+        property_supported :available? do
+          !!(content_for_scanner =~ /No entries found for domain/)
+        end
+
+        property_supported :registered? do
+          !available?
+        end
+
+
+        property_not_supported :created_on
+
+        property_supported :updated_on do
+          if content_for_scanner =~ /changed:\s+(.+)\n/
+            time = $1.split(" ").last
+            Time.parse(time)
+          end
+        end
+
+        property_supported :expires_on do
+          if content_for_scanner =~ /status:\s+(.+)\n/
+            time = $1.split(" ").last
+            Time.parse(time)
+          end
+        end
+
+
+        property_supported :nameservers do
+          content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |name|
+            Record::Nameserver.new(:name => name.strip.downcase)
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/version.rb

@@ -12,7 +12,7 @@ module Whois
   # Holds information about library version.
   module Version
     MAJOR = 2
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     BUILD = nil
 

data/spec/fixtures/responses/jobswhois.verisign-grs.com/property_nameserver_no_nameserver.expected

@@ -1,3 +1,3 @@
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/jobswhois.verisign-grs.com/status_available.expected

@@ -41,5 +41,5 @@
 
 
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/jobswhois.verisign-grs.com/status_registered.expected

@@ -27,20 +27,20 @@
 
 
 #created_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2006-02-21")
 
 #updated_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2009-02-20")
 
 #expires_on
-  should: %s (time)
+  should: %s CLASS(time)
   should: %s == Time.parse("2010-02-21")
 
 
 #registrar
-  should: %s (registrar)
+  should: %s CLASS(registrar)
   should: %s.id           == nil
   should: %s.name         == "ENCIRCA, INC"
   should: %s.organization == "ENCIRCA, INC"
@@ -48,9 +48,9 @@
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(2).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(2)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns2.registry.jobs"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns1.registry.jobs"

data/spec/fixtures/responses/kero.yachay.pe/status_available.expected

@@ -19,5 +19,5 @@
 
 
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/kero.yachay.pe/status_inactive.expected

@@ -19,6 +19,6 @@
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(0).items
+  should: %s CLASS(array)
+  should: %s SIZE(0)
   should: %s == []

data/spec/fixtures/responses/kero.yachay.pe/status_registered.expected

@@ -19,13 +19,13 @@
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(4).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(4)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns1.google.com"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns2.google.com"
-  should: %s[2] (nameserver)
+  should: %s[2] CLASS(nameserver)
   should: %s[2].name == "ns3.google.com"
-  should: %s[3] (nameserver)
+  should: %s[3] CLASS(nameserver)
   should: %s[3].name == "ns4.google.com"

data/spec/fixtures/responses/whois.adamsnames.tc/gd/status_available.expected

@@ -19,5 +19,5 @@
 
 
 #nameservers
-  should: %s (array)
+  should: %s CLASS(array)
   should: %s == []

data/spec/fixtures/responses/whois.adamsnames.tc/gd/status_registered.expected

@@ -19,9 +19,9 @@
 
 
 #nameservers
-  should: %s (array)
-  should: %s have(2).items
-  should: %s[0] (nameserver)
+  should: %s CLASS(array)
+  should: %s SIZE(2)
+  should: %s[0] CLASS(nameserver)
   should: %s[0].name == "ns1.google.com"
-  should: %s[1] (nameserver)
+  should: %s[1] CLASS(nameserver)
   should: %s[1].name == "ns2.google.com"