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

Define #succ and #pred methods #82

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Define #succ and #pred methods #82

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
7b8e3f6
Define #succ and #pred methods
raorn Sep 8, 2016
e6f3628
Merge branch 'master' into succ/pred
raorn Dec 12, 2017
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
29 changes: 29 additions & 0 deletions lib/ipaddress/ipv4.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,35 @@ def each
end
end

#
# Returns the successor to the IP address
#
# Example:
#
# ip = IPAddress("192.168.45.23/16")
#
# ip.succ.to_string
# => "192.168.45.24/16"
#
def succ
self.class.new("#{IPAddress.ntoa(to_u32.succ % 0x100000000)}/#{prefix}")
end
alias_method :next, :succ

#
# Returns the predecessor to the IP address
#
# Example:
#
# ip = IPAddress("192.168.45.23/16")
#
# ip.pred.to_string
# => "192.168.45.22/16"
#
def pred
self.class.new("#{IPAddress.ntoa(to_u32.pred % 0x100000000)}/#{prefix}")
end

#
# Spaceship operator to compare IPv4 objects
#
Expand Down
29 changes: 29 additions & 0 deletions lib/ipaddress/ipv6.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,35 @@ def each
end
end

#
# Returns the successor to the IP address
#
# Example:
#
# ip6 = IPAddress("2001:db8::8:800:200c:417a/64")
#
# ip6.succ.to_string
# => "2001:db8::8:800:200c:417b/64"
#
def succ
IPAddress::IPv6.parse_u128(to_u128.succ, prefix)
end
alias_method :next, :succ

#
# Returns the predecessor to the IP address
#
# Example:
#
# ip6 = IPAddress("2001:db8::8:800:200c:417a/64")
#
# ip6.pred.to_string
# => "2001:db8::8:800:200c:4179/64"
#
def pred
IPAddress::IPv6.parse_u128(to_u128.pred, prefix)
end

#
# Spaceship operator to compare IPv6 objects
#
Expand Down
30 changes: 30 additions & 0 deletions test/ipaddress/ipv4_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,36 @@ def test_method_each
assert_equal expected, arr
end

def test_method_succ
ip = @klass.new("192.168.100.0/24")
assert_instance_of @klass, ip.succ
assert_equal "192.168.100.1/24", ip.succ.to_string
ip = @klass.new("192.168.100.50/24")
assert_instance_of @klass, ip.succ
assert_equal "192.168.100.51/24", ip.succ.to_string
ip = @klass.new("0.0.0.0/32")
assert_instance_of @klass, ip.succ
assert_equal "0.0.0.1/32", ip.succ.to_string
ip = @klass.new("255.255.255.255/32")
assert_instance_of @klass, ip.succ
assert_equal "0.0.0.0/32", ip.succ.to_string
end

def test_method_pred
ip = @klass.new("192.168.100.0/24")
assert_instance_of @klass, ip.pred
assert_equal "192.168.99.255/24", ip.pred.to_string
ip = @klass.new("192.168.100.50/24")
assert_instance_of @klass, ip.pred
assert_equal "192.168.100.49/24", ip.pred.to_string
ip = @klass.new("0.0.0.0/32")
assert_instance_of @klass, ip.pred
assert_equal "255.255.255.255/32", ip.pred.to_string
ip = @klass.new("255.255.255.255/32")
assert_instance_of @klass, ip.pred
assert_equal "255.255.255.254/32", ip.pred.to_string
end

def test_method_size
ip = @klass.new("10.0.0.1/29")
assert_equal 8, ip.size
Expand Down
29 changes: 29 additions & 0 deletions test/ipaddress/ipv6_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,35 @@ def test_method_each
assert_equal expected, arr
end

def test_method_succ
ip = @klass.new("2001:db8:0:cd30::/64")
assert_instance_of @klass, ip.succ
assert_equal "2001:db8:0:cd30::1/64", ip.succ.to_string
ip = @klass.new("::")
assert_instance_of @klass, ip.succ
assert_equal "::1/128", ip.succ.to_string
ip = @klass.new("::1")
assert_instance_of @klass, ip.succ
assert_equal "::2/128", ip.succ.to_string
ip = @klass.new("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/64")
assert_instance_of @klass, ip.succ
assert_equal "::/64", ip.succ.to_string
end

def test_method_pred
ip = @klass.new("2001:db8:0:cd30::/64")
assert_instance_of @klass, ip.pred
assert_equal "2001:db8:0:cd2f:ffff:ffff:ffff:ffff/64", ip.pred.to_string
ip = @klass.new("::")
assert_instance_of @klass, ip.pred
assert_equal "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128", ip.pred.to_string
ip = @klass.new("::1")
assert_instance_of @klass, ip.pred
assert_equal "::/128", ip.pred.to_string
ip = @klass.new("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/64")
assert_instance_of @klass, ip.pred
assert_equal "ffff:ffff:ffff:ffff:ffff:ffff:ffff:fffe/64", ip.pred.to_string

def test_allocate_addresses
ip = @klass.new("2001:db8::4/125")
ip1 = ip.allocate
Expand Down