fluent-plugin-kvp-parser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9531b6a37e094df25de873640acb15603b415c05
-  data.tar.gz: 471f40d671b789a23cf9bb9df4f11b60f1b1d34a
+  metadata.gz: 843d6092683665ce9588bc3c1da61e0bca6001dc
+  data.tar.gz: 21975d2887a0e3864e76ee78b708345c6e07ddbd
 SHA512:
-  metadata.gz: ad9100bf25117d6838686fd075efb1404dcf43c797e43affd28c23b2694ce70f73ef203b002518fd3e617bea0a9d0b91e2acbdd0e2f9c202d7c72855e9dbb531
-  data.tar.gz: ae34c3052942a13cb8d3415225d4dad76b4d4ddad712d5c747b3734788af2e891eec19500d82a0b614ca81eac3b4ab90ff4f72dca45786d00567fb1c07e49e0b
+  metadata.gz: 1759ac967e1fad058a5667935521088c2c0d8dcf74f24d71125ab04105f902bb5a134eb87e84960f1e1c4bae8031c100947d3843edd8627746efdb80883938f4
+  data.tar.gz: 9c152c5351402d73280d7f05dff0c6fb29d4ed3001759843aecae002f93a59fb25165e208dd6469de4205a7e73d0b098ab7409649606f22dd21be491319a636e

data/fluent-plugin-kvp-parser.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-kvp-parser"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.description   = 'Fluentd parser plugin to parse key value pairs'
   spec.authors       = ["mosuka"]
   spec.email         = ["minoru.osuka@gmail.com"]

data/lib/fluent/plugin/parser_kvp.rb

@@ -6,18 +6,19 @@ module Fluent
 
       Plugin.register_parser('kvp', self)
 
+      config_param :key_char, :string, :default => '\w.-'
       config_param :key_prefix, :string, :default => ''
-      config_param :kv_delimiter, :string, :default => '\t\s'
-      config_param :kv_char, :string, :default => '='
+      config_param :key_value_pair_delimiter, :string, :default => '\t\s'
+      config_param :key_value_delimiter, :string, :default => '='
       config_param :time_key, :string, :default => 'time'
 
       def configure(conf={})
         super
-        if @kv_delimiter[0] == '/' and @kv_delimiter[-1] == '/'
-          @kv_delimiter = Regexp.new(@kv_delimiter[1..-2])
+        if @key_value_pair_delimiter[0] == '/' and @key_value_pair_delimiter[-1] == '/'
+          @kv_delimiter = @key_value_pair_delimiter[1..-2]
         end
 
-        @kv_regex_str = '(?:(?:([\w]+)\s*[' + @kv_char + ']\s*("(?:(?:\\\.|[^"])*)"|(?:[^"' + @kv_delimiter + ']*)))(?:|[' + @kv_delimiter + ']*))'
+        @kv_regex_str = '(?:(?:([' + @key_char + ']+)\s*[' + @key_value_delimiter + ']\s*("(?:(?:\\\.|[^"])*)"|(?:[^"' + @key_value_pair_delimiter + ']*)))(?:|[' + @key_value_pair_delimiter + ']*))'
         @kv_regex = Regexp.new(@kv_regex_str)
       end
 

data/test/test_kvp_parser.rb

@@ -15,6 +15,7 @@ module ParserTest
     def test_basic
       d = create_driver({})
       d.instance.parse("k1=v1 k2=v2") {|_, v| assert_equal({"k1"=>"v1", "k2"=>"v2"}, v)}
+      d.instance.parse("k.1=v1 k.2=v2") {|_, v| assert_equal({"k.1"=>"v1", "k.2"=>"v2"}, v)}
       d.instance.parse("k1=v1    k2=v2") {|_, v| assert_equal({"k1"=>"v1", "k2"=>"v2"}, v)}
       d.instance.parse("k2=v2 k1=v1") {|_, v| assert_equal({"k1"=>"v1", "k2"=>"v2"}, v)}
       d.instance.parse("k2=v2\tk1=v1") {|_, v| assert_equal({"k1"=>"v1", "k2"=>"v2"}, v)}
@@ -47,18 +48,18 @@ module ParserTest
     end
 
     def test_custom_delimiter
-      d = create_driver({"kv_delimiter" => "|"})
+      d = create_driver({"key_value_pair_delimiter" => "|"})
       d.instance.parse("k1=v1|k2=v2") {|_, v| assert_equal({"k1"=>"v1", "k2"=>"v2"}, v)}
       d.instance.parse("k1=v1||k2=v2") {|_, v| assert_equal({"k1"=>"v1", "k2"=>"v2"}, v)}
 
-      d = create_driver({"kv_delimiter" => "@ "})
+      d = create_driver({"key_value_pair_delimiter" => "@ "})
       d.instance.parse("k1=v1@k2=v2 k3=v3") {|_, v|
         assert_equal({"k1"=>"v1", "k2"=>"v2", "k3"=>"v3"}, v)
       }
     end
 
     def test_custom_kv_char
-      d = create_driver({"kv_char" => "#"})
+      d = create_driver({"key_value_delimiter" => "#"})
       d.instance.parse("k1#v1 k2#v2") {|_, v| assert_equal({"k1"=>"v1", "k2"=>"v2"}, v)}
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kvp-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - mosuka