Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions lib/ipaddr-ext/extensions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ def wildcard_mask
# Returns true if two ipaddrs are equal.
# Overwrite original == method, fixing to compare address with prefix
def ==(other)
# Fix inconsistent behavior between `IPAddr.new("0.0.0.0") == nil` and `nil == IPAddr.new("0.0.0.0")`
# https://github.com/ruby/ipaddr/pull/76
if other.nil?
return false
end

other = coerce_other(other)
rescue
false
Expand Down
6 changes: 6 additions & 0 deletions spec/ipaddr-ext/extensions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
expect(IPAddr.new("192.168.1.0/24") == IPAddr.new("192.168.1.0/25")).to eq false
expect(IPAddr.new("192.168.1.0/24") == IPAddr.new("192.168.1.0")).to eq false
expect(IPAddr.new("192.168.1.0/24") == IPAddr.new("192.168.1.1")).to eq false

expect(IPAddr.new("0.0.0.0") == nil).to eq false
expect(nil == IPAddr.new("0.0.0.0")).to eq false
end

it "ipv6" do
Expand All @@ -50,6 +53,9 @@
expect(IPAddr.new("3ffe:505:2::/64") == IPAddr.new("3ffe:505:2::/48")).to eq false
expect(IPAddr.new("3ffe:505:2::/64") == IPAddr.new("3ffe:505:2::")).to eq false
expect(IPAddr.new("3ffe:505:2::/64") == IPAddr.new("3ffe:505:2::1")).to eq false

expect(IPAddr.new("::") == nil).to eq false
expect(nil == IPAddr.new("::")).to eq false
end
end

Expand Down