vipnet_parser 2.4.6 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c4590202f1956a350afab1e4176b6358e13975
-  data.tar.gz: 1f407a462dcb35869af77229dc49592e0a4b5c12
+  metadata.gz: fd4aac8bf2f2cea3f9bb09767fdff61ee56cd4f5
+  data.tar.gz: 26457db935a0e9f58b7ae5a2a25008d22ea90760
 SHA512:
-  metadata.gz: 7a566393249ea90c4eb02a1b0bff09fc464533806c6a03bac5ec541a6e7b49667496f9ca426152dda3b8683ee3ba3d480f391ec952c23e3c90147eb88e6437d9
-  data.tar.gz: 90eb57f3871ba558327b54a9df85ac31b5d50c6fb0c8aea29dfc629c070bc08017fe67343cdd2bbb8cf9df0c47347ba25cdac8672f5f69880bd27d71b5d80157
+  metadata.gz: 1966c6bc0f4b30eb88a80d5954fa0d74068538038f4409711ead9ca6a4617302a3fe6f648d9c847f68e91a2417f626ed51c84b9e447e6f2a03ce4adb7b2845b6
+  data.tar.gz: 4cdee64d7a7e96926eac5e9a14fb4c410c3f2a13196b7b2b04064ec313163dc2ecd48c510a6fc23570ea4c44318e95f7a1374331b5df4b3c3c6aebc0110a8827

data/lib/vipnet_parser/struct.rb

@@ -0,0 +1,136 @@
+require "vipnet_parser/vipnet_config"
+
+module VipnetParser
+  class Struct < VipnetConfig
+    attr_accessor :string, :hash
+
+    DEFAULT_PARSE_ARGS = {
+      format: :hash,
+      encoding: "cp866",
+    }
+
+    def parse(args = DEFAULT_PARSE_ARGS)
+      args = DEFAULT_PARSE_ARGS.merge(args)
+      format, encoding = args.values_at(
+        :format, :encoding, :normalize_names,
+      )
+
+      # Change encoding to utf8.
+      string = self.string
+        .force_encoding(encoding)
+        .encode("utf-8", replace: nil)
+
+      sign_aliases = { "+" => true, "-" => false }
+
+      case format
+      when :hash
+        @hash = { nodes: [] }
+
+        current_node_id = nil
+        previous_node = nil
+        current_usergroups = []
+        current_users = []
+        lines = string.split("\r\n")
+        lines.each_with_index do |line, line_index|
+          line_hash = _line_hash(line)
+          next unless line_hash
+
+          # Normalize data.
+          line_hash.each do |_, higher_name_hash|
+            next unless higher_name_hash.class == Hash
+
+            parsed_ids = VipnetParser.id(higher_name_hash[:id])
+            id =
+              if parsed_ids.size > 0
+                parsed_ids.first
+              else
+                nil
+              end
+            higher_name_hash[:id] = id
+
+            higher_name_hash[:name].rstrip!
+            if higher_name_hash[:name].size == 0
+              higher_name_hash[:name] = nil
+            end
+          end
+          line_hash[:node][:network_address].rstrip!
+          line_hash[:user][:sign] = sign_aliases[line_hash[:user][:sign]]
+          line_hash[:usergroup] = nil if (!line_hash[:usergroup][:id] && !line_hash[:usergroup][:name])
+
+          # first id
+          if !current_node_id && line_hash[:node][:id]
+            current_node_id = line_hash[:node][:id]
+          end
+
+          # initial previous node
+          if !previous_node
+            previous_node = line_hash[:node]
+          end
+
+          next_node_appears = (line_hash[:node][:id] && current_node_id != line_hash[:node][:id])
+          this_is_the_last_line = (line_index == lines.size - 1)
+
+          if this_is_the_last_line
+            current_usergroups.push(line_hash[:usergroup]) if line_hash[:usergroup]
+            current_users.push(line_hash[:user])
+          end
+
+          if next_node_appears || this_is_the_last_line
+            final_hash = previous_node
+            final_hash[:usergroups] = current_usergroups.dup
+            final_hash[:users] = current_users.dup
+            @hash[:nodes].push(final_hash)
+          end
+
+          if next_node_appears
+            current_node_id = line_hash[:node][:id]
+            previous_node = line_hash[:node]
+            current_usergroups = []
+            current_users = []
+          end
+
+          current_usergroups.push(line_hash[:usergroup]) if line_hash[:usergroup]
+          current_users.push(line_hash[:user])
+        end
+
+        @hash
+      end
+    end
+
+    def _line_hash(line)
+      # NOTE: could be done without regexp, but it seems easier with.
+      line_regexp = /^
+        (?<node>.{#{15 + 1 + 50 + 1 + 8}})│
+        (?<usergroup>.{#{50 + 1 + 8}})│
+        (?<user>.{#{56 + 1 + 8 + 1 + 1}})
+      $/x
+      node_regexp = /(?<network_address>.{15})│(?<name>.{50})│(?<id>.{8})/
+      usergroup_regexp = /(?<name>.{50})│(?<id>.{8})/
+      user_regexp = /(?<name>.{56})│(?<id>.{8})│(?<sign>.{1})/
+      regexps_map = {
+        node: node_regexp,
+        usergroup: usergroup_regexp,
+        user: user_regexp,
+      }
+
+      line_match = line_regexp.match(line)
+      return unless line_match
+      line_names = line_match.names.map { |name| name.to_sym }
+      line_hash = Hash[line_names.zip(line_match.captures)]
+
+      hash = {}
+      regexps_map.each do |higher_name_component, regexp|
+        match = regexp.match(line_hash[higher_name_component])
+        next unless match
+        names = match.names.map { |name| name.to_sym }
+        higher_name_hash = Hash[names.zip(match.captures)]
+
+        hash[higher_name_component] = higher_name_hash
+      end
+
+      hash
+    end
+
+    private :_line_hash
+  end
+end

data/lib/vipnet_parser.rb

@@ -1,3 +1,4 @@
 require "vipnet_parser/strings"
 require "vipnet_parser/iplirconf"
 require "vipnet_parser/nodename"
+require "vipnet_parser/struct"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vipnet_parser
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.5.0
 platform: ruby
 authors:
 - Alexander Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies: []
 description: Parses ViPNet™ IDs, iplir.conf and other files
 email: ntcomp12@gmail.com
@@ -20,6 +20,7 @@ files:
 - lib/vipnet_parser/iplirconf.rb
 - lib/vipnet_parser/nodename.rb
 - lib/vipnet_parser/strings.rb
+- lib/vipnet_parser/struct.rb
 - lib/vipnet_parser/vipnet_config.rb
 homepage: https://github.com/kengho/vipnet_parser
 licenses:
@@ -41,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: ViPNet™ strings parser