fluent-plugin-forest 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3258fc645b387ab5f9dbd03981fff601d5ee66a
-  data.tar.gz: 1254f5e53ce7d0ecb7195033c459f3a02c7d1976
+  metadata.gz: 05ff9d75e8864a29e9ae2c43cdff96a137e53062
+  data.tar.gz: f75361da08c4990575e0e8938df23c36f0b64465
 SHA512:
-  metadata.gz: d4a445761e331b96e551a18c18937bfef3dff23ea71d9510d3f4e40be851b66364ed8eb63acc7a76d59d007f639023eb459cc01696bc8f8af237d6ce2f9e3e1a
-  data.tar.gz: f038b8287ff57a31ff260af1de9e8449e5659042719d81242551de828889d07a26497526521c3aa277b4ebe7ac66ca5d6d710c43d33154e790938f6f93070708
+  metadata.gz: a6b921ca4e6b17126bcf80988eea42a541ec9cb15dcdfd1fe079a9bc0f5f674b6b2b074ff2b1abd7f75362661475f7a5037799fa08b9735a5e2491989b13ffb2
+  data.tar.gz: 7925733f1ce183561d5d4f67ec291c8dfda7e0a024a95fb941ba12cd6cdc19fb28b8d202f9c752d0adcb5178d5a6d0f9196aaba40e079d7c4e3b80decc6bb78e

data/README.md

@@ -156,6 +156,10 @@ Subsections with same arguments will be overwritten. See this example:
 
 In this case, `<route {search,admin}.*>` subsection will be overwritten to add prefix 'other' for tag `service.admin.*`.
 
+### For Configuration DSL
+
+In DSL configurations, `case` is reserved by Ruby itself. Use `pattern` instead of `case`. `pattern` works just as same as `case`. (`v0.3.0` or later.)
+
 ## TODO
 
 * patches welcome!

data/fluent-plugin-forest.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-forest"
-  gem.version       = "0.2.4"
+  gem.version       = "0.3.0"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{create sub-plugin dynamically per tags, with template configuration and parameters}

data/lib/fluent/plugin/out_forest.rb

@@ -40,7 +40,7 @@ class Fluent::ForestOutput < Fluent::MultiOutput
       case element.name
       when 'template'
         @template = element
-      when 'case'
+      when 'case', 'pattern'
         matcher = Fluent::GlobMatchPattern.new(element.arg)
         @cases.push([matcher, element])
       end

data/test/plugin/test_out_forest.rb

@@ -82,6 +82,52 @@ subtype hoge
     assert_equal 'd.zz', conf['alt_key']
   end
 
+  def test_spec_with_pattern_section
+    d = create_driver %[
+subtype hoge
+<template>
+  keyx xxxxxx
+  keyy yyyyyy.__TAG__
+  alt_key a
+</template>
+<pattern xx>
+  keyz z1
+  alt_key b
+</pattern>
+<pattern yy.**>
+  keyz z2
+  alt_key c
+</pattern>
+<pattern *>
+  keyz z3
+  alt_key d.__TAG__
+</pattern>
+    ]
+    conf = d.instance.spec('xx')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.xx', conf['keyy']
+    assert_equal 'z1', conf['keyz']
+    assert_equal 'b', conf['alt_key']
+
+    conf = d.instance.spec('yy')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.yy', conf['keyy']
+    assert_equal 'z2', conf['keyz']
+    assert_equal 'c', conf['alt_key']
+
+    conf = d.instance.spec('yy.3')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.yy.3', conf['keyy']
+    assert_equal 'z2', conf['keyz']
+    assert_equal 'c', conf['alt_key']
+
+    conf = d.instance.spec('zz')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.zz', conf['keyy']
+    assert_equal 'z3', conf['keyz']
+    assert_equal 'd.zz', conf['alt_key']
+  end
+
   NESTED_CONF = %[
 subtype hoge
 <template>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-forest
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,3 +87,4 @@ test_files:
 - test/output/out_forest_test.rb
 - test/plugin/test_out_forest.rb
 - test/plugin/test_out_forest_test.rb
+has_rdoc: