whois 2.0.1 → 2.0.2

data/CHANGELOG.rdoc

@@ -1,5 +1,13 @@
 = Changelog
 
+
+== Release 2.0.2
+
+* CHANGED: whois.ripn.net now returns an array of contacts, one for each email (#89)
+
+* FIXED: whois.nic.it parser must support UNASSIGNABLE status.
+
+
 == Release 2.0.1
 
 * FIXED: Removed invalid test files.

data/LICENSE

@@ -1,6 +1,6 @@
-Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+The MIT License
 
-MIT License
+Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -124,7 +124,7 @@ Any WHOIS query returns a <tt>Whois::Record</tt>. This object looks like a Strin
   r.created_on
   # => Fri Dec 10 00:00:00 +0100 1999
   
-  t = r.technical
+  t = r.technical_contact
   # => #<Whois::Record::Contact>
   t.id
   # => "TS7016-ITNIC"

data/Rakefile

@@ -34,8 +34,8 @@ spec = Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.8.7"
 
-  s.author            = "Simone Carletti"
-  s.email             = "weppos@weppos.net"
+  s.authors           = ["Simone Carletti"]
+  s.email             = ["weppos@weppos.net"]
   s.homepage          = "http://www.ruby-whois.org"
   s.rubyforge_project = "whois"
 
@@ -101,13 +101,12 @@ namespace :multitest do
 end
 
 
-desc "Remove any temporary products, including gemspec"
-task :clean => [:clobber] do
-  rm "#{spec.name}.gemspec" if File.file?("#{spec.name}.gemspec")
+task :clean_gemspec do
+  rm "#{spec.name}.gemspec" rescue nil
 end
 
-desc "Remove any generated file"
-task :clobber => [:clobber_rcov, :clobber_package]
+task :clean   => [:clean_gemspec]
+task :clobber => [:clobber_package]
 
 desc "Package the library and generates the gemspec"
 task :package => [:gemspec]

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

@@ -49,6 +49,8 @@ module Whois
             :registered
           when "pendingdelete / redemptionperiod", "grace-period"
             :registered
+          when "unassignable"
+            :reserved
           when "available"
             :available
           else
@@ -61,6 +63,7 @@ module Whois
         end
 
         property_supported :registered? do
+          node("Status") != "UNASSIGNABLE" &&
           !available?
         end
 

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

@@ -67,15 +67,14 @@ module Whois
 
 
         property_supported :admin_contacts do
-          if content_for_scanner =~ /e-mail:\s+(.+)\n/
+          content_for_scanner.scan(/e-mail:\s+(.+)\n/).flatten.map do |email|
             Record::Contact.new(
               :type         => Record::Contact::TYPE_ADMIN,
               :name         => content_for_scanner[/person:\s+(.+)\n/, 1],
               :organization => content_for_scanner[/org:\s+(.+)\n/, 1],
               :phone        => content_for_scanner[/phone:\s+(.+)\n/, 1],
               :fax          => content_for_scanner[/fax-no:\s+(.+)\n/, 1],
-              # Return the first matched email, even if there are a few of them
-              :email        => content_for_scanner[/e-mail:\s+(.+)\n/, 1]
+              :email        => email
             )
           end
         end

data/lib/whois/record/parser.rb

@@ -185,7 +185,7 @@ module Whois
       # @see Whois::Record::Parser::Base#contacts
       #
       def contacts
-        parsers.inject([]) { |all, parser| all.concat(parser.contacts) }
+        parsers.map(&:contacts).flatten
       end
 
       # @endgroup

data/lib/whois/version.rb

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

data/spec/fixtures/responses/whois.nic.it/property_status_unassignable.expected

@@ -0,0 +1,8 @@
+#status
+  should: %s == :reserved
+
+#available?
+  should: %s == false
+
+#registered?
+  should: %s == false

data/spec/fixtures/responses/whois.nic.it/property_status_unassignable.txt

@@ -0,0 +1,2 @@
+Domain:             la.it
+Status:             UNASSIGNABLE

data/spec/fixtures/responses/whois.ripn.net/ru/status_registered.expected

@@ -31,7 +31,7 @@
 
 #admin_contacts
   should: %s be_a(Array)
-  should: %s have(1).items
+  should: %s have(2).items
   should: %s[0] be_a(_contact)
   should: %s[0].type         == Whois::Record::Contact::TYPE_ADMIN
   should: %s[0].id           == nil
@@ -40,6 +40,13 @@
   should: %s[0].phone        == "+1 650 330 0100"
   should: %s[0].fax          == "+1 650 618 8571"
   should: %s[0].email        == "dns-admin@google.com"
+  should: %s[1].type         == Whois::Record::Contact::TYPE_ADMIN
+  should: %s[1].id           == nil
+  should: %s[1].name         == nil
+  should: %s[1].organization == "Google Inc"
+  should: %s[1].phone        == "+1 650 330 0100"
+  should: %s[1].fax          == "+1 650 618 8571"
+  should: %s[1].email        == "ccops@markmonitor.com"
 
 #technical_contacts
   should: %s raise_error(Whois::PropertyNotSupported)

data/spec/support/helpers/spec_helper.rb

@@ -1,3 +1,18 @@
+module Helper
+
+  # Gets the currently described class.
+  # Conversely to +subject+, it returns the class
+  # instead of an instance.
+  def klass
+    described_class
+  end
+
+  def fixture(*names)
+    File.join(SPEC_ROOT, "fixtures", *names)
+  end
+
+end
+
 module SpecHelper
 
   private
@@ -31,17 +46,6 @@ module SpecHelper
       Whois::Record::Parser::Base.send :class_variable_set, :@@property_registry, @_property_registry
     end
 
-    # Gets the currently described class.
-    # Conversely to +subject+, it returns the class
-    # instead of an instance.
-    def klass
-      described_class
-    end
-
-    def fixture(*names)
-      File.join(SPEC_ROOT, "fixtures", *names)
-    end
-
     def nameserver(*params)
       Whois::Record::Nameserver.new(*params)
     end
@@ -49,5 +53,6 @@ module SpecHelper
 end
 
 RSpec.configure do |config|
+  config.include Helper
   config.include SpecHelper
 end

data/spec/whois/record/parser/responses/whois.nic.it/property_status_unassignable_spec.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+# This file is autogenerated. Do not edit it manually.
+# If you want change the content of this file, edit
+#
+#   /spec/fixtures/responses/whois.nic.it/property_status_unassignable.expected
+#
+# and regenerate the tests with the following rake task
+#
+#   $ rake genspec:parsers
+#
+
+require 'spec_helper'
+require 'whois/record/parser/whois.nic.it.rb'
+
+describe Whois::Record::Parser::WhoisNicIt, "property_status_unassignable.expected" do
+
+  before(:each) do
+    file = fixture("responses", "whois.nic.it/property_status_unassignable.txt")
+    part = Whois::Record::Part.new(:body => File.read(file))
+    @parser = klass.new(part)
+  end
+
+  context "#status" do
+    it do
+      @parser.status.should == :reserved
+    end
+  end
+  context "#available?" do
+    it do
+      @parser.available?.should == false
+    end
+  end
+  context "#registered?" do
+    it do
+      @parser.registered?.should == false
+    end
+  end
+end

data/spec/whois/record/parser/responses/whois.ripn.net/ru/status_registered_spec.rb

@@ -69,7 +69,7 @@ describe Whois::Record::Parser::WhoisRipnNet, "status_registered.expected" do
   context "#admin_contacts" do
     it do
       @parser.admin_contacts.should be_a(Array)
-      @parser.admin_contacts.should have(1).items
+      @parser.admin_contacts.should have(2).items
       @parser.admin_contacts[0].should be_a(_contact)
       @parser.admin_contacts[0].type.should         == Whois::Record::Contact::TYPE_ADMIN
       @parser.admin_contacts[0].id.should           == nil
@@ -78,6 +78,13 @@ describe Whois::Record::Parser::WhoisRipnNet, "status_registered.expected" do
       @parser.admin_contacts[0].phone.should        == "+1 650 330 0100"
       @parser.admin_contacts[0].fax.should          == "+1 650 618 8571"
       @parser.admin_contacts[0].email.should        == "dns-admin@google.com"
+      @parser.admin_contacts[1].type.should         == Whois::Record::Contact::TYPE_ADMIN
+      @parser.admin_contacts[1].id.should           == nil
+      @parser.admin_contacts[1].name.should         == nil
+      @parser.admin_contacts[1].organization.should == "Google Inc"
+      @parser.admin_contacts[1].phone.should        == "+1 650 330 0100"
+      @parser.admin_contacts[1].fax.should          == "+1 650 618 8571"
+      @parser.admin_contacts[1].email.should        == "ccops@markmonitor.com"
     end
   end
   context "#technical_contacts" do