fluent-plugin-datacalculator 0.0.3 → 0.0.4

data/Rakefile

@@ -7,5 +7,12 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+desc "fomulas test"
+Rake::TestTask.new(:fomulas) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_out_datacalculator_fomulas.rb'
+  test.verbose = true
+end
+
 task :default => :test
 

data/example.conf

@@ -2,6 +2,21 @@
   type forward
 </source>
 
+
+
+<match payment.install>
+  type datacalculator
+  tag result.install
+  count_interval 5s
+  aggregate keys area_id, mission_id
+  formulas sum = amount * price, cnt = 1, total = amount
+  finalizer name = "area_" + cnt.to_s
+  <unmatched>
+    type file
+    path unmatched
+  </unmatched>
+</match>
+
 <match payment.quest>
   type datacalculator
   tag result.quest

data/fluent-plugin-datacalculator.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-datacalculator"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.authors     = ["Muddy Dixon"]
   s.email       = ["muddydixon@gmail.com"]
   s.homepage    = "https://github.com/muddydixon/fluent-plugin-datacalculator"

data/lib/fluent/plugin/out_datacalculator.rb

@@ -70,8 +70,12 @@ class Fluent::DataCalculatorOutput < Fluent::Output
     def createFunc (cnt, str)
       str.strip!
       left, right = str.split(/\s*=\s*/, 2)
-      # Fluent moduleだけはOK
-      rights = right.scan(/[a-zA-Z][\w\d_\.\$\:\@]*/).uniq.select{|x| x.index('Fluent') != 0}
+
+      rights = right.gsub(/([^\\]|^)\".+[^\\]\"/, '')
+      rights = rights.scan(/[a-zA-Z][\w\d_\.\$\:\@]*/).uniq.select{|x| not x.match(/^[A-Z]/)}
+      rights = rights.map do|var|
+        var.sub(/[\.:].+$/, '')
+      end
 
       begin
         f = eval('lambda {|'+rights.join(',')+'|  '+right + '}')
@@ -94,7 +98,11 @@ class Fluent::DataCalculatorOutput < Fluent::Output
         end
         _argv.push obj[arg]
       }
-      formula.call(*_argv)
+      begin
+        formula.call(*_argv)
+      rescue ArgumentError
+        raise Fluent::RuntimeError, "argument error " + _argv + " are adapted to "+ formula
+      end
     end
 
     @_formulas = []

data/test/plugin/test_out_datacalculator_fomulas.rb

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class DataCalculatorOutputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  CONFIG = %[
+    unit minute
+    aggregate tag
+    input_tag_remove_prefix test
+    formulas sum = amount * price, amounts = amount, record = 1
+    finalizer ave = amounts > 0 ? 1.0 * sum / amounts : 0
+  ]
+
+  def create_driver(conf = CONFIG, tag='test.input')
+    Fluent::Test::OutputTestDriver.new(Fluent::DataCalculatorOutput, tag).configure(conf)
+  end
+
+  def test_create_formula
+
+    # case: common case
+    d = create_driver %[
+      aggregate all
+      formulas sum = amount * price, cnt = amount
+    ]
+    assert_equal 0, d.instance._formulas[0][0]
+    assert_equal 'sum', d.instance._formulas[0][1]
+    assert_equal ['amount', 'price'], d.instance._formulas[0][2]
+    assert_equal 1, d.instance._formulas[1][0]
+    assert_equal 'cnt', d.instance._formulas[1][1]
+    assert_equal ['amount'], d.instance._formulas[1][2]
+
+    assert_equal 200, d.instance._formulas[0][3].call(10, 20)
+    assert_equal 20, d.instance._formulas[1][3].call(20)
+    assert_raise(ArgumentError){
+      d.instance._formulas[0][3].call(10)
+    }
+
+    # case: use Class
+    d = create_driver %[
+      aggregate all
+      formulas time = Fluent::Engine.now
+    ]
+    assert_equal 0, d.instance._formulas[0][0]
+    assert_equal 'time', d.instance._formulas[0][1]
+    assert_equal [], d.instance._formulas[0][2]
+    assert_equal Time.now.to_i, d.instance._formulas[0][3].call()
+
+    # case: use instance.method
+    d = create_driver %[
+      aggregate all
+      formulas sum = amount.to_i * price, cnt = amount
+    ]
+    assert_equal 0, d.instance._formulas[0][0]
+    assert_equal 'sum', d.instance._formulas[0][1]
+    assert_equal ['amount', 'price'], d.instance._formulas[0][2]
+    assert_equal 1, d.instance._formulas[1][0]
+    assert_equal 'cnt', d.instance._formulas[1][1]
+    assert_equal ['amount'], d.instance._formulas[1][2]
+
+    assert_equal 200, d.instance._formulas[0][3].call("10", 20)
+    assert_equal 20, d.instance._formulas[1][3].call(20)
+    assert_raise(ArgumentError){
+      d.instance._formulas[0][3].call(10)
+    }
+
+    # case: use string
+    d = create_driver %[
+      aggregate all
+      formulas cnt = 1
+      finalizer name = "muddy" + "dixon" + cnt.to_s
+    ]
+    assert_equal 0, d.instance._finalizer[0]
+    assert_equal ['cnt'], d.instance._finalizer[2]
+    assert_equal "muddydixon20", d.instance._finalizer[3].call(20)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datacalculator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -61,6 +61,7 @@ files:
 - lib/fluent/plugin/out_datacalculator.rb
 - test/helper.rb
 - test/plugin/test_out_datacalculator.rb
+- test/plugin/test_out_datacalculator_fomulas.rb
 homepage: https://github.com/muddydixon/fluent-plugin-datacalculator
 licenses: []
 post_install_message: 
@@ -88,3 +89,4 @@ summary: Output filter plugin to calculate messages that matches specified condi
 test_files:
 - test/helper.rb
 - test/plugin/test_out_datacalculator.rb
+- test/plugin/test_out_datacalculator_fomulas.rb