subnet_calc 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f08208310333a341c9f31757534e9e40986c827
-  data.tar.gz: c7a36481efddf08a866a1ed2697f49f0044dbfd4
+  metadata.gz: bfe95c8c2371bb03c0efbd706989a2f222e9b5c0
+  data.tar.gz: 3ca24defd9741771d4d4f5cae620803e73fcecfe
 SHA512:
-  metadata.gz: 71f6d30b105979461de671031e9ded95c93f98db2808571d3f63462908a3c7194502a75d73c5e1769b9ad20dfe08c667401665df464176158573991314194159
-  data.tar.gz: a0bce9a42f943f9e654a25abb4aaad74c1bafc5955dfed872218f477aeea9508eb71e6bd5100ce105376e317035efc2de149439626177212f5956a86ec95cbeb
+  metadata.gz: ef8dbcec7e56ad18c6cf949aa0d2c77465f772b3d1e3072bc86b6f46cb0fa25bfe40a9f0102e29ea795a1462a57ab7b1a283257a2c8407a406b5d56dcae163ea
+  data.tar.gz: 57062c36c999592ee8bc9fe2b7e58303ebafaa3db4d77146791351e97c5138c87abca5bbe0916ed5470e8868a8d8273127dd5477f023ce27445b42b91e88a2c9

data/lib/subnet_calc.rb

@@ -90,7 +90,7 @@ class SubnetCalc
     end    
 
     # determine what class of network we are using
-    class_type = (hosts and hosts <= 254 or prefix >= 24) ? 'c' : 'b'
+    class_type = ((hosts and hosts <= 254) or (prefix and prefix >= 24)) ? 'c' : 'b'
 
     # Identify the network bits and the host bits
 
@@ -114,7 +114,8 @@ class SubnetCalc
 
     bit = octets[octet_n].bits[col]
 
-    magic_number, prefix = bit.hosts_per_subnet, bit.prefix    
+    magic_number, hosts_per_subnet, prefix = bit.decimal, 
+        bit.hosts_per_subnet, bit.prefix
     
     no_of_subnets = (2 ** 8.0) / bit.hosts_per_subnet
 
@@ -129,7 +130,7 @@ class SubnetCalc
 
     subnets = case class_type
     when 'c'
-      class_subnets(segments, magic_number)
+      class_subnets(segments, hosts_per_subnet)
     when 'b'
       class_b_subnets(256 / segments, bit.decimal)
     end
@@ -142,7 +143,7 @@ class SubnetCalc
     result = {
       class_type: class_type.upcase,
       magic_number: magic_number,
-      hosts: magic_number - 2,
+      hosts: hosts_per_subnet - 2,
       subnet_mask: subnet_mask,
       subnet_bitmask: subnet_mask.split('.').map {|x| x.to_i.to_s(2)},
       prefix: prefix,
@@ -199,7 +200,7 @@ Summary
 
 * Network class: #{@h[:class_type]}
 * magic number: #{@h[:magic_number]}
-* hosts per subnet (magic number - 2 ): #{@h[:hosts]}
+* hosts per subnet: #{@h[:hosts]}
 * subnet mask: #{@h[:subnet_mask]}
 * subnet bitmask: #{@h[:subnet_bitmask].join('.')}
 * prefix bit-length: #{@h[:prefix]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subnet_calc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson