subnet_calc 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfe95c8c2371bb03c0efbd706989a2f222e9b5c0
-  data.tar.gz: 3ca24defd9741771d4d4f5cae620803e73fcecfe
+  metadata.gz: c6269772bdd1895f45f3d245d545d2f1f38c0c0b
+  data.tar.gz: 4b7c062156c81833fb15752a8f0546d6f7490632
 SHA512:
-  metadata.gz: ef8dbcec7e56ad18c6cf949aa0d2c77465f772b3d1e3072bc86b6f46cb0fa25bfe40a9f0102e29ea795a1462a57ab7b1a283257a2c8407a406b5d56dcae163ea
-  data.tar.gz: 57062c36c999592ee8bc9fe2b7e58303ebafaa3db4d77146791351e97c5138c87abca5bbe0916ed5470e8868a8d8273127dd5477f023ce27445b42b91e88a2c9
+  metadata.gz: e89aa0d80d8cd8e5777375d601bbf6950ed8ffdf6bd8ed9965b2a2fcd9319136fa203cb0d84ecc6fb19f344a0fcc2f63c224da6309252d698f300ace9b1fb607
+  data.tar.gz: 52a283f8937e9ff97c31429e1881e218afe95cf71b79a3db338b00d51d94ffd434c670c258ccb3146d53a7c5efa534a368eba1bfc06de7959d3f122a4e33900f

data/lib/subnet_calc.rb

@@ -22,7 +22,7 @@ class SubnetCalc
 
   using Ordinals
 
-  attr_reader :to_h
+  attr_reader :to_h, :octets
 
   def initialize(inputs={})
 
@@ -64,11 +64,13 @@ class SubnetCalc
 
     end
     
+    @octets = octets
+    
 
     # ------------------------------------
 
 
-    octet_n, col = if hosts then
+    octet_n, col, class_type = if hosts then
       
       hosts_per_subnet = octets.flat_map.with_index do |octet,i| 
         octet.bits.map.with_index {|y,j| [i, j, y.hosts_per_subnet] }
@@ -77,7 +79,18 @@ class SubnetCalc
       # find the smallest decimal value to match the 
       # required number of hosts on a network    
       
-      hosts_per_subnet.reverse.detect {|x| x.last >  hosts + 1}    
+      *r, _ = hosts_per_subnet.reverse.detect {|x| x.last >  hosts + 1}    
+      
+      network = case hosts
+      when 1..254
+        'c'
+      when 255..65534
+        'b'
+      else
+        'a'
+      end
+      
+      (r + [network])
     
     elsif prefix
 
@@ -85,12 +98,20 @@ class SubnetCalc
         octet.map.with_index {|x,j| [i, j, x]}
       end
       
-      prefixes.detect {|x| x.last == prefix}
-    
+      *r, _ = prefixes.detect {|x| x.last == prefix}
+      
+      network = case prefix
+      when 24..32
+        'c'
+      when 16..23
+        'b'
+      else
+        'a'
+      end
+      
+      (r + [network])
     end    
 
-    # determine what class of network we are using
-    class_type = ((hosts and hosts <= 254) or (prefix and prefix >= 24)) ? 'c' : 'b'
 
     # Identify the network bits and the host bits
 
@@ -111,7 +132,6 @@ class SubnetCalc
     end
 
 
-
     bit = octets[octet_n].bits[col]
 
     magic_number, hosts_per_subnet, prefix = bit.decimal, 
@@ -119,8 +139,7 @@ class SubnetCalc
     
     no_of_subnets = (2 ** 8.0) / bit.hosts_per_subnet
 
-    segments = (no_of_subnets >= 1 ? no_of_subnets : 
-                256 / (256 * no_of_subnets)).to_i
+    segments = (no_of_subnets >= 1 ? no_of_subnets : (1 / no_of_subnets)).to_i
     n =  col
 
     # add the new mask to the octet
@@ -133,6 +152,8 @@ class SubnetCalc
       class_subnets(segments, hosts_per_subnet)
     when 'b'
       class_b_subnets(256 / segments, bit.decimal)
+    when 'a'
+      class_a_subnets(256  ** 2 / segments, bit.decimal)      
     end
 
     ip = (default_inputs[:ip] + ' ') .split('.')[0..octet_n-1]
@@ -145,7 +166,8 @@ class SubnetCalc
       magic_number: magic_number,
       hosts: hosts_per_subnet - 2,
       subnet_mask: subnet_mask,
-      subnet_bitmask: subnet_mask.split('.').map {|x| x.to_i.to_s(2)},
+      subnet_bitmask: subnet_mask.split('.').map \
+                                  {|x| ('0' * 7 + x.to_i.to_s(2))[-8..-1]},
       prefix: prefix,
       subnets: subnets,
       range: "%s-%s" % [first_ip, last_ip],
@@ -160,7 +182,6 @@ class SubnetCalc
 
   def to_s()
 
-
     tfo = TableFormatter.new
 
     tfo.source = @h[:subnets].map.with_index do |x,i|
@@ -244,9 +265,7 @@ EOF
       broadcast = i + block_size - 1
       first = i + 1
       last = broadcast - 1
-      
-
-      
+        
       h = if block_given? then
         yield(i,first,last,broadcast)
       else
@@ -274,7 +293,21 @@ EOF
     end    
     
   end  
-  
+
+  def class_a_subnets(n, block_size)
+    
+    class_subnets(n, block_size) do |network, first, last, broadcast|
+      
+      {
+        network: [network, 0, 0].join('.'), 
+        first: [network, 1, 1].join('.'), 
+        last: [broadcast, 255, 254].join('.'), 
+        broadcast: [broadcast, 255, 255].join('.')
+      }
+                
+    end    
+    
+  end    
   
   def indent(s, i=2)
     s.lines.map{|x| ' ' * i + x}.join

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subnet_calc
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   oAH9dWawpFIItSVexeVF4ycrINDboVQH/q93Udr9ZLbwux6Dp2bpsAxyXAdIw+Um
   ZWJvjR10ewlMyQ==
   -----END CERTIFICATE-----
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kvx