fluent-plugin-xml-parser 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d3406d82a44a2830bb0c1f1efbbbf38e9b4f44
-  data.tar.gz: 3af74358485266fabc9b6aa6c3a71438a5a9ecd9
+  metadata.gz: 44c77dc562482affd2975f6a695a00307610d9e0
+  data.tar.gz: e0db1b2675515ce230dfd0b987100b79cb6aa34e
 SHA512:
-  metadata.gz: 8c8a19e8665cf5b276017378c337ac3c5cb8da6f02ad457587ac8d9593acc2c81959cde3c2a42e8c7ef3bdac3aaf447f60280cba08b77ab7c3a8fd308e647ac8
-  data.tar.gz: eb7de25d711da38b66fdf67c9ec3ed9a56e46c33d97c1ac773b88dbc7cd92479f65638fb5d061d4da574faf2e98a9895e236b551cee2210e035870554ef92ab2
+  metadata.gz: 4e8a95bcb3ad0c5481b8603524cda28a9678cb3a2ea29a535e17c2da95d24357b47bbdd017b19ed309fa2062de69e07ef7900cec13460f23fd34966b5a01d00f
+  data.tar.gz: c6075abd38b55ef0a88042fbb59d39c6cd21607863a8c8c003f66a29e5649a91f7a5510881555290d43a57cb72930d5b08da5ef7b070114186d91645b604b6f3

data/fluent-plugin-xml-parser.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-xml-parser"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.4"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
   spec.summary       = %q{fluentd xml parser plugin}

data/lib/fluent/plugin/parser_xml.rb

@@ -27,21 +27,23 @@ module Fluent
       # doc = REXML::Document.new(open("test.xml"))
       # doc.elements['cap:alert/cap:info'].children
       #
-      config_param :time_xpath, :string, :default => '[]'
+      config_param :time_xpath, :string, :default => nil
+      config_param :time_key, :string, :default => nil
+      config_param :time_format, :string, :default => nil # time_format is configurable
       config_param :attr_xpaths, :string, :default => '[]'
       config_param :value_xpaths, :string, :default => '[]'
-      config_param :time_format, :string, :default => nil # time_format is configurable
       # This method is called after config_params have read configuration parameters
       def configure(conf)
         super
 
         @time_xpath = json_parse(conf['time_xpath'])
+        @time_key = conf['time_key']
+        @time_format = conf['time_format']
+        @time_parser = TimeParser.new(@time_format)
         @attr_xpaths = json_parse(conf['attr_xpaths'])
         @value_xpaths = json_parse(conf['value_xpaths'])
-        @time_format = conf['time_format']
         # TimeParser class is already given. It takes a single argument as the time format
         # to parse the time string with.
-        @time_parser = TimeParser.new(@time_format)
       end
 
       # This is the main method. The input "text" is the unit of data to be parsed.
@@ -52,8 +54,15 @@ module Fluent
           doc = REXML::Document.new(text)
           $log.debug doc
           # parse time field
-          @time = @time_parser.parse(doc.elements[@time_xpath[0]].method(@time_xpath[1]).call)
+          if @time_xpath.nil?
+            @time = Fluent::Engine.now
+          else
+            @time = @time_parser.parse(doc.elements[@time_xpath[0]].method(@time_xpath[1]).call)
+          end
           record = {}
+          if !@time_key.nil?
+            record = {@time_key => format_time(@time)}
+          end
           attrs = @attr_xpaths.map do |attr_xpath|
             if attr_xpath[0].nil? # when null is specified
               attr_xpath[1] # second parameter is used as the attribute name
@@ -81,6 +90,14 @@ module Fluent
         end
       end
 
+      def format_time(time)
+        if @time_format.nil?
+          Time.at(time).iso8601
+        else
+          Time.at(time).strftime(@time_format)
+        end
+      end
+
       def json_parse message
         begin
           y = Yajl::Parser.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-xml-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler