whois 3.4.5 → 3.5.0

data/lib/whois/core_ext.rb

@@ -6,4 +6,6 @@ else
   require 'whois/core_ext/array/wrap'
   require 'whois/core_ext/class/attribute'
   require 'whois/core_ext/object/blank'
-end
+end
+
+require 'whois/core_ext/time/calculations'

data/lib/whois/core_ext/time/calculations.rb

@@ -0,0 +1,32 @@
+class Time
+
+  # Returns a new Time where one or more of the elements have been changed according
+  # to the +options+ parameter. The time options (<tt>:hour</tt>, <tt>:min</tt>,
+  # <tt>:sec</tt>, <tt>:usec</tt>) reset cascadingly, so if only the hour is passed,
+  # then minute, sec, and usec is set to 0. If the hour and minute is passed, then
+  # sec and usec is set to 0.  The +options+ parameter takes a hash with any of these
+  # keys: <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:min</tt>,
+  # <tt>:sec</tt>, <tt>:usec</tt>.
+  #
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(day: 1)              # => Time.new(2012, 8, 1, 22, 35, 0)
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, day: 1)  # => Time.new(1981, 8, 1, 22, 35, 0)
+  #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, hour: 0) # => Time.new(1981, 8, 29, 0, 0, 0)
+  def change(options)
+    new_year  = options.fetch(:year, year)
+    new_month = options.fetch(:month, month)
+    new_day   = options.fetch(:day, day)
+    new_hour  = options.fetch(:hour, hour)
+    new_min   = options.fetch(:min, options[:hour] ? 0 : min)
+    new_sec   = options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec)
+    new_usec  = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+
+    if utc?
+      ::Time.utc(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+    elsif zone
+      ::Time.local(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+    else
+      ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec + (new_usec.to_r / 1000000), utc_offset)
+    end
+  end unless method_defined? :change
+
+end

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

@@ -87,11 +87,10 @@ module Whois
         end
 
 
-      private
+        private
 
         def parse_time(value)
-          # Hack to remove usec. Do you know a better way?
-          Time.utc(*Time.parse(value).to_a)
+          Time.parse(value).change(usec: 0)
         end
 
       end

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

@@ -57,19 +57,19 @@ module Whois
 
         property_supported :created_on do
           node('Creation Date') do |value|
-            Time.parse(value)
+            parse_time(value)
           end
         end
 
         property_supported :updated_on do
           node('Updated Date') do |value|
-            Time.parse(value)
+            parse_time(value)
           end
         end
 
         property_supported :expires_on do
           node('Registrar Registration Expiration Date') do |value|
-            Time.parse(value)
+            parse_time(value)
           end
         end
 
@@ -126,6 +126,10 @@ module Whois
           end
         end
 
+        def parse_time(value)
+          Time.parse(value)
+        end
+
         def value_for_phone_property(element, property)
           [
             value_for_property(element, "#{property}"),

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

@@ -0,0 +1,63 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2014 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base_icann_compliant'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.donuts.com server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisDonutsCo < BaseIcannCompliant
+        self.scanner = Scanners::BaseIcannCompliant, {
+            pattern_available: /^Domain not found\.\n/
+        }
+
+
+        property_supported :domain_id do
+          node('Domain ID')
+        end
+
+
+        property_supported :expires_on do
+          node('Registry Expiry Date') do |value|
+            Time.parse(value)
+          end
+        end
+
+
+        property_supported :registrar do
+          return unless node('Sponsoring Registrar')
+          Record::Registrar.new(
+              id:           node('Sponsoring Registrar IANA ID'),
+              name:         node('Sponsoring Registrar'),
+              organization: node('Sponsoring Registrar')
+          )
+        end
+
+
+        private
+
+        def build_contact(element, type)
+          if (contact = super)
+            contact.id = node("#{element} ID")
+          end
+          contact
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -28,7 +28,7 @@ module Whois
 
         def build_contact(element, type)
           if (contact = super) && !contact.state.present?
-            contact.state = value_for_property(element, 'State')
+            contact.state = node("#{element} State")
           end
           contact
         end

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

@@ -24,12 +24,14 @@ module Whois
 
         self.scanner = Scanners::WhoisNicCz
 
-        self.status_mapping = {
-          "paid and in zone" => :registered,
-          "update prohibited" => :registered,
-          "expired" => :expired,
-          "to be deleted" => :expired,
-        }
+        property_supported :status do
+          if available?
+            :available
+          else
+            :registered
+          end
+        end
+
 
         def response_throttled?
           !!node("response:throttled")

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

@@ -36,7 +36,7 @@ module Whois
 
         property_supported :status do
           case s = node("Status").to_s.downcase
-          when /^ok/, "active", /\bclient/
+          when /^ok/, /\bclient/
             :registered
           when "grace-period", "no-provider"
             :registered
@@ -95,9 +95,10 @@ module Whois
         property_supported :registrar do
           node("Registrar") do |str|
             Record::Registrar.new(
-                :id           => str["Name"],
-                :name         => str["Name"],
-                :organization => str["Organization"]
+                id:           str["Name"],
+                name:         str["Name"],
+                organization: str["Organization"],
+                url:          str["Web"]
             )
           end
         end

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

@@ -20,6 +20,12 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisNicMg < BaseCocca2
+
+        property_supported :status do
+          list = Array.wrap(node("Domain Status")).map(&:downcase)
+          list.include?("available") ? :available : super()
+        end
+
       end
 
     end

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

@@ -20,12 +20,6 @@ module Whois
       #   The Example parser for the list of all available methods.
       #
       class WhoisNicMu < BaseCocca2
-
-        property_supported :status do
-          list = Array.wrap(node("Domain Status")).map(&:downcase)
-          list.include?("available") ? :available : super()
-        end
-
       end
 
     end

data/lib/whois/record/parser/whois.nic.net.sa.rb

@@ -14,16 +14,14 @@ module Whois
   class Record
     class Parser
 
-      #
-      # = whois.nic.net.sa parser
-      #
       # Parser for the whois.nic.net.sa 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.
-      # See WhoisNicIt parser for an explanation of all available methods
-      # and examples.
+      # @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.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
       #
       class WhoisNicNetSa < Base
 
@@ -36,7 +34,7 @@ module Whois
         end
 
         property_supported :available? do
-          !!(content_for_scanner =~ /^No match\.$/)
+          !!(content_for_scanner =~ /^No Match for/)
         end
 
         property_supported :registered? do
@@ -45,19 +43,25 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /reg-date:\s+(.*)\n/
+          if content_for_scanner =~ /Created on: (.+)\n/
             Time.parse($1)
           end
         end
 
-        property_not_supported :updated_on
+        property_supported :updated_on do
+          if content_for_scanner =~ /Last Updated on: (.+)\n/
+            Time.parse($1)
+          end
+        end
 
         property_not_supported :expires_on
 
 
         property_supported :nameservers do
-          content_for_scanner.scan(/nserver:\s+(.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(:name => name)
+          if content_for_scanner =~ /Name Servers:\n((.+\n)+)\n/
+            $1.split("\n").map do |name|
+              Record::Nameserver.new(name: name.strip)
+            end
           end
         end
 

data/lib/whois/record/parser/whois.registry.net.za.rb

@@ -110,10 +110,8 @@ module Whois
         def build_contact(node)
           lines = node.dup
 
-          name = lines.shift
-          email, phone, fax = [:email, :phone, :fax].map do |attribute|
-            lines.shift.split(":").last.strip
-          end
+          fax, phone, email = 3.times.map { lines.pop.split(":", 2).last.strip.presence }
+          name = lines.delete_if(&:blank?).join("\n")
 
           Record::Contact.new(
               type:         Whois::Record::Contact::TYPE_REGISTRANT,

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

@@ -0,0 +1,67 @@
+#--
+# Ruby Whois
+#
+# An intelligent pure Ruby WHOIS client and parser.
+#
+# Copyright (c) 2009-2014 Simone Carletti <weppos@weppos.net>
+#++
+
+
+require 'whois/record/parser/base_icann_compliant'
+
+
+module Whois
+  class Record
+    class Parser
+
+      # Parser for the whois.donuts.com server.
+      #
+      # @see Whois::Record::Parser::Example
+      #   The Example parser for the list of all available methods.
+      #
+      class WhoisUniregistryNet < BaseIcannCompliant
+        self.scanner = Scanners::BaseIcannCompliant, {
+            pattern_available: />>> Domain \".+\" is available/
+        }
+
+
+        property_supported :domain_id do
+          node('Domain ID')
+        end
+
+
+        property_supported :expires_on do
+          node('Registry Expiry Date') do |value|
+            parse_time(value)
+          end
+        end
+
+
+        property_supported :registrar do
+          return unless node('Sponsoring Registrar')
+          Record::Registrar.new(
+              id:           node('Sponsoring Registrar IANA ID'),
+              name:         node('Sponsoring Registrar'),
+              organization: node('Sponsoring Registrar')
+          )
+        end
+
+
+        private
+
+        def build_contact(element, type)
+          if (contact = super)
+            contact.id = node("#{element} ID")
+          end
+          contact
+        end
+
+        def parse_time(value)
+          Time.parse(value).change(usec: 0)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/whois/version.rb

@@ -12,8 +12,8 @@ module Whois
   # Holds information about library version.
   module Version
     MAJOR = 3
-    MINOR = 4
-    PATCH = 5
+    MINOR = 5
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/whois.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = "2014-03-06"
+  s.date = "2014-03-10"
   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.4.5
+  version: 3.5.0
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +94,7 @@ files:
 - lib/whois/core_ext/kernel/singleton_class.rb
 - lib/whois/core_ext/module/remove_method.rb
 - lib/whois/core_ext/object/blank.rb
+- lib/whois/core_ext/time/calculations.rb
 - lib/whois/core_ext.rb
 - lib/whois/errors.rb
 - lib/whois/record/contact.rb
@@ -153,6 +154,7 @@ files:
 - lib/whois/record/parser/whois.domainregistry.ie.rb
 - lib/whois/record/parser/whois.domainregistry.my.rb
 - lib/whois/record/parser/whois.domreg.lt.rb
+- lib/whois/record/parser/whois.donuts.co.rb
 - lib/whois/record/parser/whois.dot.cf.rb
 - lib/whois/record/parser/whois.dot.tk.rb
 - lib/whois/record/parser/whois.dotmobiregistry.net.rb
@@ -298,6 +300,7 @@ files:
 - lib/whois/record/parser/whois.tznic.or.tz.rb
 - lib/whois/record/parser/whois.ua.rb
 - lib/whois/record/parser/whois.udag.net.rb
+- lib/whois/record/parser/whois.uniregistry.net.rb
 - lib/whois/record/parser/whois.usp.ac.fj.rb
 - lib/whois/record/parser/whois.verisign-grs.com.rb
 - lib/whois/record/parser/whois.website.ws.rb