ipaddress 0.5.0 → 0.6.0

data/test/ipaddress/ipv6_test.rb

@@ -83,7 +83,7 @@ class IPv6Test < Test::Unit::TestCase
     assert_equal 128, ip.prefix
     ip.prefix = 64
     assert_equal 64, ip.prefix
-    assert_equal "2001:db8::8:800:200c:417a/64", ip.to_s
+    assert_equal "2001:db8::8:800:200c:417a/64", ip.to_string
   end
 
   def test_method_mapped?
@@ -111,18 +111,36 @@ class IPv6Test < Test::Unit::TestCase
   end
   
   def test_method_to_s
-    assert_equal "2001:db8::8:800:200c:417a/64", @ip.to_s
+    assert_equal "2001:db8::8:800:200c:417a", @ip.to_s
   end
 
   def test_method_to_string
+    assert_equal "2001:db8::8:800:200c:417a/64", @ip.to_string
+  end
+
+  def test_method_to_string_uncompressed
     str = "2001:0db8:0000:0000:0008:0800:200c:417a/64" 
-    assert_equal str, @ip.to_string
+    assert_equal str, @ip.to_string_uncompressed
   end
   
   def test_method_data
     str = " \001\r\270\000\000\000\000\000\b\b\000 \fAz"
     assert_equal str, @ip.data
   end
+
+
+  def test_method_reverse
+    str = "f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.arpa"
+    assert_equal str, @klass.new("3ffe:505:2::f").reverse
+  end
+
+#   def test_ip6_int
+#     assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.int", IPAddress("3ffe:505:2::f").ip6_int)
+  #     assert_raises(ArgumentError) {
+#       IPAddress("192.168.2.1").ip6_int
+  #     }
+#   end
+
   
   def test_method_compressed
     assert_equal "1:1:1::1", @klass.new("1:1:1:0:0:0:0:1").compressed
@@ -181,7 +199,7 @@ class IPv6Test < Test::Unit::TestCase
     ip = @klass.parse_data str
     assert_instance_of @klass, ip
     assert_equal "2001:0db8:0000:0000:0008:0800:200c:417a", ip.address
-    assert_equal "2001:db8::8:800:200c:417a/128", ip.to_s
+    assert_equal "2001:db8::8:800:200c:417a/128", ip.to_string
   end
 
   def test_classhmethod_parse_u128
@@ -201,6 +219,7 @@ class IPv6UnspecifiedTest < Test::Unit::TestCase
   def setup
     @klass = IPAddress::IPv6::Unspecified
     @ip = @klass.new
+    @s = "::"
     @str = "::/128"
     @string = "0000:0000:0000:0000:0000:0000:0000:0000/128"
     @u128 = 0
@@ -216,8 +235,9 @@ class IPv6UnspecifiedTest < Test::Unit::TestCase
     assert_equal @address, @ip.compressed
     assert_equal 128, @ip.prefix
     assert_equal true, @ip.unspecified?
-    assert_equal @str, @ip.to_s
-    assert_equal @string, @ip.to_string
+    assert_equal @s, @ip.to_s
+    assert_equal @str, @ip.to_string
+    assert_equal @string, @ip.to_string_uncompressed
     assert_equal @u128, @ip.to_u128
   end
   
@@ -229,6 +249,7 @@ class IPv6LoopbackTest < Test::Unit::TestCase
   def setup
     @klass = IPAddress::IPv6::Loopback
     @ip = @klass.new
+    @s = "::1"
     @str = "::1/128"
     @string = "0000:0000:0000:0000:0000:0000:0000:0001/128"
     @u128 = 1
@@ -244,8 +265,9 @@ class IPv6LoopbackTest < Test::Unit::TestCase
     assert_equal @address, @ip.compressed
     assert_equal 128, @ip.prefix
     assert_equal true, @ip.loopback?
-    assert_equal @str, @ip.to_s
-    assert_equal @string, @ip.to_string
+    assert_equal @s, @ip.to_s
+    assert_equal @str, @ip.to_string
+    assert_equal @string, @ip.to_string_uncompressed
     assert_equal @u128, @ip.to_u128
   end
   
@@ -256,6 +278,7 @@ class IPv6MappedTest < Test::Unit::TestCase
   def setup
     @klass = IPAddress::IPv6::Mapped
     @ip = @klass.new("::172.16.10.1")
+    @s = "::ffff:172.16.10.1"
     @str = "::ffff:172.16.10.1/128"
     @string = "0000:0000:0000:0000:0000:ffff:ac10:0a01/128"
     @u128 = 281473568475649
@@ -278,8 +301,9 @@ class IPv6MappedTest < Test::Unit::TestCase
   def test_attributes
     assert_equal @address, @ip.compressed
     assert_equal 128, @ip.prefix
-    assert_equal @str, @ip.to_s
-    assert_equal @string, @ip.to_string
+    assert_equal @s, @ip.to_s
+    assert_equal @str, @ip.to_string
+    assert_equal @string, @ip.to_string_uncompressed
     assert_equal @u128, @ip.to_u128
   end
 

data/test/ipaddress/prefix_test.rb

@@ -68,6 +68,21 @@ class Prefix32Test < Test::Unit::TestCase
     end
   end
 
+  def test_method_plus
+    p1 = @klass.new 8
+    p2 = @klass.new 10
+    assert_equal 18, p1+p2
+    assert_equal 12, p1+4
+  end
+
+  def test_method_minus
+    p1 = @klass.new 8
+    p2 = @klass.new 24
+    assert_equal 16, p1-p2
+    assert_equal 16, p2-p1
+    assert_equal 20, p2-4
+  end
+
   def test_initialize
     assert_raise (ArgumentError) do
       @klass.new 33

data/test/ipaddress_test.rb

@@ -33,6 +33,23 @@ class IPAddressTest < Test::Unit::TestCase
 
   end
 
+  def test_module_method_valid?
+    assert_equal true, IPAddress::valid?("10.0.0.1")
+    assert_equal true, IPAddress::valid?("10.0.0.0")
+    assert_equal true, IPAddress::valid?("2002::1")
+    assert_equal true, IPAddress::valid?("dead:beef:cafe:babe::f0ad")
+    assert_equal false, IPAddress::valid?("10.0.0.256")
+    assert_equal false, IPAddress::valid?("10.0.0.0.0")
+    assert_equal false, IPAddress::valid?("10.0.0")
+    assert_equal false, IPAddress::valid?("10.0")
+    assert_equal false, IPAddress::valid?("2002:::1")
+  end
+
+  def test_module_method_valid_ipv4_netmark?
+    assert_equal true, IPAddress::valid_ipv4_netmask?("255.255.255.0")
+    assert_equal false, IPAddress::valid_ipv4_netmask?("10.0.0.1")
+  end
+
 end
 
 

data/test/test_helper.rb

@@ -1,15 +1,10 @@
 require 'rubygems'
 require 'test/unit'
-require 'ruby-prof'
-
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ipaddress'
 
-class Test::Unit::TestCase
-end
-
 module Test::Unit
   
   class TestCase

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ipaddress
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Marco Ceresa
@@ -15,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 +01:00
+date: 2010-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: 
+description: "      IPAddress is a Ruby library designed to make manipulation \n      of IPv4 and IPv6 addresses both powerful and simple. It mantains\n      a layer of compatibility with Ruby's own IPAddr, while \n      addressing many of its issues.\n"
 email: ceresa@gmail.com
 executables: []
 
@@ -31,18 +25,17 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/ipaddress.rb
 - lib/ipaddress/extensions/extensions.rb
-- lib/ipaddress/ipbase.rb
 - lib/ipaddress/ipv4.rb
 - lib/ipaddress/ipv6.rb
 - lib/ipaddress/prefix.rb
 - test/ipaddress/extensions/extensions_test.rb
-- test/ipaddress/ipbase_test.rb
 - test/ipaddress/ipv4_test.rb
 - test/ipaddress/ipv6_test.rb
 - test/ipaddress/prefix_test.rb
@@ -58,35 +51,28 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: IPv4/IPv6 addresses manipulation library
 test_files: 
-- test/ipaddress/prefix_test.rb
-- test/ipaddress/ipbase_test.rb
-- test/ipaddress/ipv4_test.rb
-- test/ipaddress/extensions/extensions_test.rb
-- test/ipaddress/ipv6_test.rb
 - test/test_helper.rb
 - test/ipaddress_test.rb
+- test/ipaddress/prefix_test.rb
+- test/ipaddress/ipv6_test.rb
+- test/ipaddress/extensions/extensions_test.rb
+- test/ipaddress/ipv4_test.rb

data/lib/ipaddress/ipbase.rb

@@ -1,83 +0,0 @@
-require 'ipaddress/extensions/extensions'
-
-module IPAddress
-
-  # 
-  # Checks if the given string is a valid IP address,
-  # either IPv4 or IPv6
-  #
-  # Example:
-  #
-  #   IPAddress::valid? "2002::1"
-  #     #=> true
-  #
-  #   IPAddress::valid? "10.0.0.256"   
-  #     #=> false
-  #
-  def self.valid?(addr)
-    valid_ipv4?(addr) || valid_ipv6?(addr)
-  end
-
-  #
-  # Checks if the given string is a valid IPv4 address
-  #
-  # Example:
-  #
-  #   IPAddress::valid_ipv4? "2002::1"
-  #     #=> false
-  #
-  #   IPAddress::valid_ipv4? "172.16.10.1"
-  #     #=> true
-  #
-  def self.valid_ipv4?(addr)
-    if /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ addr
-      return $~.captures.all? {|i| i.to_i < 256}
-    end
-    false
-  end
-  
-  #
-  # Checks if the argument is a valid IPv4 netmark
-  # expressed in dotted decimal format.
-  #
-  #   IPAddress.valid_ipv4_netmask? "255.255.0.0"
-  #     #=> true
-  #
-  def self.valid_ipv4_netmask?(addr)
-    arr = addr.split(".").map{|i| i.to_i}.pack("CCCC").unpack("B*").first.scan(/01/)
-    arr.empty? && valid_ipv4?(addr)
-  rescue
-    return false
-  end
-  
-  #
-  # Checks if the given string is a valid IPv6 address
-  #
-  # Example:
-  #
-  #   IPAddress::valid_ipv6? "2002::1"
-  #     #=> true
-  #
-  #   IPAddress::valid_ipv6? "2002::DEAD::BEEF"
-  #     #=> false
-  #
-  def self.valid_ipv6?(addr)
-    # IPv6 (normal)
-    return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*\Z/ =~ addr
-    return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
-    return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
-    # IPv6 (IPv4 compat)
-    return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/ =~ addr && valid_ipv4?($')
-    return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?($')
-    return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_ipv4?($')
-    false
-    end
-
-  class IPBase; end
-  
-end # module IPAddress
-
-
-
-
-

data/test/ipaddress/ipbase_test.rb

@@ -1,28 +0,0 @@
-require 'test_helper'
-
-class IpaddressTest < Test::Unit::TestCase
-
-  must "be valid ip" do
-    assert_equal true, IPAddress::valid?("10.0.0.1")
-    assert_equal true, IPAddress::valid?("10.0.0.0")
-    assert_equal true, IPAddress::valid?("2002::1")
-    assert_equal true, IPAddress::valid?("dead:beef:cafe:babe::f0ad")
-  end
-
-  must "be valid netmask" do
-    assert_equal true, IPAddress::valid_ipv4_netmask?("255.255.255.0")
-  end
-
-  must "be invalid netmask" do
-    assert_equal false, IPAddress::valid_ipv4_netmask?("10.0.0.1")
-  end
- 
-  must "be invalid" do
-    assert_equal false, IPAddress::valid?("10.0.0.256")
-    assert_equal false, IPAddress::valid?("10.0.0.0.0")
-    assert_equal false, IPAddress::valid?("10.0.0")
-    assert_equal false, IPAddress::valid?("10.0")
-    assert_equal false, IPAddress::valid?("2002:::1")
-  end
-
-end