whois 3.2.0 → 3.2.1

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## Release 3.2.1
+
+- NEW: Added full whois.nic.tr parser.
+
+- CHANGED: Updated whois.nic.hn parsers to the new response format.
+
+- CHANGED: Updated whois.nic.as parsers to the new response format.
+
+- CHANGED: Updated whois.nic.mg parsers to the new response format.
+
+- CHANGED: Updated whois.nic.cd parsers to the new response format.
+
+- CHANGED: Updated whois.je parsers to the new response format.
+
+- CHANGED: Updated whois.gg parsers to the new response format.
+
+- CHANGED: Updated whois.pnina.ps parsers to the new response format.
+
+- CHANGED: Deprecate Whois::Record::Contact::TYPE_ADMIN in favor of Whois::Record::Contact::TYPE_ADMINISTRATIVE
+
 
 ## Release 3.2.0
 

data/lib/whois/core_ext.rb

@@ -1,7 +1,9 @@
 if defined?(ActiveSupport::VERSION) && ActiveSupport::VERSION::MAJOR == 3
   require 'active_support/core_ext/array/wrap'
-  require 'whois/core_ext/class/attribute'
+  require 'active_support/core_ext/class/attribute'
+  require 'active_support/core_ext/object/blank'
 else
   require 'whois/core_ext/array/wrap'
   require 'whois/core_ext/class/attribute'
+  require 'whois/core_ext/object/blank'
 end

data/lib/whois/core_ext/array/extract_options.rb

@@ -17,8 +17,8 @@ class Array
   #     args.extract_options!
   #   end
   #
-  #   options(1, 2)           # => {}
-  #   options(1, 2, :a => :b) # => {:a=>:b}
+  #   options(1, 2)        # => {}
+  #   options(1, 2, a: :b) # => {:a=>:b}
   def extract_options!
     if last.is_a?(Hash) && last.extractable_options?
       pop

data/lib/whois/core_ext/array/wrap.rb

@@ -7,35 +7,32 @@ class Array
   # * Otherwise, if the argument responds to +to_ary+ it is invoked, and its result returned.
   # * Otherwise, returns an array with the argument as its single element.
   #
-  #   Array.wrap(nil)       # => []
-  #   Array.wrap([1, 2, 3]) # => [1, 2, 3]
-  #   Array.wrap(0)         # => [0]
+  #     Array.wrap(nil)       # => []
+  #     Array.wrap([1, 2, 3]) # => [1, 2, 3]
+  #     Array.wrap(0)         # => [0]
   #
   # This method is similar in purpose to <tt>Kernel#Array</tt>, but there are some differences:
   #
   # * If the argument responds to +to_ary+ the method is invoked. <tt>Kernel#Array</tt>
-  # moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns
-  # such a +nil+ right away.
+  #   moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns
+  #   +nil+ right away.
   # * If the returned value from +to_ary+ is neither +nil+ nor an +Array+ object, <tt>Kernel#Array</tt>
-  # raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value.
-  # * It does not call +to_a+ on the argument, though special-cases +nil+ to return an empty array.
+  #   raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value.
+  # * It does not call +to_a+ on the argument, but returns an empty array if argument is +nil+.
   #
-  # The last point is particularly worth comparing for some enumerables:
+  # The second point is easily explained with some enumerables:
   #
-  #   Array(:foo => :bar)      # => [[:foo, :bar]]
-  #   Array.wrap(:foo => :bar) # => [{:foo => :bar}]
-  #
-  #   Array("foo\nbar")        # => ["foo\n", "bar"], in Ruby 1.8
-  #   Array.wrap("foo\nbar")   # => ["foo\nbar"]
+  #   Array(foo: :bar)      # => [[:foo, :bar]]
+  #   Array.wrap(foo: :bar) # => [{:foo=>:bar}]
   #
   # There's also a related idiom that uses the splat operator:
   #
   #   [*object]
   #
-  # which returns <tt>[nil]</tt> for +nil+, and calls to <tt>Array(object)</tt> otherwise.
+  # which returns <tt>[]</tt> for +nil+, but calls to <tt>Array(object)</tt> otherwise.
   #
-  # Thus, in this case the behavior is different for +nil+, and the differences with
-  # <tt>Kernel#Array</tt> explained above apply to the rest of +object+s.
+  # The differences with <tt>Kernel#Array</tt> explained above
+  # apply to the rest of <tt>object</tt>s.
   def self.wrap(object)
     if object.nil?
       []

data/lib/whois/core_ext/object/blank.rb

@@ -0,0 +1,105 @@
+# encoding: utf-8
+
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, '', '   ', +nil+, [], and {} are all blank.
+  #
+  # This simplifies:
+  #
+  #   if address.nil? || address.empty?
+  #
+  # ...to:
+  #
+  #   if address.blank?
+  def blank?
+    respond_to?(:empty?) ? empty? : !self
+  end
+
+  # An object is present if it's not <tt>blank?</tt>.
+  def present?
+    !blank?
+  end
+
+  # Returns object if it's <tt>present?</tt> otherwise returns +nil+.
+  # <tt>object.presence</tt> is equivalent to <tt>object.present? ? object : nil</tt>.
+  #
+  # This is handy for any representation of objects where blank is the same
+  # as not present at all. For example, this simplifies a common check for
+  # HTTP POST/query parameters:
+  #
+  #   state   = params[:state]   if params[:state].present?
+  #   country = params[:country] if params[:country].present?
+  #   region  = state || country || 'US'
+  #
+  # ...becomes:
+  #
+  #   region = params[:state].presence || params[:country].presence || 'US'
+  def presence
+    self if present?
+  end
+end
+
+class NilClass
+  # +nil+ is blank:
+  #
+  #   nil.blank? # => true
+  def blank?
+    true
+  end
+end
+
+class FalseClass
+  # +false+ is blank:
+  #
+  #   false.blank? # => true
+  def blank?
+    true
+  end
+end
+
+class TrueClass
+  # +true+ is not blank:
+  #
+  #   true.blank? # => false
+  def blank?
+    false
+  end
+end
+
+class Array
+  # An array is blank if it's empty:
+  #
+  #   [].blank?      # => true
+  #   [1,2,3].blank? # => false
+  alias_method :blank?, :empty?
+end
+
+class Hash
+  # A hash is blank if it's empty:
+  #
+  #   {}.blank?                # => true
+  #   { key: 'value' }.blank?  # => false
+  alias_method :blank?, :empty?
+end
+
+class String
+  # A string is blank if it's empty or contains whitespaces only:
+  #
+  #   ''.blank?                 # => true
+  #   '   '.blank?              # => true
+  #   '　'.blank?               # => true
+  #   ' something here '.blank? # => false
+  def blank?
+    self !~ /[^[:space:]]/
+  end
+end
+
+class Numeric #:nodoc:
+  # No number is blank:
+  #
+  #   1.blank? # => false
+  #   0.blank? # => false
+  def blank?
+    false
+  end
+end

data/lib/whois/record/contact.rb

@@ -44,9 +44,20 @@ module Whois
                                     :phone, :fax, :email, :url,
                                     :created_on, :updated_on)
 
-      TYPE_REGISTRANT = 1
-      TYPE_ADMIN = 2
-      TYPE_TECHNICAL = 3
+      TYPE_REGISTRANT     = 1
+      TYPE_ADMINISTRATIVE = 2
+      TYPE_TECHNICAL      = 3
+
+
+      def self.const_missing(name)
+        case name
+        when :TYPE_ADMIN
+          Whois.deprecate("Whois::Record::Contact::TYPE_ADMIN is now Whois::Record::Contact::TYPE_ADMINISTRATIVE")
+          self.const_set(name, TYPE_ADMINISTRATIVE)
+        else
+          super
+        end
+      end
 
     end
 

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

@@ -76,9 +76,8 @@ module Whois
                 Whois.bug!(ParserError, "Unknown registrar format `#{value}'")
 
             Record::Registrar.new(
-                :id =>            parts[0],
-                :name =>          parts[1],
-                :organization =>  parts[1]
+                id:           parts[0],
+                name:         parts[1]
             )
           end
         end
@@ -88,7 +87,7 @@ module Whois
         end
 
         property_supported :admin_contacts do
-          build_contact("Admin", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("Admin", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
         end
 
         property_supported :technical_contacts do

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

@@ -19,6 +19,15 @@ module Whois
       # @abstract
       class BaseCocca < Base
 
+        class_attribute :status_mapping
+
+        self.status_mapping = {
+          "active" => :registered,
+          "delegated" => :registered,
+          "not registered" => :available,
+        }
+
+
         property_supported :domain do
           content_for_scanner =~ /Query:\s+(.+?)\n/
           $1 || Whois.bug!(ParserError, "Unable to parse domain.")
@@ -29,16 +38,8 @@ module Whois
 
         property_supported :status do
           if content_for_scanner =~ /Status:\s+(.+?)\n/
-            case $1.downcase
-            when "active"
-              :registered
-            when "delegated"
-              :registered
-            when "not registered"
-              :available
-            else
-              Whois.bug!(ParserError, "Unknown status `#{$1}'.")
-            end
+            status = $1.downcase
+            self.class.status_mapping[status] || Whois.bug!(ParserError, "Unknown status `#{status}'.")
           else
             Whois.bug!(ParserError, "Unable to parse status.")
           end
@@ -75,9 +76,9 @@ module Whois
         property_supported :registrar do
           if content_for_scanner =~ /Registrar Name: (.+)\n/
             Record::Registrar.new(
-                :name         => $1,
-                :organization => nil,
-                :url          => content_for_scanner.slice(/Registration URL: (.+)\n/, 1)
+                name:         $1,
+                organization: nil,
+                url:          content_for_scanner.slice(/Registration URL: (.+)\n/, 1)
             )
           end
         end

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

@@ -8,6 +8,7 @@
 
 
 require 'whois/record/parser/base'
+require 'whois/record/scanners/base_cocca2.rb'
 
 
 module Whois
@@ -18,28 +19,31 @@ module Whois
       #
       # @abstract
       class BaseCocca2 < Base
+        include Scanners::Scannable
+
+        self.scanner = Scanners::BaseCocca2
+
 
         property_supported :domain do
-          content_for_scanner.slice(/Domain Name: (.+)\n/, 1)
+          node("Domain Name")
         end
 
         property_supported :domain_id do
-          content_for_scanner.slice(/Domain ID: (.+)\n/, 1)
+          node("Domain ID")
         end
 
+
         # TODO: /pending delete/ => :redemption
         # TODO: /pending purge/  => :redemption
         property_supported :status do
-          list = statuses
+          list = Array.wrap(node("Domain Status")).map(&:downcase)
           case
-            when list.empty?
-              Whois.bug!(ParserError, "Unable to parse status.")
-            when list.include?("available")
-              :available
-            when list.include?("ok")
-              :registered
-            else
-              Whois.bug!(ParserError, "Unknown status `#{list.join(", ")}'.")
+          when list.include?("available")
+            :available
+          when list.include?("ok")
+            :registered
+          else
+            Whois.bug!(ParserError, "Unknown status `#{list.join(", ")}'.")
           end
         end
 
@@ -53,48 +57,37 @@ module Whois
 
 
         property_supported :created_on do
-          if content_for_scanner =~ /Creation Date: (.+?)\n/
-            parse_time($1)
-          end
+          node("Creation Date") { |value| parse_time(value) }
         end
 
         property_supported :updated_on do
-          if content_for_scanner =~ /Updated Date: (.+?)\n/
-            parse_time($1)
-          end
+          node("Updated Date") { |value| parse_time(value) }
         end
 
         property_supported :expires_on do
-          if content_for_scanner =~ /Registry Expiry Date: (.+?)\n/
-            parse_time($1)
-          end
+          node("Registry Expiry Date") { |value| parse_time(value) }
         end
 
 
         property_supported :registrar do
-          if content_for_scanner =~ /Sponsoring Registrar: (.+?)\n/
+          if node("Sponsoring Registrar")
             Record::Registrar.new(
-                :name         => $1,
-                :organization => nil,
-                :url          => content_for_scanner.slice(/Sponsoring Registrar URL: (.+)\n/, 1)
+                id:           node("Sponsoring Registrar IANA ID").presence,
+                name:         node("Sponsoring Registrar"),
+                url:          node("Sponsoring Registrar URL").presence
             )
           end
         end
 
 
         property_supported :nameservers do
-          content_for_scanner.scan(/Name Server: (.+)\n/).flatten.map do |name|
-            Record::Nameserver.new(:name => name)
+          Array.wrap(node("Name Server")).map do |name|
+            Record::Nameserver.new(name: name)
           end
         end
 
 
-        def statuses
-          content_for_scanner.scan(/Domain Status: (.+)\n/).flatten.map(&:downcase)
-        end
-
-
-        private
+      private
 
         def parse_time(value)
           # Hack to remove usec. Do you know a better way?

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

@@ -80,7 +80,7 @@ module Whois
         end
 
         property_supported :admin_contacts do
-          build_contact("Administrative Contact", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("Administrative Contact", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
         end
 
         property_supported :technical_contacts do

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

@@ -82,7 +82,7 @@ module Whois
         end
 
         property_supported :admin_contacts do
-          build_contact("admin", Whois::Record::Contact::TYPE_ADMIN)
+          build_contact("admin", Whois::Record::Contact::TYPE_ADMINISTRATIVE)
         end
 
         property_supported :technical_contacts do

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

@@ -21,14 +21,13 @@ module Whois
       class BaseWhoisd < Base
         include Scanners::Scannable
 
-        self.scanner = Scanners::BaseWhoisd
-
-
         class_attribute :status_mapping
+
         self.status_mapping = {
-          'paid and in zone' => :registered,
-          'expired' => :expired,
+          "paid and in zone" => :registered,
+          "expired" => :expired,
         }
+        self.scanner = Scanners::BaseWhoisd
 
 
         property_supported :domain do
@@ -88,7 +87,7 @@ module Whois
 
         property_supported :admin_contacts do
           node('admin-c') do |value|
-            build_contact(value, Record::Contact::TYPE_ADMIN)
+            build_contact(value, Record::Contact::TYPE_ADMINISTRATIVE)
           end
         end