fluent-plugin-unit-time-filter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0bf31be1cb31c459450da1fe3d767a6ed82f3d
-  data.tar.gz: 48f82a08b5bd76cbe50f5d930a297d5ba67f74c4
+  metadata.gz: 8f1bd07a1afac7e72f3568f45e2de855ad7327ba
+  data.tar.gz: 6e84001ccb9b650ec8d826ba8dcd6840d88d02fe
 SHA512:
-  metadata.gz: 7dd5dedbbcbfaf1425baddaef19c51856ddfcdc149afcbd44d5b2d144dfa1806745ef72b063a0d6f7acc41763d36579fa7217ddae1a739286f93a6c149476457
-  data.tar.gz: 24a6577e6917f9c79f92521030c483f5884e449c47df6ec114c5b76693164a7fd9ab8de49e20a25a9153b6b95316d0a85252862865dde4a33b1edd63aa3f6e77
+  metadata.gz: 09ae3f0a588e3e71059097efe7e3c98b39ffdcf78743c4acaa5bd9089f264295948332f0773cc664dd3803b80d2c8d0036ae36baf562f2f65c827b18aeece6c2
+  data.tar.gz: f7c99021e342a03d7d412b9069e3cd4b353ed65d41ef64d583c0312aa3cc77019dd86d4f8f0c9d485b217f02a7ba6639e12eb55fb5b998891b1544a34c2165b2

data/fluent-plugin-unit-time-filter.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-unit-time-filter"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.3"
   spec.authors       = ["Genki Sugawara"]
   spec.email         = ["sgwr_dts@yahoo.co.jp"]
   spec.description   = %q{Plug-in to aggregate by unit time}

data/lib/fluent/plugin/out_unit_time_filter.rb

@@ -30,8 +30,8 @@ class Fluent::UnitTimeFilterOutput < Fluent::Output
       raise Fluent::ConfigError, "Invalid filter: #{@filter_path}: #{e}"
     end
 
-    unless @filter.kind_of?(Proc)
-      raise Fluent::ConfigError, "Invalid filter: #{@filter_path}: Filter must be Proc"
+    unless @filter.respond_to?(:call)
+      raise Fluent::ConfigError, "`call` method not implemented in filter: #{@filter_path}: Filter must be Proc"
     end
   end
 

data/lib/fluent/plugin/unit_time_filter_buffer.rb

@@ -3,18 +3,19 @@ class Fluent::UnitTimeFilterOutput < Fluent::Output
     include Enumerable
 
     def initialize(options)
-      @init_queue = []
       @log = options[:log]
 
-      @fiber = Fiber.new do |tag, es|
-        @init_queue << [tag, es]
+      @fiber = Fiber.new do
         run(options)
       end
+
+      # Step to `yield`
+      @fiber.resume
     end
 
     def each
       loop do
-        tag, es = @init_queue.shift || Fiber.yield
+        tag, es = Fiber.yield
         break unless (tag && es)
 
         es.each do |time, record|

data/spec/out_unit_time_filter_spec.rb

@@ -362,4 +362,37 @@ describe Fluent::UnitTimeFilterOutput do
       end
     end
   end
+
+  describe 'when the non-Proc filter passed' do
+    it 'should be filtered' do
+      filter = <<-EOS
+        class Filter
+          def call(records)
+            @total_count ||= 0
+            @total_count += records.count
+            {'total_count' => @total_count}
+          end
+        end
+        Filter.new
+      EOS
+
+      run_driver(:filter => filter) do |d|
+        (0...10).each do |i|
+          d.emit({"key#{i}" => "val#{i}"}, time + i)
+          d.emit({"key#{i}_" => "val#{i}_"}, time + i)
+        end
+
+        expect(d.emits).to eq(
+          [["filtered.test.default", 1391832855, {"total_count"=>2}],
+           ["filtered.test.default", 1391832856, {"total_count"=>4}],
+           ["filtered.test.default", 1391832857, {"total_count"=>6}],
+           ["filtered.test.default", 1391832858, {"total_count"=>8}],
+           ["filtered.test.default", 1391832859, {"total_count"=>10}],
+           ["filtered.test.default", 1391832860, {"total_count"=>12}],
+           ["filtered.test.default", 1391832861, {"total_count"=>14}],
+           ["filtered.test.default", 1391832862, {"total_count"=>16}]]
+        )
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-unit-time-filter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd