vipnet_parser 0.0.5 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 412976a93107392b94f27890186cc98f02930536
-  data.tar.gz: 1717777e8beb43cd21e4853011b3901dffd38e48
+  metadata.gz: d834041f66023f7257a3a5a3eb3d86d3aae798ed
+  data.tar.gz: 12061630839986ebafb911c7b7e15926157a1a7c
 SHA512:
-  metadata.gz: f242154edba17fce0881e5a9647ead0282ab7be9847f7c0544e3e98cf7b5406035b2a1c2beade5fac983c530e53b0980194c2eee528fea28c524a9e74126b396
-  data.tar.gz: 1b90c4dacb6b683cb2944d146f85ca89833e794d571f0d8e7212e0557d37b66cca632b1c15be9d6cec8583af324e19fc93d98a6914346cb05cc1ccdedc1fe8ef
+  metadata.gz: 378f8d2f99939bef16a1d60651571ba829e097c7e998222271d6bfcfbce606be3a3aa51628ae834a14a6628d1f9e893bd75fa4d4235185c0e09e48e6cc1feff2
+  data.tar.gz: 31b653b65ba55eab00aa7dff8e83ff7155166b5b804b388755dc3ab696ea4527b802b1400b90a2d64fb191b32ce4a4c35edc3b13af3e9b369b2d2d06059b2e6b

data/lib/vipnet_parser.rb

@@ -7,24 +7,66 @@ class VipnetParser
     res
   end
 
-  def self.id(string)
-    if string =~ /(.*)0x([0-9a-f]{1,8})-0x([0-9a-f]{1,8})(.*)/
-      interval_begin = Regexp.last_match(2).to_i(16)
-      interval_end = Regexp.last_match(3).to_i(16)
-      return [] if interval_end < interval_begin
-      vipnet_ids = Array.new
-      (interval_end - interval_begin + 1).times do |n|
-        vipnet_ids.push("0x#{(interval_begin + n).to_s(16).rjust(8, '0')}")
+  def self.id(args)
+    if args.class == String
+      string = args
+      array = Array.new
+    elsif args.class == Hash
+      string = args[:string]
+      array = args[:array]
+      threshold = args[:threshold]
+    end
+    array = [] unless array
+    regexps = {
+      /(.*)(0x[0-9a-f]{1,8}-0x[0-9a-f]{1,8})(.*)/m => method(:id_parse_variant1),
+      /(.*)([0-9A-F]{8})(.*)/m => method(:id_parse_variant2),
+      /(.*)0x([0-9a-f]{1,8})(.*)/m => method(:id_parse_variant3),
+    }
+    string_matches_anything = false
+    regexps.each do |regexp, callback|
+      if string =~ regexp && !string_matches_anything
+        string_matches_anything = true
+        array += callback.call({ string: Regexp.last_match(2), threshold: threshold })
+        if Regexp.last_match(1) != ""
+          array += VipnetParser::id({ string: Regexp.last_match(1), array: array, threshold: threshold })
+        end
+        if Regexp.last_match(3) != ""
+          array += VipnetParser::id({ string: Regexp.last_match(3), array: array, threshold: threshold })
+        end
       end
-      return vipnet_ids
     end
-    if string =~ /(.*)([0-9A-F]{8})(.*)/
-      return ["0x" + Regexp.last_match(2).downcase]
+    if string_matches_anything
+      return array.uniq.sort
+    else
+      return []
     end
-    if string =~ /(.*)0x([0-9a-f]{1,8})(.*)/
-      return ["0x" + Regexp.last_match(2).to_s.rjust(8, "0")]
+  end
+
+  def self.id_parse_variant1(args)
+    string = args[:string]
+    threshold = args[:threshold]
+    string =~ /0x([0-9a-f]{1,8})-0x([0-9a-f]{1,8})/
+    interval_begin = Regexp.last_match(1).to_i(16)
+    interval_end = Regexp.last_match(2).to_i(16)
+    return [] if interval_end < interval_begin
+    if threshold
+      return [] if interval_end - interval_begin + 1 > threshold
     end
-    false
+    array = Array.new
+    (interval_end - interval_begin + 1).times do |n|
+      array.push("0x#{(interval_begin + n).to_s(16).rjust(8, '0')}")
+    end
+    array
+  end
+
+  def self.id_parse_variant2(args)
+    string = args[:string]
+    ["0x" + string.downcase]
+  end
+
+  def self.id_parse_variant3(args)
+    string = args[:string]
+    ["0x" + string.rjust(8, "0")]
   end
 
   def self.network(id)
@@ -35,6 +77,8 @@ class VipnetParser
     end
     false
   end
+
+  private_class_method :id_parse_variant1, :id_parse_variant2, :id_parse_variant3
 end
 
 class Iplirconf < VipnetParser

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vipnet_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: '0.1'
 platform: ruby
 authors:
 - Alexander Morozov