fluent-plugin-record-reformer 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d0e50cb908d582e7b826037f0e73df95713e44
-  data.tar.gz: ffd150c413f42bf034997dc30d96c919061ea2c9
+  metadata.gz: b11c53c3848c8e1f62cb8edbf0791b6d8da44fcc
+  data.tar.gz: 9d898ccdf04a40be27a8308545fa8c3da2df7a45
 SHA512:
-  metadata.gz: 6812b8c69cccd058cff3fc41f42d4d058ef4d4fb15a482e71f9263fcb6d9627269f284aaa6a492304fbab0489633b2978a53d89271122e247ea3195fe176f4b9
-  data.tar.gz: 9c3e4434096f28fe84393c7fd74cd906ff5772e930168783b10e2f784a055c2dde4c3564c7c022f311b1fc18ffe7c931ebca6b941bf22a6eaab37f130ed45697
+  metadata.gz: d38295f7e65940410aa78551dca912f0cbc40d3eff113fd685face34edd6cad5210d6492316b1fddb33ad80296fb0905bad7032173f2754c2bc941df8a642ff8
+  data.tar.gz: 54452db122efb3d69883095aef369d2ed13fc0901c259b0d92cff14c1af6af97ca939a048f03697f8a17c682a447ae545244231599186a85523aa1f6ecec10c7

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.5.0 (2014/03/06)
+## 0.6.0 (2015/04/11)
+
+Changes:
+
+* Accept field names starting with `@` (and any field names) in `enable_ruby false`
+
+## 0.5.0 (2015/03/06)
 
 Enhancements:
 

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.5.0"
+  gem.version     = "0.6.0"
   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

@@ -185,7 +185,7 @@ module Fluent
       end
 
       def expand(str)
-        str.gsub(/(\${[a-zA-Z0-9_]+(\[-?[0-9]+\])?}|__[A-Z_]+__)/) {
+        str.gsub(/(\${[^}]+}|__[A-Z_]+__)/) {
           log.warn "record_reformer: unknown placeholder `#{$1}` found" unless @placeholders.include?($1)
           @placeholders[$1]
         }

data/test/test_out_record_reformer.rb

@@ -161,7 +161,7 @@ class RecordReformerOutputTest < Test::Unit::TestCase
         emits = emit(config, use_v1, msgs)
         emits.each_with_index do |(tag, time, record), i|
           assert_equal("reformed.#{@tag}", tag)
-          assert_equal("#{@hostname} ${tag_parts.last} ${URI.encode(message)}", record['message'])
+          assert_equal("#{@hostname}  ", record['message'])
         end
       end
     end
@@ -385,6 +385,36 @@ class RecordReformerOutputTest < Test::Unit::TestCase
         # nil tag message should not be emitted
         assert_equal 0, d.emits.size
       end
+
+      test 'expand fields starting with @ (enable_ruby no)' do
+        config = %[
+          tag tag
+          enable_ruby no
+          <record>
+            foo ${@timestamp}
+          </record>
+        ]
+        d = create_driver(config, use_v1)
+        message = {"@timestamp" => "foo"}
+        d.run { d.emit(message, @time) }
+        reformed = d.emits.first[2]
+        assert_equal reformed["foo"], message["@timestamp"]
+      end
+
+      test 'expand fields starting with @ (enable_ruby yes)' do
+        config = %[
+          tag tag
+          enable_ruby yes
+          <record>
+            foo ${__send__("@timestamp")}
+          </record>
+        ]
+        d = create_driver(config, use_v1)
+        message = {"@timestamp" => "foo"}
+        d.run { d.emit(message, @time) }
+        reformed = d.emits.first[2]
+        assert_equal reformed["foo"], message["@timestamp"]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-reformer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd