diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-02 00:10:04 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-02 00:10:04 +0000 |
commit | ec7f1f5dc23b331e09340e0431b17eb5307aeddb (patch) | |
tree | 7246b68406b6e6db6e10214d5dcfdbac1cd60b11 | |
parent | 31d24fae56f5564f9d9e13520b69e4f8575ef650 (diff) | |
download | ruby-ec7f1f5dc23b331e09340e0431b17eb5307aeddb.tar.gz |
* lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality.
(Resolv::DNS::Name#initialize): Normalize labels as
Resolv::DNS::Label::Str objects.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/resolv.rb | 10 | ||||
-rw-r--r-- | test/resolv/test_dns.rb | 7 |
3 files changed, 22 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Jan 2 09:08:31 2015 Tanaka Akira <akr@fsij.org> + + * lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality. + (Resolv::DNS::Name#initialize): Normalize labels as + Resolv::DNS::Label::Str objects. + Thu Jan 1 21:41:49 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> * doc/regexp.rdoc: fix regexp docs for whitespace character. diff --git a/lib/resolv.rb b/lib/resolv.rb index 3b7ab2a394..a801cf6ff4 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1185,7 +1185,7 @@ class Resolv end def ==(other) - return @downcase == other.downcase + return self.class == other.class && @downcase == other.downcase end def eql?(other) @@ -1221,6 +1221,14 @@ class Resolv end def initialize(labels, absolute=true) # :nodoc: + labels = labels.map {|label| + case label + when String then Label::Str.new(label) + when Label::Str then label + else + raise ArgumentError, "unexpected label: #{label.inspect}" + end + } @labels = labels @absolute = absolute end diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index 8e54dd7904..d7e5c3683a 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -190,4 +190,11 @@ class TestResolvDNS < Test::Unit::TestCase upper = Resolv::DNS::Name.create("Ruby-Lang.org") assert_equal(lower, upper, bug10550) end + + def test_ipv6_name + addr = Resolv::IPv6.new("\0"*16) + labels = addr.to_name.to_a + expected = (['0'] * 32 + ['ip6', 'arpa']).map {|label| Resolv::DNS::Label::Str.new(label) } + assert_equal(expected, labels) + end end |