ip_address 0.1 → 0.1.2

data/lib/ip_address.rb

@@ -8,12 +8,51 @@ end
 
 # This class represents an IP address.
 class IPAddress
-	# Things that match this are (mostly) IPs.
-	IP_REGEXP = /^(?:\d{1,3}\.){3}\d{1,3}$/
+	class << self
+		# Is _addr_ an IP address?
+		def is_an_ip?(addr)
+			%w{
+					is_an_ip_instance? is_a_string_ip? is_an_array_ip?
+			    is_an_integer_ip?
+			  }.each do |m|
+					return true if send(m, addr)
+				end
+
+			false
+		end
+
+		def is_an_ip_instance?(addr)
+			addr.is_a?(IPAddress)
+		end
+
+		# Is _addr_ a string representation of an IP (without a netmask)?
+		def is_a_string_ip?(addr)
+			addr, mask = /^(\d+(?:\.\d+){3})(?:\/(\d+))?$/.match(addr).captures
+
+			# nil.to_i is 0.
+			return false unless (0..32) === mask.to_i
+
+			is_an_array_ip?( addr.split(".").map{|x| x.to_i} )
+		end
 
-	# Is _addr_ a string representation of an IP (without a netmask)?
-	def self.is_an_ip?(addr)
-		!!( IP_REGEXP =~ addr and addr.split(".").all?{|x| x.to_i < 256} )
+		# Is this an array representation of an IP?
+		def is_an_array_ip?(addr)
+			addr.length == 4 and addr.all?{|a| (0..255).include?(a)}
+		end
+
+		# Is _addr_ and integer representation of an IP?
+		def is_an_integer_ip?(addr)
+			addr.integer? and (0 ... 256**4).include?(addr)
+		end
+
+		%w{
+			is_an_ip_instance? is_a_string_ip? is_an_array_ip? is_an_integer_ip?
+		}.each do |meth_name|
+			_m = instance_method(meth_name)
+			define_method(meth_name){ |*a,&b|
+				_m.bind(self).(*a, &b) rescue false
+			}
+		end
 	end
 
 	# our netmask
@@ -58,9 +97,9 @@ class IPAddress
 	#  ip[3] = 8
 	#  ip #=> #<IPAddress: 12.4.97.8>
 	def []=(index, val)
-		if not (0..3) === index
+		if !((0..3) === index)
 			raise ArgumentError, "there are four parts to an IP address"
-		elsif not (0..256) === val
+		elsif !((0..256) === val)
 			raise ArgumentError, "each of the IP parts is between 0 and 256"
 		end
 
@@ -97,6 +136,7 @@ class IPAddress
 	end
 
 	def ==(ip)
+		return false unless self.class.is_an_ip?(ip)
 		ip = self.class.new(ip) unless ip.is_a? self.class
 
 		ip.to_i == to_i and ip.netmask == @netmask
@@ -116,25 +156,27 @@ class IPAddress
 	# Fixnum (also described there) and a netmask.
 	# @return [Fixnum, Fixnum] something like [201613576, 32]
 	def any_to_int_and_netmask(ip)
-		case ip
-			when /^((?:\d+\.){3}\d+)(?:\/(\d+))?$/
-				m = $~
-				int_ip = array_to_int(m[1].split(".").map{|x| x.to_i})
-				nmask = (m[2] || 32).to_i
+		if self.class.is_a_string_ip?(ip)
+			if ip =~ /^(.+)\/(.+)$/
+				ip, mask = $1, $2.to_i
+			else
+				mask = 32
+			end
 
-				return int_ip, nmask
+			quads = ip.split('.').map{|q| q.to_i}
+			return [array_to_int(quads), mask]
 
-			when Array
-				return array_to_int(ip), 32
+		elsif self.class.is_an_array_ip?(ip)
+			return array_to_int(ip), 32
 
-			when Integer
-				return ip, 32
+		elsif self.class.is_an_integer_ip?(ip)
+			return ip, 32
 
-			when self.class
-				return ip.to_i, ip.netmask
+		elsif self.class.is_an_ip_instance?(ip)
+			return ip.to_i, ip.netmask
 
-			else
-				raise NotAnIPError.new(ip)
+		else
+			raise NotAnIPError.new(ip)
 		end
 	end
 

metadata

@@ -1,87 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ip_address
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - katmagic
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
+cert_chain:
+- ! '-----BEGIN CERTIFICATE-----
+
   MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQUFADBGMRgwFgYDVQQDDA90aGUu
+
   bWFnaWNhbC5rYXQxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
-  ARkWA2NvbTAeFw0xMDExMjcwMTQwMTRaFw0xMTExMjcwMTQwMTRaMEYxGDAWBgNV
+
+  ARkWA2NvbTAeFw0xMTAyMTUwNDU0MDZaFw0xMjAyMTUwNDU0MDZaMEYxGDAWBgNV
+
   BAMMD3RoZS5tYWdpY2FsLmthdDEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYK
+
   CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-  vVnssXKFL/qdWKIjTbLKZNz+gg78DICoQSVxeO63aSaYMxFtbv0KGXPZDkiFF1Jl
-  m9ZIh+iVmoo9UcENk6CqY1BiMTMZ9QnHPdIFOsw3eBujh1wJ9cXybhaoma2apiIS
-  CtPYPbTs1ucJ8tZUv2jddnj3hlFB2LRjMCquWs70uYhjOAwLkxAi6mijLyeQ+NCk
-  X+wPgYF8mTylt2VbQAQEDtmchURoPtSjc1RTsPmD09JbLVV/5yxqKxZFBP5UfWRy
-  ah/sKsDKIu/GonFvX0t4XQGwDRbT39eETQ/zbkLjwb4Mf32r4CrcWUWN8jqLVonB
-  p59Fvw9gNb7eC2VvCPuF6QIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUEirhbP8V735WXh9StgsdQNg5NXkwDQYJKoZIhvcNAQEFBQAD
-  ggEBAIkMv0N2VTwBvUeEv036tpOAl91MiweXUoPmLba+/ekzowQDb1Y6zQD+Oi10
-  bgae6Je3Vr/t3fewldVLO6zar90rQo9MXa0+QDilogtmDSVQc8gO0eHRnFtix7VM
-  wKcje4Ns3w7zE0ztOkGwdTQaDWKFMGwd1es6hnLTOH09vGtaO2Xu39KXijA71XLM
-  0WspZe4zNBRmcdsNUYArw0KOcB3WLFZ2pI9K9rveB7hkwgAn6rSBf8/evZ9qPinZ
-  PcrsoLG0ZZxFAoFhlVaxZsQhw8aIev48+0uD9l1cy1+rrYsgL4lHlUzK8tndhR0+
-  kCxJ3nT4fqhTbbQYnOuTu8+un3E=
+
+  lOa4PmKeI2SoGx2fvQUQTHF8RpOw52yZgkeB/ZOLHhPGpkxN9zn0sBVRCh+8YsOh
+
+  4GGtY9kS5Z4pkMQhhJkdfqBhWxI/Dk3wkEd+GI0cyQ3cXc/INw/CmiFxvBiKEjoN
+
+  zeLesxMeHoOJmwpdF52VdIVwRanZQpL/9buTw+sJykXp/uSYV30M6A/KaiPdnAaN
+
+  +oautPQYWV3sf27vcOVWWG1gvyS8Ardcd8Nx9lSRf8w9WolMXG8qgCY+OGZQm8WK
+
+  WrJ8G6CEHABpd3123gY0Qx1mpPfgaCCi3nfCaSDIabcGFRvIUMiG6m950xcOOt9G
+
+  X0WDpSHYldyBVr3p+Nz4wQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+
+  sDAdBgNVHQ4EFgQUTkdCjc2gkF28POXx+iuTDgmaR20wDQYJKoZIhvcNAQEFBQAD
+
+  ggEBAHV/0Mp6m577vyZMxXGdBUcXHAxtd8n4FexczZlZm5NUXwGGVFAeFAG9jY0U
+
+  A/uWI3gIGoE1GOh+iDKnq56epx+wMcWIsLyu7qSbVBgEGmlbYZ9A8LUkk8FQ+CK1
+
+  v5dQUsPRBBYHR/GmQQekkAKumU2n0m1tYLOdKcsi0f3Rjx5XcpUtvgDd4RHiVLcx
+
+  ezvazGDhHTO5Jx5qF3wQ9yJqEoqb+G+tTOBi/OnKOhLKghp7diil8dwBx8jaVw2+
+
+  vfPcHDqz0OtHW/g2q3Y849LoINY8X27EvP0AaCrkrSUhX6736VvUh0gAPBdBQQfj
+
+  Rx1K02ODN+9Ezaa/+0cgt+bNFLM=
+
   -----END CERTIFICATE-----
 
-date: 2010-11-26 00:00:00 -05:00
+'
+date: 2011-02-14 00:00:00.000000000 -05:00
 default_executable: 
 dependencies: []
-
 description: Easily manipulate IPv4 addresses.
 email: the.magical.kat@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ip_address.rb
 has_rdoc: true
-homepage: https://github.com/katmagic/ip_address
-licenses: 
+homepage: https://github.com/katmagic/IPAddress
+licenses:
 - Unlicense (http://unlicense.org)
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ip_address
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Work with IP addresses.
 test_files: []
-

metadata.gz.sig

@@ -1 +1 @@
-Z�$.���:{���a0��&G�����_J�Zd����ݴ�S�9�[��*�w���r�-Z��Ĥ�T�p>/p�@T�"���%��7th�C���;��Z��������;��m�P]iܩ�����>�w�i���4�4�`����$���]+��O��t/QtY��]%~���
�A)�<C-3�c"&�ޱ�/�憄���R�J[+r�گ�Q�5n�	���T�ڎ�!Cl�?�\|ڞ�$	����DGi�Z��ҥ`�,WU������|
+&7[�y��^q��P�9��/hp�a��.b��!d9X���ߢ7q��;Z>�ij1�	a�������m�/"NIB`���`G{ohOs�{3��<�E�n��s����S'��g�u*w
�S�;�e��]a���C��.ŋ+�Id�nkW���De^�������;�rr%����&�����[�Z�-����Z%�m��R�߽F�g&f�h�_����e.�X���]���w6�:j>V�������ԡi�����C$*ն