fluent-plugin-simplearithmetic 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9896bc5f77125536a6e6efec0c519947c8b8c487
-  data.tar.gz: 0416741cba7d514ed3bdaf97f063ad03a3d87f33
+  metadata.gz: 0729561faf0a6bdfe8b37615452a2db2207e0d9a
+  data.tar.gz: 3d5dbbf8965144c1c2b6403f38210d1532963399
 SHA512:
-  metadata.gz: 6f18b7a4f4f43996d715a41231946bf83eecf67a2af69d096e82a5f72d60a7e0946c62a9a3c88482fc635b3dbd57d0905f95ba3718fdf6d35c89a2d7e4089ed7
-  data.tar.gz: 2574ec4b858814077aa20b9ceb44a4d8f95588fc233ee661229495035394aec602132399e88e2cc35446071eec68ead80be5151540a34d2beb1070a044646f0f
+  metadata.gz: cf12f6164a95569664a573f10e52cfdddee25cefaa1ba73bf6dd95f71ce5504ec47cfe22b8b7b5798eb16421d4e7647708d63e8d37181ef6c76888bc7904d616
+  data.tar.gz: cecbe91a3a1f9ecabb386f2c285ff008f0d30c223772cbf79725f6c3da09b3417c571717d90430d2c41908a24d50d8e6b72b2995e774fbe29ee9cdb787350f34

data/NOTICE

@@ -0,0 +1,6 @@
+fluent-plugin-simplearithmetic
+
+Copyright 2014- Takahiro Kamatani
+
+The portion of this product was originally developed by Muddy Dixon, for fluent-plugin-datacalculator.
+fluent-plugin-datacalculator is licensed under Apache License v2.0 and available at https://github.com/muddydixon/fluent-plugin-datacalculator

data/README.md

@@ -5,7 +5,7 @@ This fluentd output plugin helps you to calculate messages.
 This plugin is based on [fluent-plugin-datacalculator](https://github.com/muddydixon/fluent-plugin-datacalculator) written by Muddy Dixon. This plugin doesn't have a summarize function which provided by fluent-plugin-datacalculator.
 
 
-## Installaion
+## Installation
 
 ```
 $ fluent-gem install fluent-plugin-simplearithmetic
@@ -120,22 +120,25 @@ All formulas will be evaluated as ruby sentences. Some json fields will not be f
 
 ```
 <formulas>
-   var-1   a + b
-   var$2   c * d
+   var-1  a + b
+   var$2  c * d
+   var@   "@@@"
 </formulas>
 ```
 
 will raise an syntax error in the initialize process of fluentd.
 
-To get rid of this case, you can set `replace_hyphen` and `replace_dollar` in the configuration and formulas.
+To get rid of this case, you can set `replace_hyphen`, `replace_at` and `replace_dollar` in the configuration and formulas.
 
 ```
 replace_hyphen   __H__
 replace_dollar   __D__
+replace_at       __AT__
 
 <formulas>
-   var__H__1   a + b
-   var__D__2   c * d
+   var__H__1  a + b
+   var__D__2  c * d
+   var__AT__  "@@@"
 </formulas>
 ```
 

data/fluent-plugin-simplearithmetic.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-simplearithmetic"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Takahiro Kamatani"]
   spec.email         = ["buhii314@gmail.com"]
   spec.description   = %q{Fluent plugin to calculate messages.}

data/lib/fluent/plugin/out_simple_arithmetic.rb

@@ -13,6 +13,7 @@ module Fluent
 
     config_param :replace_hyphen, :string, :default => '__HYPHON__'
     config_param :replace_dollar, :string, :default => '__DOLLAR__'
+    config_param :replace_at,     :string, :default => '__AT__'
 
     attr_accessor :_formulas
 
@@ -91,7 +92,7 @@ module Fluent
       # 'var-1' -> 'var__HYPHEN__1'
       new_record = {}
       record.each_pair {|key, value|
-        new_key = key.gsub('-', @replace_hyphen).gsub('$', @replace_dollar)
+        new_key = key.gsub('-', @replace_hyphen).gsub('$', @replace_dollar).gsub('@', @replace_at)
         new_record[new_key] = value
       }
       return new_record
@@ -101,7 +102,7 @@ module Fluent
       # 'var__HYPHEN__1' -> 'var-1'
       new_record = {}
       record.each_pair {|key, value|
-        new_key = key.gsub(@replace_hyphen, '-').gsub(@replace_dollar, '$')
+        new_key = key.gsub(@replace_hyphen, '-').gsub(@replace_dollar, '$').gsub(@replace_at, '@')
         new_record[new_key] = value
       }
       new_record

data/test/plugin/test_out_simple_arithmetic.rb

@@ -50,19 +50,21 @@ class SimpleArithmeticOutputTest < Test::Unit::TestCase
     d1 = create_driver %[
       replace_hyphen  __H__
       replace_dollar  __D__
+      replace_at      __AT__
       <formulas>
-        var__H__1  __H__2 * var__D__3
-        __D__3  __D__1 + __D__2
+        var__H__1        __H__2 * var__D__3
+        __D__3           __D__1 + __D__2
+        __AT__timestamp  var__AT__
       </formulas>
     ]
     assert_equal '__H__', d1.instance.replace_hyphen
     assert_equal '__D__', d1.instance.replace_dollar
     d1.run do
       time = Time.parse("2011-01-02 13:14:15 UTC").to_i
-      d1.emit({'-2'=>10, 'var$3'=>20}, time)
+      d1.emit({'-2'=>10, 'var$3'=>20, 'var@'=>'__at'}, time)
       d1.emit({'$1'=>10, '$2'=>20}, time)
     end
-    assert_equal d1.emits[0][2], {"-2"=>10, "var$3"=>20, "var-1"=>200}
+    assert_equal d1.emits[0][2], {"-2"=>10, "var$3"=>20, "var-1"=>200, "var@"=>"__at", "@timestamp"=>"__at"}
     assert_equal d1.emits[1][2], {"$1"=>10, "$2"=>20, "$3"=>30}
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-simplearithmetic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Takahiro Kamatani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -48,6 +48,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
+- NOTICE
 - README.md
 - Rakefile
 - fluent-plugin-simplearithmetic.gemspec