fluent-plugin-datacalculator 0.0.4 → 0.0.5

data/Rakefile

@@ -7,12 +7,5 @@ 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,21 +2,6 @@
   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.4"
+  s.version     = "0.0.5"
   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

@@ -24,15 +24,27 @@ class Fluent::DataCalculatorOutput < Fluent::Output
     if @count_interval
       @tick = @count_interval.to_i
     else
-      @tick = case @unit
-              when 'minute' then 60
-              when 'hour' then 3600
-              when 'day' then 86400
-              else 
-                raise RuntimeError, "@unit must be one of minute/hour/day"
-              end
+      if @unit.index('sec') == 0
+        @tick = 1
+      elsif @unit.index('sec') != nil
+        @tick = @unit[0, @unit.index('sec')].to_i
+      elsif @unit.index('minute') == 0
+        @tick = 60
+      elsif @unit.index('minute') != nil
+        @tick = @unit[0, @unit.index('minute')].to_i * 60
+      elsif @unit.index('hour') == 0
+        @tick = 3600
+      elsif @unit.index('hour') != nil
+        @tick = @unit[0, @unit.index('hour')].to_i * 3600
+      elsif @unit.index('day') == 0
+        @tick = 86400
+      elsif @unit.index('day') != nil
+        @tick = @unit[0, @unit.index('day')].to_i * 86400
+      else
+        raise RuntimeError, "@unit must be one of Xsec[onds]/Xminute[s]/Xhour[s]/Xday[s]"
+      end
     end
-    
+
 
     conf.elements.each do |element|
       element.keys.each do |k|
@@ -70,12 +82,8 @@ class Fluent::DataCalculatorOutput < Fluent::Output
     def createFunc (cnt, str)
       str.strip!
       left, right = str.split(/\s*=\s*/, 2)
-
-      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
+      # Fluent moduleだけはOK
+      rights = right.scan(/[a-zA-Z][\w\d_\.\$\:\@]*/).uniq.select{|x| x.index('Fluent') != 0}
 
       begin
         f = eval('lambda {|'+rights.join(',')+'|  '+right + '}')
@@ -96,13 +104,9 @@ class Fluent::DataCalculatorOutput < Fluent::Output
         if tag != nil and tag != 'all'
           arg = tag + '_' + arg
         end
-        _argv.push obj[arg]
+        _argv.push obj[arg].to_f
       }
-      begin
-        formula.call(*_argv)
-      rescue ArgumentError
-        raise Fluent::RuntimeError, "argument error " + _argv + " are adapted to "+ formula
-      end
+      formula.call(*_argv)
     end
 
     @_formulas = []
@@ -167,7 +171,7 @@ class Fluent::DataCalculatorOutput < Fluent::Output
     if @aggregate == :all
       tag = 'all'
     end
-   
+
     @mutex.synchronize {
       @counts[tag] ||= [0] * @_formulas.length
       counts.each_with_index do |count, i|
@@ -208,7 +212,7 @@ class Fluent::DataCalculatorOutput < Fluent::Output
           name = @_formulas[i][1]
           output[name] = count
         end
-        
+
         @aggregate_keys.each_with_index do |key, i|
           output[@aggregate_keys[i]] = pat_val[i]
         end
@@ -216,10 +220,10 @@ class Fluent::DataCalculatorOutput < Fluent::Output
         if @_finalizer
           output[@_finalizer[1]] = execFunc('all', output, @_finalizer[2], @_finalizer[3])
         end
-        
+
         outputs.push(output)
       end
-      
+
       return outputs
     end
 
@@ -253,7 +257,7 @@ class Fluent::DataCalculatorOutput < Fluent::Output
     # for internal, or tests only
     @watcher = Thread.new(&method(:watch))
   end
-  
+
   def watch
     # instance variable, and public accessable, for test
     @last_checked = Fluent::Engine.now
@@ -277,7 +281,7 @@ class Fluent::DataCalculatorOutput < Fluent::Output
   end
 
   def emit (tag, es, chain)
-    
+
     if @aggregate == 'keys'
       emit_aggregate_keys(tag, es, chain)
     else
@@ -314,13 +318,12 @@ class Fluent::DataCalculatorOutput < Fluent::Output
 
   def emit_single_tag (tag, es, chain)
     c = [0] * @_formulas.length
-      
+
     es.each do |time,record|
       matched = false
       if @_formulas.length > 0
         @_formulas.each do |index, outkey, inkeys, formula|
           next unless formula and checkArgs(record, inkeys)
-
           c[index] += execFunc(nil, record, inkeys, formula)
           matched = true
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datacalculator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2164769940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2164769940
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2164769420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2164769420
 description: Output filter plugin to calculate messages that matches specified conditions
 email:
 - muddydixon@gmail.com
@@ -61,7 +51,6 @@ 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: 
@@ -82,11 +71,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-datacalculator
-rubygems_version: 1.8.21
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Output filter plugin to calculate messages that matches specified conditions
 test_files:
 - test/helper.rb
 - test/plugin/test_out_datacalculator.rb
-- test/plugin/test_out_datacalculator_fomulas.rb

data/test/plugin/test_out_datacalculator_fomulas.rb

@@ -1,79 +0,0 @@
-# -*- 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