Update to ruby/spec@9be7c7e

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64180 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

49 files changed, 1589 insertions, 205 deletions

diff --git a/spec/ruby/library/socket/addrinfo/afamily_spec.rb b/spec/ruby/library/socket/addrinfo/afamily_spec.rb
index 5e61c8f99c..7229dab9de 100644
--- a/spec/ruby/library/socket/addrinfo/afamily_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/afamily_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#afamily" do
   describe "for an ipv4 socket" do
@@ -24,7 +23,7 @@ describe "Addrinfo#afamily" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/bind_spec.rb b/spec/ruby/library/socket/addrinfo/bind_spec.rb
index 8a20ab54d4..6f78890a4d 100644
--- a/spec/ruby/library/socket/addrinfo/bind_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/bind_spec.rb
@@ -1,6 +1,5 @@
-require_relative '../../../spec_helper'
+require_relative '../spec_helper'
 require_relative '../fixtures/classes'
-require 'socket'
 
 describe "Addrinfo#bind" do
 
diff --git a/spec/ruby/library/socket/addrinfo/canonname_spec.rb b/spec/ruby/library/socket/addrinfo/canonname_spec.rb
index 6105d905d6..a1cc8b3980 100644
--- a/spec/ruby/library/socket/addrinfo/canonname_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/canonname_spec.rb
@@ -1,6 +1,5 @@
-require_relative '../../../spec_helper'
+require_relative '../spec_helper'
 require_relative '../fixtures/classes'
-require 'socket'
 
 describe "Addrinfo#canonname" do
 
@@ -16,4 +15,13 @@ describe "Addrinfo#canonname" do
       canonname.should == nil
     end
   end
+
+  describe 'when the canonical name is not available' do
+    it 'returns nil' do
+      addr = Addrinfo.new(Socket.sockaddr_in(0, '127.0.0.1'))
+
+      addr.canonname.should be_nil
+    end
+  end
+
 end
diff --git a/spec/ruby/library/socket/addrinfo/connect_from_spec.rb b/spec/ruby/library/socket/addrinfo/connect_from_spec.rb
new file mode 100644
index 0000000000..55fce2e159
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/connect_from_spec.rb
@@ -0,0 +1,75 @@
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+
+describe 'Addrinfo#connect_from' do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    before do
+      @server = TCPServer.new(ip_address, 0)
+      @port   = @server.connect_address.ip_port
+      @addr   = Addrinfo.tcp(ip_address, @port)
+    end
+
+    after do
+      @socket.close if @socket
+      @server.close
+    end
+
+    describe 'using separate arguments' do
+      it 'returns a Socket when no block is given' do
+        @socket = @addr.connect_from(ip_address, 0)
+        @socket.should be_an_instance_of(Socket)
+      end
+
+      it 'yields the Socket when a block is given' do
+        @addr.connect_from(ip_address, 0) do |socket|
+          socket.should be_an_instance_of(Socket)
+        end
+      end
+
+      it 'treats the last argument as a set of options if it is a Hash' do
+        @socket = @addr.connect_from(ip_address, 0, timeout: 2)
+        @socket.should be_an_instance_of(Socket)
+      end
+
+      it 'binds the socket to the local address' do
+        @socket = @addr.connect_from(ip_address, 0)
+
+        @socket.local_address.ip_address.should == ip_address
+
+        @socket.local_address.ip_port.should > 0
+        @socket.local_address.ip_port.should_not == @port
+      end
+    end
+
+    describe 'using an Addrinfo as the 1st argument' do
+      before do
+        @from_addr = Addrinfo.tcp(ip_address, 0)
+      end
+
+      it 'returns a Socket when no block is given' do
+        @socket = @addr.connect_from(@from_addr)
+        @socket.should be_an_instance_of(Socket)
+      end
+
+      it 'yields the Socket when a block is given' do
+        @addr.connect_from(@from_addr) do |socket|
+          socket.should be_an_instance_of(Socket)
+        end
+      end
+
+      it 'treats the last argument as a set of options if it is a Hash' do
+        @socket = @addr.connect_from(@from_addr, timeout: 2)
+        @socket.should be_an_instance_of(Socket)
+      end
+
+      it 'binds the socket to the local address' do
+        @socket = @addr.connect_from(@from_addr)
+
+        @socket.local_address.ip_address.should == ip_address
+
+        @socket.local_address.ip_port.should > 0
+        @socket.local_address.ip_port.should_not == @port
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/connect_spec.rb b/spec/ruby/library/socket/addrinfo/connect_spec.rb
new file mode 100644
index 0000000000..1c2dc609ca
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/connect_spec.rb
@@ -0,0 +1,35 @@
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+
+describe 'Addrinfo#connect' do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    before do
+      @server = TCPServer.new(ip_address, 0)
+      @port   = @server.connect_address.ip_port
+    end
+
+    after do
+      @socket.close if @socket
+      @server.close
+    end
+
+    it 'returns a Socket when no block is given' do
+      addr = Addrinfo.tcp(ip_address, @port)
+      @socket = addr.connect
+      @socket.should be_an_instance_of(Socket)
+    end
+
+    it 'yields a Socket when a block is given' do
+      addr = Addrinfo.tcp(ip_address, @port)
+      addr.connect do |socket|
+        socket.should be_an_instance_of(Socket)
+      end
+    end
+
+    it 'accepts a Hash of options' do
+      addr = Addrinfo.tcp(ip_address, @port)
+      @socket = addr.connect(timeout: 2)
+      @socket.should be_an_instance_of(Socket)
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/connect_to_spec.rb b/spec/ruby/library/socket/addrinfo/connect_to_spec.rb
new file mode 100644
index 0000000000..69666da19b
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/connect_to_spec.rb
@@ -0,0 +1,75 @@
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+
+describe 'Addrinfo#connect_to' do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    before do
+      @server = TCPServer.new(ip_address, 0)
+      @port   = @server.connect_address.ip_port
+      @addr   = Addrinfo.tcp(ip_address, 0)
+    end
+
+    after do
+      @socket.close if @socket
+      @server.close
+    end
+
+    describe 'using separate arguments' do
+      it 'returns a Socket when no block is given' do
+        @socket = @addr.connect_to(ip_address, @port)
+        @socket.should be_an_instance_of(Socket)
+      end
+
+      it 'yields the Socket when a block is given' do
+        @addr.connect_to(ip_address, @port) do |socket|
+          socket.should be_an_instance_of(Socket)
+        end
+      end
+
+      it 'treats the last argument as a set of options if it is a Hash' do
+        @socket = @addr.connect_to(ip_address, @port, timeout: 2)
+        @socket.should be_an_instance_of(Socket)
+      end
+
+      it 'binds the Addrinfo to the local address' do
+        @socket = @addr.connect_to(ip_address, @port)
+
+        @socket.local_address.ip_address.should == ip_address
+
+        @socket.local_address.ip_port.should > 0
+        @socket.local_address.ip_port.should_not == @port
+      end
+    end
+
+    describe 'using an Addrinfo as the 1st argument' do
+      before do
+        @to_addr = Addrinfo.tcp(ip_address, @port)
+      end
+
+      it 'returns a Socket when no block is given' do
+        @socket = @addr.connect_to(@to_addr)
+        @socket.should be_an_instance_of(Socket)
+      end
+
+      it 'yields the Socket when a block is given' do
+        @addr.connect_to(@to_addr) do |socket|
+          socket.should be_an_instance_of(Socket)
+        end
+      end
+
+      it 'treats the last argument as a set of options if it is a Hash' do
+        @socket = @addr.connect_to(@to_addr, timeout: 2)
+        @socket.should be_an_instance_of(Socket)
+      end
+
+      it 'binds the socket to the local address' do
+        @socket = @addr.connect_to(@to_addr)
+
+        @socket.local_address.ip_address.should == ip_address
+
+        @socket.local_address.ip_port.should > 0
+        @socket.local_address.ip_port.should_not == @port
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/family_addrinfo_spec.rb b/spec/ruby/library/socket/addrinfo/family_addrinfo_spec.rb
new file mode 100644
index 0000000000..d3419daaaf
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/family_addrinfo_spec.rb
@@ -0,0 +1,115 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#family_addrinfo' do
+  it 'raises ArgumentError if no arguments are given' do
+    addr = Addrinfo.tcp('127.0.0.1', 0)
+
+    lambda { addr.family_addrinfo }.should raise_error(ArgumentError)
+  end
+
+  describe 'using multiple arguments' do
+    describe 'with an IP Addrinfo' do
+      before do
+        @source = Addrinfo.tcp('127.0.0.1', 0)
+      end
+
+      it 'raises ArgumentError if only 1 argument is given' do
+        lambda { @source.family_addrinfo('127.0.0.1') }.should raise_error(ArgumentError)
+      end
+
+      it 'raises ArgumentError if more than 2 arguments are given' do
+        lambda { @source.family_addrinfo('127.0.0.1', 0, 666) }.should raise_error(ArgumentError)
+      end
+
+      it 'returns an Addrinfo when a host and port are given' do
+        addr = @source.family_addrinfo('127.0.0.1', 0)
+
+        addr.should be_an_instance_of(Addrinfo)
+      end
+
+      describe 'the returned Addrinfo' do
+        before do
+          @addr = @source.family_addrinfo('127.0.0.1', 0)
+        end
+
+        it 'uses the same address family as the source Addrinfo' do
+          @addr.afamily.should == @source.afamily
+        end
+
+        it 'uses the same protocol family as the source Addrinfo' do
+          @addr.pfamily.should == @source.pfamily
+        end
+
+        it 'uses the same socket type as the source Addrinfo' do
+          @addr.socktype.should == @source.socktype
+        end
+
+        it 'uses the same protocol as the source Addrinfo' do
+          @addr.protocol.should == @source.protocol
+        end
+      end
+    end
+
+    with_feature :unix_socket do
+      describe 'with a UNIX Addrinfo' do
+        before do
+          @source = Addrinfo.unix('cats')
+        end
+
+        it 'raises ArgumentError if more than 1 argument is given' do
+          lambda { @source.family_addrinfo('foo', 'bar') }.should raise_error(ArgumentError)
+        end
+
+        it 'returns an Addrinfo when a UNIX socket path is given' do
+          addr = @source.family_addrinfo('dogs')
+
+          addr.should be_an_instance_of(Addrinfo)
+        end
+
+        describe 'the returned Addrinfo' do
+          before do
+            @addr = @source.family_addrinfo('dogs')
+          end
+
+          it 'uses AF_UNIX as the address family' do
+            @addr.afamily.should == Socket::AF_UNIX
+          end
+
+          it 'uses PF_UNIX as the protocol family' do
+            @addr.pfamily.should == Socket::PF_UNIX
+          end
+
+          it 'uses the given socket path' do
+            @addr.unix_path.should == 'dogs'
+          end
+        end
+      end
+    end
+  end
+
+  describe 'using an Addrinfo as the 1st argument' do
+    before do
+      @source = Addrinfo.tcp('127.0.0.1', 0)
+    end
+
+    it 'returns the input Addrinfo' do
+      input = Addrinfo.tcp('127.0.0.2', 0)
+      @source.family_addrinfo(input).should == input
+    end
+
+    it 'raises ArgumentError if more than 1 argument is given' do
+      input = Addrinfo.tcp('127.0.0.2', 0)
+      lambda { @source.family_addrinfo(input, 666) }.should raise_error(ArgumentError)
+    end
+
+    it "raises ArgumentError if the protocol families don't match" do
+      input = Addrinfo.tcp('::1', 0)
+      lambda { @source.family_addrinfo(input) }.should raise_error(ArgumentError)
+    end
+
+    it "raises ArgumentError if the socket types don't match" do
+      input = Addrinfo.udp('127.0.0.1', 0)
+      lambda { @source.family_addrinfo(input) }.should raise_error(ArgumentError)
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/foreach_spec.rb b/spec/ruby/library/socket/addrinfo/foreach_spec.rb
new file mode 100644
index 0000000000..75c1d1dea2
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/foreach_spec.rb
@@ -0,0 +1,9 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo.foreach' do
+  it 'yields Addrinfo instances to the supplied block' do
+    Addrinfo.foreach('localhost', 80) do |addr|
+      addr.should be_an_instance_of(Addrinfo)
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb b/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb
new file mode 100644
index 0000000000..f0e4b3c986
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/getaddrinfo_spec.rb
@@ -0,0 +1,88 @@
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+
+describe 'Addrinfo.getaddrinfo' do
+  it 'returns an Array of Addrinfo instances' do
+    array = Addrinfo.getaddrinfo('localhost', 80)
+
+    array.should be_an_instance_of(Array)
+    array[0].should be_an_instance_of(Addrinfo)
+  end
+
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    it 'sets the IP address of the Addrinfo instances' do
+      array = Addrinfo.getaddrinfo(ip_address, 80)
+
+      array[0].ip_address.should == ip_address
+    end
+
+    it 'sets the port of the Addrinfo instances' do
+      array = Addrinfo.getaddrinfo(ip_address, 80)
+
+      array[0].ip_port.should == 80
+    end
+
+    it 'sets the address family of the Addrinfo instances' do
+      array = Addrinfo.getaddrinfo(ip_address, 80)
+
+      array[0].afamily.should == family
+    end
+
+    it 'sets the protocol family of the Addrinfo instances' do
+      array = Addrinfo.getaddrinfo(ip_address, 80)
+
+      array[0].pfamily.should == family
+    end
+  end
+
+  guard -> { SocketSpecs.ipv6_available? } do
+    it 'sets a custom protocol family of the Addrinfo instances' do
+      array = Addrinfo.getaddrinfo('localhost', 80, Socket::PF_INET6)
+
+      array[0].pfamily.should == Socket::PF_INET6
+    end
+
+    it 'sets a corresponding address family based on a custom protocol family' do
+      array = Addrinfo.getaddrinfo('localhost', 80, Socket::PF_INET6)
+
+      array[0].afamily.should == Socket::AF_INET6
+    end
+  end
+
+  platform_is_not :windows do
+    it 'sets the default socket type of the Addrinfo instances' do
+      array    = Addrinfo.getaddrinfo('localhost', 80)
+      possible = [Socket::SOCK_STREAM, Socket::SOCK_DGRAM]
+
+      possible.should include(array[0].socktype)
+    end
+  end
+
+  it 'sets a custom socket type of the Addrinfo instances' do
+    array = Addrinfo.getaddrinfo('localhost', 80, nil, Socket::SOCK_DGRAM)
+
+    array[0].socktype.should == Socket::SOCK_DGRAM
+  end
+
+  platform_is_not :windows do
+    it 'sets the default socket protocol of the Addrinfo instances' do
+      array    = Addrinfo.getaddrinfo('localhost', 80)
+      possible = [Socket::IPPROTO_TCP, Socket::IPPROTO_UDP]
+
+      possible.should include(array[0].protocol)
+    end
+  end
+
+  it 'sets a custom socket protocol of the Addrinfo instances' do
+    array = Addrinfo.getaddrinfo('localhost', 80, nil, nil, Socket::IPPROTO_UDP)
+
+    array[0].protocol.should == Socket::IPPROTO_UDP
+  end
+
+  it 'sets the canonical name when AI_CANONNAME is given as a flag' do
+    array = Addrinfo
+      .getaddrinfo('localhost', 80, nil, nil, nil, Socket::AI_CANONNAME)
+
+    array[0].canonname.should be_an_instance_of(String)
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb b/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb
new file mode 100644
index 0000000000..eb600f3e66
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb
@@ -0,0 +1,44 @@
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+
+describe 'Addrinfo#getnameinfo' do
+  describe 'using an IP Addrinfo' do
+    SocketSpecs.each_ip_protocol do |family, ip_address|
+      before do
+        @addr = Addrinfo.tcp(ip_address, 80)
+      end
+
+      it 'returns the node and service names' do
+        host, service = @addr.getnameinfo
+
+        host.should be_an_instance_of(String)
+        service.should == 'http'
+      end
+
+      it 'accepts flags as a Fixnum as the first argument' do
+        host, service = @addr.getnameinfo(Socket::NI_NUMERICSERV)
+
+        host.should be_an_instance_of(String)
+        service.should == '80'
+      end
+    end
+  end
+
+  platform_is :linux do
+    with_feature :unix_socket do
+      describe 'using a UNIX Addrinfo' do
+        before do
+          @addr = Addrinfo.unix('cats')
+          @host = Socket.gethostname
+        end
+
+        it 'returns the hostname and UNIX socket path' do
+          host, path = @addr.getnameinfo
+
+          host.should == @host
+          path.should == 'cats'
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/initialize_spec.rb b/spec/ruby/library/socket/addrinfo/initialize_spec.rb
index 7a6475018a..42a09ebd68 100644
--- a/spec/ruby/library/socket/addrinfo/initialize_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/initialize_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#initialize" do
 
@@ -22,6 +21,12 @@ describe "Addrinfo#initialize" do
         @addrinfo.pfamily.should == Socket::PF_UNSPEC
       end
 
+      it 'returns AF_INET as the default address family' do
+        addr = Addrinfo.new(Socket.sockaddr_in(80, '127.0.0.1'))
+
+        addr.afamily.should == Socket::AF_INET
+      end
+
       it "returns the INET6 afamily" do
         @addrinfo.afamily.should == Socket::AF_INET6
       end
@@ -142,7 +147,7 @@ describe "Addrinfo#initialize" do
         @addrinfo.ip_port.should == 46102
       end
 
-      it "returns the Socket::UNSPEC pfamily" do
+      it "returns the Socket::PF_INET pfamily" do
         @addrinfo.pfamily.should == Socket::PF_INET
       end
 
@@ -159,6 +164,46 @@ describe "Addrinfo#initialize" do
       end
     end
 
+    describe 'with a valid IP address' do
+      # Uses AF_INET6 since AF_INET is the default, making it a better test
+      # that Addrinfo actually sets the family correctly.
+      before do
+        @sockaddr = ['AF_INET6', 80, 'hostname', '::1']
+      end
+
+      it 'returns an Addrinfo with the correct IP' do
+        addr = Addrinfo.new(@sockaddr)
+
+        addr.ip_address.should == '::1'
+      end
+
+      it 'returns an Addrinfo with the correct address family' do
+        addr = Addrinfo.new(@sockaddr)
+
+        addr.afamily.should == Socket::AF_INET6
+      end
+
+      it 'returns an Addrinfo with the correct protocol family' do
+        addr = Addrinfo.new(@sockaddr)
+
+        addr.pfamily.should == Socket::PF_INET6
+      end
+
+      it 'returns an Addrinfo with the correct port' do
+        addr = Addrinfo.new(@sockaddr)
+
+        addr.ip_port.should == 80
+      end
+    end
+
+    describe 'with an invalid IP address' do
+      it 'raises SocketError' do
+        block = lambda { Addrinfo.new(['AF_INET6', 80, 'hostname', '127.0.0.1']) }
+
+        block.should raise_error(SocketError)
+      end
+    end
+
     describe "with a family given" do
       before :each do
         @addrinfo = Addrinfo.new(["AF_INET", 46102, "localhost", "127.0.0.1"], Socket::PF_INET)
@@ -217,6 +262,38 @@ describe "Addrinfo#initialize" do
       it "returns the 0 protocol" do
         @addrinfo.protocol.should == 0
       end
+
+      [:SOCK_STREAM, :SOCK_DGRAM, :SOCK_RAW].each do |type|
+        it "overwrites the socket type #{type}" do
+          sockaddr = ['AF_INET', 80, 'hostname', '127.0.0.1']
+
+          value = Socket.const_get(type)
+          addr  = Addrinfo.new(sockaddr, nil, value)
+
+          addr.socktype.should == value
+        end
+      end
+
+      with_feature :sock_packet do
+        [:SOCK_SEQPACKET].each do |type|
+          it "overwrites the socket type #{type}" do
+            sockaddr = ['AF_INET', 80, 'hostname', '127.0.0.1']
+
+            value = Socket.const_get(type)
+            addr  = Addrinfo.new(sockaddr, nil, value)
+
+            addr.socktype.should == value
+          end
+        end
+      end
+
+      it "raises SocketError when using SOCK_RDM" do
+        sockaddr = ['AF_INET', 80, 'hostname', '127.0.0.1']
+        value = Socket::SOCK_RDM
+        block = lambda { Addrinfo.new(sockaddr, nil, value) }
+
+        block.should raise_error(SocketError)
+      end
     end
 
     describe "with a family, socket type and protocol" do
@@ -250,4 +327,261 @@ describe "Addrinfo#initialize" do
     end
   end
 
+  describe 'using an Array with extra arguments' do
+    describe 'with the AF_INET6 address family and an explicit protocol family' do
+      before do
+        @sockaddr = ['AF_INET6', 80, 'hostname', '127.0.0.1']
+      end
+
+      it "raises SocketError when using any Socket constant except except AF_INET(6)/PF_INET(6)" do
+        Socket.constants.grep(/(^AF_|^PF_)(?!INET)/).each do |constant|
+          value = Socket.const_get(constant)
+          -> {
+            Addrinfo.new(@sockaddr, value)
+          }.should raise_error(SocketError)
+        end
+      end
+    end
+
+    describe 'with the AF_INET address family and an explicit socket protocol' do
+      before do
+        @sockaddr = ['AF_INET', 80, 'hostname', '127.0.0.1']
+      end
+
+      describe 'and no socket type is given' do
+        valid = [:IPPROTO_IP, :IPPROTO_UDP, :IPPROTO_HOPOPTS]
+
+        valid.each do |type|
+          it "overwrites the protocol when using #{type}" do
+            value = Socket.const_get(type)
+            addr  = Addrinfo.new(@sockaddr, nil, nil, value)
+
+            addr.protocol.should == value
+          end
+        end
+
+        platform_is_not :windows do
+          (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
+            it "raises SocketError when using #{type}" do
+              value = Socket.const_get(type)
+              block = lambda { Addrinfo.new(@sockaddr, nil, nil, value) }
+
+              block.should raise_error(SocketError)
+            end
+          end
+        end
+      end
+
+      describe 'and the socket type is set to SOCK_DGRAM' do
+        before do
+          @socktype = Socket::SOCK_DGRAM
+        end
+
+        valid = [:IPPROTO_IP, :IPPROTO_UDP, :IPPROTO_HOPOPTS]
+
+        valid.each do |type|
+          it "overwrites the protocol when using #{type}" do
+            value = Socket.const_get(type)
+            addr  = Addrinfo.new(@sockaddr, nil, @socktype, value)
+
+            addr.protocol.should == value
+          end
+        end
+
+        platform_is_not :windows do
+          (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
+            it "raises SocketError when using #{type}" do
+              value = Socket.const_get(type)
+              block = lambda { Addrinfo.new(@sockaddr, nil, @socktype, value) }
+
+              block.should raise_error(SocketError)
+            end
+          end
+        end
+      end
+
+      with_feature :sock_packet do
+        describe 'and the socket type is set to SOCK_PACKET' do
+          before do
+            @socktype = Socket::SOCK_PACKET
+          end
+
+          Socket.constants.grep(/^IPPROTO/).each do |type|
+            it "raises SocketError when using #{type}" do
+              value = Socket.const_get(type)
+              block = lambda { Addrinfo.new(@sockaddr, nil, @socktype, value) }
+
+              block.should raise_error(SocketError)
+            end
+          end
+        end
+      end
+
+      describe 'and the socket type is set to SOCK_RAW' do
+        before do
+          @socktype = Socket::SOCK_RAW
+        end
+
+        Socket.constants.grep(/^IPPROTO/).each do |type|
+          it "overwrites the protocol when using #{type}" do
+            value = Socket.const_get(type)
+            addr  = Addrinfo.new(@sockaddr, nil, @socktype, value)
+
+            addr.protocol.should == value
+          end
+        end
+      end
+
+      describe 'and the socket type is set to SOCK_RDM' do
+        before do
+          @socktype = Socket::SOCK_RDM
+        end
+
+        Socket.constants.grep(/^IPPROTO/).each do |type|
+          it "raises SocketError when using #{type}" do
+            value = Socket.const_get(type)
+            block = lambda { Addrinfo.new(@sockaddr, nil, @socktype, value) }
+
+            block.should raise_error(SocketError)
+          end
+        end
+      end
+
+      platform_is_not :windows do
+        describe 'and the socket type is set to SOCK_SEQPACKET' do
+          before do
+            @socktype = Socket::SOCK_SEQPACKET
+          end
+
+          valid = [:IPPROTO_IP, :IPPROTO_HOPOPTS]
+
+          valid.each do |type|
+            it "overwrites the protocol when using #{type}" do
+              value = Socket.const_get(type)
+              addr  = Addrinfo.new(@sockaddr, nil, @socktype, value)
+
+              addr.protocol.should == value
+            end
+          end
+
+          (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
+            it "raises SocketError when using #{type}" do
+              value = Socket.const_get(type)
+              block = lambda { Addrinfo.new(@sockaddr, nil, @socktype, value) }
+
+              block.should raise_error(SocketError)
+            end
+          end
+        end
+      end
+
+      describe 'and the socket type is set to SOCK_STREAM' do
+        before do
+          @socktype = Socket::SOCK_STREAM
+        end
+
+        valid = [:IPPROTO_IP, :IPPROTO_TCP, :IPPROTO_HOPOPTS]
+
+        valid.each do |type|
+          it "overwrites the protocol when using #{type}" do
+            value = Socket.const_get(type)
+            addr  = Addrinfo.new(@sockaddr, nil, @socktype, value)
+
+            addr.protocol.should == value
+          end
+        end
+
+        platform_is_not :windows do
+          (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
+            it "raises SocketError when using #{type}" do
+              value = Socket.const_get(type)
+              block = lambda { Addrinfo.new(@sockaddr, nil, @socktype, value) }
+
+              block.should raise_error(SocketError)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  describe 'with Symbols' do
+    before do
+      @sockaddr = Socket.sockaddr_in(80, '127.0.0.1')
+    end
+
+    it 'returns an Addrinfo with :PF_INET  family' do
+      addr = Addrinfo.new(@sockaddr, :PF_INET)
+
+      addr.pfamily.should == Socket::PF_INET
+    end
+
+    it 'returns an Addrinfo with :INET  family' do
+      addr = Addrinfo.new(@sockaddr, :INET)
+
+      addr.pfamily.should == Socket::PF_INET
+    end
+
+    it 'returns an Addrinfo with :SOCK_STREAM as the socket type' do
+      addr = Addrinfo.new(@sockaddr, nil, :SOCK_STREAM)
+
+      addr.socktype.should == Socket::SOCK_STREAM
+    end
+
+    it 'returns an Addrinfo with :STREAM as the socket type' do
+      addr = Addrinfo.new(@sockaddr, nil, :STREAM)
+
+      addr.socktype.should == Socket::SOCK_STREAM
+    end
+  end
+
+  describe 'with Strings' do
+    before do
+      @sockaddr = Socket.sockaddr_in(80, '127.0.0.1')
+    end
+
+    it 'returns an Addrinfo with "PF_INET"  family' do
+      addr = Addrinfo.new(@sockaddr, 'PF_INET')
+
+      addr.pfamily.should == Socket::PF_INET
+    end
+
+    it 'returns an Addrinfo with "INET"  family' do
+      addr = Addrinfo.new(@sockaddr, 'INET')
+
+      addr.pfamily.should == Socket::PF_INET
+    end
+
+    it 'returns an Addrinfo with "SOCK_STREAM" as the socket type' do
+      addr = Addrinfo.new(@sockaddr, nil, 'SOCK_STREAM')
+
+      addr.socktype.should == Socket::SOCK_STREAM
+    end
+
+    it 'returns an Addrinfo with "STREAM" as the socket type' do
+      addr = Addrinfo.new(@sockaddr, nil, 'STREAM')
+
+      addr.socktype.should == Socket::SOCK_STREAM
+    end
+  end
+
+  with_feature :unix_socket do
+    describe 'using separate arguments for a Unix socket' do
+      before do
+        @sockaddr = Socket.pack_sockaddr_un('socket')
+      end
+
+      it 'returns an Addrinfo with the correct unix path' do
+        Addrinfo.new(@sockaddr).unix_path.should == 'socket'
+      end
+
+      it 'returns an Addrinfo with the correct protocol family' do
+        Addrinfo.new(@sockaddr).pfamily.should == Socket::PF_UNSPEC
+      end
+
+      it 'returns an Addrinfo with the correct address family' do
+        Addrinfo.new(@sockaddr).afamily.should == Socket::AF_UNIX
+      end
+    end
+  end
 end
diff --git a/spec/ruby/library/socket/addrinfo/inspect_sockaddr_spec.rb b/spec/ruby/library/socket/addrinfo/inspect_sockaddr_spec.rb
index 2a5990cd47..70ca4dd4d7 100644
--- a/spec/ruby/library/socket/addrinfo/inspect_sockaddr_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/inspect_sockaddr_spec.rb
@@ -1,25 +1,50 @@
-require_relative '../../../spec_helper'
+require_relative '../spec_helper'
 
-require 'socket'
 
 describe 'Addrinfo#inspect_sockaddr' do
-  it 'IPv4' do
-    Addrinfo.tcp('127.0.0.1', 80).inspect_sockaddr.should == '127.0.0.1:80'
-    Addrinfo.tcp('127.0.0.1', 0).inspect_sockaddr.should == '127.0.0.1'
+  describe 'using an IPv4 address' do
+    it 'returns a String containing the IP address and port number' do
+      addr = Addrinfo.tcp('127.0.0.1', 80)
+
+      addr.inspect_sockaddr.should == '127.0.0.1:80'
+    end
+
+    it 'returns a String containing just the IP address when no port is given' do
+      addr = Addrinfo.tcp('127.0.0.1', 0)
+
+      addr.inspect_sockaddr.should == '127.0.0.1'
+    end
   end
 
-  it 'IPv6' do
-    Addrinfo.tcp('::1', 80).inspect_sockaddr.should == '[::1]:80'
-    Addrinfo.tcp('::1', 0).inspect_sockaddr.should == '::1'
-    ip = '2001:0db8:85a3:0000:0000:8a2e:0370:7334'
-    Addrinfo.tcp(ip, 80).inspect_sockaddr.should == '[2001:db8:85a3::8a2e:370:7334]:80'
-    Addrinfo.tcp(ip, 0).inspect_sockaddr.should == '2001:db8:85a3::8a2e:370:7334'
+  describe 'using an IPv6 address' do
+    before :each do
+      @ip = '2001:0db8:85a3:0000:0000:8a2e:0370:7334'
+    end
+
+    it 'returns a String containing the IP address and port number' do
+      Addrinfo.tcp('::1', 80).inspect_sockaddr.should == '[::1]:80'
+      Addrinfo.tcp(@ip, 80).inspect_sockaddr.should == '[2001:db8:85a3::8a2e:370:7334]:80'
+    end
+
+    it 'returns a String containing just the IP address when no port is given' do
+      Addrinfo.tcp('::1', 0).inspect_sockaddr.should == '::1'
+      Addrinfo.tcp(@ip, 0).inspect_sockaddr.should == '2001:db8:85a3::8a2e:370:7334'
+    end
   end
 
-  platform_is_not :windows do
-    it 'UNIX' do
-      Addrinfo.unix('/tmp/sock').inspect_sockaddr.should == '/tmp/sock'
-      Addrinfo.unix('rel').inspect_sockaddr.should == 'UNIX rel'
+  with_feature :unix_socket do
+    describe 'using a UNIX path' do
+      it 'returns a String containing the UNIX path' do
+        addr = Addrinfo.unix('/foo/bar')
+
+        addr.inspect_sockaddr.should == '/foo/bar'
+      end
+
+      it 'returns a String containing the UNIX path when using a relative path' do
+        addr = Addrinfo.unix('foo')
+
+        addr.inspect_sockaddr.should == 'UNIX foo'
+      end
     end
   end
 end
diff --git a/spec/ruby/library/socket/addrinfo/inspect_spec.rb b/spec/ruby/library/socket/addrinfo/inspect_spec.rb
new file mode 100644
index 0000000000..98e1e83ffa
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/inspect_spec.rb
@@ -0,0 +1,65 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#inspect' do
+  describe 'using an IPv4 Addrinfo' do
+    it 'returns a String when using a TCP Addrinfo' do
+      addr = Addrinfo.tcp('127.0.0.1', 80)
+
+      addr.inspect.should == '#<Addrinfo: 127.0.0.1:80 TCP>'
+    end
+
+    it 'returns a String when using an UDP Addrinfo' do
+      addr = Addrinfo.udp('127.0.0.1', 80)
+
+      addr.inspect.should == '#<Addrinfo: 127.0.0.1:80 UDP>'
+    end
+
+    it 'returns a String when using an Addrinfo without a port' do
+      addr = Addrinfo.ip('127.0.0.1')
+
+      addr.inspect.should == '#<Addrinfo: 127.0.0.1>'
+    end
+  end
+
+  describe 'using an IPv6 Addrinfo' do
+    it 'returns a String when using a TCP Addrinfo' do
+      addr = Addrinfo.tcp('::1', 80)
+
+      addr.inspect.should == '#<Addrinfo: [::1]:80 TCP>'
+    end
+
+    it 'returns a String when using an UDP Addrinfo' do
+      addr = Addrinfo.udp('::1', 80)
+
+      addr.inspect.should == '#<Addrinfo: [::1]:80 UDP>'
+    end
+
+    it 'returns a String when using an Addrinfo without a port' do
+      addr = Addrinfo.ip('::1')
+
+      addr.inspect.should == '#<Addrinfo: ::1>'
+    end
+  end
+
+  with_feature :unix_socket do
+    describe 'using a UNIX Addrinfo' do
+      it 'returns a String' do
+        addr = Addrinfo.unix('/foo')
+
+        addr.inspect.should == '#<Addrinfo: /foo SOCK_STREAM>'
+      end
+
+      it 'returns a String when using a relative UNIX path' do
+        addr = Addrinfo.unix('foo')
+
+        addr.inspect.should == '#<Addrinfo: UNIX foo SOCK_STREAM>'
+      end
+
+      it 'returns a String when using a DGRAM socket' do
+        addr = Addrinfo.unix('/foo', Socket::SOCK_DGRAM)
+
+        addr.inspect.should == '#<Addrinfo: /foo SOCK_DGRAM>'
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ip_address_spec.rb b/spec/ruby/library/socket/addrinfo/ip_address_spec.rb
index c36399bf0c..004de37254 100644
--- a/spec/ruby/library/socket/addrinfo/ip_address_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ip_address_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ip_address" do
   describe "for an ipv4 socket" do
@@ -22,7 +21,7 @@ describe "Addrinfo#ip_address" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
@@ -33,4 +32,54 @@ describe "Addrinfo#ip_address" do
       end
     end
   end
+
+  describe 'with an Array as the socket address' do
+    it 'returns the IP as a String' do
+      sockaddr = ['AF_INET', 80, 'localhost', '127.0.0.1']
+      addr     = Addrinfo.new(sockaddr)
+
+      addr.ip_address.should == '127.0.0.1'
+    end
+  end
+
+  describe 'without an IP address' do
+    before do
+      @ips = ['127.0.0.1', '0.0.0.0', '::1']
+    end
+
+    # Both these cases seem to return different values at times on MRI. Since
+    # this is network dependent we can't rely on an exact IP being returned.
+    it 'returns the local IP address when using an empty String as the IP' do
+      sockaddr = Socket.sockaddr_in(80, '')
+      addr     = Addrinfo.new(sockaddr)
+
+      @ips.include?(addr.ip_address).should == true
+    end
+
+    it 'returns the local IP address when using nil as the IP' do
+      sockaddr = Socket.sockaddr_in(80, nil)
+      addr     = Addrinfo.new(sockaddr)
+
+      @ips.include?(addr.ip_address).should == true
+    end
+  end
+
+  # On MRI calling Addrinfo#ip_address with AF_UNSPEC as the address family is
+  # supposed to raise a SocketError. MRI however doesn't provide a way to
+  # actually initialize an Addrinfo with AF_UNSPEC, nor does it allow stubbing
+  # of any methods since Addrinfo doesn't use any Ruby methods for checking the
+  # IP address. As a result we can only run this test on Rubinius.
+  with_feature :pure_ruby_addrinfo do
+    describe 'with a non IPv4 or IPv6 address' do
+      it 'raises SocketError' do
+        sockaddr = Socket.sockaddr_in(80, '127.0.0.1')
+        addr     = Addrinfo.new(sockaddr)
+
+        addr.stub!(:ipv4?).and_return(false)
+        addr.stub!(:ipv6?).and_return(false)
+
+        lambda { addr.ip_address }.should raise_error(SocketError)
+      end
+    end
+  end
 end
diff --git a/spec/ruby/library/socket/addrinfo/ip_port_spec.rb b/spec/ruby/library/socket/addrinfo/ip_port_spec.rb
index ace6c00ff4..6cf9e7a18e 100644
--- a/spec/ruby/library/socket/addrinfo/ip_port_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ip_port_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ip_port" do
   describe "for an ipv4 socket" do
@@ -22,7 +21,7 @@ describe "Addrinfo#ip_port" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ip_spec.rb b/spec/ruby/library/socket/addrinfo/ip_spec.rb
index 6eabbccef8..80e7a62df7 100644
--- a/spec/ruby/library/socket/addrinfo/ip_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ip_spec.rb
@@ -1,5 +1,5 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
 
 describe "Addrinfo#ip?" do
   describe "for an ipv4 socket" do
@@ -22,15 +22,43 @@ describe "Addrinfo#ip?" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
       end
 
-      it "returns Socket::AF_INET6" do
+      it "returns false" do
         @addrinfo.ip?.should be_false
       end
     end
   end
 end
+
+describe 'Addrinfo.ip' do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    it 'returns an Addrinfo instance' do
+      Addrinfo.ip(ip_address).should be_an_instance_of(Addrinfo)
+    end
+
+    it 'sets the IP address' do
+      Addrinfo.ip(ip_address).ip_address.should == ip_address
+    end
+
+    it 'sets the port to 0' do
+      Addrinfo.ip(ip_address).ip_port.should == 0
+    end
+
+    it 'sets the address family' do
+      Addrinfo.ip(ip_address).afamily.should == family
+    end
+
+    it 'sets the protocol family' do
+      Addrinfo.ip(ip_address).pfamily.should == family
+    end
+
+    it 'sets the socket type to 0' do
+      Addrinfo.ip(ip_address).socktype.should == 0
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ip_unpack_spec.rb b/spec/ruby/library/socket/addrinfo/ip_unpack_spec.rb
index caa34d521d..57ae79a6c8 100644
--- a/spec/ruby/library/socket/addrinfo/ip_unpack_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ip_unpack_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ip_unpack" do
   describe "for an ipv4 socket" do
@@ -22,7 +21,7 @@ describe "Addrinfo#ip_unpack" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ipv4_loopback_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_loopback_spec.rb
index bff15fd407..f5bab711db 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_loopback_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_loopback_spec.rb
@@ -1,19 +1,16 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ipv4_loopback?" do
   describe "for an ipv4 socket" do
-    before :each do
-      @loopback = Addrinfo.tcp("127.0.0.1", 80)
-      @other    = Addrinfo.tcp("0.0.0.0", 80)
-    end
-
     it "returns true for the loopback address" do
-      @loopback.ipv4_loopback?.should be_true
+      Addrinfo.ip('127.0.0.1').ipv4_loopback?.should == true
+      Addrinfo.ip('127.0.0.2').ipv4_loopback?.should == true
+      Addrinfo.ip('127.255.0.1').ipv4_loopback?.should == true
+      Addrinfo.ip('127.255.255.255').ipv4_loopback?.should == true
     end
 
     it "returns false for another address" do
-      @other.ipv4_loopback?.should be_false
+      Addrinfo.ip('255.255.255.0').ipv4_loopback?.should be_false
     end
   end
 
@@ -32,7 +29,7 @@ describe "Addrinfo#ipv4_loopback?" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
index bc6d5afa2d..81a68d3d13 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
@@ -1,38 +1,21 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ipv4_multicast?" do
-  describe "for an ipv4 socket" do
-    before :each do
-      @multicast = Addrinfo.tcp("224.0.0.1", 80)
-      @other     = Addrinfo.tcp("0.0.0.0", 80)
-    end
-
-    it "returns true for the loopback address" do
-      @multicast.ipv4_multicast?.should be_true
-    end
-
-    it "returns false for another address" do
-      @other.ipv4_multicast?.should be_false
-    end
+  it 'returns true for a multicast address' do
+    Addrinfo.ip('224.0.0.0').ipv4_multicast?.should == true
+    Addrinfo.ip('224.0.0.9').ipv4_multicast?.should == true
+    Addrinfo.ip('239.255.255.250').ipv4_multicast?.should == true
   end
 
-  describe "for an ipv6 socket" do
-    before :each do
-      @multicast = Addrinfo.tcp("ff02::1", 80)
-      @other     = Addrinfo.tcp("::", 80)
-    end
-
-    it "returns false for the loopback address" do
-      @multicast.ipv4_multicast?.should be_false
-    end
+  it 'returns false for a regular addrss' do
+    Addrinfo.ip('8.8.8.8').ipv4_multicast?.should == false
+  end
 
-    it "returns false for another address" do
-      @other.ipv4_multicast?.should be_false
-    end
+  it 'returns false for an IPv6 address' do
+    Addrinfo.ip('::1').ipv4_multicast?.should == false
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ipv4_private_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_private_spec.rb
index 6ef5f5574a..733577609e 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_private_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_private_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ipv4_private?" do
   describe "for an ipv4 socket" do
@@ -9,7 +8,14 @@ describe "Addrinfo#ipv4_private?" do
     end
 
     it "returns true for a private address" do
-      @private.ipv4_private?.should be_true
+      Addrinfo.ip('10.0.0.0').ipv4_private?.should == true
+      Addrinfo.ip('10.0.0.5').ipv4_private?.should == true
+
+      Addrinfo.ip('172.16.0.0').ipv4_private?.should == true
+      Addrinfo.ip('172.16.0.5').ipv4_private?.should == true
+
+      Addrinfo.ip('192.168.0.0').ipv4_private?.should == true
+      Addrinfo.ip('192.168.0.5').ipv4_private?.should == true
     end
 
     it "returns false for a public address" do
@@ -27,7 +33,7 @@ describe "Addrinfo#ipv4_private?" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ipv4_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_spec.rb
index 7f8926a497..7cba8209b6 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ipv4?" do
   describe "for an ipv4 socket" do
@@ -22,7 +21,7 @@ describe "Addrinfo#ipv4?" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_linklocal_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_linklocal_spec.rb
new file mode 100644
index 0000000000..fadc612fb7
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_linklocal_spec.rb
@@ -0,0 +1,18 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_linklocal?' do
+  it 'returns true for a link-local address' do
+    Addrinfo.ip('fe80::').ipv6_linklocal?.should == true
+    Addrinfo.ip('fe81::').ipv6_linklocal?.should == true
+    Addrinfo.ip('fe8f::').ipv6_linklocal?.should == true
+    Addrinfo.ip('fe80::1').ipv6_linklocal?.should == true
+  end
+
+  it 'returns false for a regular address' do
+    Addrinfo.ip('::1').ipv6_linklocal?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_linklocal?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_loopback_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_loopback_spec.rb
index e078bce30c..9ff8f107bf 100644
--- a/spec/ruby/library/socket/addrinfo/ipv6_loopback_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv6_loopback_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ipv6_loopback?" do
   describe "for an ipv4 socket" do
@@ -8,7 +7,7 @@ describe "Addrinfo#ipv6_loopback?" do
       @other    = Addrinfo.tcp("0.0.0.0", 80)
     end
 
-    it "returns true for the loopback address" do
+    it "returns false for the loopback address" do
       @loopback.ipv6_loopback?.should be_false
     end
 
@@ -23,7 +22,7 @@ describe "Addrinfo#ipv6_loopback?" do
       @other    = Addrinfo.tcp("::", 80)
     end
 
-    it "returns false for the loopback address" do
+    it "returns true for the loopback address" do
       @loopback.ipv6_loopback?.should be_true
     end
 
@@ -32,7 +31,7 @@ describe "Addrinfo#ipv6_loopback?" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_mc_global_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_mc_global_spec.rb
new file mode 100644
index 0000000000..9c8e4dccb4
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_mc_global_spec.rb
@@ -0,0 +1,20 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_mc_global?' do
+  it 'returns true for a multi-cast address in the global scope' do
+    Addrinfo.ip('ff1e::').ipv6_mc_global?.should == true
+    Addrinfo.ip('fffe::').ipv6_mc_global?.should == true
+    Addrinfo.ip('ff0e::').ipv6_mc_global?.should == true
+    Addrinfo.ip('ff1e::1').ipv6_mc_global?.should == true
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_mc_global?.should == false
+    Addrinfo.ip('ff1a::').ipv6_mc_global?.should == false
+    Addrinfo.ip('ff1f::1').ipv6_mc_global?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_mc_global?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_mc_linklocal_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_mc_linklocal_spec.rb
new file mode 100644
index 0000000000..dd52a9ad8b
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_mc_linklocal_spec.rb
@@ -0,0 +1,19 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_mc_linklocal?' do
+  it 'returns true for a multi-cast link-local address' do
+    Addrinfo.ip('ff12::').ipv6_mc_linklocal?.should == true
+    Addrinfo.ip('ff02::').ipv6_mc_linklocal?.should == true
+    Addrinfo.ip('fff2::').ipv6_mc_linklocal?.should == true
+    Addrinfo.ip('ff12::1').ipv6_mc_linklocal?.should == true
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_mc_linklocal?.should == false
+    Addrinfo.ip('fff1::').ipv6_mc_linklocal?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_mc_linklocal?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_mc_nodelocal_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_mc_nodelocal_spec.rb
new file mode 100644
index 0000000000..b3cf5ffbab
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_mc_nodelocal_spec.rb
@@ -0,0 +1,18 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_mc_nodelocal?' do
+  it 'returns true for a multi-cast node-local address' do
+    Addrinfo.ip('ff11::').ipv6_mc_nodelocal?.should == true
+    Addrinfo.ip('ff01::').ipv6_mc_nodelocal?.should == true
+    Addrinfo.ip('fff1::').ipv6_mc_nodelocal?.should == true
+    Addrinfo.ip('ff11::1').ipv6_mc_nodelocal?.should == true
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_mc_nodelocal?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_mc_nodelocal?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_mc_orglocal_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_mc_orglocal_spec.rb
new file mode 100644
index 0000000000..90653dd49c
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_mc_orglocal_spec.rb
@@ -0,0 +1,18 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_mc_orglocal?' do
+  it 'returns true for a multi-cast org-local address' do
+    Addrinfo.ip('ff18::').ipv6_mc_orglocal?.should == true
+    Addrinfo.ip('ff08::').ipv6_mc_orglocal?.should == true
+    Addrinfo.ip('fff8::').ipv6_mc_orglocal?.should == true
+    Addrinfo.ip('ff18::1').ipv6_mc_orglocal?.should == true
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_mc_orglocal?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_mc_orglocal?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_mc_sitelocal_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_mc_sitelocal_spec.rb
new file mode 100644
index 0000000000..686b625e0d
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_mc_sitelocal_spec.rb
@@ -0,0 +1,18 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_mc_sitelocal?' do
+  it 'returns true for a multi-cast site-local address' do
+    Addrinfo.ip('ff15::').ipv6_mc_sitelocal?.should == true
+    Addrinfo.ip('ff05::').ipv6_mc_sitelocal?.should == true
+    Addrinfo.ip('fff5::').ipv6_mc_sitelocal?.should == true
+    Addrinfo.ip('ff15::1').ipv6_mc_sitelocal?.should == true
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_mc_sitelocal?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_mc_sitelocal?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
index cdb6c798c0..c25322869c 100644
--- a/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ipv6_multicast?" do
   describe "for an ipv4 socket" do
@@ -8,7 +7,7 @@ describe "Addrinfo#ipv6_multicast?" do
       @other     = Addrinfo.tcp("0.0.0.0", 80)
     end
 
-    it "returns true for the loopback address" do
+    it "returns true for a multicast address" do
       @multicast.ipv6_multicast?.should be_false
     end
 
@@ -18,21 +17,24 @@ describe "Addrinfo#ipv6_multicast?" do
   end
 
   describe "for an ipv6 socket" do
-    before :each do
-      @multicast = Addrinfo.tcp("ff02::1", 80)
-      @other     = Addrinfo.tcp("::", 80)
-    end
-
-    it "returns false for the loopback address" do
-      @multicast.ipv6_multicast?.should be_true
+    it "returns true for a multicast address" do
+      Addrinfo.ip('ff00::').ipv6_multicast?.should == true
+      Addrinfo.ip('ff00::1').ipv6_multicast?.should == true
+      Addrinfo.ip('ff08::1').ipv6_multicast?.should == true
+      Addrinfo.ip('fff8::1').ipv6_multicast?.should == true
+
+      Addrinfo.ip('ff02::').ipv6_multicast?.should == true
+      Addrinfo.ip('ff02::1').ipv6_multicast?.should == true
+      Addrinfo.ip('ff0f::').ipv6_multicast?.should == true
     end
 
     it "returns false for another address" do
-      @other.ipv6_multicast?.should be_false
+      Addrinfo.ip('::1').ipv6_multicast?.should == false
+      Addrinfo.ip('fe80::').ipv6_multicast?.should == false
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_sitelocal_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_sitelocal_spec.rb
new file mode 100644
index 0000000000..f0c382f00c
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_sitelocal_spec.rb
@@ -0,0 +1,18 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_sitelocal?' do
+  it 'returns true for a site-local address' do
+    Addrinfo.ip('feef::').ipv6_sitelocal?.should == true
+    Addrinfo.ip('fee0::').ipv6_sitelocal?.should == true
+    Addrinfo.ip('fee2::').ipv6_sitelocal?.should == true
+    Addrinfo.ip('feef::1').ipv6_sitelocal?.should == true
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_sitelocal?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_sitelocal?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_spec.rb
index 02908b793f..131e38849c 100644
--- a/spec/ruby/library/socket/addrinfo/ipv6_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv6_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ipv6?" do
   describe "for an ipv4 socket" do
@@ -22,7 +21,7 @@ describe "Addrinfo#ipv6?" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb
new file mode 100644
index 0000000000..48c1706459
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_to_ipv4_spec.rb
@@ -0,0 +1,66 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_to_ipv4' do
+  it 'returns an Addrinfo for ::192.168.1.1' do
+    addr = Addrinfo.ip('::192.168.1.1').ipv6_to_ipv4
+
+    addr.should be_an_instance_of(Addrinfo)
+
+    addr.afamily.should    == Socket::AF_INET
+    addr.ip_address.should == '192.168.1.1'
+  end
+
+  it 'returns an Addrinfo for ::0.0.1.1' do
+    addr = Addrinfo.ip('::0.0.1.1').ipv6_to_ipv4
+
+    addr.should be_an_instance_of(Addrinfo)
+
+    addr.afamily.should    == Socket::AF_INET
+    addr.ip_address.should == '0.0.1.1'
+  end
+
+  it 'returns an Addrinfo for ::0.0.1.0' do
+    addr = Addrinfo.ip('::0.0.1.0').ipv6_to_ipv4
+
+    addr.should be_an_instance_of(Addrinfo)
+
+    addr.afamily.should    == Socket::AF_INET
+    addr.ip_address.should == '0.0.1.0'
+  end
+
+  it 'returns an Addrinfo for ::0.1.0.0' do
+    addr = Addrinfo.ip('::0.1.0.0').ipv6_to_ipv4
+
+    addr.should be_an_instance_of(Addrinfo)
+
+    addr.afamily.should    == Socket::AF_INET
+    addr.ip_address.should == '0.1.0.0'
+  end
+
+  it 'returns an Addrinfo for ::ffff:192.168.1.1' do
+    addr = Addrinfo.ip('::ffff:192.168.1.1').ipv6_to_ipv4
+
+    addr.should be_an_instance_of(Addrinfo)
+
+    addr.afamily.should    == Socket::AF_INET
+    addr.ip_address.should == '192.168.1.1'
+  end
+
+  it 'returns nil for ::0.0.0.1' do
+    Addrinfo.ip('::0.0.0.1').ipv6_to_ipv4.should be_nil
+  end
+
+  it 'returns nil for a pure IPv6 Addrinfo' do
+    Addrinfo.ip('::1').ipv6_to_ipv4.should be_nil
+  end
+
+  it 'returns nil for an IPv4 Addrinfo' do
+    Addrinfo.ip('192.168.1.1').ipv6_to_ipv4.should be_nil
+  end
+
+  with_feature :unix_socket do
+    it 'returns nil for a UNIX Addrinfo' do
+      Addrinfo.unix('foo').ipv6_to_ipv4.should be_nil
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_unique_local_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_unique_local_spec.rb
new file mode 100644
index 0000000000..b80a15fcb0
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_unique_local_spec.rb
@@ -0,0 +1,18 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_unique_local?' do
+  it 'returns true for an unique local IPv6 address' do
+    Addrinfo.ip('fc00::').ipv6_unique_local?.should == true
+    Addrinfo.ip('fd00::').ipv6_unique_local?.should == true
+    Addrinfo.ip('fcff::').ipv6_unique_local?.should == true
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_unique_local?.should == false
+    Addrinfo.ip('fe00::').ipv6_unique_local?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_unique_local?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_unspecified_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_unspecified_spec.rb
new file mode 100644
index 0000000000..dd79d57503
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_unspecified_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_unspecified?' do
+  it 'returns true for an unspecified IPv6 address' do
+    Addrinfo.ip('::').ipv6_unspecified?.should == true
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_unspecified?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_unspecified?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_v4compat_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_v4compat_spec.rb
new file mode 100644
index 0000000000..ab8388a21b
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_v4compat_spec.rb
@@ -0,0 +1,20 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_v4compat?' do
+  it 'returns true for an IPv4 compatible address' do
+    Addrinfo.ip('::127.0.0.1').ipv6_v4compat?.should == true
+    Addrinfo.ip('::192.168.1.1').ipv6_v4compat?.should == true
+  end
+
+  it 'returns false for an IPv4 mapped address' do
+    Addrinfo.ip('::ffff:192.168.1.1').ipv6_v4compat?.should == false
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_v4compat?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_v4compat?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_v4mapped_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_v4mapped_spec.rb
new file mode 100644
index 0000000000..82b272c165
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/ipv6_v4mapped_spec.rb
@@ -0,0 +1,20 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#ipv6_v4mapped?' do
+  it 'returns true for an IPv4 compatible address' do
+    Addrinfo.ip('::ffff:192.168.1.1').ipv6_v4mapped?.should == true
+  end
+
+  it 'returns false for an IPv4 compatible address' do
+    Addrinfo.ip('::192.168.1.1').ipv6_v4mapped?.should == false
+    Addrinfo.ip('::127.0.0.1').ipv6_v4mapped?.should == false
+  end
+
+  it 'returns false for a regular IPv6 address' do
+    Addrinfo.ip('::1').ipv6_v4mapped?.should == false
+  end
+
+  it 'returns false for an IPv4 address' do
+    Addrinfo.ip('127.0.0.1').ipv6_v4mapped?.should == false
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/listen_spec.rb b/spec/ruby/library/socket/addrinfo/listen_spec.rb
new file mode 100644
index 0000000000..714a96ed6c
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/listen_spec.rb
@@ -0,0 +1,34 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#listen' do
+  before do
+    @addr   = Addrinfo.tcp('127.0.0.1', 0)
+    @socket = nil
+  end
+
+  after do
+    @socket.close if @socket
+  end
+
+  it 'returns a Socket when no block is given' do
+    @socket = @addr.listen
+
+    @socket.should be_an_instance_of(Socket)
+  end
+
+  it 'yields the Socket if a block is given' do
+    @addr.listen do |socket|
+      socket.should be_an_instance_of(Socket)
+    end
+  end
+
+  it 'closes the socket if a block is given' do
+    socket = nil
+
+    @addr.listen do |sock|
+      socket = sock
+    end
+
+    socket.closed?.should == true
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb b/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb
new file mode 100644
index 0000000000..2d69a33b53
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/marshal_dump_spec.rb
@@ -0,0 +1,82 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#marshal_dump' do
+  describe 'using an IP Addrinfo' do
+    before do
+      @addr = Addrinfo.getaddrinfo('localhost', 80, :INET, :STREAM,
+                                   Socket::IPPROTO_TCP, Socket::AI_CANONNAME)[0]
+    end
+
+    it 'returns an Array' do
+      @addr.marshal_dump.should be_an_instance_of(Array)
+    end
+
+    describe 'the returned Array' do
+      before do
+        @array = @addr.marshal_dump
+      end
+
+      it 'includes the address family as the 1st value' do
+        @array[0].should == 'AF_INET'
+      end
+
+      it 'includes the IP address as the 2nd value' do
+        @array[1].should == [@addr.ip_address, @addr.ip_port.to_s]
+      end
+
+      it 'includes the protocol family as the 3rd value' do
+        @array[2].should == 'PF_INET'
+      end
+
+      it 'includes the socket type as the 4th value' do
+        @array[3].should == 'SOCK_STREAM'
+      end
+
+      it 'includes the protocol as the 5th value' do
+        @array[4].should == 'IPPROTO_TCP'
+      end
+
+      it 'includes the canonical name as the 6th value' do
+        @array[5].should == @addr.canonname
+      end
+    end
+  end
+
+  with_feature :unix_socket do
+    describe 'using a UNIX Addrinfo' do
+      before do
+        @addr = Addrinfo.unix('foo')
+      end
+
+      it 'returns an Array' do
+        @addr.marshal_dump.should be_an_instance_of(Array)
+      end
+
+      describe 'the returned Array' do
+        before do
+          @array = @addr.marshal_dump
+        end
+
+        it 'includes the address family as the 1st value' do
+          @array[0].should == 'AF_UNIX'
+        end
+
+        it 'includes the UNIX path as the 2nd value' do
+          @array[1].should == @addr.unix_path
+        end
+
+        it 'includes the protocol family as the 3rd value' do
+          @array[2].should == 'PF_UNIX'
+        end
+
+        it 'includes the socket type as the 4th value' do
+          @array[3].should == 'SOCK_STREAM'
+        end
+
+        it 'includes the protocol as the 5th value' do
+          @array[4].should == 0
+        end
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/marshal_load_spec.rb b/spec/ruby/library/socket/addrinfo/marshal_load_spec.rb
new file mode 100644
index 0000000000..aa20865224
--- /dev/null
+++ b/spec/ruby/library/socket/addrinfo/marshal_load_spec.rb
@@ -0,0 +1,35 @@
+require_relative '../spec_helper'
+
+describe 'Addrinfo#marshal_load' do
+  describe 'using an IP address' do
+    it 'returns a new Addrinfo' do
+      source = Addrinfo.getaddrinfo('localhost', 80, :INET, :STREAM,
+                                    Socket::IPPROTO_TCP, Socket::AI_CANONNAME)[0]
+
+      addr = Marshal.load(Marshal.dump(source))
+
+      addr.afamily.should    == source.afamily
+      addr.pfamily.should    == source.pfamily
+      addr.socktype.should   == source.socktype
+      addr.protocol.should   == source.protocol
+      addr.ip_address.should == source.ip_address
+      addr.ip_port.should    == source.ip_port
+      addr.canonname.should  == source.canonname
+    end
+  end
+
+  with_feature :unix_socket do
+    describe 'using a UNIX socket' do
+      it 'returns a new Addrinfo' do
+        source = Addrinfo.unix('foo')
+        addr   = Marshal.load(Marshal.dump(source))
+
+        addr.afamily.should   == source.afamily
+        addr.pfamily.should   == source.pfamily
+        addr.socktype.should  == source.socktype
+        addr.protocol.should  == source.protocol
+        addr.unix_path.should == source.unix_path
+      end
+    end
+  end
+end
diff --git a/spec/ruby/library/socket/addrinfo/pfamily_spec.rb b/spec/ruby/library/socket/addrinfo/pfamily_spec.rb
index 6a6bd542f7..984744a964 100644
--- a/spec/ruby/library/socket/addrinfo/pfamily_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/pfamily_spec.rb
@@ -1,7 +1,12 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#pfamily" do
+  it 'returns PF_UNSPEC as the default socket family' do
+    sockaddr = Socket.pack_sockaddr_in(80, 'localhost')
+
+    Addrinfo.new(sockaddr).pfamily.should == Socket::PF_UNSPEC
+  end
+
   describe "for an ipv4 socket" do
 
     before :each do
@@ -24,7 +29,7 @@ describe "Addrinfo#pfamily" do
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/protocol_spec.rb b/spec/ruby/library/socket/addrinfo/protocol_spec.rb
index 72f4f93b5c..ea143fc4a8 100644
--- a/spec/ruby/library/socket/addrinfo/protocol_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/protocol_spec.rb
@@ -1,30 +1,16 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#protocol" do
-  describe "for an ipv4 socket" do
-
-    before :each do
-      @addrinfo = Addrinfo.tcp("127.0.0.1", 80)
-    end
-
-    it "returns Socket::IPPROTO_TCP" do
-      @addrinfo.protocol.should == Socket::IPPROTO_TCP
-    end
-
+  it 'returns 0 by default' do
+    Addrinfo.ip('127.0.0.1').protocol.should == 0
   end
 
-  describe "for an ipv6 socket" do
-    before :each do
-      @addrinfo = Addrinfo.tcp("::1", 80)
-    end
-
-    it "returns Socket::IPPROTO_TCP" do
-      @addrinfo.protocol.should == Socket::IPPROTO_TCP
-    end
+  it 'returns a custom protocol when given' do
+    Addrinfo.tcp('127.0.0.1', 80).protocol.should == Socket::IPPROTO_TCP
+    Addrinfo.tcp('::1', 80).protocol.should == Socket::IPPROTO_TCP
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/shared/to_sockaddr.rb b/spec/ruby/library/socket/addrinfo/shared/to_sockaddr.rb
index 86819a31b0..c32da5986d 100644
--- a/spec/ruby/library/socket/addrinfo/shared/to_sockaddr.rb
+++ b/spec/ruby/library/socket/addrinfo/shared/to_sockaddr.rb
@@ -6,7 +6,7 @@ describe :socket_addrinfo_to_sockaddr, :shared => true do
     end
 
     it "returns a sockaddr packed structure" do
-      @addrinfo.send(@method).should be_kind_of(String)
+      @addrinfo.send(@method).should == Socket.sockaddr_in(80, '127.0.0.1')
     end
   end
 
@@ -16,20 +16,36 @@ describe :socket_addrinfo_to_sockaddr, :shared => true do
     end
 
     it "returns a sockaddr packed structure" do
-      @addrinfo.send(@method).should be_kind_of(String)
+      @addrinfo.send(@method).should == Socket.sockaddr_in(80, '::1')
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
       end
 
       it "returns a sockaddr packed structure" do
-        @addrinfo.send(@method).should be_kind_of(String)
+        @addrinfo.send(@method).should == Socket.sockaddr_un('/tmp/sock')
       end
     end
   end
 
+  describe 'using a Addrinfo with just an IP address' do
+    it 'returns a String' do
+      addr = Addrinfo.ip('127.0.0.1')
+
+      addr.send(@method).should == Socket.sockaddr_in(0, '127.0.0.1')
+    end
+  end
+
+  describe 'using a Addrinfo without an IP and port' do
+    it 'returns a String' do
+      addr = Addrinfo.new(['AF_INET', 0, '', ''])
+
+      addr.send(@method).should == Socket.sockaddr_in(0, '')
+    end
+  end
+
 end
diff --git a/spec/ruby/library/socket/addrinfo/socktype_spec.rb b/spec/ruby/library/socket/addrinfo/socktype_spec.rb
index c38c629c96..b994bea140 100644
--- a/spec/ruby/library/socket/addrinfo/socktype_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/socktype_spec.rb
@@ -1,30 +1,15 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#socktype" do
-  describe "for an ipv4 socket" do
-
-    before :each do
-      @addrinfo = Addrinfo.tcp("127.0.0.1", 80)
-    end
-
-    it "returns Socket::SOCK_STREAM" do
-      @addrinfo.socktype.should == Socket::SOCK_STREAM
-    end
-
+  it 'returns 0 by default' do
+    Addrinfo.ip('127.0.0.1').socktype.should == 0
   end
 
-  describe "for an ipv6 socket" do
-    before :each do
-      @addrinfo = Addrinfo.tcp("::1", 80)
-    end
-
-    it "returns Socket::SOCK_STREAM" do
-      @addrinfo.socktype.should == Socket::SOCK_STREAM
-    end
+  it 'returns the socket type when given' do
+    Addrinfo.tcp('127.0.0.1', 80).socktype.should == Socket::SOCK_STREAM
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")
diff --git a/spec/ruby/library/socket/addrinfo/tcp_spec.rb b/spec/ruby/library/socket/addrinfo/tcp_spec.rb
index 39406b64ee..c74c9c21c2 100644
--- a/spec/ruby/library/socket/addrinfo/tcp_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/tcp_spec.rb
@@ -1,20 +1,34 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
 
-describe "Addrinfo.tcp" do
+describe 'Addrinfo.tcp' do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    it 'returns an Addrinfo instance' do
+      Addrinfo.tcp(ip_address, 80).should be_an_instance_of(Addrinfo)
+    end
 
-  before :each do
-    @addrinfo = Addrinfo.tcp("localhost", "smtp")
-  end
+    it 'sets the IP address' do
+      Addrinfo.tcp(ip_address, 80).ip_address.should == ip_address
+    end
 
-  it "creates a addrinfo for a tcp socket" do
-    ["::1", "127.0.0.1"].should include(@addrinfo.ip_address)
-    [Socket::PF_INET, Socket::PF_INET6].should include(@addrinfo.pfamily)
-    @addrinfo.ip_port.should == 25
-    @addrinfo.socktype.should == Socket::SOCK_STREAM
-    platform_is_not :solaris do
-      @addrinfo.protocol.should == Socket::IPPROTO_TCP
+    it 'sets the port' do
+      Addrinfo.tcp(ip_address, 80).ip_port.should == 80
+    end
+
+    it 'sets the address family' do
+      Addrinfo.tcp(ip_address, 80).afamily.should == family
     end
-  end
 
+    it 'sets the protocol family' do
+      Addrinfo.tcp(ip_address, 80).pfamily.should == family
+    end
+
+    it 'sets the socket type' do
+      Addrinfo.tcp(ip_address, 80).socktype.should == Socket::SOCK_STREAM
+    end
+
+    it 'sets the socket protocol' do
+      Addrinfo.tcp(ip_address, 80).protocol.should == Socket::IPPROTO_TCP
+    end
+  end
 end
diff --git a/spec/ruby/library/socket/addrinfo/to_s_spec.rb b/spec/ruby/library/socket/addrinfo/to_s_spec.rb
index 5ac31e3099..ddf994e051 100644
--- a/spec/ruby/library/socket/addrinfo/to_s_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/to_s_spec.rb
@@ -1,6 +1,5 @@
-require_relative '../../../spec_helper'
+require_relative '../spec_helper'
 require_relative 'shared/to_sockaddr'
-require 'socket'
 
 describe "Addrinfo#to_s" do
   it_behaves_like :socket_addrinfo_to_sockaddr, :to_s
diff --git a/spec/ruby/library/socket/addrinfo/to_sockaddr_spec.rb b/spec/ruby/library/socket/addrinfo/to_sockaddr_spec.rb
index eee9f961b2..b9f75454bd 100644
--- a/spec/ruby/library/socket/addrinfo/to_sockaddr_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/to_sockaddr_spec.rb
@@ -1,6 +1,5 @@
-require_relative '../../../spec_helper'
+require_relative '../spec_helper'
 require_relative 'shared/to_sockaddr'
-require 'socket'
 
 describe "Addrinfo#to_sockaddr" do
   it_behaves_like :socket_addrinfo_to_sockaddr, :to_sockaddr
diff --git a/spec/ruby/library/socket/addrinfo/udp_spec.rb b/spec/ruby/library/socket/addrinfo/udp_spec.rb
index 237afdbc61..b05cbf9b0b 100644
--- a/spec/ruby/library/socket/addrinfo/udp_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/udp_spec.rb
@@ -1,20 +1,36 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
 
-describe "Addrinfo.udp" do
+describe 'Addrinfo.udp' do
+  SocketSpecs.each_ip_protocol do |family, ip_address|
+    it 'returns an Addrinfo instance' do
+      Addrinfo.udp(ip_address, 80).should be_an_instance_of(Addrinfo)
+    end
 
-  before :each do
-    @addrinfo = Addrinfo.udp("localhost", "daytime")
-  end
+    it 'sets the IP address' do
+      Addrinfo.udp(ip_address, 80).ip_address.should == ip_address
+    end
+
+    it 'sets the port' do
+      Addrinfo.udp(ip_address, 80).ip_port.should == 80
+    end
+
+    it 'sets the address family' do
+      Addrinfo.udp(ip_address, 80).afamily.should == family
+    end
+
+    it 'sets the protocol family' do
+      Addrinfo.udp(ip_address, 80).pfamily.should == family
+    end
+
+    it 'sets the socket type' do
+      Addrinfo.udp(ip_address, 80).socktype.should == Socket::SOCK_DGRAM
+    end
 
-  it "creates a addrinfo for a tcp socket" do
-    ["::1", "127.0.0.1"].should include(@addrinfo.ip_address)
-    [Socket::PF_INET, Socket::PF_INET6].should include(@addrinfo.pfamily)
-    @addrinfo.ip_port.should == 13
-    @addrinfo.socktype.should == Socket::SOCK_DGRAM
     platform_is_not :solaris do
-      @addrinfo.protocol.should == Socket::IPPROTO_UDP
+      it 'sets the socket protocol' do
+        Addrinfo.udp(ip_address, 80).protocol.should == Socket::IPPROTO_UDP
+      end
     end
   end
-
 end
diff --git a/spec/ruby/library/socket/addrinfo/unix_path_spec.rb b/spec/ruby/library/socket/addrinfo/unix_path_spec.rb
index 1168a225b0..0f25881724 100644
--- a/spec/ruby/library/socket/addrinfo/unix_path_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/unix_path_spec.rb
@@ -1,7 +1,6 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
-platform_is_not :windows do
+with_feature :unix_socket do
   describe "Addrinfo#unix_path" do
     describe "for an ipv4 socket" do
 
@@ -25,15 +24,13 @@ platform_is_not :windows do
       end
     end
 
-    platform_is_not :windows do
-      describe "for a unix socket" do
-        before :each do
-          @addrinfo = Addrinfo.unix("/tmp/sock")
-        end
+    describe "for a unix socket" do
+      before :each do
+        @addrinfo = Addrinfo.unix("/tmp/sock")
+      end
 
-        it "returns the socket path" do
-          @addrinfo.unix_path.should == "/tmp/sock"
-        end
+      it "returns the socket path" do
+        @addrinfo.unix_path.should == "/tmp/sock"
       end
     end
   end
diff --git a/spec/ruby/library/socket/addrinfo/unix_spec.rb b/spec/ruby/library/socket/addrinfo/unix_spec.rb
index 599c20e815..4596ece17e 100644
--- a/spec/ruby/library/socket/addrinfo/unix_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/unix_spec.rb
@@ -1,18 +1,35 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
-describe "Addrinfo.unix" do
+with_feature :unix_socket do
+  describe 'Addrinfo.unix' do
+    it 'returns an Addrinfo instance' do
+      Addrinfo.unix('socket').should be_an_instance_of(Addrinfo)
+    end
 
-  platform_is_not :windows do
-    before :each do
-      @addrinfo = Addrinfo.unix("/tmp/sock")
+    it 'sets the IP address' do
+      Addrinfo.unix('socket').unix_path.should == 'socket'
+    end
+
+    it 'sets the address family' do
+      Addrinfo.unix('socket').afamily.should == Socket::AF_UNIX
+    end
+
+    it 'sets the protocol family' do
+      Addrinfo.unix('socket').pfamily.should == Socket::PF_UNIX
+    end
+
+    it 'sets the socket type' do
+      Addrinfo.unix('socket').socktype.should == Socket::SOCK_STREAM
+    end
+
+    it 'sets a custom socket type' do
+      addr = Addrinfo.unix('socket', Socket::SOCK_DGRAM)
+
+      addr.socktype.should == Socket::SOCK_DGRAM
     end
 
-    it "creates a addrinfo for a unix socket" do
-      @addrinfo.pfamily.should == Socket::PF_UNIX
-      @addrinfo.socktype.should == Socket::SOCK_STREAM
-      @addrinfo.protocol.should == 0
-      @addrinfo.unix_path.should == "/tmp/sock"
+    it 'sets the socket protocol to 0' do
+      Addrinfo.unix('socket').protocol.should == 0
     end
   end
 end