construqt-ipaddress 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68efedd1ed7a0b49fcdafe4dad0b34d00208c11c
-  data.tar.gz: e8e4ede0555891a4c3852b5bd3780494338ab045
+  metadata.gz: 09666181f499c798901477f5738ac611ccf0537b
+  data.tar.gz: dbfe66242c03ed3c997437111c258f3e90e587a5
 SHA512:
-  metadata.gz: 758df94417d927ecb6eacd4a5b904852f04ee16f66c517f5ec39751424d9e8b385acc53b3f3878903e61ae88db913e4515236e4f12f6242825c08ec471186434
-  data.tar.gz: 01c2c1db4efdb0bd9a93f2e18dd75297ac8971f905c1ce1e24fbd3fbdf1c942a969caa7dd8ef6ddac31975cae19d7d8e31fbb6180f481af02af86e228af61d72
+  metadata.gz: ac36fc4db7a36cb89397e2533a15eb061b488043fe30d47a1b47c12dbfc226ee2eede0ce97016a3653ed3956d2b4ae14b3dfa6749415c9d883e9ae78aff9f915
+  data.tar.gz: f1e505af7cb8e2ea958f4e79cbdc656e085e8af97efa366c78df9654b949a38032a478cae82a1f7c6ed6ec5250f7fdb8a28f4f0d51c865b0dde869a0dd67df1a

data/ipaddress.gemspec

@@ -5,8 +5,9 @@
 
 Gem::Specification.new do |s|
   s.name = %q{construqt-ipaddress}
-  s.version = "0.8.2"
+  s.version = "0.8.4"
 
+  s.license       = "Simple from Marco Ceresa"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Ceresa", "Meno Abels"]
   s.date = %q{2014-11-29}

data/lib/ipaddress/ipv6.rb

@@ -327,12 +327,9 @@ module IPAddress;
     #     #=> ["e.ip6.arpa", "f.ip6.arpa"]
     #
     def rev_domains
-      ret = []
-      network = IPv6.parse_u128(network_u128, [(@prefix.to_i/4)*4 + 3, 123].min)
-      network.each_net do |net|
-        ret << net.reverse[(128-(net.prefix.to_i))/4*2..-1]
+      network.four_bit_networks.map do |net|
+        net.reverse[(128-(net.prefix.to_i))/4*2..-1]
       end
-      ret
     end
 
 
@@ -483,12 +480,21 @@ module IPAddress;
     # WARNING: if the host portion is very large, this method
     # can be very slow and possibly hang your system!
     #
-    def each_net
-      start = network_u128
-      while (@prefix.host_prefix.to_i-1) > 0 && start < broadcast_u128
-          yield self.class.parse_u128(start, @prefix)
-          start += 1<<(@prefix.host_prefix.to_i-1)
+    # There is a symantic problem i will now
+    # decide how network work in ipv6
+    def four_bit_networks
+      step = network_u128
+      next_four_bit_mask = ((@prefix.to_i+3)/4)*4
+      return [network] if next_four_bit_mask <= 0
+      step_four_bit_net = 1<<(128-next_four_bit_mask)
+      return [network] if step_four_bit_net == 0
+      ret = []
+      while step <= broadcast_u128
+#puts "%s %x=>%x/%d"%[to_string, step,step_four_bit_net,next_four_bit_mask]
+        ret << self.class.parse_u128(step, next_four_bit_mask)
+        step += step_four_bit_net
       end
+      ret
     end
 
     #

data/test/ipaddress/ipv6_test.rb

@@ -1,11 +1,11 @@
 require 'test_helper'
- 
+
 class IPv6Test < Test::Unit::TestCase
-  
+
   def setup
     @klass = IPAddress::IPv6
-    
-    @compress_addr = {      
+
+    @compress_addr = {
       "2001:db8:0000:0000:0008:0800:200c:417a" => "2001:db8::8:800:200c:417a",
       "2001:db8:0:0:8:800:200c:417a" => "2001:db8::8:800:200c:417a",
       "ff01:0:0:0:0:0:0:101" => "ff01::101",
@@ -30,7 +30,7 @@ class IPv6Test < Test::Unit::TestCase
       "::/0" => 0,
       "1080:0:0:0:8:800:200C:417A" => 21932261930451111902915077091070067066,
       "1080::8:800:200C:417A" => 21932261930451111902915077091070067066}
-      
+
     @invalid_ipv6 = [":1:2:3:4:5:6:7",
                      ":1:2:3:4:5:6:7",
                      "2002:516:2:200",
@@ -40,13 +40,13 @@ class IPv6Test < Test::Unit::TestCase
       "2001:db8:1:1:1:1:1:1/32" => "2001:db8::/32",
       "2001:db8:1:1:1:1:1::/32" => "2001:db8::/32",
       "2001:db8::1/64" => "2001:db8::/64"}
-    
+
     @ip = @klass.new "2001:db8::8:800:200c:417a/64"
     @network = @klass.new "2001:db8:8:800::/64"
     @arr = [8193,3512,0,0,8,2048,8204,16762]
     @hex = "20010db80000000000080800200c417a"
   end
-  
+
   def test_attribute_address
     addr = "2001:0db8:0000:0000:0008:0800:200c:417a"
     assert_equal addr, @ip.address
@@ -66,7 +66,7 @@ class IPv6Test < Test::Unit::TestCase
       @klass.new "::10.1.1.1"
     }
   end
-  
+
   def test_attribute_groups
     assert_equal @arr, @ip.groups
   end
@@ -75,7 +75,7 @@ class IPv6Test < Test::Unit::TestCase
     arr = "2001:0db8:0000:0000:0008:0800:200c:417a".split(":")
     assert_equal arr, @ip.hexs
   end
-  
+
   def test_method_to_i
     @valid_ipv6.each do |ip,num|
       assert_equal num, @klass.new(ip).to_i
@@ -84,7 +84,7 @@ class IPv6Test < Test::Unit::TestCase
 
   def test_method_bits
     bits = "0010000000000001000011011011100000000000000000000" +
-      "000000000000000000000000000100000001000000000000010000" + 
+      "000000000000000000000000000100000001000000000000010000" +
       "0000011000100000101111010"
     assert_equal bits, @ip.bits
   end
@@ -117,7 +117,7 @@ class IPv6Test < Test::Unit::TestCase
   def test_method_ipv4?
     assert_equal false, @ip.ipv4?
   end
-  
+
   def test_method_ipv6?
     assert_equal true, @ip.ipv6?
   end
@@ -153,7 +153,7 @@ class IPv6Test < Test::Unit::TestCase
     not_included = @klass.new "2001:db8::8:800:200c:417a/46"
     assert_equal true, @ip.include?(included)
     assert_equal false, @ip.include?(not_included)
-    # test address on same prefix 
+    # test address on same prefix
     included = @klass.new "2001:db8::8:800:200c:0/64"
     not_included = @klass.new "2001:db8:1::8:800:200c:417a/64"
     assert_equal true, @ip.include?(included)
@@ -164,11 +164,11 @@ class IPv6Test < Test::Unit::TestCase
     assert_equal true, @ip.include?(included)
     assert_equal false, @ip.include?(not_included)
   end
-  
+
   def test_method_to_hex
     assert_equal @hex, @ip.to_hex
   end
-  
+
   def test_method_to_s
     assert_equal "2001:db8::8:800:200c:417a", @ip.to_s
   end
@@ -178,10 +178,10 @@ class IPv6Test < Test::Unit::TestCase
   end
 
   def test_method_to_string_uncompressed
-    str = "2001:0db8:0000:0000:0008:0800:200c:417a/64" 
+    str = "2001:0db8:0000:0000:0008:0800:200c:417a/64"
     assert_equal str, @ip.to_string_uncompressed
   end
-  
+
   def test_method_data
     if RUBY_VERSION < "2.0"
       str = " \001\r\270\000\000\000\000\000\b\b\000 \fAz"
@@ -199,8 +199,16 @@ class IPv6Test < Test::Unit::TestCase
   def test_method_rev_domains
     assert_equal ["e.ip6.arpa", "f.ip6.arpa"], @klass.new("f000:f100::/3").rev_domains
     assert_equal ["2.a.e.f.ip6.arpa", "3.a.e.f.ip6.arpa"], @klass.new("fea3:f120::/15").rev_domains
-    assert_equal ["2.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa",
-                  "3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa"],
+    assert_equal ["f.0.0.0.0.8.f.2.3.0.a.3.ip6.arpa"], @klass.new("3a03:2f80:f::/48").rev_domains
+
+    assert_equal ["0.3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa",
+                  "1.3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa",
+                  "2.3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa",
+                  "3.3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa",
+                  "4.3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa",
+                  "5.3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa",
+                  "6.3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa",
+                  "7.3.2.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.f.0.0.0.f.ip6.arpa"],
                   @klass.new("f000:f100::1234/125").rev_domains
   end
 
@@ -214,15 +222,15 @@ class IPv6Test < Test::Unit::TestCase
     assert_equal "1::1", @klass.new("1:0:0:0:0:0:0:1").compressed
     #assert_equal "1:1::1:2:0:0:1", @klass.new("1:1:0:1:2::1").compressed
   end
-  
+
   def test_method_unspecified?
     assert_equal true, @klass.new("::").unspecified?
-    assert_equal false, @ip.unspecified?    
+    assert_equal false, @ip.unspecified?
   end
-  
+
   def test_method_loopback?
     assert_equal true, @klass.new("::1").loopback?
-    assert_equal false, @ip.loopback?        
+    assert_equal false, @ip.loopback?
   end
 
   def test_method_network
@@ -244,11 +252,24 @@ class IPv6Test < Test::Unit::TestCase
   end
 
   def test_method_each_net
-    ip = @klass.new("fd01:db8::4/3")
-    arr = []
-    ip.each_net {|i| arr << i.to_string}
-    expected = ["e000::/3","f000::/3"]
-    assert_equal expected, arr
+    test_addrs = []
+    (0..15).each do |nibble|
+      test_addrs << (0..7).to_a.map{(0..3).to_a.map{"%x"%nibble}.join("")}.join(":")
+    end
+    (0..128).each do |prefix|
+      nr_networks = 1<<((128-prefix)%4)
+      test_addrs.each do |adr|
+        net_adr = @klass.new("#{adr}/#{prefix}")
+        ret = net_adr.four_bit_networks
+        assert_equal ret.first.prefix.to_i%4, 0
+        assert_equal ret.size, nr_networks
+        assert_equal net_adr.network_u128, ret.first.network_u128
+        assert_equal net_adr.broadcast_u128, ret.last.broadcast_u128
+#        puts "#{adr}/#{prefix} #{nr_networks} #{ret}"
+      end
+    end
+    assert_equal ["e000::/4","f000::/4"], @klass.new("fd01:db8::4/3").four_bit_networks.map{|i| i.to_string}
+    assert_equal ["3a03:2f80:f::/48"], @klass.new("3a03:2f80:f::/48").four_bit_networks.map{|i| i.to_string}
   end
 
   def test_method_compare
@@ -260,7 +281,7 @@ class IPv6Test < Test::Unit::TestCase
     # ip2 should be greater than ip1
     assert_equal true, ip2 > ip1
     assert_equal false, ip1 > ip2
-    assert_equal false, ip2 < ip1        
+    assert_equal false, ip2 < ip1
     # ip3 should be less than ip2
     assert_equal true, ip2 > ip3
     assert_equal false, ip2 < ip3
@@ -287,7 +308,7 @@ class IPv6Test < Test::Unit::TestCase
     assert_not_equal expanded, @klass.expand("2001:0db8::cd30")
     assert_not_equal expanded, @klass.expand("2001:0db8::cd3")
   end
-  
+
   def test_classmethod_compress
     compressed = "2001:db8:0:cd30::"
     expanded = "2001:0db8:0000:cd30:0000:0000:0000:0000"
@@ -318,7 +339,7 @@ class IPv6Test < Test::Unit::TestCase
 end # class IPv6Test
 
 class IPv6UnspecifiedTest < Test::Unit::TestCase
-  
+
   def setup
     @klass = IPAddress::IPv6::Unspecified
     @ip = @klass.new
@@ -347,12 +368,12 @@ class IPv6UnspecifiedTest < Test::Unit::TestCase
   def test_method_ipv6?
     assert_equal true, @ip.ipv6?
   end
-  
+
 end # class IPv6UnspecifiedTest
 
 
 class IPv6LoopbackTest < Test::Unit::TestCase
-  
+
   def setup
     @klass = IPAddress::IPv6::Loopback
     @ip = @klass.new
@@ -381,11 +402,11 @@ class IPv6LoopbackTest < Test::Unit::TestCase
   def test_method_ipv6?
     assert_equal true, @ip.ipv6?
   end
-  
+
 end # class IPv6LoopbackTest
 
 class IPv6MappedTest < Test::Unit::TestCase
-  
+
   def setup
     @klass = IPAddress::IPv6::Mapped
     @ip = @klass.new("::172.16.10.1")
@@ -444,5 +465,5 @@ class IPv6MappedTest < Test::Unit::TestCase
   def test_mapped?
     assert_equal true, @ip.mapped?
   end
-  
+
 end # class IPv6MappedTest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: construqt-ipaddress
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - Marco Ceresa
@@ -40,7 +40,8 @@ files:
 - test/ipaddress_test.rb
 - test/test_helper.rb
 homepage: http://github.com/bluemonk/ipaddress
-licenses: []
+licenses:
+- Simple from Marco Ceresa
 metadata: {}
 post_install_message: 
 rdoc_options: []