vipnet_parser 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d834041f66023f7257a3a5a3eb3d86d3aae798ed
-  data.tar.gz: 12061630839986ebafb911c7b7e15926157a1a7c
+  metadata.gz: 6c12c7a620a2e80a808e81ef380e3c84ef4498a4
+  data.tar.gz: b5c9c4dd56f9cc43619ea7109705e628cc3fb513
 SHA512:
-  metadata.gz: 378f8d2f99939bef16a1d60651571ba829e097c7e998222271d6bfcfbce606be3a3aa51628ae834a14a6628d1f9e893bd75fa4d4235185c0e09e48e6cc1feff2
-  data.tar.gz: 31b653b65ba55eab00aa7dff8e83ff7155166b5b804b388755dc3ab696ea4527b802b1400b90a2d64fb191b32ce4a4c35edc3b13af3e9b369b2d2d06059b2e6b
+  metadata.gz: c6c2300da35ea7e80b52899f17a5ca24063ba09db10625677e22c7d198b19e4cf8bc9c729fe103ca98ff01c28313fab6c32b5db9e6d39c600bd03adb34817697
+  data.tar.gz: 83d219af3d3cd9395db168783b08f9b14b70479849b41be6a4a3ce737bb29b04a913b626920130026bf117ebbc1582e6afdfab0675737c03d2fbb2c45d615c2b

data/lib/vipnet_parser.rb

@@ -1,13 +1,5 @@
-class VipnetParser
-  def ==(other)
-    res = true
-    @props.each do |prop|
-      res = res && self.send(prop.to_s) == other.send(prop.to_s)
-    end
-    res
-  end
-
-  def self.id(args)
+module VipnetParser
+  def id(args)
     if args.class == String
       string = args
       array = Array.new
@@ -27,11 +19,10 @@ class VipnetParser
       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 })
+        [Regexp.last_match(1), Regexp.last_match(3)].each do |side_match|
+          unless side_match.empty?
+            array += id({ string: side_match, array: array, threshold: threshold })
+          end
         end
       end
     end
@@ -69,7 +60,7 @@ class VipnetParser
     ["0x" + string.rjust(8, "0")]
   end
 
-  def self.network(id)
+  def network(id)
     normal_ids = id(id)
     if normal_ids
       normal_id = normal_ids[0]
@@ -78,115 +69,125 @@ class VipnetParser
     false
   end
 
-  private_class_method :id_parse_variant1, :id_parse_variant2, :id_parse_variant3
-end
-
-class Iplirconf < VipnetParser
-  PROPS = [:content, :id, :sections]
-  attr_accessor *PROPS, :last_error
-  private_constant :PROPS
+  module_function :id, :network
 
-  def initialize(*args)
-    @props = PROPS
-    unless args.size == 1
-      return false
-    end
-    @content = args[0]
-    # remove comments
-    content_nc = @content.gsub(/^#.*\n/, "")
-    # remove ending
-    @sections = Hash.new
-    adapter_position = content_nc.index("[adapter]")
-    unless adapter_position
-      @last_error = "unable to parse iplirconf (no [adapter] section)"
-      return false
+  class VipnetParser
+    def ==(other)
+      res = true
+      @props.each do |prop|
+        res = res && self.send(prop.to_s) == other.send(prop.to_s)
+      end
+      res
     end
-    # prepare for split
-    content_nc = content_nc[0..(adapter_position - 2)]
-    content_nc = "\n" + content_nc
-    content_nc.split("\n[id]\n").reject{ |t| t.empty? }.each_with_index do |section_content, i|
-      tmp_section = Hash.new
-      props = {
-        :single => [
-          :id, :name, :filterdefault, :tunnel,
-          :firewallip, :port, :proxyid, :dynamic_timeout, :accessip,
-          :usefirewall, :fixfirewall, :virtualip, :version,
-        ],
-        :multi => [:ip, :filterudp, :filtertcp]
-      }
-      props.each do |type, props|
-        props.each do |prop|
-          get_section_param({ prop: prop, section: tmp_section, content: section_content, type: type })
+  end
+
+  class Iplirconf < VipnetParser
+    PROPS = [:content, :id, :sections]
+    attr_accessor *PROPS, :last_error
+    private_constant :PROPS
+
+    def initialize(*args)
+      @props = PROPS
+      unless args.size == 1
+        return false
+      end
+      @content = args[0]
+      # remove comments
+      content_nc = @content.gsub(/^#.*\n/, "")
+      # remove ending
+      @sections = Hash.new
+      adapter_position = content_nc.index("[adapter]")
+      unless adapter_position
+        @last_error = "unable to parse iplirconf (no [adapter] section)"
+        return false
+      end
+      # prepare for split
+      content_nc = content_nc[0..(adapter_position - 2)]
+      content_nc = "\n" + content_nc
+      content_nc.split("\n[id]\n").reject{ |t| t.empty? }.each_with_index do |section_content, i|
+        tmp_section = Hash.new
+        props = {
+          :single => [
+            :id, :name, :filterdefault, :tunnel,
+            :firewallip, :port, :proxyid, :dynamic_timeout, :accessip,
+            :usefirewall, :fixfirewall, :virtualip, :version,
+          ],
+          :multi => [:ip, :filterudp, :filtertcp]
+        }
+        props.each do |type, props|
+          props.each do |prop|
+            get_section_param({ prop: prop, section: tmp_section, content: section_content, type: type })
+          end
         end
+        # self section id
+        @id = tmp_section[:id] if i == 0
+        @sections[tmp_section[:id]] = tmp_section
       end
-      # self section id
-      @id = tmp_section[:id] if i == 0
-      @sections[tmp_section[:id]] = tmp_section
+      true
     end
-    true
-  end
 
-  def get_section_param(args)
-    value_regexp = Regexp.new("^#{args[:prop].to_s}=\s(.*)$")
-    if args[:type] == :multi
-      tmp_array = Array.new
-      args[:content].each_line do |line|
-        value = line[value_regexp, 1]
-        tmp_array.push(value) if value
+    def get_section_param(args)
+      value_regexp = Regexp.new("^#{args[:prop].to_s}=\s(.*)$")
+      if args[:type] == :multi
+        tmp_array = Array.new
+        args[:content].each_line do |line|
+          value = line[value_regexp, 1]
+          tmp_array.push(value) if value
+        end
+        args[:section][args[:prop]] = tmp_array unless tmp_array.empty?
+      elsif args[:type] == :single
+        value = args[:content][value_regexp, 1]
+        args[:section][args[:prop]] = value if value
       end
-      args[:section][args[:prop]] = tmp_array unless tmp_array.empty?
-    elsif args[:type] == :single
-      value = args[:content][value_regexp, 1]
-      args[:section][args[:prop]] = value if value
     end
-  end
 
-  private :get_section_param
-end
+    private :get_section_param
+  end
 
-class Nodename < VipnetParser
-  PROPS = [:content, :records]
-  attr_accessor *PROPS, :last_error
-  private_constant :PROPS
+  class Nodename < VipnetParser
+    PROPS = [:content, :records]
+    attr_accessor *PROPS, :last_error
+    private_constant :PROPS
 
-  def initialize(*args)
-    @props = PROPS
-    unless args.size == 1
-      return false
-    end
-    @content = args[0]
-    lines = content.force_encoding("cp866").encode("utf-8", replace: nil).split("\r\n")
-    if lines.size == 0
-      @last_error = "error parsing nodename"
-      return false
+    def initialize(*args)
+      @props = PROPS
+      unless args.size == 1
+        return false
+      end
+      @content = args[0]
+      lines = content.force_encoding("cp866").encode("utf-8", replace: nil).split("\r\n")
+      if lines.size == 0
+        @last_error = "error parsing nodename"
+        return false
+      end
+      @records = Hash.new
+      lines.each do |line|
+        tmp_record = Hash.new
+        tmp_record = get_record_params(line)
+        tmp_record[:name].rstrip!
+        tmp_record[:enabled] = { "1" => true, "0" => false }[tmp_record[:enabled]]
+        tmp_record[:category] = { "A" => :client, "S" => :server, "G" => :group }[tmp_record[:category]]
+        @records[tmp_record[:id]] = tmp_record
+      end
+      true
     end
-    @records = Hash.new
-    lines.each do |line|
-      tmp_record = Hash.new
-      tmp_record = get_record_params(line)
-      tmp_record[:name].rstrip!
-      tmp_record[:enabled] = { "1" => true, "0" => false }[tmp_record[:enabled]]
-      tmp_record[:category] = { "A" => :client, "S" => :server, "G" => :group }[tmp_record[:category]]
-      @records[tmp_record[:id]] = tmp_record
+
+    def get_record_params(line)
+      record_regexp = /^
+        (?<name>.{50})\s
+        (?<enabled>[01])\s
+        (?<category>[ASG])\s
+        [0-9A-F]{8}
+        (?<server_number>[0-9A-F]{4})
+        (?<abonent_number>[0-9A-F]{4})\s
+        (?<id>[0-9A-F]{8})
+      $/x
+      match = record_regexp.match(line)
+      names = match.names.map { |name| name.to_sym }
+      # https://gist.github.com/flarnie/6221219
+      return Hash[names.zip(match.captures)]
     end
-    true
-  end
 
-  def get_record_params(line)
-    record_regexp = /^
-      (?<name>.{50})\s
-      (?<enabled>[01])\s
-      (?<category>[ASG])\s
-      [0-9A-F]{8}
-      (?<server_number>[0-9A-F]{4})
-      (?<abonent_number>[0-9A-F]{4})\s
-      (?<id>[0-9A-F]{8})
-    $/x
-    match = record_regexp.match(line)
-    names = match.names.map { |name| name.to_sym }
-    # https://gist.github.com/flarnie/6221219
-    return Hash[names.zip(match.captures)]
+    private :get_record_params
   end
-
-  private :get_record_params
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vipnet_parser
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Alexander Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies: []
-description: Parses ViPNet strings like 'something 1A0EABCD something' and returns
-  0x1a0eabcd (and stuff).
+description: Parses ViPNet strings like 'something 1A0EABCD something', iplir.conf
+  and other files.
 email: ntcomp12@gmail.com
 executables: []
 extensions: []