vipnet_parser 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83759d7e632c4b66ff7b6aada228c807381b5ae5
-  data.tar.gz: 2bd2ed5e06b1518814c7a59889f63b21d35fe179
+  metadata.gz: 7970f04e800c4708b908008d233b801145a23ba6
+  data.tar.gz: ade58764a0627fbee189144d7891824b1394d447
 SHA512:
-  metadata.gz: 4a050843054685430ffef617b99c8a1dea9e4746e42b342f488859a243a6b51c0f8e98ed57d43e806bf2f091a909a0e9532ae09419f04536efc62ccce635223f
-  data.tar.gz: 0656d373bf227f86068ab34c32f2c9fa6005dc49d34d0f95b36533278b1fe46e4c8e2b65345d4ff889a3b0b846bbe027122a2a368960a778af45b0db5c1042b4
+  metadata.gz: db265c3b81ebfbfa511b289be370d6aa2e439e51042335495ca957b8dab16bee2a79581ac849da15753fe7070113668acb9265fbcae142fd5e8106f216d19be1
+  data.tar.gz: 6fda0aa8af392f7a76d430fe0e29b744bd013ba9fff680f65ce43232e95dc1587c3b900f1363f27082c06151ca092f9e19988c9e69eb3044dcba05dd925fd0e7

data/lib/vipnet_parser/iplirconf.rb

@@ -12,9 +12,7 @@ module VipnetParser
 
     def parse(args = DEFAULT_PARSE_ARGS)
       args = DEFAULT_PARSE_ARGS.merge(args)
-      format = args[:format]
-      encoding = args[:encoding]
-      normalize_names = args[:normalize_names]
+      format, encoding, normalize_names = args.values_at(:format, :encoding, :normalize_names)
 
       # change encoding to utf8 and remove comments
       string = self.string
@@ -35,8 +33,8 @@ module VipnetParser
       sections = string.map do |section|
         section =~ /\[(?<section_name>.+)\]\n(?<section_content>.*)/m
         {
-          name: Regexp.last_match[:section_name].to_sym,
-          content: Regexp.last_match[:section_content],
+          name: Regexp.last_match(:section_name).to_sym,
+          content: Regexp.last_match(:section_content),
         }
       end
 
@@ -80,11 +78,11 @@ module VipnetParser
 
       section_content.split("\n").each do |line|
         if line =~ /(?<prop>.*)=\s(?<value>.*)/
-          prop = Regexp.last_match[:prop].to_sym
-          value = Regexp.last_match[:value]
+          prop = Regexp.last_match(:prop).to_sym
+          value = Regexp.last_match(:value)
 
           # array-type props
-          if [:ip, :filterudp, :filtertcp, :server].include?(prop)
+          if %i[ip filterudp filtertcp server].include?(prop)
             if hash[prop]
               hash[prop].push(value)
             else

data/lib/vipnet_parser/nodename.rb

@@ -12,9 +12,7 @@ module VipnetParser
 
     def parse(args = DEFAULT_PARSE_ARGS)
       args = DEFAULT_PARSE_ARGS.merge(args)
-      format = args[:format]
-      encoding = args[:encoding]
-      normalize_names = args[:normalize_names]
+      format, encoding, normalize_names = args.values_at(:format, :encoding, :normalize_names)
 
       # change encoding to utf8
       string = self.string

data/lib/vipnet_parser/strings.rb

@@ -2,16 +2,14 @@ module VipnetParser
   def id(args)
     if args.class == String
       string = args
-      array = Array.new
+      array = []
     elsif args.class == Hash
-      string = args[:string]
-      array = args[:array]
-      threshold = args[:threshold]
+      string, array, threshold = args.values_at(:string, :array, :threshold)
     end
     string = string.downcase
     cyrillic_sub = {
-      "а" => "a", "б" => "b", "с" => "c", "д" => "d", "е" => "e", "ф" => "f",
-      "А" => "a", "Б" => "b", "С" => "c", "Д" => "d", "Е" => "e", "Ф" => "f",
+      "а" => "a", "б" => "b", "В" => "b", "с" => "c", "д" => "d", "е" => "e", "ф" => "f",
+      "А" => "a", "Б" => "b", "в" => "b", "С" => "c", "Д" => "d", "Е" => "e", "Ф" => "f",
     }
     cyrillic_sub.each do |cyr, lat|
       string = string.gsub(cyr, lat)
@@ -27,10 +25,10 @@ module VipnetParser
     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 })
+        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 })
+            array += id(string: side_match, array: array, threshold: threshold)
           end
         end
       end
@@ -53,7 +51,7 @@ module VipnetParser
     if threshold
       return [] if interval_end - interval_begin + 1 > threshold
     end
-    array = Array.new
+    array = []
     (interval_end - interval_begin + 1).times do |n|
       array.push("0x#{(interval_begin + n).to_s(16).rjust(8, '0')}")
     end
@@ -74,7 +72,7 @@ module VipnetParser
   def network(id)
     normal_ids = id(id)
     if normal_ids
-      normal_id = normal_ids[0]
+      normal_id = normal_ids.first
       return id[2..5].to_i(16).to_s(10)
     end
 

metadata

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