vipnet_parser 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5c5241f638c3d35c981955f9192acc9920eca39
-  data.tar.gz: 4b749d623deaf05fcf21afe195be1f05c68859a1
+  metadata.gz: 18ba9d681a3e5cc40c4c06aaf20fa3fe75733b60
+  data.tar.gz: 265358e6ef795a63c222842de5734456020d57f7
 SHA512:
-  metadata.gz: 9e966f520bbe3cccde867ab8a5c8a93ebc4221bfdfb30de32ba6edc658cc762226f546d7cfa14fd03aead1b667addc09e0f55f19a54e221393fe5d3a91dc102e
-  data.tar.gz: 97d3a90b289dd98a4865ef3c2fc608201a7587ba8aafbfe21a4beaee431a275136f2e458c12a13981098a78b0fa22a9d8880c6f5e57172e3ac3eac53932b6b70
+  metadata.gz: 67962aa3f924045d0a1a2958f1477a952f15fa6172e9456f5c4b459d06c4fbca4eda6b5b81409b29918b1901238042826dd9e0599c0bda01a0c89d276c09b52c
+  data.tar.gz: cd51472f23c9aa2a71ef79ae7e774ace2a8d4f0840361b9fa06d728fd6d1dbf43b06be1c1fd2cf00d2e9f36d0b9b30f89fd15954e5b590b80fa225005a0123c0

data/lib/vipnet_parser/iplirconf.rb

@@ -8,7 +8,14 @@ module VipnetParser
       @string = iplirconf_file
     end
 
-    def parse(format = :hash, encoding = "koi8-r")
+    DEFAULT_PARSE_ARGS = { format: :hash, encoding: "koi8-r", normalize_names: false }
+
+    def parse(args = DEFAULT_PARSE_ARGS)
+      args = DEFAULT_PARSE_ARGS.merge(args)
+      format = args[:format]
+      encoding = args[:encoding]
+      normalize_names = args[:normalize_names]
+
       # change encoding to utf8 and remove comments
       string = self.string
         .force_encoding(encoding)
@@ -35,7 +42,7 @@ module VipnetParser
 
       case format
       when :hash
-        @hash = { _meta: { version: "1" }}
+        @hash = { _meta: { version: "3" }}
         hash_keys = {
           id: :id,
           adapter: :name,
@@ -47,6 +54,13 @@ module VipnetParser
           if hash_key
             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)
+            name = @hash[section[:name]][current_key][:name]
+            if name && normalize_names
+              @hash[section[:name]][current_key][:name] = VipnetParser.name(name, current_key)
+            end
           else
             hash, _ = _section_hash(section[:content])
             @hash[section[:name]] = hash

data/lib/vipnet_parser/nodename.rb

@@ -8,7 +8,14 @@ module VipnetParser
       @string = nodename_file
     end
 
-    def parse(format = :hash, encoding = "cp866")
+    DEFAULT_PARSE_ARGS = { format: :hash, encoding: "cp866", normalize_names: false }
+
+    def parse(args = DEFAULT_PARSE_ARGS)
+      args = DEFAULT_PARSE_ARGS.merge(args)
+      format = args[:format]
+      encoding = args[:encoding]
+      normalize_names = args[:normalize_names]
+
       # change encoding to utf8
       string = self.string
         .force_encoding(encoding)
@@ -16,14 +23,15 @@ module VipnetParser
 
       case format
       when :hash
-        @hash = { _meta: { version: "1" }, id: {} }
+        @hash = { _meta: { version: "3" }, id: {} }
 
         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]]
-          normal_id = VipnetParser::id(record[:id]).first
+          normal_id = VipnetParser.id(record[:id]).first
+          record[:name] = VipnetParser.name(record[:name], normal_id) if normalize_names
           record.delete(:id)
           @hash[:id][normal_id] = record
         end

data/lib/vipnet_parser/strings.rb

@@ -35,6 +35,7 @@ module VipnetParser
         end
       end
     end
+
     if string_matches_anything
       return array.uniq.sort
     else
@@ -56,6 +57,7 @@ module VipnetParser
     (interval_end - interval_begin + 1).times do |n|
       array.push("0x#{(interval_begin + n).to_s(16).rjust(8, '0')}")
     end
+
     array
   end
 
@@ -75,8 +77,21 @@ module VipnetParser
       normal_id = normal_ids[0]
       return id[2..5].to_i(16).to_s(10)
     end
+
     false
   end
 
-  module_function :id, :network
+  MAX_NAME_SIZE = 50
+
+  def name(name, vid)
+    return name unless name.size == MAX_NAME_SIZE
+    network = network(vid)
+    search_range = (MAX_NAME_SIZE - network.size..-1)
+    inverted_search_range = (0..MAX_NAME_SIZE - network.size - 1)
+    return name[inverted_search_range].strip if name[search_range] == network
+
+    name
+  end
+
+  module_function :id, :network, :name
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vipnet_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-20 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies: []
-description: Parses ViPNet IDs, iplir.conf and other files
+description: Parses ViPNet™ IDs, iplir.conf and other files
 email: ntcomp12@gmail.com
 executables: []
 extensions: []
@@ -41,8 +41,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: ViPNet strings parser
+summary: ViPNet™ strings parser
 test_files: []