fluent-plugin-uri-cma-parser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d04532bcd22a574a9d66352f0fb8e7a5cf741e2990e6a306f1717b64a2cdbde
-  data.tar.gz: 42a4aed6f6f50341c711cdb7f424dfd215a3d026cfe8ea7ef1d966838bc593fb
+  metadata.gz: 59f9d417d0657abf0bae8e0bc00576277460c28e79205be599ff412311033f78
+  data.tar.gz: 795fe429d3363422df487e0b3e02df6cb577e32e2dcd1401ea0404fbe80bcc9f
 SHA512:
-  metadata.gz: 3c8d06cf6d8e42e4d8dc99c63f5c3b1e82c536ffd5c40f7e1512619dc72cbdd0a7da976fcce4869623420128a361d9190b268c13d112457ea255b21de9a2563f
-  data.tar.gz: 119cc9a30f0af93d2eaa83ae1882a7ab0eb7a054b969fd3e88931a2c22fb0584278d18853232e07acdc44e481c2ac9e5454ec49a2836ebfc35b12585bfac25cf
+  metadata.gz: 2f2b70230abf48c8345b14dfbfe067bdbf68edc7b13a1c9d345abacb976a7314362539dfc92003cf1edcf0e2296e83c4f74c6e53f6f2b7c19a728205e60a41a2
+  data.tar.gz: 61426d0f815fbc072de782d033757d2c2890c8079997723706389594411a76a8c792228c5f901895235f4d70896eca24d5e4b8894cec7d05c96710bbbb330747

data/fluent-plugin-uri-parser.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-uri-cma-parser"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Philippe BENAOUN"]
   spec.email         = ["philippe.benaoun@gmail.com"]
   spec.license       = "Apache-2.0"

data/lib/fluent/plugin/filter_query_string_parser.rb

@@ -26,6 +26,8 @@ module Fluent
       def valid_url(line)
         if line.match(Regexp.new('(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})'))
           true
+        elsif line.nil?
+          false
         else
           false
         end
@@ -51,26 +53,27 @@ module Fluent
             values.reject! {|_, v| v.nil? } if @ignore_nil
             unless values[@out_key_query].nil?
               params = Addressable::URI.form_unencode(cleaner_prefix(values[@out_key_query]))
-            end
 
-            unless params.empty?
-              if @multi_value_params
-                values = Hash.new {|h,k| h[k] = [] }
-                params.each{|pair| values[pair[0]].push(pair[1])}
-              else
-                values = Hash[params]
+              unless params.nil?
+                if @multi_value_params
+                  values = Hash.new {|h,k| h[k] = [] }
+                  params.each{|pair| values[pair[0]].push(pair[1])}
+                else
+                  values = Hash[params]
+                end
+                if @inject_key_prefix
+                  values = Hash[values.map{|k,v| [ @inject_key_prefix + k, v ]}]
+                end
+                r = @hash_value_field ? { @hash_value_field => values } : values
+                record = record.merge(r)
               end
-              if @inject_key_prefix
-                values = Hash[values.map{|k,v| [ @inject_key_prefix + k, v ]}]
-              end
-              r = @hash_value_field ? { @hash_value_field => values } : values
-              record = record.merge(r)
             end
+
           else
             log.warn "url not valid: #{raw_value}"
           end
         rescue => e
-          log.warn "parse failed #{e.message}" unless @suppress_parse_error_log
+            log.warn "parse failed #{e.message}" unless @suppress_parse_error_log
         end
         record
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-uri-cma-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Philippe BENAOUN
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd