fluent-plugin-record-reformer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79ddbaecca21d91a17132b991c9f031b5a19b01
-  data.tar.gz: e6f3777a3a2fdc0fe14887c3d745dfd38e39c60a
+  metadata.gz: 01c153cf57bbdddaf7164d074b5f3e4f47402682
+  data.tar.gz: bcd0d98e566429e1e04a1823a354f05934997ce1
 SHA512:
-  metadata.gz: 5193f5ee853ff6af02e119759bc8ec6a6c018f1a69bad34511757f62bd95918c2c3dc766eb3bc485ad47e65829a88e44da16e63a5238150314b9dca4f137e678
-  data.tar.gz: dc3313b3754851512e110247fd0c184c9130e9c2137f5c6adc39c62c173e9c6f2a3379b55b29dd2bf453c88e036722817a19455e72389e05e25f00e02da77585
+  metadata.gz: c161aa72e64c8414deccef1ce8d2dfa22755ce52af9c17de5468490eea0972ddaa6ac0c57ae2bb5d433a9a7cb7e0f7897bccb297c1435d663add76ff61f01e6f
+  data.tar.gz: 58e92e2efc93924898c7070adacc4112745dfc3f8d7f5d862cc6f11d633405004642e3c3db215191c6505c19d13fee07d5635aa15587960159c501afcbb437a6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.3 (2014/01/25)
+
+Changes:
+
+* Change ${time} placeholder from integer to string when `enable_ruby false`
+
 ## 0.2.2 (2014/01/20)
 
 Enhancement:

data/fluent-plugin-record-reformer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-record-reformer"
-  gem.version     = "0.2.2"
+  gem.version     = "0.2.3"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-record-reformer"

data/lib/fluent/plugin/out_record_reformer.rb

@@ -47,13 +47,6 @@ module Fluent
           PlaceholderExpander.new
         end
 
-      @time_proc = # hmm, want to remove ${time} placeholder ...
-        if @enable_ruby
-          Proc.new {|time| Time.at(time) }
-        else
-          Proc.new {|time| time }
-        end
-
       @hostname = Socket.gethostname
     end
 
@@ -61,8 +54,16 @@ module Fluent
       tag_parts = tag.split('.')
       tag_prefix = tag_prefix(tag_parts)
       tag_suffix = tag_suffix(tag_parts)
+      placeholders = {
+        'tag' => tag,
+        'tags' => tag_parts,
+        'tag_parts' => tag_parts,
+        'tag_prefix' => tag_prefix,
+        'tag_suffix' => tag_suffix,
+        'hostname' => @hostname,
+      }
       es.each { |time, record|
-        new_tag, new_record = reform(@output_tag, record, tag, tag_parts, tag_prefix, tag_suffix, @time_proc.call(time))
+        new_tag, new_record = reform(@output_tag, time, record, placeholders)
         Engine.emit(new_tag, time, new_record)
       }
       chain.next
@@ -72,8 +73,8 @@ module Fluent
 
     private
 
-    def reform(output_tag, record, tag, tag_parts, tag_prefix, tag_suffix, time)
-      @placeholder_expander.prepare_placeholders(record, tag, tag_parts, tag_prefix, tag_suffix, @hostname, time)
+    def reform(output_tag, time, record, opts)
+      @placeholder_expander.prepare_placeholders(time, record, opts)
       new_tag = @placeholder_expander.expand(output_tag)
 
       new_record = @renew_record ? {} : record.dup
@@ -103,40 +104,23 @@ module Fluent
     end
 
     class PlaceholderExpander
-      # referenced https://github.com/fluent/fluent-plugin-rewrite-tag-filter, thanks!
       attr_reader :placeholders
 
-      def prepare_placeholders(record, tag, tag_parts, tag_prefix, tag_suffix, hostname, time)
-        placeholders = {
-          '${time}' => time,
-          '${tag}' => tag,
-          '${hostname}' => hostname,
-        }
-
-        size = tag_parts.size
-
-        tag_parts.each_with_index { |t, idx|
-          placeholders.store("${tag_parts[#{idx}]}", t)
-          placeholders.store("${tag_parts[#{idx-size}]}", t) # support tag_parts[-1]
-
-          # tags is just for old version compatibility
-          placeholders.store("${tags[#{idx}]}", t)
-          placeholders.store("${tags[#{idx-size}]}", t) # support tags[-1]
-        }
-
-        tag_prefix.each_with_index { |t, idx|
-          placeholders.store("${tag_prefix[#{idx}]}", t)
-          placeholders.store("${tag_prefix[#{idx-size}]}", t) # support tag_prefix[-1]
-        }
-
-        tag_suffix.each_with_index { |t, idx|
-          placeholders.store("${tag_suffix[#{idx}]}", t)
-          placeholders.store("${tag_suffix[#{idx-size}]}", t) # support tag_suffix[-1]
-        }
-
-        record.each { |k, v|
-          placeholders.store("${#{k}}", v)
-        }
+      def prepare_placeholders(time, record, opts)
+        placeholders = { '${time}' => Time.at(time).to_s }
+        record.each {|key, val| placeholders.store("${#{key}}", val) }
+
+        opts.each do |key, val|
+          if val.kind_of?(Array)
+            size = val.size
+            val.each_with_index { |t, idx|
+              placeholders.store("${#{key}[#{idx}]}", t)
+              placeholders.store("${#{key}[#{idx-size}]}", t) # support [-1]
+            }
+          else # string, interger, float, and others?
+            placeholders["${#{key}}"] = val
+          end
+        end
 
         @placeholders = placeholders
       end
@@ -154,21 +138,13 @@ module Fluent
 
       # Get placeholders as a struct
       #
-      # @param [Hash]   record      the record, one of information
-      # @param [String] tag         the tag
-      # @param [Array]  tag_parts   the tag parts (tag splitted by .)
-      # @param [Array]  tag_prefix  the tag prefix parts
-      # @param [Array]  tag_suffix  the tag suffix parts
-      # @param [String] hostname    the hostname
       # @param [Time]   time        the time
-      def prepare_placeholders(record, tag, tag_parts, tag_prefix, tag_suffix, hostname, time)
+      # @param [Hash]   record      the record
+      # @param [Hash]   opts        others
+      def prepare_placeholders(time, record, opts)
         struct = UndefOpenStruct.new(record)
-        struct.tag  = tag
-        struct.tags = struct.tag_parts = tag_parts # tags is for old version compatibility
-        struct.tag_prefix = tag_prefix
-        struct.tag_suffix = tag_suffix
-        struct.time = time
-        struct.hostname = hostname
+        struct.time = Time.at(time)
+        opts.each {|key, val| struct.__send__("#{key}=", val) }
         @placeholders = struct
       end
 

data/spec/out_record_reformer_spec.rb

@@ -163,14 +163,14 @@ describe Fluent::RecordReformerOutput do
           'foo' => 'bar',
           'hostname' => hostname,
           'tag' => tag,
-          'time' => time.to_i.to_s, # hmm, want to remove ${time} placeholder
+          'time' => time.to_s,
           'message' => "#{hostname} #{tag_parts.last} 1",
         })
         Fluent::Engine.should_receive(:emit).with("reformed.#{tag}", time.to_i, {
           'foo' => 'bar',
           'hostname' => hostname,
           'tag' => tag,
-          'time' => time.to_i.to_s, # hmm, want to remove ${time} placeholder
+          'time' => time.to_s,
           'message' => "#{hostname} #{tag_parts.last} 2",
         })
       end
@@ -197,14 +197,14 @@ describe Fluent::RecordReformerOutput do
           'message' => "prefix.test prefix.test.tag tag.suffix test.tag.suffix 1",
           'hostname' => hostname,
           'tag' => tag,
-          'time' => time.to_i.to_s, # hmm, want to remove ${time} placeholder
+          'time' => time.to_s,
         })
         Fluent::Engine.should_receive(:emit).with("tag.suffix", time.to_i, {
           'foo' => 'bar',
           'message' => "prefix.test prefix.test.tag tag.suffix test.tag.suffix 2",
           'hostname' => hostname,
           'tag' => tag,
-          'time' => time.to_i.to_s, # hmm, want to remove ${time} placeholder
+          'time' => time.to_s,
         })
       end
       it { emit }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-reformer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd