diff options
| author | Francis Luong (Franco) <franco@definefunk.com> | 2017-08-30 07:46:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 07:46:53 -0400 |
| commit | 9dedeaf13caddb1827a48091c353c8f953b517ac (patch) | |
| tree | f4347c4d451e147661ea01d93aebc6eac6b053ff | |
| parent | 032e8247f7840a490b226d6fbee89b4799b88660 (diff) | |
| parent | e5c9039420d0d38e066aa2f81c46cba698d7803a (diff) | |
| download | ipaddress-9dedeaf13caddb1827a48091c353c8f953b517ac.tar.gz | |
Merge pull request #76 from smortex/spaceship_compare
Fix <=> for IPv4 and IPv6.
| -rw-r--r-- | lib/ipaddress/ipv4.rb | 1 | ||||
| -rw-r--r-- | lib/ipaddress/ipv6.rb | 1 | ||||
| -rw-r--r-- | test/ipaddress/ipv4_test.rb | 6 | ||||
| -rw-r--r-- | test/ipaddress/ipv6_test.rb | 6 |
4 files changed, 14 insertions, 0 deletions
diff --git a/lib/ipaddress/ipv4.rb b/lib/ipaddress/ipv4.rb index a123e71..5979489 100644 --- a/lib/ipaddress/ipv4.rb +++ b/lib/ipaddress/ipv4.rb @@ -509,6 +509,7 @@ module IPAddress; # #=> ["10.100.100.1/8","10.100.100.1/16","172.16.0.1/16"] # def <=>(oth) + return nil unless oth.is_a?(self.class) return prefix <=> oth.prefix if to_u32 == oth.to_u32 to_u32 <=> oth.to_u32 end diff --git a/lib/ipaddress/ipv6.rb b/lib/ipaddress/ipv6.rb index 6ae651d..2205de4 100644 --- a/lib/ipaddress/ipv6.rb +++ b/lib/ipaddress/ipv6.rb @@ -494,6 +494,7 @@ module IPAddress; # #=> ["2001:db8:1::1/64","2001:db8:1::1/65","2001:db8:2::1/64"] # def <=>(oth) + return nil unless oth.is_a?(self.class) return prefix <=> oth.prefix if to_u128 == oth.to_u128 to_u128 <=> oth.to_u128 end diff --git a/test/ipaddress/ipv4_test.rb b/test/ipaddress/ipv4_test.rb index 19264e2..33b3a31 100644 --- a/test/ipaddress/ipv4_test.rb +++ b/test/ipaddress/ipv4_test.rb @@ -372,6 +372,12 @@ class IPv4Test < Minitest::Test ip3 = @klass.new("10.0.0.0/8") arr = ["10.0.0.0/8","10.0.0.0/16","10.0.0.0/24"] assert_equal arr, [ip1,ip2,ip3].sort.map{|s| s.to_string} + # compare with alien thing + ip1 = @klass.new('127.0.0.1') + ip2 = IPAddress::IPv6.new('::1') + not_ip = String + assert_equal nil, ip1 <=> ip2 + assert_equal nil, ip1 <=> not_ip end def test_method_minus diff --git a/test/ipaddress/ipv6_test.rb b/test/ipaddress/ipv6_test.rb index 7eaa765..3c3da90 100644 --- a/test/ipaddress/ipv6_test.rb +++ b/test/ipaddress/ipv6_test.rb @@ -260,6 +260,12 @@ class IPv6Test < Minitest::Test arr = ["2001:db8:1::1/64","2001:db8:1::1/65", "2001:db8:1::2/64","2001:db8:2::1/64"] assert_equal arr, [ip1,ip2,ip3,ip4].sort.map{|s| s.to_string} + # compare with alien thing + ip1 = @klass.new('::1') + ip2 = IPAddress::IPv4.new('127.0.0.1') + not_ip = String + assert_equal nil, ip1 <=> ip2 + assert_equal nil, ip1 <=> not_ip end def test_classmethod_expand |