fluent-plugin-add 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e24142ee147848fe4a6dd43fee405cccd7d19af0
-  data.tar.gz: d4579ea7fdee5a14f187fe40ce09a387e93de438
+  metadata.gz: 7bf64a5f84f157f3c6a8df0255db7bcb35c6a0c3
+  data.tar.gz: 57146af805319e37dbbe649cca5d3eecb6eb064c
 SHA512:
-  metadata.gz: 5a23b8ad838be4e8c849598857f33b54ac9274ebbb3c4b2a36b36f83f86d9c10ff59eab55886f8f15049e4e8e708d903fa2634f77ee238c8073ceac54d0bfe2f
-  data.tar.gz: 0b458e3c58dfcfda2ba0e3a55a42d972c3a4738e9f7b7a07d6c3c3bb2a9ef62e5140485710f2dd49536813dcfb76f57c56ecd42f1a4a633bf752b42ee93762ca
+  metadata.gz: 0cdf4a85caea8d2102544180de4a55a137227a8c351f16181fa99765d1d759e2a84f8b0bdb4fed1d3373870f2c472b5cef457a521af0d41bb73a4e4b8abd67cd
+  data.tar.gz: 2b0956a4286ae55b22f7e9e712c949b191e40f73d84d5ec599596574eb7bfb52e6224073e3cd7f9abb09e56ba190f271c22c5424e83d4d8a94d0781a46868d2a

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+- 2.2
+- 2.1
+- 2.0.0
+- 1.9.3
+bundler_args: --jobs=2
+script: rake test
+branches:
+  only:
+    - master

data/LICENSE.txt

@@ -1 +1,22 @@
-Copyright (c) 2013 yu-yamada 
+Copyright (c) 2013 yu-yamada
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,5 +1,5 @@
-# fluent-plugin-add 
-
+# fluent-plugin-add, a plugin for [Fluentd](http://fluentd.org) 
+[![Build Status](https://travis-ci.org/yu-yamada/fluent-plugin-add.svg?branch=master)](https://travis-ci.org/yu-yamada/fluent-plugin-add)
 
 ## Installation
 
@@ -8,6 +8,8 @@
 
 ## Configration
 
+### AddOutput
+
     <match test.**>
       type add
       add_tag_prefix debug
@@ -23,6 +25,21 @@
 ### then output bocomes as belows
     debug.test.aa: {"json":"dayo", "hoge":"moge","hogehoge":"mogemoge"}
 
+### AddFilter
+
+    <filter test.**>
+      type add
+      <pair>
+        hoge moge
+        hogehoge mogemoge
+      </pair>
+    </filter>
+
+
+### Assuming following inputs are coming:
+    test.aa: {"json":"dayo"}
+### then output bocomes as belows
+    debug.test.aa: {"json":"dayo", "hoge":"moge","hogehoge":"mogemoge"}
 
 ## Contributing
 

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
 
-require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'

data/fluent-plugin-add.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-add"
-  spec.version       = "0.0.3" 
+  spec.version       = "0.0.4" 
   spec.authors       = ["yu yamada"]
   spec.email         = ["yu.yamada07@gmail.com"]
   spec.description   = %q{Output filter plugin to add messages} 
@@ -20,4 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit", "~> 3.1.0"
+  spec.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/filter_add.rb

@@ -0,0 +1,28 @@
+class Fluent::AddFilter < Fluent::Filter
+  Fluent::Plugin.register_filter('add', self)
+
+  def initialize
+    super
+  end
+
+  def configure(conf)
+    super
+
+    @add_hash = Hash.new
+
+    conf.elements.select {|element|
+      element.name == 'pair'
+    }.each do |pair|
+      pair.each do | k,v|
+       @add_hash[k] = v
+      end
+    end
+  end
+
+  def filter(tag, time, record)
+    @add_hash.each do |k,v|
+      record[k] = v
+    end
+    record
+  end
+end if defined?(Fluent::Filter)

data/lib/fluent/plugin/out_add.rb

@@ -1,7 +1,11 @@
-require 'pp'
 class Fluent::AddOutput < Fluent::Output
   Fluent::Plugin.register_output('add', self)
 
+   # Define `router` method of v0.12 to support v0.10.57 or earlier
+  unless method_defined?(:router)
+    define_method("router") { Fluent::Engine }
+  end
+
   config_param :add_tag_prefix, :string, :default => 'greped'
 
   def initialize
@@ -11,8 +15,6 @@ class Fluent::AddOutput < Fluent::Output
   def configure(conf)
     super
 
-    # @key = @key.to_s
-    # @value = @value.to_s 
     @tag_prefix = "#{@add_tag_prefix}."
     @add_hash = Hash.new
 
@@ -35,11 +37,10 @@ class Fluent::AddOutput < Fluent::Output
     emit_tag = @tag_proc.call(tag)
 
     es.each do |time,record|
-      # record[@key] = @value
       @add_hash.each do |k,v|
         record[k] = v
       end
-      Fluent::Engine.emit(emit_tag, time, record)
+      router.emit(emit_tag, time, record)
     end
 
     chain.next

data/test/helper.rb

@@ -11,7 +11,7 @@ require 'test/unit'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-# require 'fluent/test'
+require 'fluent/test'
 unless ENV.has_key?('VERBOSE')
   nulllogger = Object.new
   nulllogger.instance_eval {|obj|
@@ -23,6 +23,7 @@ unless ENV.has_key?('VERBOSE')
 end
 
 require 'fluent/plugin/out_add'
+require 'fluent/plugin/filter_add'
 
 class Test::Unit::TestCase
 end

data/test/plugin/test_filter_add.rb

@@ -0,0 +1,36 @@
+require 'helper'
+
+class AddFilterTest < Test::Unit::TestCase
+  def setup
+    omit("Use Fluentd v0.12 or later.") unless defined?(Fluent::Filter)
+
+    Fluent::Test.setup
+  end
+
+  CONFIG = %[
+    <pair>
+      hoge moge
+      hogehoge mogemoge
+    </pair>
+  ]
+
+  def create_driver(conf = CONFIG, tag='test')
+    Fluent::Test::FilterTestDriver.new(Fluent::AddFilter, tag).configure(conf)
+  end
+
+  def test_configure
+    d = create_driver
+  end
+
+  def test_format
+    d = create_driver
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    d.run do
+      d.filter("a" => 1)
+    end
+    mapped = {'hoge' => 'moge', 'hogehoge' => 'mogemoge'}
+    expect = {"a" => 1}.merge(mapped)
+    assert_equal expect, d.filtered_as_array[0][2]
+  end
+end

data/test/plugin/test_out_add.rb

@@ -6,19 +6,34 @@ class AddOutputTest < Test::Unit::TestCase
   end
 
   CONFIG = %[
+    add_tag_prefix pre_hoge
+    <pair>
+      hoge moge
+      hogehoge mogemoge
+    </pair>
   ]
-  # CONFIG = %[
-  #   path #{TMP_DIR}/out_file_test
-  #   compress gz
-  #   utc
-  # ]
-
+  
   def create_driver(conf = CONFIG, tag='test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::DataCounterOutput, tag).configure(conf)
+    Fluent::Test::OutputTestDriver.new(Fluent::AddOutput, tag).configure(conf)
   end
 
-  def test_configure
+  def test_configure 
+    d = create_driver
+    assert_equal 'pre_hoge', d.instance.config["add_tag_prefix"] 
   end
 
-end
+  def test_format
+    d = create_driver
+    
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    d.run do
+      d.emit("a" => 1)
+    end
+    mapped = {'hoge' => 'moge', 'hogehoge' => 'mogemoge'}
+    assert_equal [
+      {"a" => 1}.merge(mapped),
+    ], d.records
 
+    d.run
+  end
+end

metadata

@@ -1,41 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-add
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - yu yamada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: fluentd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Output filter plugin to add messages
@@ -45,14 +73,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - fluent-plugin-add.gemspec
+- lib/fluent/plugin/filter_add.rb
 - lib/fluent/plugin/out_add.rb
 - test/helper.rb
+- test/plugin/test_filter_add.rb
 - test/plugin/test_out_add.rb
 homepage: https://github.com/yu-yamada/fluent-plugin-add
 licenses:
@@ -64,20 +95,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Output filter plugin to add messages
 test_files:
 - test/helper.rb
+- test/plugin/test_filter_add.rb
 - test/plugin/test_out_add.rb