whois 2.0.7 → 2.1.0

data/spec/integration_spec.rb

@@ -2,14 +2,16 @@ require "spec_helper"
 
 describe Whois do
 
+  let(:response)    { "Domain:             example.it\nStatus:             AVAILABLE\n" }
+
   describe "Basic WHOIS querying and parsing" do
     it "works" do
       with_definitions do
         Whois::Server.define(:tld, ".it", "whois.nic.it")
-        Whois::Server::Adapters::Standard.any_instance.expects(:ask_the_socket).with("example.it", "whois.nic.it", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(<<-EOS)
-  Domain:             example.it
-  Status:             AVAILABLE
-        EOS
+        Whois::Server::Adapters::Standard.any_instance \
+            .expects(:ask_the_socket) \
+            .with("example.it", "whois.nic.it", 43) \
+            .returns(response)
 
         record = Whois.query("example.it")
 
@@ -23,17 +25,32 @@ describe Whois do
     end
   end
 
-  describe "Binding a WHOIS query to a different local host and port" do
-    it "works" do
+  describe "Passing :bind_host and :bind_port options" do
+    it "binds the WHOIS query to given host and port" do
+      with_definitions do
+        Whois::Server.define(:tld, ".it", "whois.nic.it")
+        Whois::Server::Adapters::Standard.any_instance \
+            .expects(:ask_the_socket) \
+            .with("example.it", "whois.nic.it", 43, "192.168.1.1", 3000) \
+            .returns(response)
+
+        client = Whois::Client.new(:bind_host => "192.168.1.1", :bind_port => 3000)
+        client.query("example.it")
+      end
+    end
+  end
+
+  describe "Passing :bind_port options" do
+    it "binds the WHOIS query to given port and defaults host" do
       with_definitions do
         Whois::Server.define(:tld, ".it", "whois.nic.it")
-        Whois::Server::Adapters::Standard.any_instance.expects(:ask_the_socket).with("example.it", "whois.nic.it", 43, "127.0.0.1", 3000).returns(<<-EOS)
-  Domain:             example.it
-  Status:             AVAILABLE
-        EOS
+        Whois::Server::Adapters::Standard.any_instance \
+            .expects(:ask_the_socket) \
+            .with("example.it", "whois.nic.it", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, 3000) \
+            .returns(response)
 
-        client = Whois::Client.new(:bind_host => "127.0.0.1", :bind_port => 3000)
-        record = client.query("example.it")
+        client = Whois::Client.new(:bind_port => 3000)
+        client.query("example.it")
       end
     end
   end

data/spec/support/helpers/spec_helper.rb

@@ -36,16 +36,6 @@ module SpecHelper
     end
 
 
-    # Temporary resets parser @@registry
-    # to let the test setup a custom registry.
-    def with_registry
-      @_property_registry = Whois::Record::Parser::Base.send :class_variable_get, :@@property_registry
-      Whois::Record::Parser::Base.send :class_variable_set, :@@property_registry, {}
-      yield
-    ensure
-      Whois::Record::Parser::Base.send :class_variable_set, :@@property_registry, @_property_registry
-    end
-
     def nameserver(*params)
       Whois::Record::Nameserver.new(*params)
     end

data/spec/tlds

@@ -237,7 +237,7 @@ ps;whois.pnina.ps;google.ps;u34jedzcq.ps
 pt;whois.dns.pt;google.pt;u34jedzcq.pt
 pw;;;
 py;;;
-qa;;;
+qa.com;whois.registry.qa;qtel.com.qa;u34jedzcq.qa
 qc.com;whois.centralnic.com;ceo.qc.com;u34jedzcq.qc.com
 re;whois.nic.fr;nic.re;u34jedzcq.re
 ro;whois.rotld.ro;google.ro;u34jedzcq.ro

data/spec/whois/record/parser/base_spec.rb

@@ -7,57 +7,29 @@ describe Whois::Record::Parser::Base do
   end
 
 
-  describe ".property_registry" do
-    it "returns the @@registry variable when class argument is not passed" do
-      with_registry do
-        klass.property_registry.should == klass.send(:class_variable_get, :@@property_registry)
-      end
-    end
-
-    it "returns the hash for given class when class argument is passed" do
-      with_registry do
-        pklass = Class.new(klass)
-        klass.send(:class_variable_set, :@@property_registry, { pklass => {} })
-
-        klass.property_registry[pklass].should == Hash.new
-      end
-    end
-
-    it "lazy initializes the hash for given class" do
-      with_registry do
-        pklass = Class.new(klass)
-        klass.send(:class_variable_set, :@@property_registry, Hash.new)
-        klass.property_registry[pklass]
-        klass.send(:class_variable_get, :@@property_registry).should == {}
-      end
-    end
-  end
-
   describe ".property_register" do
     it "register given property" do
-      with_registry do
-        pklass = Class.new(klass)
-        pklass.property_register(:greetings, :supported)
+      koncrete = Class.new(klass)
+      koncrete.property_register(:greetings, :supported)
 
-        klass.property_registry[pklass][:greetings].should == :supported
-      end
+      koncrete._properties[:greetings].should == :supported
     end
   end
 
   describe "#property_supported?" do
     it "returns false if the property is not supported" do
-      k = Class.new(klass) do
+      koncrete = Class.new(klass) do
       end
-      k.new(@part).property_supported?(:disclaimer).should be_false
-      k.new(@part).respond_to?(:disclaimer).should be_true
+      koncrete.new(@part).property_supported?(:disclaimer).should be_false
+      koncrete.new(@part).respond_to?(:disclaimer).should be_true
     end
 
     it "returns true if the property is supported" do
-      k = Class.new(klass) do
+      koncrete = Class.new(klass) do
         property_register(:disclaimer, :supported) {}
       end
-      k.new(@part).property_supported?(:disclaimer).should be_true
-      k.new(@part).respond_to?(:disclaimer).should be_true
+      koncrete.new(@part).property_supported?(:disclaimer).should be_true
+      koncrete.new(@part).respond_to?(:disclaimer).should be_true
     end
   end
 
@@ -96,30 +68,30 @@ describe Whois::Record::Parser::Base do
 
   describe "#is" do
     it "calls the method if the object respond to the method" do
-      i = Class.new(klass) { def response_throttled?; true; end }.new(Whois::Record::Part.new)
-      i.is(:response_throttled?)
+      koncrete = Class.new(klass) { def response_throttled?; true; end }.new(Whois::Record::Part.new)
+      koncrete.is(:response_throttled?)
     end
     it "does not call the method if the object does not respond to the method" do
-      i = Class.new(klass).new(Whois::Record::Part.new)
-      i.is(:response_throttled?).should be_false
+      koncrete = Class.new(klass).new(Whois::Record::Part.new)
+      koncrete.is(:response_throttled?).should be_false
     end
   end
 
   describe "#validate!" do
     it "raises Whois::ResponseIsThrottled when the response is throttled" do
-      i = Class.new(klass) { def response_throttled?; true; end }.new(Whois::Record::Part.new)
-      lambda { i.validate! }.should raise_error(Whois::ResponseIsThrottled)
+      koncrete = Class.new(klass) { def response_throttled?; true; end }.new(Whois::Record::Part.new)
+      lambda { koncrete.validate! }.should raise_error(Whois::ResponseIsThrottled)
 
-      i = Class.new(klass) { def response_throttled?; false; end }.new(Whois::Record::Part.new)
-      lambda { i.validate! }.should_not raise_error
+      koncrete = Class.new(klass) { def response_throttled?; false; end }.new(Whois::Record::Part.new)
+      lambda { koncrete.validate! }.should_not raise_error
     end
 
     it "raises Whois::ResponseIsUnavailable when the response is unavailable" do
-      i = Class.new(klass) { def response_unavailable?; true; end }.new(Whois::Record::Part.new)
-      lambda { i.validate! }.should raise_error(Whois::ResponseIsUnavailable)
+      koncrete = Class.new(klass) { def response_unavailable?; true; end }.new(Whois::Record::Part.new)
+      lambda { koncrete.validate! }.should raise_error(Whois::ResponseIsUnavailable)
 
-      i = Class.new(klass) { def response_unavailable?; false; end }.new(Whois::Record::Part.new)
-      lambda { i.validate! }.should_not raise_error
+      koncrete = Class.new(klass) { def response_unavailable?; false; end }.new(Whois::Record::Part.new)
+      lambda { koncrete.validate! }.should_not raise_error
     end
   end
 
@@ -170,13 +142,13 @@ describe Whois::Record::Parser::Base do
       c1 = Whois::Record::Contact.new(:id => "1st", :name => "foo")
       c2 = Whois::Record::Contact.new(:id => "2nd", :name => "foo")
       c3 = Whois::Record::Contact.new(:id => "3rd", :name => "foo")
-      i  = Class.new(klass) do
+      koncrete = Class.new(klass) do
         property_supported(:registrant_contacts) { [c1, c2] }
         property_supported(:admin_contacts)      { [] }
         property_supported(:technical_contacts)  { [c3] }
       end.new(@part)
 
-      i.contacts.should == [c1, c2, c3]
+      koncrete.contacts.should == [c1, c2, c3]
     end
 
     it "returns an empty array when no contact is supported" do

data/spec/whois/record/parser/responses/whois.aero/status_available_spec.rb

@@ -21,9 +21,34 @@ describe Whois::Record::Parser::WhoisAero, "status_available.expected" do
     @parser = klass.new(part)
   end
 
+  describe "#disclaimer" do
+    it do
+      @parser.disclaimer.should == nil
+    end
+  end
+  describe "#domain" do
+    it do
+      @parser.domain.should == nil
+    end
+  end
+  describe "#domain_id" do
+    it do
+      @parser.domain_id.should == nil
+    end
+  end
+  describe "#referral_whois" do
+    it do
+      lambda { @parser.referral_whois }.should raise_error(Whois::PropertyNotSupported)
+    end
+  end
+  describe "#referral_url" do
+    it do
+      lambda { @parser.referral_url }.should raise_error(Whois::PropertyNotSupported)
+    end
+  end
   describe "#status" do
     it do
-      @parser.status.should == :available
+      @parser.status.should == []
     end
   end
   describe "#available?" do
@@ -51,6 +76,29 @@ describe Whois::Record::Parser::WhoisAero, "status_available.expected" do
       @parser.expires_on.should == nil
     end
   end
+  describe "#registrar" do
+    it do
+      @parser.registrar.should == nil
+    end
+  end
+  describe "#registrant_contacts" do
+    it do
+      @parser.registrant_contacts.should be_a(Array)
+      @parser.registrant_contacts.should == []
+    end
+  end
+  describe "#admin_contacts" do
+    it do
+      @parser.admin_contacts.should be_a(Array)
+      @parser.admin_contacts.should == []
+    end
+  end
+  describe "#technical_contacts" do
+    it do
+      @parser.technical_contacts.should be_a(Array)
+      @parser.technical_contacts.should == []
+    end
+  end
   describe "#nameservers" do
     it do
       @parser.nameservers.should be_a(Array)

data/spec/whois/record/parser/responses/whois.aero/status_registered_spec.rb

@@ -21,9 +21,34 @@ describe Whois::Record::Parser::WhoisAero, "status_registered.expected" do
     @parser = klass.new(part)
   end
 
+  describe "#disclaimer" do
+    it do
+      @parser.disclaimer.should == "Access to .AERO WHOIS information is provided to assist persons in determining the contents of a domain name registration record in the Afilias registry database. The data in this record is provided by Afilias Limited for informational purposes only, and Afilias does not guarantee its accuracy.  This service is intended only for query-based access. You agree that you will use this data only for lawful purposes and that, under no circumstances will you use this data to: (a) allow, enable, or otherwise support the transmission by e-mail, telephone, or facsimile of mass unsolicited, commercial advertising or solicitations to entities other than the data recipient's own existing customers; or (b) enable high volume, automated, electronic processes that send queries or data to the systems of Registry Operator, a Registrar, or Afilias except as reasonably necessary to register domain names or modify existing registrations. All rights reserved. Afilias reserves the right to modify these terms at any time. By submitting this query, you agree to abide by this policy."
+    end
+  end
+  describe "#domain" do
+    it do
+      @parser.domain.should == "srilankan.aero"
+    end
+  end
+  describe "#domain_id" do
+    it do
+      @parser.domain_id.should == "D246-AERO"
+    end
+  end
+  describe "#referral_whois" do
+    it do
+      lambda { @parser.referral_whois }.should raise_error(Whois::PropertyNotSupported)
+    end
+  end
+  describe "#referral_url" do
+    it do
+      lambda { @parser.referral_url }.should raise_error(Whois::PropertyNotSupported)
+    end
+  end
   describe "#status" do
     it do
-      @parser.status.should == :registered
+      @parser.status.should == ["OK"]
     end
   end
   describe "#available?" do
@@ -54,6 +79,71 @@ describe Whois::Record::Parser::WhoisAero, "status_registered.expected" do
       @parser.expires_on.should == Time.parse("2010-03-26 06:48:27 UTC")
     end
   end
+  describe "#registrar" do
+    it do
+      @parser.registrar.should be_a(_registrar)
+      @parser.registrar.id.should           == "380"
+      @parser.registrar.name.should         == "Tuonome IT"
+      @parser.registrar.organization.should == "Tuonome IT"
+    end
+  end
+  describe "#registrant_contacts" do
+    it do
+      @parser.registrant_contacts.should be_a(Array)
+      @parser.registrant_contacts.should have(1).items
+      @parser.registrant_contacts[0].should be_a(_contact)
+      @parser.registrant_contacts[0].type.should         == Whois::Record::Contact::TYPE_REGISTRANT
+      @parser.registrant_contacts[0].id.should           == "C4526901-AERO"
+      @parser.registrant_contacts[0].name.should         == "Domain Name Administrator"
+      @parser.registrant_contacts[0].organization.should == "SriLankan Airlines Ltd"
+      @parser.registrant_contacts[0].address.should      == "Admin Bldg"
+      @parser.registrant_contacts[0].city.should         == "Katunayaka"
+      @parser.registrant_contacts[0].zip.should          == "11450"
+      @parser.registrant_contacts[0].state.should        == "WP"
+      @parser.registrant_contacts[0].country_code.should == "LK"
+      @parser.registrant_contacts[0].phone.should        == "+94.197331600"
+      @parser.registrant_contacts[0].fax.should          == "+94.197335160"
+      @parser.registrant_contacts[0].email.should        == "domregister@srilankan.aero"
+    end
+  end
+  describe "#admin_contacts" do
+    it do
+      @parser.admin_contacts.should be_a(Array)
+      @parser.admin_contacts.should have(1).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           == "C4526901-AERO"
+      @parser.admin_contacts[0].name.should         == "Domain Name Administrator"
+      @parser.admin_contacts[0].organization.should == "SriLankan Airlines Ltd"
+      @parser.admin_contacts[0].address.should      == "Admin Bldg"
+      @parser.admin_contacts[0].city.should         == "Katunayaka"
+      @parser.admin_contacts[0].zip.should          == "11450"
+      @parser.admin_contacts[0].state.should        == "WP"
+      @parser.admin_contacts[0].country_code.should == "LK"
+      @parser.admin_contacts[0].phone.should        == "+94.197331600"
+      @parser.admin_contacts[0].fax.should          == "+94.197335160"
+      @parser.admin_contacts[0].email.should        == "domregister@srilankan.aero"
+    end
+  end
+  describe "#technical_contacts" do
+    it do
+      @parser.technical_contacts.should be_a(Array)
+      @parser.technical_contacts.should have(1).items
+      @parser.technical_contacts[0].should be_a(_contact)
+      @parser.technical_contacts[0].type.should         == Whois::Record::Contact::TYPE_TECHNICAL
+      @parser.technical_contacts[0].id.should           == "C4526901-AERO"
+      @parser.technical_contacts[0].name.should         == "Domain Name Administrator"
+      @parser.technical_contacts[0].organization.should == "SriLankan Airlines Ltd"
+      @parser.technical_contacts[0].address.should      == "Admin Bldg"
+      @parser.technical_contacts[0].city.should         == "Katunayaka"
+      @parser.technical_contacts[0].zip.should          == "11450"
+      @parser.technical_contacts[0].state.should        == "WP"
+      @parser.technical_contacts[0].country_code.should == "LK"
+      @parser.technical_contacts[0].phone.should        == "+94.197331600"
+      @parser.technical_contacts[0].fax.should          == "+94.197335160"
+      @parser.technical_contacts[0].email.should        == "domregister@srilankan.aero"
+    end
+  end
   describe "#nameservers" do
     it do
       @parser.nameservers.should be_a(Array)

data/spec/whois/record/parser/responses/whois.afilias-grs.info/bz/status_available_spec.rb

@@ -21,6 +21,31 @@ describe Whois::Record::Parser::WhoisAfiliasGrsInfo, "status_available.expected"
     @parser = klass.new(part)
   end
 
+  describe "#disclaimer" do
+    it do
+      @parser.disclaimer.should == nil
+    end
+  end
+  describe "#domain" do
+    it do
+      @parser.domain.should == nil
+    end
+  end
+  describe "#domain_id" do
+    it do
+      @parser.domain_id.should == nil
+    end
+  end
+  describe "#referral_whois" do
+    it do
+      lambda { @parser.referral_whois }.should raise_error(Whois::PropertyNotSupported)
+    end
+  end
+  describe "#referral_url" do
+    it do
+      lambda { @parser.referral_url }.should raise_error(Whois::PropertyNotSupported)
+    end
+  end
   describe "#status" do
     it do
       @parser.status.should == []
@@ -51,6 +76,29 @@ describe Whois::Record::Parser::WhoisAfiliasGrsInfo, "status_available.expected"
       @parser.expires_on.should == nil
     end
   end
+  describe "#registrar" do
+    it do
+      @parser.registrar.should == nil
+    end
+  end
+  describe "#registrant_contacts" do
+    it do
+      @parser.registrant_contacts.should be_a(Array)
+      @parser.registrant_contacts.should == []
+    end
+  end
+  describe "#admin_contacts" do
+    it do
+      @parser.admin_contacts.should be_a(Array)
+      @parser.admin_contacts.should == []
+    end
+  end
+  describe "#technical_contacts" do
+    it do
+      @parser.technical_contacts.should be_a(Array)
+      @parser.technical_contacts.should == []
+    end
+  end
   describe "#nameservers" do
     it do
       @parser.nameservers.should be_a(Array)