added IPv4#+ and many new IPv6 methods and tests

3 files changed, 95 insertions, 13 deletions

diff --git a/lib/ipaddress/ipv4.rb b/lib/ipaddress/ipv4.rb
index 5621a97..23dec91 100644
--- a/lib/ipaddress/ipv4.rb
+++ b/lib/ipaddress/ipv4.rb
@@ -225,7 +225,7 @@ module IPAddress;
     #   a.puts binary_data
     #
     def data
-      @octets.pack("CCCC")
+      @octets.pack("C4")
     end
 
     #
@@ -588,6 +588,25 @@ module IPAddress;
     end
 
     #
+    # Returns a new IPv4 object which is the result 
+    # of the summarization, if possible, of the two 
+    # objects
+    #
+    # Example:
+    #
+    #   ip1 = IPAddress("172.16.10.1/24")
+    #   ip2 = IPAddress("172.16.11.2/24")
+    #   puts ip1 + ip2
+    #     #=>"172.16.10.0/23"
+    #
+    # If the networks are not contiguous, returns
+    # the two network numbers from the objects
+    #
+    def +(oth)
+      self.class.summarize(self,oth)
+    end
+
+    #
     # Creates a new IPv4 object from an
     # unsigned 32bits integer.
     #
@@ -603,7 +622,7 @@ module IPAddress;
     #     #=> "10.0.0.0/8"
     #
     def self.parse_u32(u32, prefix=nil)
-      ip = [u32].pack("N").unpack("CCCC").join(".")
+      ip = [u32].pack("N").unpack("C4").join(".")
       if prefix
         IPAddress::IPv4.new(ip+"/#{prefix}")
       else
@@ -616,7 +635,7 @@ module IPAddress;
     # TODO
     #
     def self.parse_data(str)
-      self.new str.unpack("CCCC").join(".")
+      self.new str.unpack("C4").join(".")
     end
 
     #
@@ -712,7 +731,7 @@ module IPAddress;
     private
     
     def bits_from_address(ip)
-      ip.split(".").map{|i| i.to_i}.pack("CCCC").unpack("B*").first
+      ip.split(".").map{|i| i.to_i}.pack("C4").unpack("B*").first
     end
     
     def prefix_from_ip(ip)
diff --git a/lib/ipaddress/ipv6.rb b/lib/ipaddress/ipv6.rb
index ebb2d03..01e2f04 100644
--- a/lib/ipaddress/ipv6.rb
+++ b/lib/ipaddress/ipv6.rb
@@ -36,12 +36,14 @@ module IPAddress;
         raise ArgumentError, "Invalid IP #{ip.inspect}"
       end
       
-      # Check the prefix
-      if netmask =~ /^\d{1,3}$/  
-        @prefix = Prefix128.new(netmask.to_i)
-      else
-        @prefix = Prefix128.new(128)
-      end
+#      # Check the prefix
+#      if netmask =~ /^\d{1,3}$/  
+#        @prefix = Prefix128.new(netmask.to_i)
+#      else
+#        @prefix = Prefix128.new(128)
+#      end
+
+      @prefix = Prefix128.new(netmask ? netmask : 128)
 
     end # def initialize
 
@@ -58,6 +60,27 @@ module IPAddress;
       @prefix
     end
 
+    #
+    # Set a new prefix number for the object
+    #
+    # This is useful if you want to change the prefix
+    # to an object created with IPv6::parse_u128 or
+    # if the object was created using the default prefix
+    # of 128 bits.
+    #
+    #   ip = IPAddress("2001:db8::8:800:200c:417a")
+    #   puts ip
+    #     #=> 2001:db8::8:800:200c:417a/128
+    #
+    #   ip.prefix = 64
+    #   puts ip
+    #     #=> 2001:db8::8:800:200c:417a/64
+    #
+    def prefix=(num)
+      @prefix = Prefix128.new(num)
+    end
+
+
     def to_string
       "#@address/#@prefix"
     end
@@ -69,6 +92,25 @@ module IPAddress;
     def to_i
       to_hex.hex
     end
+    alias_method :to_u128, :to_i
+
+    #
+    # Returns the 16-bits value specified by index
+    #
+    #   ip = IPAddress("2001:db8::8:800:200c:417a/64")
+    #   ip[0]
+    #     #=> 8193
+    #   ip[1]
+    #     #=> 3512
+    #   ip[2]
+    #     #=> 0
+    #   ip[3]
+    #     #=> 0
+    #
+    def [](index)
+      @groups[index]
+    end
+    alias_method :group, :[]
 
     def to_hex
       hexs.to_s
@@ -93,6 +135,18 @@ module IPAddress;
     def loopback?
       @prefix == 128 and @compressed == "::1"
     end
+
+    #
+    # Returns the address portion of an IP in binary format,
+    # as a string containing a sequence of 0 and 1
+    #
+    #   ip = IPAddress("2001:db8::8:800:200c:417a")
+    #   ip.bits
+    #     #=> "01111111000000000000000000000001"
+    #
+    def bits
+      data.unpack("B*").first
+    end
       
     #
     # Expands an IPv6 address in the canocical form
@@ -120,6 +174,15 @@ module IPAddress;
     def self.parse_data(str)
       self.new(IN6FORMAT % str.unpack("n8"))
     end
+
+    def self.parse_u128(u128, prefix=128)
+      str = IN6FORMAT % (0..7).map{|i| (u128>>(112-16*i))&0xffff}
+      self.new(str + "/#{prefix}")
+    end
+
+    def self.parse_hex(hex, prefix=128)
+      self.parse_u128(hex.hex, prefix)
+    end
     
   private
 
diff --git a/lib/ipaddress/prefix.rb b/lib/ipaddress/prefix.rb
index 5726272..b2fa07b 100644
--- a/lib/ipaddress/prefix.rb
+++ b/lib/ipaddress/prefix.rb
@@ -69,11 +69,11 @@ module IPAddress
 
   class Prefix128 < Prefix
 
-    def initialize(num)
-      unless (1..128).include? num
+    def initialize(num=128)
+      unless (1..128).include? num.to_i
         raise ArgumentError, "Prefix must be in range 1..128, got: #{num}"
       end
-      super(num)
+      super(num.to_i)
     end
 
     def bits