vipnet_parser 2.0.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7970f04e800c4708b908008d233b801145a23ba6
-  data.tar.gz: ade58764a0627fbee189144d7891824b1394d447
+  metadata.gz: 0018f8a0e0d0d113c4e1e5c203a2a498e52575b6
+  data.tar.gz: 01d8e9fc145b3ea3ffa321ea8a5f5f99fa0df178
 SHA512:
-  metadata.gz: db265c3b81ebfbfa511b289be370d6aa2e439e51042335495ca957b8dab16bee2a79581ac849da15753fe7070113668acb9265fbcae142fd5e8106f216d19be1
-  data.tar.gz: 6fda0aa8af392f7a76d430fe0e29b744bd013ba9fff680f65ce43232e95dc1587c3b900f1363f27082c06151ca092f9e19988c9e69eb3044dcba05dd925fd0e7
+  metadata.gz: 93f780cb24ab89dbc740feadd338d97ff570cb13578f73dd0f7fa357363e3904f6cc30a1b821077098d821cf2cefdab2d2d501e73eb7242c6060f7489dbab3d1
+  data.tar.gz: fde5be2a5e48a79ee5bdc6d59bf99951c8df98143d9ad7c098355dddd3e7e651bfb57b90a7a5016031de5f61056e12ca211d2a74eb5b728e4e2d21cd00c7b3cf

data/lib/vipnet_parser/iplirconf.rb

@@ -8,25 +8,33 @@ module VipnetParser
       @string = iplirconf_file
     end
 
-    DEFAULT_PARSE_ARGS = { format: :hash, encoding: "koi8-r", normalize_names: false }
+    DEFAULT_PARSE_ARGS = {
+      format: :hash,
+      encoding: "koi8-r",
+      normalize_names: false,
+    }
 
     def parse(args = DEFAULT_PARSE_ARGS)
       args = DEFAULT_PARSE_ARGS.merge(args)
-      format, encoding, normalize_names = args.values_at(:format, :encoding, :normalize_names)
+      format, encoding, normalize_names = args.values_at(
+        :format, :encoding, :normalize_names,
+      )
 
-      # change encoding to utf8 and remove comments
+      # Change encoding to utf8 and remove comments.
       string = self.string
-        .force_encoding(encoding)
-        .encode("utf-8")
-        .gsub(/^#.*\n/, "")
-        .gsub(/^;.*\n/, "")
+                   .force_encoding(encoding)
+                   .encode("utf-8")
+                   .gsub(/^#.*\n/, "")
+                   .gsub(/^;.*\n/, "")
 
       # "[id]something[server]something".split(/(?=\[.+\])/)
-      # => ["[id]something", "[server]something"]
+      # =>
+      # ["[id]something", "[server]something"]
       string = string.split(/(?=\[.+\])/)
 
       # ["[id]something1", "[server]something2"]
-      # => [
+      # =>
+      # [
       #   { name: :id, content: "something1" },
       #   { name: :server, content: "something2" },
       # ]
@@ -40,7 +48,7 @@ module VipnetParser
 
       case format
       when :hash
-        @hash = { _meta: { version: "3" }}
+        @hash = {}
         hash_keys = {
           id: :id,
           adapter: :name,
@@ -53,26 +61,44 @@ module VipnetParser
             hash, current_key = _section_hash(section[:content], hash_key)
             @hash[section[:name]][current_key] = hash
 
-            # normalize names
-            # (only available for [id] sections, which are processed with current_key == id)
+            # Normalize names.
+            # (Only available for [id] sections, which are processed with current_key == id.)
             name = @hash[section[:name]][current_key][:name]
-            if name && normalize_names
-              @hash[section[:name]][current_key][:name] = VipnetParser.name(name, current_key)
-            end
+            next unless name && normalize_names
+            name = VipnetParser.name(name, current_key)
+            @hash[section[:name]][current_key][:name] = name
           else
             hash, _ = _section_hash(section[:content])
             @hash[section[:name]] = hash
           end
         end
 
+        # Reduce [servers] section.
         # :servers => { :server => ["0x1a0e000a, coordinator1"] }
-        # => :servers => ["0x1a0e000a, coordinator1"]
+        # =>
+        # :servers => ["0x1a0e000a, coordinator1"]
         @hash[:servers] = @hash[:servers][:server] || nil
 
-        return @hash
+        @hash
       end
     end
 
+    # Returns config version.
+    # If misc => config_version isn't present, put "3",
+    # otherwise, get major version:
+    # "4.2.3-3" => "4".
+    def version
+      self.parse(format: :hash) unless self.hash
+      config_version = self.hash[:misc][:config_version]
+      parsed_config_version = if config_version
+                                config_version[0]
+                              else
+                                "3"
+                              end
+
+      parsed_config_version
+    end
+
     def _section_hash(section_content, hash_key = nil)
       hash = {}
 
@@ -81,8 +107,11 @@ module VipnetParser
           prop = Regexp.last_match(:prop).to_sym
           value = Regexp.last_match(:value)
 
-          # array-type props
-          if %i[ip filterudp filtertcp server].include?(prop)
+          array_props = %i(
+            ip filterudp filtertcp server
+            exclude_from_tunnels accessiplist subnet_real subnet_virtual
+          )
+          if array_props.include?(prop)
             if hash[prop]
               hash[prop].push(value)
             else
@@ -94,13 +123,11 @@ module VipnetParser
         end
       end
 
-      if hash_key && hash[hash_key]
-        current_key = hash[hash_key]
-        hash.delete(hash_key)
-        return [hash, current_key]
-      else
-        return hash
-      end
+      return hash unless hash_key && hash[hash_key]
+      current_key = hash[hash_key]
+      hash.delete(hash_key)
+
+      [hash, current_key]
     end
 
     private :_section_hash

data/lib/vipnet_parser/nodename.rb

@@ -8,17 +8,26 @@ module VipnetParser
       @string = nodename_file
     end
 
-    DEFAULT_PARSE_ARGS = { format: :hash, encoding: "cp866", normalize_names: false }
+    DEFAULT_PARSE_ARGS = {
+      format: :hash,
+      encoding: "cp866",
+      normalize_names: false,
+    }
 
     def parse(args = DEFAULT_PARSE_ARGS)
       args = DEFAULT_PARSE_ARGS.merge(args)
-      format, encoding, normalize_names = args.values_at(:format, :encoding, :normalize_names)
+      format, encoding, normalize_names = args.values_at(
+        :format, :encoding, :normalize_names,
+      )
 
-      # change encoding to utf8
+      # Change encoding to utf8.
       string = self.string
         .force_encoding(encoding)
         .encode("utf-8", replace: nil)
 
+      enable_aliases = { "1" => true, "0" => false }
+      group_aliases = { "A" => :client, "S" => :server, "G" => :group }
+
       case format
       when :hash
         @hash = { _meta: { version: "3" }, id: {} }
@@ -26,15 +35,17 @@ module VipnetParser
         string.split("\r\n").each do |line|
           record = _record_hash(line)
           record[:name].rstrip!
-          record[:enabled] = { "1" => true, "0" => false }[record[:enabled]]
-          record[:category] = { "A" => :client, "S" => :server, "G" => :group }[record[:category]]
+          record[:enabled] = enable_aliases[record[:enabled]]
+          record[:category] = group_aliases[record[:category]]
           normal_id = VipnetParser.id(record[:id]).first
-          record[:name] = VipnetParser.name(record[:name], normal_id) if normalize_names
+          if normalize_names
+            record[:name] = VipnetParser.name(record[:name], normal_id)
+          end
           record.delete(:id)
           @hash[:id][normal_id] = record
         end
 
-        return @hash
+        @hash
       end
     end
 
@@ -52,7 +63,7 @@ module VipnetParser
       names = match.names.map { |name| name.to_sym }
 
       # https://gist.github.com/flarnie/6221219
-      return Hash[names.zip(match.captures)]
+      Hash[names.zip(match.captures)]
     end
 
     private :_record_hash

data/lib/vipnet_parser/strings.rb

@@ -6,7 +6,10 @@ module VipnetParser
     elsif args.class == Hash
       string, array, threshold = args.values_at(:string, :array, :threshold)
     end
+    array ||= []
     string = string.downcase
+
+    # Substitute cyrillic symbols.
     cyrillic_sub = {
       "а" => "a", "б" => "b", "В" => "b", "с" => "c", "д" => "d", "е" => "e", "ф" => "f",
       "А" => "a", "Б" => "b", "в" => "b", "С" => "c", "Д" => "d", "Е" => "e", "Ф" => "f",
@@ -15,30 +18,28 @@ module VipnetParser
       string = string.gsub(cyr, lat)
     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)
-        [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
+      next if string_matches_anything
+      next unless string =~ regexp
+      string_matches_anything = true
+
+      array += callback.call(string: Regexp.last_match(2), 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
+    return [] unless string_matches_anything
 
-    if string_matches_anything
-      return array.uniq.sort
-    else
-      return []
-    end
+    array.uniq.sort
   end
 
   def self.id_parse_variant1(args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vipnet_parser
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Alexander Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies: []
 description: Parses ViPNet™ IDs, iplir.conf and other files
 email: ntcomp12@gmail.com