Skip to content

Bug/cause #14

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

Closed
nobu wants to merge 2 commits into from
Closed

Bug/cause #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fecdd0
Require ruby 2.3 or later
nobu May 6, 2019
8397d38
Same cause is not needed
nobu May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ipaddr.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Both IPv4 and IPv6 are supported.
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.required_ruby_version = ">= 2.3.0"

spec.add_development_dependency "bundler", "~> 2.0"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "test-unit"
Expand Down
2 changes: 1 addition & 1 deletion lib/ipaddr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ def initialize(addr = '::', family = Socket::AF_UNSPEC)
@mask_addr = (@family == Socket::AF_INET) ? IN4MASK : IN6MASK
end
rescue InvalidAddressError => e
raise e.class, "#{e.message}: #{addr}"
raise e.class, "#{e.message}: #{addr}", e.backtrace, cause: nil
end

def coerce_other(other)
Expand Down
31 changes: 19 additions & 12 deletions test/test_ipaddr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,25 @@ def test_s_new
assert_equal("1:2:3:4:5:6:7:0", IPAddr.new("1:2:3:4:5:6:7::").to_s)
assert_equal("0:2:3:4:5:6:7:8", IPAddr.new("::2:3:4:5:6:7:8").to_s)

assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.256") }
assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.011") }
assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("fe80::1%fxp0") }
assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("[192.168.1.2]/120") }
assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("[2001:200:300::]\nINVALID") }
assert_raise(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.1/32\nINVALID") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/255.255.255.0") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("::1/129") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/33") }
assert_raise(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/255.255.255.1") }
assert_raise(IPAddr::AddressFamilyError) { IPAddr.new(1) }
assert_raise(IPAddr::AddressFamilyError) { IPAddr.new("::ffff:192.168.1.2/120", Socket::AF_INET) }
assert_invalid_ipaddr(IPAddr::InvalidAddressError, "192.168.0.256")
assert_invalid_ipaddr(IPAddr::InvalidAddressError, "192.168.0.011")
assert_invalid_ipaddr(IPAddr::InvalidAddressError, "fe80::1%fxp0")
assert_invalid_ipaddr(IPAddr::InvalidAddressError, "[192.168.1.2]/120")
assert_invalid_ipaddr(IPAddr::InvalidAddressError, "[2001:200:300::]\nINVALID")
assert_invalid_ipaddr(IPAddr::InvalidAddressError, "192.168.0.1/32\nINVALID")
assert_invalid_ipaddr(IPAddr::InvalidPrefixError, "::1/255.255.255.0")
assert_invalid_ipaddr(IPAddr::InvalidPrefixError, "::1/129")
assert_invalid_ipaddr(IPAddr::InvalidPrefixError, "192.168.0.1/33")
assert_invalid_ipaddr(IPAddr::InvalidPrefixError, "192.168.0.1/255.255.255.1")
assert_invalid_ipaddr(IPAddr::AddressFamilyError, 1)
assert_invalid_ipaddr(IPAddr::AddressFamilyError, "::ffff:192.168.1.2/120", Socket::AF_INET)
end

private def assert_invalid_ipaddr(exc, addr, *opts)
e = assert_raise(exc) { IPAddr.new(addr, *opts) }
if cause = e.cause and cause.class == exc
assert_not_send([e.message, :start_with?, cause.message])
end
end

def test_s_new_ntoh
Expand Down