fluent-plugin-calc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14fc42370c6cdcf0ffd500ca287940035e54151e
-  data.tar.gz: 28b511128dd7c1b714c7e76fdf19c949314e2af3
+  metadata.gz: 509139d04a8c636beb1a9da08e6ee48df90b3a35
+  data.tar.gz: 47bb1eb2987b1fe83c9bac58709eaffcd19fc28f
 SHA512:
-  metadata.gz: c02f0ae43c7cd297e243c5d6b97f5a5d9cb693d4197591a97d58878e9bbb397c8bf66e4530038fc71a948c9e0cffd2204d9b27c595714246a30f45fed8843a6b
-  data.tar.gz: 52f8f3511d14422be46c3e5de7ddcb00e30d88910f6a4185c2c594e2713f1075bc26fa8a24306e3f9a7e2c46736f034b98b9534c515deb9aa7bae8223c2fd94e
+  metadata.gz: 7d4c04775644c8fe7d383e1b85ed803313d9f7e6ef6df4ba2d1f2b8421f8a79287bac9098d370fb8b8a9e78302ab5ec601b9135e16f09ff6e979064ebc7cc709
+  data.tar.gz: 40e571e79841859b9ca6d09b128f58ddc15f148974b59f9b448278647620bf1dd8bc439675bf8faddd9daf6824cedd27b573bf45566cb6b84672666d4313e261

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.1 (2013/09/02)
+
+Fixes
+
+- Fix the case when not record is found.
+
 ## 0.1.0 (2013/09/02)
 
 Changes

data/fluent-plugin-calc.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-calc"
-  s.version     = "0.1.0"
+  s.version     = "0.1.1"
   s.authors     = ["Naotoshi SEO"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-calc"

data/lib/fluent/plugin/out_calc.rb

@@ -74,25 +74,24 @@ class Fluent::CalcOutput < Fluent::Output
   # Called when new line comes. This method actually does not emit
   def emit(tag, es, chain)
     tag = 'all' if @aggregate == 'all'
-      
     # calc
     count = 0; matches = { :sum => {}, :max => {}, :min => {}, :avg => {} }
     es.each do |time, record|
       @sum_keys.each do |key|
-        value = record[key].to_f if record[key]
+        next unless record[key] and value = record[key].to_f
         matches[:sum][key] = sum(matches[:sum][key], value)
       end
       @max_keys.each do |key|
-        value = record[key].to_f if record[key]
+        next unless record[key] and value = record[key].to_f
         matches[:max][key] = max(matches[:max][key], value)
       end
       @min_keys.each do |key|
-        value = record[key].to_f if record[key]
+        next unless record[key] and value = record[key].to_f
         matches[:min][key] = min(matches[:min][key], value)
       end
       @avg_keys.each do |key|
-        value = record[key].to_f if record[key]
-        matches[:avg][key] = avg(matches[:avg][key], value)
+        next unless record[key] and value = record[key].to_f
+        matches[:avg][key] = sum(matches[:avg][key], value)
       end
       record.keys.each do |key|
         value = record[key].to_f

data/spec/out_calc_spec.rb

@@ -38,7 +38,7 @@ describe Fluent::CalcOutput do
     describe 'good configuration' do
       context "nothing" do
         let(:config) { '' }
-        it { expect { driver }.to_not raise_error(Fluent::ConfigError) }
+        it { expect { driver }.to_not raise_error }
       end
 
       context 'sum/max/min/avg' do
@@ -50,7 +50,7 @@ describe Fluent::CalcOutput do
             avg _avg$
           ]
         end
-        it { expect { driver }.to_not raise_error(Fluent::ConfigError) }
+        it { expect { driver }.to_not raise_error }
       end
 
       context "check default" do
@@ -100,9 +100,9 @@ describe Fluent::CalcOutput do
       let(:config) do
         CONFIG + %[
           sum_keys 4xx_count,5xx_count
-          max reqtime_max
-          min reqtime_min
-          avg reqtime_avg
+          max_keys reqtime_max
+          min_keys reqtime_min
+          avg_keys reqtime_avg,not_found
         ]
       end
       before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-calc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Naotoshi SEO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd