whois 2.0.7 → 2.1.0

data/spec/whois/record/parser/responses/whois.sgnic.sg/property_nameservers_schema_1_with_ip_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.sgnic.sg/property_nameservers_schema_1_with_ip.expected
+#
+# and regenerate the tests with the following rake task
+#
+#   $ rake genspec:parsers
+#
+
+require 'spec_helper'
+require 'whois/record/parser/whois.sgnic.sg.rb'
+
+describe Whois::Record::Parser::WhoisSgnicSg, "property_nameservers_schema_1_with_ip.expected" do
+
+  before(:each) do
+    file = fixture("responses", "whois.sgnic.sg/property_nameservers_schema_1_with_ip.txt")
+    part = Whois::Record::Part.new(:body => File.read(file))
+    @parser = klass.new(part)
+  end
+
+  describe "#nameservers" do
+    it do
+      @parser.nameservers.should be_a(Array)
+      @parser.nameservers.should have(3).items
+      @parser.nameservers[0].should be_a(_nameserver)
+      @parser.nameservers[0].name.should == "dnssec1.singnet.com.sg"
+      @parser.nameservers[0].ipv4.should == "165.21.83.11"
+      @parser.nameservers[1].should be_a(_nameserver)
+      @parser.nameservers[1].name.should == "dnssec2.singnet.com.sg"
+      @parser.nameservers[1].ipv4.should == "195.13.10.226"
+      @parser.nameservers[2].should be_a(_nameserver)
+      @parser.nameservers[2].name.should == "dnssec3.singnet.com.sg"
+      @parser.nameservers[2].ipv4.should == "165.21.100.11"
+    end
+  end
+end

data/spec/whois/record/parser/responses/{whois.ripn.net → whois.tcinet.ru}/ru/property_nameservers_with_ip_spec.rb

@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.ripn.net/ru/property_nameservers_with_ip.expected
+#   /spec/fixtures/responses/whois.tcinet.ru/ru/property_nameservers_with_ip.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/record/parser/whois.ripn.net.rb'
+require 'whois/record/parser/whois.tcinet.ru.rb'
 
-describe Whois::Record::Parser::WhoisRipnNet, "property_nameservers_with_ip.expected" do
+describe Whois::Record::Parser::WhoisTcinetRu, "property_nameservers_with_ip.expected" do
 
   before(:each) do
-    file = fixture("responses", "whois.ripn.net/ru/property_nameservers_with_ip.txt")
+    file = fixture("responses", "whois.tcinet.ru/ru/property_nameservers_with_ip.txt")
     part = Whois::Record::Part.new(:body => File.read(file))
     @parser = klass.new(part)
   end

data/spec/whois/record/parser/responses/{whois.ripn.net/su → whois.tcinet.ru/ru}/status_available_spec.rb

@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.ripn.net/su/status_available.expected
+#   /spec/fixtures/responses/whois.tcinet.ru/ru/status_available.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/record/parser/whois.ripn.net.rb'
+require 'whois/record/parser/whois.tcinet.ru.rb'
 
-describe Whois::Record::Parser::WhoisRipnNet, "status_available.expected" do
+describe Whois::Record::Parser::WhoisTcinetRu, "status_available.expected" do
 
   before(:each) do
-    file = fixture("responses", "whois.ripn.net/su/status_available.txt")
+    file = fixture("responses", "whois.tcinet.ru/ru/status_available.txt")
     part = Whois::Record::Part.new(:body => File.read(file))
     @parser = klass.new(part)
   end

data/spec/whois/record/parser/responses/{whois.ripn.net → whois.tcinet.ru}/ru/status_registered_spec.rb

@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.ripn.net/ru/status_registered.expected
+#   /spec/fixtures/responses/whois.tcinet.ru/ru/status_registered.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/record/parser/whois.ripn.net.rb'
+require 'whois/record/parser/whois.tcinet.ru.rb'
 
-describe Whois::Record::Parser::WhoisRipnNet, "status_registered.expected" do
+describe Whois::Record::Parser::WhoisTcinetRu, "status_registered.expected" do
 
   before(:each) do
-    file = fixture("responses", "whois.ripn.net/ru/status_registered.txt")
+    file = fixture("responses", "whois.tcinet.ru/ru/status_registered.txt")
     part = Whois::Record::Part.new(:body => File.read(file))
     @parser = klass.new(part)
   end

data/spec/whois/record/parser/responses/{whois.ripn.net/ru → whois.tcinet.ru/su}/status_available_spec.rb

@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.ripn.net/ru/status_available.expected
+#   /spec/fixtures/responses/whois.tcinet.ru/su/status_available.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/record/parser/whois.ripn.net.rb'
+require 'whois/record/parser/whois.tcinet.ru.rb'
 
-describe Whois::Record::Parser::WhoisRipnNet, "status_available.expected" do
+describe Whois::Record::Parser::WhoisTcinetRu, "status_available.expected" do
 
   before(:each) do
-    file = fixture("responses", "whois.ripn.net/ru/status_available.txt")
+    file = fixture("responses", "whois.tcinet.ru/su/status_available.txt")
     part = Whois::Record::Part.new(:body => File.read(file))
     @parser = klass.new(part)
   end

data/spec/whois/record/parser/responses/{whois.ripn.net → whois.tcinet.ru}/su/status_registered_spec.rb

@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.ripn.net/su/status_registered.expected
+#   /spec/fixtures/responses/whois.tcinet.ru/su/status_registered.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/record/parser/whois.ripn.net.rb'
+require 'whois/record/parser/whois.tcinet.ru.rb'
 
-describe Whois::Record::Parser::WhoisRipnNet, "status_registered.expected" do
+describe Whois::Record::Parser::WhoisTcinetRu, "status_registered.expected" do
 
   before(:each) do
-    file = fixture("responses", "whois.ripn.net/su/status_registered.txt")
+    file = fixture("responses", "whois.tcinet.ru/su/status_registered.txt")
     part = Whois::Record::Part.new(:body => File.read(file))
     @parser = klass.new(part)
   end

data/spec/whois/record/parser/responses/{whois.ripn.net → whois.tcinet.ru}/xn--p1ai/status_available_spec.rb

@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.ripn.net/xn--p1ai/status_available.expected
+#   /spec/fixtures/responses/whois.tcinet.ru/xn--p1ai/status_available.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/record/parser/whois.ripn.net.rb'
+require 'whois/record/parser/whois.tcinet.ru.rb'
 
-describe Whois::Record::Parser::WhoisRipnNet, "status_available.expected" do
+describe Whois::Record::Parser::WhoisTcinetRu, "status_available.expected" do
 
   before(:each) do
-    file = fixture("responses", "whois.ripn.net/xn--p1ai/status_available.txt")
+    file = fixture("responses", "whois.tcinet.ru/xn--p1ai/status_available.txt")
     part = Whois::Record::Part.new(:body => File.read(file))
     @parser = klass.new(part)
   end

data/spec/whois/record/parser/responses/{whois.ripn.net → whois.tcinet.ru}/xn--p1ai/status_registered_spec.rb

@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.ripn.net/xn--p1ai/status_registered.expected
+#   /spec/fixtures/responses/whois.tcinet.ru/xn--p1ai/status_registered.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/record/parser/whois.ripn.net.rb'
+require 'whois/record/parser/whois.tcinet.ru.rb'
 
-describe Whois::Record::Parser::WhoisRipnNet, "status_registered.expected" do
+describe Whois::Record::Parser::WhoisTcinetRu, "status_registered.expected" do
 
   before(:each) do
-    file = fixture("responses", "whois.ripn.net/xn--p1ai/status_registered.txt")
+    file = fixture("responses", "whois.tcinet.ru/xn--p1ai/status_registered.txt")
     part = Whois::Record::Part.new(:body => File.read(file))
     @parser = klass.new(part)
   end

data/spec/whois/record_spec.rb

@@ -102,14 +102,14 @@ describe Whois::Record do
       (one.eql? two).should be_false
     end
 
-    it "returns true when other is string and has the same content", :deprecated => true do
+    it "returns false when other is string and has the same content" do
       one, two = klass.new(@server, @parts), klass.new(@server, @parts).to_s
 
-      (one == two).should be_true
-      (one.eql? two).should be_true
+      (one == two).should be_false
+      (one.eql? two).should be_false
     end
 
-    it "returns false when other is string and has different content", :deprecated => true do
+    it "returns false when other is string and has different content" do
       one, two = klass.new(@server, @parts), "different"
 
       (one == two).should be_false

data/spec/whois/server/adapters/afilias_spec.rb

@@ -13,7 +13,7 @@ describe Whois::Server::Adapters::Afilias do
       it "returns the WHOIS record" do
         response = "No match for DOMAIN.TEST."
         expected = response
-        @server.expects(:ask_the_socket).with("domain.test", "whois.afilias-grs.info", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(response)
+        @server.expects(:ask_the_socket).with("domain.test", "whois.afilias-grs.info", 43).returns(response)
 
         record = @server.query("domain.test")
         record.to_s.should  == expected
@@ -27,8 +27,8 @@ describe Whois::Server::Adapters::Afilias do
         referral = File.read(fixture("referrals/afilias.bz.txt"))
         response = "Match for DOMAIN.TEST."
         expected = referral + "\n" + response
-        @server.expects(:ask_the_socket).with("domain.test", "whois.afilias-grs.info", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(referral)
-        @server.expects(:ask_the_socket).with("domain.test", "whois.belizenic.bz", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(response)
+        @server.expects(:ask_the_socket).with("domain.test", "whois.afilias-grs.info", 43).returns(referral)
+        @server.expects(:ask_the_socket).with("domain.test", "whois.belizenic.bz", 43).returns(response)
 
         record = @server.query("domain.test")
         record.to_s.should  == expected

data/spec/whois/server/adapters/base_spec.rb

@@ -2,9 +2,7 @@ require "spec_helper"
 
 describe Whois::Server::Adapters::Base do
 
-  before(:each) do
-    @definition = [:tld, ".test", "whois.test", { :foo => "bar" }]
-  end
+  let(:definition)  { [:tld, ".test", "whois.test", { :foo => "bar" }] }
 
 
   describe "#initialize" do
@@ -34,14 +32,14 @@ describe Whois::Server::Adapters::Base do
 
   describe "#==" do
     it "returns true when other is the same instance" do
-      one = two = klass.new(*@definition)
+      one = two = klass.new(*definition)
 
       (one == two).should be_true
       (one.eql? two).should be_true
     end
 
     it "returns true when other has same class and has the same attributes" do
-      one, two = klass.new(*@definition), klass.new(*@definition)
+      one, two = klass.new(*definition), klass.new(*definition)
 
       (one == two).should be_true
       (one.eql? two).should be_true
@@ -49,14 +47,14 @@ describe Whois::Server::Adapters::Base do
 
     it "returns true when other has descendant class and has the same attributes" do
       subklass = Class.new(klass)
-      one, two = klass.new(*@definition), subklass.new(*@definition)
+      one, two = klass.new(*definition), subklass.new(*definition)
 
       (one == two).should be_true
       (one.eql? two).should be_true
     end
 
     it "returns false when other has different class and has the same attributes" do
-      one, two = klass.new(*@definition), Struct.new(:type, :allocation, :host, :options).new(*@definition)
+      one, two = klass.new(*definition), Struct.new(:type, :allocation, :host, :options).new(*definition)
 
       (one == two).should be_false
       (one.eql? two).should be_false
@@ -96,13 +94,13 @@ describe Whois::Server::Adapters::Base do
 
   describe "#query" do
     it "raises NotImplementedError" do
-      lambda { klass.new(*@definition).query("example.test") }.should raise_error(NotImplementedError)
+      lambda { klass.new(*definition).query("example.test") }.should raise_error(NotImplementedError)
     end
   end
 
   describe "#request" do
     it "is an abstract method" do
-      lambda { klass.new(*@definition).request("example.test") }.should raise_error(NotImplementedError)
+      lambda { klass.new(*definition).request("example.test") }.should raise_error(NotImplementedError)
     end
   end
 
@@ -111,10 +109,52 @@ describe Whois::Server::Adapters::Base do
       it "re-raises #{error} as Whois::ConnectionError" do
         klass.any_instance.expects(:ask_the_socket).raises(error)
         expect {
-          klass.new(*@definition).send(:query_the_socket, "example.com", "whois.test")
+          klass.new(*definition).send(:query_the_socket, "example.com", "whois.test")
         }.to raise_error(Whois::ConnectionError, "#{error}: #{error.new.message}")
       end
     end
+
+    context "without :bind_host or :bind_port options" do
+      before(:each) do
+        @base = klass.new(:tld, ".test", "whois.test", {})
+      end
+
+      it "does not bind the WHOIS query" do
+        @base \
+            .expects(:ask_the_socket) \
+            .with("example.test", "whois.test", 43)
+
+        @base.send(:query_the_socket, "example.test", "whois.test", 43)
+      end
+    end
+
+    context "with :bind_host and :bind_port options" do
+      before(:each) do
+        @base = klass.new(:tld, ".test", "whois.test", { :bind_host => "192.168.1.1", :bind_port => 3000 })
+      end
+
+      it "binds the WHOIS query to given host and port" do
+        @base \
+            .expects(:ask_the_socket) \
+            .with("example.test", "whois.test", 43, "192.168.1.1", 3000)
+
+        @base.send(:query_the_socket, "example.test", "whois.test", 43)
+      end
+    end
+
+    context "with :bind_port and without :bind_host options" do
+      before(:each) do
+        @base = klass.new(:tld, ".test", "whois.test", { :bind_port => 3000 })
+      end
+
+      it "binds the WHOIS query to given port and defaults host" do
+        @base \
+            .expects(:ask_the_socket) \
+            .with("example.test", "whois.test", 43, klass::DEFAULT_BIND_HOST, 3000)
+
+        @base.send(:query_the_socket, "example.test", "whois.test", 43)
+      end
+    end
   end
 
 end

data/spec/whois/server/adapters/formatted_spec.rb

@@ -12,7 +12,7 @@ describe Whois::Server::Adapters::Formatted do
       response = "Whois Response"
       expected = response
       server = klass.new(*@definition)
-      server.expects(:ask_the_socket).with("-T dn,ace -C US-ASCII domain.de", "whois.denic.de", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(response)
+      server.expects(:ask_the_socket).with("-T dn,ace -C US-ASCII domain.de", "whois.denic.de", 43).returns(response)
 
       record = server.query("domain.de")
       record.to_s.should  == expected
@@ -33,7 +33,7 @@ describe Whois::Server::Adapters::Formatted do
       it "sends the request to given port" do
         response = "Whois Response"
         server = klass.new(:tld, ".de", "whois.denic.de", { :format => "-T dn,ace -C US-ASCII %s", :port => 20 })
-        server.expects(:ask_the_socket).with("-T dn,ace -C US-ASCII domain.de", "whois.denic.de", 20, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(response)
+        server.expects(:ask_the_socket).with("-T dn,ace -C US-ASCII domain.de", "whois.denic.de", 20).returns(response)
 
         server.query("domain.de")
       end
@@ -43,8 +43,8 @@ describe Whois::Server::Adapters::Formatted do
       it "binds the request to given host and port" do
         response = "Whois Response"
         server = klass.new(:tld, ".de", "whois.denic.de", { :format => "-T dn,ace -C US-ASCII %s" })
-        server.configure(:bind_host => "192.168.0.100", :bind_port => 3000)
-        server.expects(:ask_the_socket).with("-T dn,ace -C US-ASCII domain.de", "whois.denic.de", 43, "192.168.0.100", 3000).returns(response)
+        server.configure(:bind_host => "192.168.1.1", :bind_port => 3000)
+        server.expects(:ask_the_socket).with("-T dn,ace -C US-ASCII domain.de", "whois.denic.de", 43, "192.168.1.1", 3000).returns(response)
 
         server.query("domain.de")
       end

data/spec/whois/server/adapters/pir_spec.rb

@@ -13,7 +13,7 @@ describe Whois::Server::Adapters::Pir do
       it "returns the WHOIS record" do
         response = "No match for DOMAIN.TEST."
         expected = response
-        @server.expects(:ask_the_socket).with("FULL domain.test", "whois.publicinterestregistry.net", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(response)
+        @server.expects(:ask_the_socket).with("FULL domain.test", "whois.publicinterestregistry.net", 43).returns(response)
 
         record = @server.query("domain.test")
         record.to_s.should  == expected
@@ -27,8 +27,8 @@ describe Whois::Server::Adapters::Pir do
         referral = File.read(fixture("referrals/pir.org.txt"))
         response = "Match for DOMAIN.TEST."
         expected = referral + "\n" + response
-        @server.expects(:ask_the_socket).with("FULL domain.test", "whois.publicinterestregistry.net", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(referral)
-        @server.expects(:ask_the_socket).with("domain.test", "whois.iana.org", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(response)
+        @server.expects(:ask_the_socket).with("FULL domain.test", "whois.publicinterestregistry.net", 43).returns(referral)
+        @server.expects(:ask_the_socket).with("domain.test", "whois.iana.org", 43).returns(response)
 
         record = @server.query("domain.test")
         record.to_s.should  == expected

data/spec/whois/server/adapters/standard_spec.rb

@@ -12,7 +12,7 @@ describe Whois::Server::Adapters::Standard do
       response = "Whois Response"
       expected = response
       server = klass.new(*@definition)
-      server.expects(:ask_the_socket).with("domain.test", "whois.test", 43, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(response)
+      server.expects(:ask_the_socket).with("domain.test", "whois.test", 43).returns(response)
 
       record = server.query("domain.test")
       record.to_s.should  == expected
@@ -23,7 +23,7 @@ describe Whois::Server::Adapters::Standard do
       it "sends the request to given port" do
         response = "Whois Response"
         server = klass.new(:tld, ".test", "whois.test", { :port => 20 })
-        server.expects(:ask_the_socket).with("domain.test", "whois.test", 20, Whois::Server::Adapters::Base::DEFAULT_BIND_HOST, nil).returns(response)
+        server.expects(:ask_the_socket).with("domain.test", "whois.test", 20).returns(response)
 
         server.query("domain.test")
       end
@@ -33,8 +33,8 @@ describe Whois::Server::Adapters::Standard do
       it "binds the request to given host and port" do
         response = "Whois Response"
         server = klass.new(:tld, ".test", "whois.test", { :port => 20 })
-        server.configure(:bind_host => "192.168.0.100", :bind_port => 3000)
-        server.expects(:ask_the_socket).with("domain.test", "whois.test", 20, "192.168.0.100", 3000).returns(response)
+        server.configure(:bind_host => "192.168.1.100", :bind_port => 3000)
+        server.expects(:ask_the_socket).with("domain.test", "whois.test", 20, "192.168.1.100", 3000).returns(response)
 
         server.query("domain.test")
       end