fluent-plugin-record-reformer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd21069087496f3c30e1599b22b8847d6429323d
-  data.tar.gz: 31026f14e6ed73d41ca4ad80ed5f7caca6da72a2
+  metadata.gz: 20d0e50cb908d582e7b826037f0e73df95713e44
+  data.tar.gz: ffd150c413f42bf034997dc30d96c919061ea2c9
 SHA512:
-  metadata.gz: 504c18888e9e06f93fc2eba073399271b558e1a63811de988ecac867429b8e8c06caf9f096210568cbfdfc028d20a1c760301ebaa90f106649776f9f60f9305b
-  data.tar.gz: a4d047dbc29a96c2eed77e804ec5e08a99d1bef0055f866c1886c7e7facf2ca227058533fb7ec0e87bf26b960d6b19581c7671aa40dd455570d250d8629bca71
+  metadata.gz: 6812b8c69cccd058cff3fc41f42d4d058ef4d4fb15a482e71f9263fcb6d9627269f284aaa6a492304fbab0489633b2978a53d89271122e247ea3195fe176f4b9
+  data.tar.gz: 9c3e4434096f28fe84393c7fd74cd906ff5772e930168783b10e2f784a055c2dde4c3564c7c022f311b1fc18ffe7c931ebca6b941bf22a6eaab37f130ed45697

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.5.0 (2014/03/06)
+
+Enhancements:
+
+* Support JSON Array/Hash
+* Support placeholders for keys
+
 ## 0.4.0 (2014/10/31)
 
 Changes:

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Naotoshi SEO
+Copyright (c) 2013 - 2015 Naotoshi Seo
 
 MIT License
 

data/README.md

@@ -105,9 +105,9 @@ This results in same, but please note that following option parameters are reser
 
 The keys of input json are available as placeholders. In the above example, 
 
-* ${foo}
-* ${message}
 * ${remove_me}
+* ${not_remove_me}
+* ${message}
 
 shall be available. In addition, following placeholders are reserved: 
 
@@ -148,6 +148,7 @@ Following plugins look similar:
 * [fluent-plugin-record-modifier](https://github.com/repeatedly/fluent-plugin-record-modifier)
 * [fluent-plugin-format](https://github.com/mach/fluent-plugin-format)
 * [fluent-plugin-add](https://github.com/yu-yamada/fluent-plugin-add)
+* [filter_record_transformer](http://docs.fluentd.org/v0.12/articles/filter_record_transformer) is a Fluentd v0.12 built-in plugin which is based on record-reformer.
 
 ## ChangeLog
 
@@ -163,4 +164,4 @@ See [CHANGELOG.md](CHANGELOG.md) for details.
 
 ## Copyright
 
-Copyright (c) 2013 Naotoshi SEO. See [LICENSE](LICENSE) for details.
+Copyright (c) 2013 - 2015 Naotoshi Seo. See [LICENSE](LICENSE) for details.

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.4.0"
+  gem.version     = "0.5.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

@@ -30,13 +30,13 @@ module Fluent
       conf.each_pair { |k, v|
         next if BUILTIN_CONFIGURATIONS.include?(k)
         conf.has_key?(k) # to suppress unread configuration warning
-        @map[k] = v
+        @map[k] = parse_value(v)
       }
       # <record></record> directive
       conf.elements.select { |element| element.name == 'record' }.each { |element|
         element.each_pair { |k, v|
           element.has_key?(k) # to suppress unread configuration warning
-          @map[k] = v
+          @map[k] = parse_value(v)
         }
       }
 
@@ -97,18 +97,48 @@ module Fluent
 
     private
 
+    def parse_value(value_str)
+      if value_str.start_with?('{', '[')
+        JSON.parse(value_str)
+      else
+        value_str
+      end
+    rescue => e
+      log.warn "failed to parse #{value_str} as json. Assuming #{value_str} is a string", :error_class => e.class, :error => e.message
+      value_str # emit as string
+    end
+
     def reform(tag, time, record, opts)
       @placeholder_expander.prepare_placeholders(time, record, opts)
       new_tag = @placeholder_expander.expand(tag)
 
       new_record = @renew_record ? {} : record.dup
       @keep_keys.each {|k| new_record[k] = record[k]} if @keep_keys and @renew_record
-      @map.each_pair {|k, v| new_record[k] = @placeholder_expander.expand(v) }
+      new_record.merge!(expand_placeholders(@map))
       @remove_keys.each {|k| new_record.delete(k) } if @remove_keys
 
       [new_tag, new_record]
     end
 
+    def expand_placeholders(value)
+      if value.is_a?(String)
+        new_value = @placeholder_expander.expand(value)
+      elsif value.is_a?(Hash)
+        new_value = {}
+        value.each_pair do |k, v|
+          new_value[@placeholder_expander.expand(k)] = expand_placeholders(v)
+        end
+      elsif value.is_a?(Array)
+        new_value = []
+        value.each_with_index do |v, i|
+          new_value[i] = expand_placeholders(v)
+        end
+      else
+        new_value = value
+      end
+      new_value
+    end
+
     def tag_prefix(tag_parts)
       return [] if tag_parts.empty?
       tag_prefix = [tag_parts.first]
@@ -186,13 +216,11 @@ module Fluent
       # @param [String] str         the string to be replaced
       def expand(str)
         interpolated = str.gsub(/\$\{([^}]+)\}/, '#{\1}') # ${..} => #{..}
-        begin
-          eval "\"#{interpolated}\"", @placeholders.instance_eval { binding }
-        rescue => e
-          log.warn "record_reformer: failed to expand `#{str}`", :error_class => e.class, :error => e.message
-          log.warn_backtrace
-          nil
-        end
+        eval "\"#{interpolated}\"", @placeholders.instance_eval { binding }
+      rescue => e
+        log.warn "record_reformer: failed to expand `#{str}`", :error_class => e.class, :error => e.message
+        log.warn_backtrace
+        nil
       end
 
       class UndefOpenStruct < OpenStruct

data/test/helper.rb

@@ -7,4 +7,21 @@ unless defined?(Test::Unit::AssertionFailedError)
   end
 end
 
-$log = Fluent::Log.new(Fluent::Test::DummyLogDevice.new, Fluent::Log::LEVEL_WARN)
+# Stop non required sleep at
+# https://github.com/fluent/fluentd/blob/018791f6b1b0400b71e37df2fb3ad80e456d2c11/lib/fluent/test/base.rb#L56
+module Fluent
+  module Test
+    class TestDriver
+      def run(&block)
+        @instance.start
+        begin
+          # wait until thread starts
+          # 10.times { sleep 0.05 }
+          return yield
+        ensure
+          @instance.shutdown
+        end
+      end
+    end
+  end
+end

data/test/test_out_record_reformer.rb

@@ -18,14 +18,16 @@ class RecordReformerOutputTest < Test::Unit::TestCase
     Timecop.return
   end
 
-  def create_driver(conf)
-    Fluent::Test::OutputTestDriver.new(Fluent::RecordReformerOutput, @tag).configure(conf)
+  def create_driver(conf, use_v1)
+    Fluent::Test::OutputTestDriver.new(Fluent::RecordReformerOutput, @tag).configure(conf, use_v1)
   end
 
-  def emit(config, msgs = [''])
-    d = create_driver(config)
-    msgs.each do |msg|
-      d.run { d.emit({'eventType0' => 'bar', 'message' => msg}, @time) }
+  def emit(config, use_v1, msgs = [''])
+    d = create_driver(config, use_v1)
+    d.run do
+      msgs.each do |msg|
+        d.emit({'eventType0' => 'bar', 'message' => msg}, @time)
+      end
     end
 
     @instance = d.instance
@@ -41,52 +43,53 @@ class RecordReformerOutputTest < Test::Unit::TestCase
     message ${hostname} ${tag_parts.last} ${URI.escape(message)}
   ]
 
-  sub_test_case 'configure' do
-    test 'typical usage' do
-      assert_nothing_raised do
-        create_driver(CONFIG)
+  [true, false].each do |use_v1|
+    sub_test_case 'configure' do
+      test 'typical usage' do
+        assert_nothing_raised do
+          create_driver(CONFIG, use_v1)
+        end
       end
-    end
 
-    test "tag is not specified" do
-      assert_raise(Fluent::ConfigError) do
-        create_driver('')
+      test "tag is not specified" do
+        assert_raise(Fluent::ConfigError) do
+          create_driver('', use_v1)
+        end
       end
-    end
 
-    test "keep_keys must be specified together with renew_record true" do
-      assert_raise(Fluent::ConfigError) do
-        create_driver(%[keep_keys a])
+      test "keep_keys must be specified together with renew_record true" do
+        assert_raise(Fluent::ConfigError) do
+          create_driver(%[keep_keys a], use_v1)
+        end
       end
     end
-  end
 
-  sub_test_case "test options" do
-    test 'typical usage' do
-      msgs = ['1', '2']
-      emits = emit(CONFIG, msgs)
-      assert_equal 2, emits.size
-      emits.each_with_index do |(tag, time, record), i|
-        assert_equal("reformed.#{@tag}", tag)
-        assert_equal('bar', record['eventType0'])
-        assert_equal(@hostname, record['hostname'])
-        assert_equal(@tag, record['input_tag'])
-        assert_equal(@time.to_s, record['time'])
-        assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
+    sub_test_case "test options" do
+      test 'typical usage' do
+        msgs = ['1', '2']
+        emits = emit(CONFIG, use_v1, msgs)
+        assert_equal 2, emits.size
+        emits.each_with_index do |(tag, time, record), i|
+          assert_equal("reformed.#{@tag}", tag)
+          assert_equal('bar', record['eventType0'])
+          assert_equal(@hostname, record['hostname'])
+          assert_equal(@tag, record['input_tag'])
+          assert_equal(@time.to_s, record['time'])
+          assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
+        end
       end
-    end
 
-    test '(obsolete) output_tag' do
-      config = %[output_tag reformed.${tag}]
-      msgs = ['1']
-      emits = emit(config, msgs)
-      emits.each_with_index do |(tag, time, record), i|
-        assert_equal("reformed.#{@tag}", tag)
+      test '(obsolete) output_tag' do
+        config = %[output_tag reformed.${tag}]
+        msgs = ['1']
+        emits = emit(config, use_v1, msgs)
+        emits.each_with_index do |(tag, time, record), i|
+          assert_equal("reformed.#{@tag}", tag)
+        end
       end
-    end
 
-    test 'record directive' do
-      config = %[
+      test 'record directive' do
+        config = %[
         tag reformed.${tag}
 
         <record>
@@ -95,226 +98,293 @@ class RecordReformerOutputTest < Test::Unit::TestCase
           time ${time.to_s}
           message ${hostname} ${tag_parts.last} ${message}
         </record>
-      ]
-      msgs = ['1', '2']
-      emits = emit(config, msgs)
-      emits.each_with_index do |(tag, time, record), i|
-        assert_equal("reformed.#{@tag}", tag)
-        assert_equal('bar', record['eventType0'])
-        assert_equal(@hostname, record['hostname'])
-        assert_equal(@tag, record['tag'])
-        assert_equal(@time.to_s, record['time'])
-        assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
-      end
-    end
-
-    test 'remove_keys' do
-      config = CONFIG + %[remove_keys eventType0,message]
-      emits = emit(config)
-      emits.each_with_index do |(tag, time, record), i|
-        assert_equal("reformed.#{@tag}", tag)
-        assert_not_include(record, 'eventType0')
-        assert_equal(@hostname, record['hostname'])
-        assert_equal(@tag, record['input_tag'])
-        assert_equal(@time.to_s, record['time'])
-        assert_not_include(record, 'message')
+        ]
+        msgs = ['1', '2']
+        emits = emit(config, use_v1, msgs)
+        emits.each_with_index do |(tag, time, record), i|
+          assert_equal("reformed.#{@tag}", tag)
+          assert_equal('bar', record['eventType0'])
+          assert_equal(@hostname, record['hostname'])
+          assert_equal(@tag, record['tag'])
+          assert_equal(@time.to_s, record['time'])
+          assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
+        end
       end
-    end
 
-    test 'renew_record' do
-      config = CONFIG + %[renew_record true]
-      msgs = ['1', '2']
-      emits = emit(config, msgs)
-      emits.each_with_index do |(tag, time, record), i|
-        assert_equal("reformed.#{@tag}", tag)
-        assert_not_include(record, 'eventType0')
-        assert_equal(@hostname, record['hostname'])
-        assert_equal(@tag, record['input_tag'])
-        assert_equal(@time.to_s, record['time'])
-        assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
+      test 'remove_keys' do
+        config = CONFIG + %[remove_keys eventType0,message]
+        emits = emit(config, use_v1)
+        emits.each_with_index do |(tag, time, record), i|
+          assert_equal("reformed.#{@tag}", tag)
+          assert_not_include(record, 'eventType0')
+          assert_equal(@hostname, record['hostname'])
+          assert_equal(@tag, record['input_tag'])
+          assert_equal(@time.to_s, record['time'])
+          assert_not_include(record, 'message')
+        end
       end
-    end
 
-    test 'keep_keys' do
-      config = %[tag reformed.${tag}\nrenew_record true\nkeep_keys eventType0,message]
-      msgs = ['1', '2']
-      emits = emit(config, msgs)
-      emits.each_with_index do |(tag, time, record), i|
-        assert_equal("reformed.#{@tag}", tag)
-        assert_equal('bar', record['eventType0'])
-        assert_equal(msgs[i], record['message'])
+      test 'renew_record' do
+        config = CONFIG + %[renew_record true]
+        msgs = ['1', '2']
+        emits = emit(config, use_v1, msgs)
+        emits.each_with_index do |(tag, time, record), i|
+          assert_equal("reformed.#{@tag}", tag)
+          assert_not_include(record, 'eventType0')
+          assert_equal(@hostname, record['hostname'])
+          assert_equal(@tag, record['input_tag'])
+          assert_equal(@time.to_s, record['time'])
+          assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
+        end
       end
-    end
 
-    test 'enable_ruby no' do
-      config = %[
-        tag reformed.${tag}
-        enable_ruby no
-        <record>
-          message ${hostname} ${tag_parts.last} ${URI.encode(message)}
-        </record>
-      ]
-      msgs = ['1', '2']
-      emits = emit(config, 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'])
+      test 'keep_keys' do
+        config = %[tag reformed.${tag}\nrenew_record true\nkeep_keys eventType0,message]
+        msgs = ['1', '2']
+        emits = emit(config, use_v1, msgs)
+        emits.each_with_index do |(tag, time, record), i|
+          assert_equal("reformed.#{@tag}", tag)
+          assert_equal('bar', record['eventType0'])
+          assert_equal(msgs[i], record['message'])
+        end
       end
-    end
-  end
 
-  sub_test_case 'test placeholders' do
-    %w[yes no].each do |enable_ruby|
-      test "hostname with enble_ruby #{enable_ruby}" do
+      test 'enable_ruby no' do
         config = %[
-          tag tag
-          enable_ruby #{enable_ruby}
+          tag reformed.${tag}
+          enable_ruby no
           <record>
-            message ${hostname}
+            message ${hostname} ${tag_parts.last} ${URI.encode(message)}
           </record>
         ]
-        emits = emit(config)
-        emits.each do |(tag, time, record)|
-          assert_equal(@hostname, record['message'])
+        msgs = ['1', '2']
+        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'])
         end
       end
+    end
 
-      test "tag with enable_ruby #{enable_ruby}" do
-        config = %[
-          tag tag
-          enable_ruby #{enable_ruby}
-          <record>
-            message ${tag}
-          </record>
-        ]
-        emits = emit(config)
-        emits.each do |(tag, time, record)|
-          assert_equal(@tag, record['message'])
+    sub_test_case 'test placeholders' do
+      %w[yes no].each do |enable_ruby|
+
+        test "hostname with enble_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              message ${hostname}
+            </record>
+          ]
+          emits = emit(config, use_v1)
+          emits.each do |(tag, time, record)|
+            assert_equal(@hostname, record['message'])
+          end
         end
-      end
 
-      test "tag_parts with enable_ruby #{enable_ruby}" do
-        config = %[
-          tag tag
-          enable_ruby #{enable_ruby}
-          <record>
-            message ${tag_parts[0]} ${tag_parts[-1]}
-          </record>
-        ]
-        expected = "#{@tag.split('.').first} #{@tag.split('.').last}"
-        emits = emit(config)
-        emits.each do |(tag, time, record)|
-          assert_equal(expected, record['message'])
+        test "tag with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              message ${tag}
+            </record>
+          ]
+          emits = emit(config, use_v1)
+          emits.each do |(tag, time, record)|
+            assert_equal(@tag, record['message'])
+          end
         end
-      end
 
-      test "(obsolete) tags with enable_ruby #{enable_ruby}" do
-        config = %[
-          tag tag
-          enable_ruby #{enable_ruby}
-          <record>
-            message ${tags[0]} ${tags[-1]}
-          </record>
-        ]
-        expected = "#{@tag.split('.').first} #{@tag.split('.').last}"
-        emits = emit(config)
-        emits.each do |(tag, time, record)|
-          assert_equal(expected, record['message'])
+        test "tag_parts with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              message ${tag_parts[0]} ${tag_parts[-1]}
+            </record>
+          ]
+          expected = "#{@tag.split('.').first} #{@tag.split('.').last}"
+          emits = emit(config, use_v1)
+          emits.each do |(tag, time, record)|
+            assert_equal(expected, record['message'])
+          end
         end
-      end
 
-      test "${tag_prefix[N]} and ${tag_suffix[N]} with enable_ruby #{enable_ruby}" do
-        config = %[
-          tag tag
-          enable_ruby #{enable_ruby}
-          <record>
-            message ${tag_prefix[1]} ${tag_prefix[-2]} ${tag_suffix[2]} ${tag_suffix[-3]}
-          </record>
-        ]
-        @tag = 'prefix.test.tag.suffix'
-        expected = "prefix.test prefix.test.tag tag.suffix test.tag.suffix"
-        emits = emit(config)
-        emits.each do |(tag, time, record)|
-          assert_equal(expected, record['message'])
+        test "(obsolete) tags with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              message ${tags[0]} ${tags[-1]}
+            </record>
+          ]
+          expected = "#{@tag.split('.').first} #{@tag.split('.').last}"
+          emits = emit(config, use_v1)
+          emits.each do |(tag, time, record)|
+            assert_equal(expected, record['message'])
+          end
+        end
+
+        test "${tag_prefix[N]} and ${tag_suffix[N]} with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              message ${tag_prefix[1]} ${tag_prefix[-2]} ${tag_suffix[2]} ${tag_suffix[-3]}
+            </record>
+          ]
+          @tag = 'prefix.test.tag.suffix'
+          expected = "prefix.test prefix.test.tag tag.suffix test.tag.suffix"
+          emits = emit(config, use_v1)
+          emits.each do |(tag, time, record)|
+            assert_equal(expected, record['message'])
+          end
+        end
+
+        test "time with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              message ${time}
+            </record>
+          ]
+          emits = emit(config, use_v1)
+          emits.each do |(tag, time, record)|
+            assert_equal(@time.to_s, record['message'])
+          end
+        end
+
+        test "record keys with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            remove_keys eventType0
+            <record>
+              message bar ${message}
+              eventtype ${eventType0}
+            </record>
+          ]
+          msgs = ['1', '2']
+          emits = emit(config, use_v1, msgs)
+          emits.each_with_index do |(tag, time, record), i|
+            assert_not_include(record, 'eventType0')
+            assert_equal("bar", record['eventtype'])
+            assert_equal("bar #{msgs[i]}", record['message'])
+          end
+        end
+
+        test "hash values with placeholders with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              hash_field {"hostname":"${hostname}", "tag":"${tag}", "${tag}":100}
+            </record>
+          ]
+          msgs = ['1', '2']
+          es = emit(config, use_v1, msgs)
+          es.each_with_index do |(tag, time, record), i|
+            assert_equal({"hostname" => @hostname, "tag" => @tag, "#{@tag}" => 100}, record['hash_field'])
+          end
+        end
+
+        test "array values with placeholders with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              array_field ["${hostname}", "${tag}"]
+            </record>
+          ]
+          msgs = ['1', '2']
+          es = emit(config, use_v1, msgs)
+          es.each_with_index do |(tag, time, record), i|
+            assert_equal([@hostname, @tag], record['array_field'])
+          end
+        end
+
+        test "array and hash values with placeholders with enable_ruby #{enable_ruby}" do
+          config = %[
+            tag tag
+            enable_ruby #{enable_ruby}
+            <record>
+              mixed_field [{"tag":"${tag}"}]
+            </record>
+          ]
+          msgs = ['1', '2']
+          es = emit(config, use_v1, msgs)
+          es.each_with_index do |(tag, time, record), i|
+            assert_equal([{"tag" => @tag}], record['mixed_field'])
+          end
+        end
+
+        if use_v1 == true
+          # works with only v1 config
+          test "keys with placeholders with enable_ruby #{enable_ruby}" do
+            config = %[
+              tag tag
+              enable_ruby #{enable_ruby}
+              renew_record true
+              <record>
+                ${hostname} hostname
+                foo.${tag} tag
+              </record>
+            ]
+            msgs = ['1', '2']
+            es = emit(config, use_v1, msgs)
+            es.each_with_index do |(tag, time, record), i|
+              assert_equal({@hostname=>'hostname',"foo.#{@tag}"=>'tag'}, record)
+            end
+          end
         end
       end
 
-      test "time with enable_ruby #{enable_ruby}" do
+      test 'unknown placeholder (enable_ruby no)' do
         config = %[
           tag tag
-          enable_ruby #{enable_ruby}
+          enable_ruby no
           <record>
-            message ${time}
+            message ${unknown}
           </record>
         ]
-        emits = emit(config)
-        emits.each do |(tag, time, record)|
-          assert_equal(@time.to_s, record['message'])
-        end
+        d = create_driver(config, use_v1)
+        mock(d.instance.log).warn("record_reformer: unknown placeholder `${unknown}` found")
+        d.run { d.emit({}, @time) }
+        assert_equal 1, d.emits.size
       end
 
-      test "record keys with enable_ruby #{enable_ruby}" do
+      test 'failed to expand record field (enable_ruby yes)' do
         config = %[
           tag tag
-          enable_ruby #{enable_ruby}
-          remove_keys eventType0
+          enable_ruby yes
           <record>
-            message bar ${message}
-            eventtype ${eventType0}
+            message ${unknown['bar']}
           </record>
         ]
-        msgs = ['1', '2']
-        emits = emit(config, msgs)
-        emits.each_with_index do |(tag, time, record), i|
-          assert_not_include(record, 'eventType0')
-          assert_equal("bar", record['eventtype'])
-          assert_equal("bar #{msgs[i]}", record['message'])
+        d = create_driver(config, use_v1)
+        mock(d.instance.log).warn("record_reformer: failed to expand `${unknown['bar']}`", anything)
+        d.run { d.emit({}, @time) }
+        # emit, but nil value
+        assert_equal 1, d.emits.size
+        d.emits.each do |(tag, time, record)|
+          assert_nil(record['message'])
         end
       end
-    end
-
-    test 'unknown placeholder (enable_ruby no)' do
-      config = %[
-        tag tag
-        enable_ruby no
-        <record>
-          message ${unknown}
-        </record>
-      ]
-      d = create_driver(config)
-      mock(d.instance.log).warn("record_reformer: unknown placeholder `${unknown}` found")
-      d.run { d.emit({}, @time) }
-      assert_equal 1, d.emits.size
-    end
 
-    test 'failed to expand record field (enable_ruby yes)' do
-      config = %[
-        tag tag
-        enable_ruby yes
-        <record>
-          message ${unknown['bar']}
-        </record>
-      ]
-      d = create_driver(config)
-      mock(d.instance.log).warn("record_reformer: failed to expand `${unknown['bar']}`", anything)
-      d.run { d.emit({}, @time) }
-      # emit, but nil value
-      assert_equal 1, d.emits.size
-      d.emits.each do |(tag, time, record)|
-        assert_nil(record['message'])
+      test 'failed to expand tag (enable_ruby yes)' do
+        config = %[
+          tag ${unknown['bar']}
+          enable_ruby yes
+        ]
+        d = create_driver(config, use_v1)
+        mock(d.instance.log).warn("record_reformer: failed to expand `${unknown['bar']}`", anything)
+        d.run { d.emit({}, @time) }
+        # nil tag message should not be emitted
+        assert_equal 0, d.emits.size
       end
     end
-
-    test 'failed to expand tag (enable_ruby yes)' do
-      config = %[
-        tag ${unknown['bar']}
-        enable_ruby yes
-      ]
-      d = create_driver(config)
-      mock(d.instance.log).warn("record_reformer: failed to expand `${unknown['bar']}`", anything)
-      d.run { d.emit({}, @time) }
-      # nil tag message should not be emitted
-      assert_equal 0, d.emits.size
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-reformer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to add or replace fields of a event record