netaddr 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89ce300b6a351757d48c569e132c3e1346f7b09a
-  data.tar.gz: 5f11179793ee8a0d5a42758524b7aa49f71392cc
+SHA256:
+  metadata.gz: de26482bcd44b80695dd256c99f45c9f5ceb4d7bec3cfc57c60a0f59a860188d
+  data.tar.gz: f86ab761fd9ab76f1de6f1fb26d4f89fa85390ab772c3144de18d07b5202dc0e
 SHA512:
-  metadata.gz: 36acfbba061405495f4e4d08c271f6be19c9810de6c5a44f78a2ebf407cf24637dac6b50277c82cc6048e36d00785e143aa37170e0101d40638b36f77e575c5a
-  data.tar.gz: c9baee3f002fb16def0f60f8e9304b44015739f0a5f844b1413f8b20d2d80c9bc73678654f81906ef14255f9928b64a3153eba120e387f4044bd558e5d6f5df3
+  metadata.gz: e5afb658aa8805f286b273ada3a86fae37b6fd8c4e6ef441845e78fa70e351c7c9b2df2b84f8e919a5cea032ad801b0f1fe36494e13b8e9b3afcf7ecd2ac869b
+  data.tar.gz: 339ba4279b2f90223362c40ca5753922b889bf2cc2870c4a7a9ddd774668ad7dd419144a9773bd371a5ca16e6d77b7465756fcf5f46bf2410effbbc3a1dc0e55

data/lib/ipv4.rb

@@ -19,7 +19,7 @@ module NetAddr
 		# parse will create an IPv4 from its string representation (ie. "192.168.1.1").
 		# Throws ValidationError on error.
 		def IPv4.parse(ip)
-			ip.strip!
+			ip = ip.strip
 			i = Util.parse_IPv4(ip)
 			return IPv4.new(i)
 		end
@@ -77,6 +77,11 @@ module NetAddr
 			Util.int_to_IPv4(@addr)
 		end
 		
+		# version returns "4" for IPv4
+		def version()
+			return 4
+		end
+		
 	end # end class IPv4
 	
 end # end module

data/lib/ipv4net.rb

@@ -23,7 +23,7 @@ module NetAddr
 		# parse will create an IPv4Net from its string representation. Will default to a /32 netmask if not specified.
 		# Throws ValidationError on error.
 		def IPv4Net.parse(net)
-			net.strip!
+			net = net.strip
 			m32 = nil
 			if (net.include?("/")) # cidr format
 				addr,mask = net.split("/")
@@ -220,6 +220,11 @@ module NetAddr
 			return @base.to_s + @m32.to_s
 		end
 		
+		# version returns "4" for IPv4
+		def version()
+			return 4
+		end
+		
 		
 		protected
 

data/lib/ipv6.rb

@@ -19,7 +19,7 @@ module NetAddr
 		# parse will create an IPv6 from its string representation (ie. "1::").
 		# Throws ValidationError on error.
 		def IPv6.parse(ip)
-			ip.strip!
+			ip = ip.strip
 			i = Util.parse_IPv6(ip)
 			return IPv6.new(i)
 		end
@@ -110,6 +110,11 @@ module NetAddr
 			return hexStr.join(":")
 		end
 		
+		# version returns "6" for IPv6
+		def version()
+			return 6
+		end
+		
 	end # end class IPv6
 	
 end # end module

data/lib/ipv6net.rb

@@ -28,7 +28,7 @@ module NetAddr
 		# Throws ValidationError on error.
 		def IPv6Net.parse(net)
 			m128 = nil
-			net.strip!
+			net = net.strip
 			if (net.include?("/")) # cidr format
 				addr,mask = net.split("/")
 				m128 = Mask128.parse(mask)
@@ -224,6 +224,11 @@ module NetAddr
 			return @base.to_s + @m128.to_s
 		end
 		
+		# version returns "6" for IPv6
+		def version()
+			return 6
+		end
+		
 		
 		protected
 

data/lib/mask128.rb

@@ -26,11 +26,13 @@ module NetAddr
 		#
 		# Throws ValidationError on error.
 		def Mask128.parse(mask)
-			mask.strip!
+			mask = mask.strip
 			if (mask.start_with?("/")) # cidr format
 				mask = mask[1..-1] # remove "/"
 			end
-			return Mask128.new(mask.to_i)
+			return Mask128.new(Integer(mask))
+		rescue ArgumentError
+			raise ValidationError, "#{mask} is not valid integer."
 		end
 		
 		#cmp compares equality with another Mask128. Return:

data/lib/mask32.rb

@@ -26,11 +26,17 @@ module NetAddr
 		#
 		#	Throws ValidationError on error.
 		def Mask32.parse(mask)
-			mask.strip!
+			mask = mask.strip
 			if (mask.start_with?("/")) # cidr format
-				return Mask32.new(mask[1..-1].to_i) # remove "/"
-			elsif (!mask.include?("."))
-				return Mask32.new(mask.to_i)
+				mask = mask[1..-1] # remove "/"
+			end
+
+			if (!mask.include?("."))
+				begin
+					return Mask32.new(Integer(mask))
+				rescue ArgumentError
+					raise ValidationError, "#{mask} is not valid integer."
+				end
 			end
 			
 			# for extended netmask
@@ -62,7 +68,7 @@ module NetAddr
 		
 		# extended returns the Mask32 in extended format (eg. x.x.x.x)
 		def extended()
-			Util.intToMask32(@mask)
+			Util.int_to_IPv4(@mask)
 		end
 		
 		#cmp compares equality with another Mask32. Return:

data/lib/netaddr.rb

@@ -37,6 +37,24 @@ module NetAddr
 	end
 	module_function :ipv4_prefix_len
 	
+	## parse_ip parses a string into an IPv4 or IPv6
+	def parse_ip(ip)
+		if (ip.include?(".")) # ipv4
+			return IPv4.parse(ip)
+		end
+		return IPv6.parse(ip)
+	end
+	module_function :parse_ip
+	
+	## parse_net parses a string into an IPv4Net or IPv6Net
+	def parse_net(net)
+		if (net.include?(".")) # ipv4
+			return IPv4Net.parse(net)
+		end
+		return IPv6Net.parse(net)
+	end
+	module_function :parse_net
+	
 	# sort_IPv4 sorts a list of IPv4 objects in ascending order.
 	# It will return a new list with any non IPv4 objects removed.
 	def sort_IPv4(list)

data/lib/util.rb

@@ -23,29 +23,27 @@ module NetAddr
 	
 	# discard_subnets returns a copy of the IPv4NetList with any entries which are subnets of other entries removed.
 	def Util.discard_subnets(list)
-		unrelated = []
-		supernets = []
+		keepers = []
 		last = list[list.length-1]
+		keep_last = true
 		list.each do |net|
 			rel = last.rel(net)
-			if (!rel)
-				unrelated.push(net)
-			elsif (rel == -1) # last is subnet of net
-				supernets.push(net)
+			if (!rel) # keep unrelated nets
+				keepers.push(net)
+			elsif (rel == -1) # keep supernets, but do not keep last
+				keepers.push(net)
+				keep_last = false
 			end
 		end
 		
-		cleaned = []
-		if (supernets.length > 0)
-			cleaned = discard_subnets(supernets)
-		else
-			cleaned.push(last)
+		# recursively clean up keepers
+		if (keepers.length > 0)
+			keepers = discard_subnets(keepers)
 		end
-		
-		if (unrelated.length > 0)
-			cleaned.concat( discard_subnets(unrelated) )
+		if keep_last
+			keepers.unshift(last)
 		end
-		return cleaned
+		return keepers
 	end
 	
 	# fill returns a copy of the given Array, stripped of any networks which are not subnets of ipnet
@@ -166,8 +164,7 @@ module NetAddr
 			raise ValidationError, "#{ip} contains invalid characters."
 		end
 		
-		ip.strip!
-		octets = ip.split('.')
+		octets = ip.strip.split('.')
 		if (octets.length != 4)
 			raise ValidationError, "IPv4 requires (4) octets."
 		end
@@ -192,7 +189,7 @@ module NetAddr
 			raise ValidationError, "#{ip} contains invalid characters."
 		end
 		
-		ip.strip!
+		ip = ip.strip
 		if (ip == "::")
 			return 0 # zero address
 		end

data/test/mask32_test.rb

@@ -34,6 +34,11 @@ class TestMask32 < Test::Unit::TestCase
 		assert_equal(0, m.cmp(m4))
 	end
 	
+	def test_extended
+		m32 = NetAddr::Mask32.new(24)
+		assert_equal("255.255.255.0", m32.extended)
+	end
+	
 	def test_len
 		m = NetAddr::Mask32.new(24)
 		assert_equal(256, m.len())

data/test/netaddr_test.rb

@@ -5,6 +5,16 @@ require 'test/unit'
 
 class TestNetAddr < Test::Unit::TestCase
 
+	def test_parse_ip
+		assert_equal("128.0.0.1", NetAddr.parse_ip("128.0.0.1").to_s)
+		assert_equal("1::1", NetAddr.parse_ip("1::1").to_s)
+	end
+	
+	def test_parse_net
+		assert_equal("128.0.0.1/32", NetAddr.parse_net("128.0.0.1/32").to_s)
+		assert_equal("1::/24", NetAddr.parse_net("1::1/24").to_s)
+	end
+	
 	def test_ipv4_prefix_len
 		assert_equal(32,NetAddr.ipv4_prefix_len(1))
 		assert_equal(27,NetAddr.ipv4_prefix_len(30))
@@ -67,6 +77,17 @@ class TestNetAddr < Test::Unit::TestCase
 			assert_equal(expect[i],net.to_s)
 			i += 1
 		end
+		
+		nets = []
+		["10.0.0.0/26","10.0.0.64/26","10.0.0.0/24","10.0.0.192/26","10.0.0.128/26"].each do |net| # test out of order
+			nets.push(NetAddr::IPv4Net.parse(net))
+		end
+		expect = ["10.0.0.0/24"]
+		i = 0
+		NetAddr.summ_IPv4Net(nets).each do |net|
+			assert_equal(expect[i],net.to_s)
+			i += 1
+		end
 	end
 	
 	def test_sort_IPv6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netaddr
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Dustin Spinhirne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A Ruby library for performing calculations on IPv4 and IPv6 subnets.