Merge pull request #214 from seancribbs/uri-handling-fixups

only accept IPv6 addresses when IPV6_MATCH matches

Author: Asmod4n

lib/webmachine/request.rb

@@ -173,7 +173,7 @@ def parse_host(uri, host_string)
       # Split host and port number from string.
       case host_string
       when IPV6_MATCH
-        uri.host = IPAddr.new($~[:address]).to_s
+        uri.host = IPAddr.new($~[:address], Socket::AF_INET6).to_s
         uri.port = $~[:port].to_i
       when HOST_MATCH
         uri.host = $~[:host]

lib/webmachine/spec/adapter_lint.rb

@@ -1,6 +1,5 @@
 require "webmachine/spec/test_resource"
 require "net/http"
-require 'ipaddr'
 
 shared_examples_for :adapter_lint do
   attr_accessor :client