Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix InvalidAddressError message #70

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −2
Open

Fix InvalidAddressError message #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/ipaddr.rb
View file
Open in desktop
Expand Up @@ -693,8 +693,8 @@ def in_addr(addr)
octets = addr.split('.')
end
octets.inject(0) { |i, s|
(n = s.to_i) < 256 or raise InvalidAddressError, "invalid address: #{@addr}"
(s != '0') && s.start_with?('0') and raise InvalidAddressError, "zero-filled number in IPv4 address is ambiguous: #{@addr}"
(n = s.to_i) < 256 or raise InvalidAddressError, "invalid address: #{addr}"
(s != '0') && s.start_with?('0') and raise InvalidAddressError, "zero-filled number in IPv4 address is ambiguous: #{addr}"
i << 8 | n
}
end
Expand Down
12 changes: 12 additions & 0 deletions test/test_ipaddr.rb
View file
Open in desktop
Expand Up @@ -557,4 +557,16 @@ def test_hash
assert_equal(true, s.include?(a5))
assert_equal(true, s.include?(a6))
end

def test_raises_invalid_address_error_with_error_message
e = assert_raise(IPAddr::InvalidAddressError) do
IPAddr.new('192.168.0.1000')
end
assert_equal('invalid address: 192.168.0.1000', e.message)

e = assert_raise(IPAddr::InvalidAddressError) do
IPAddr.new('192.168.01.100')
end
assert_equal('zero-filled number in IPv4 address is ambiguous: 192.168.01.100', e.message)
end
end