fluent-plugin-parse_multiple_value_query 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 777fb2b20859695a9110bc3712300ba10ec7762db895f9bc24e26ea4e4d21300
-  data.tar.gz: 3e116c03893bb58809d0714017aa6e325a4aa591be06f020e88a5f55fec33c6f
+  metadata.gz: 1caa0fa710443594e6a2385bb30a422e85cb4305af1cc115bff9d6e53311261e
+  data.tar.gz: 1fb5ee77848f0f8d40bc5ab270680a5616df4ba2a630b504843fda823d988c03
 SHA512:
-  metadata.gz: d49c2ab0eaf6746e0219ae15004188ac80ca43e539f58c9ffb5075734e40c24e42cf20a4d9e4870e03b86fb7af1f743c167a726e0544a5af3e1feee3b588f865
-  data.tar.gz: aacc95d2384d51f78867043dff540c7a647d4aa201007f89c0563aa696131909001417e42e6686c22b144f0593fe415e9af8769c4aebf62df36f2a74ed395ed3
+  metadata.gz: b8a05d553c8dc5c8ab2f5d4b71423e4cf4a97fcbc824db6c3edb84a569a4efb64d0933f20f9b5a97f527973e44c387e53ac5a521c6ec9738af6ed466fb1bc6eb
+  data.tar.gz: 74f4abf2d266de1d074d2249e1fe6c660fe4c2da565559da838408ce022f77f53898ed8bea5d5714992d439f3017ebb7337f7ba70c22711d2452fb628072efa6

data/README.md

@@ -19,6 +19,12 @@ output
       "key3": [""]
     }
 ```
+## Requirements
+
+| fluent-plugin-parse_multiple_value_query | Fluentd     | Ruby   |
+|---------------------------|-------------|--------|
+| >= 2.0.0                  | >= v0.14.0  | >= 2.1 |
+| < 2.0.0                   | >= v0.12.0  | >= 1.9 |
 
 ## Installation
 

data/fluent-plugin-parse_multiple_value_query.gemspec

@@ -16,12 +16,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'fluentd', '~> 0.12.0'
+  spec.add_dependency 'fluentd',  ['>= 0.14.0', '< 2']
   spec.add_dependency 'rack', '>= 1.6.11'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rr'
   spec.add_development_dependency 'rubocop'

data/lib/fluent/plugin/out_parse_multiple_value_query.rb

@@ -1,5 +1,7 @@
-module Fluent
-  class ParseMultipleValueQueryOutput < Output
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
+  class ParseMultipleValueQueryOutput < Fluent::Plugin::Output
     Fluent::Plugin.register_output('parse_multiple_value_query', self)
 
     config_param :key,                :string
@@ -9,6 +11,8 @@ module Fluent
     config_param :sub_key,            :string, default: nil
     config_param :without_host,       :bool, default: false
 
+    helpers :event_emitter
+
     def initialize
       super
       require 'rack'
@@ -29,14 +33,18 @@ module Fluent
       super
     end
 
-    def emit(tag, es, chain)
+    def multi_workers_ready?
+      true
+    end
+
+    def process(tag, es)
       es.each do |time, record|
         t = tag.dup
         new_record = parse_uri(record)
 
         t = @tag_prefix + t unless @tag_prefix.nil?
 
-        Engine.emit(t, time, new_record)
+        router.emit(t, time, new_record)
       end
       chain.next
     rescue StandardError => e

data/lib/fluent/plugin/parse_multiple_value_query/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module ParseMultipleValueQuery
-    VERSION = '1.0.0'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/test/helper.rb

@@ -1,28 +1,5 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  warn e.message
-  warn 'Run `bundle install` to install missing gems'
-  exit e.status_code
-end
-require 'test/unit'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'fluent/test'
-unless ENV.key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval do |_obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  end
-  $log = nulllogger
-end
-
-require 'fluent/plugin/out_parse_multiple_value_query'
-
-class Test::Unit::TestCase
-end
+require "bundler/setup"
+require "test/unit"
+$LOAD_PATH.unshift(File.join(__dir__, "..", "lib"))
+$LOAD_PATH.unshift(__dir__)
+require "fluent/test"

data/test/plugin/test_out_parse_multiple_value_query.rb

@@ -1,184 +1,178 @@
 require 'helper'
 require 'rr'
+require 'pry-byebug'
 require 'fluent/plugin/out_parse_multiple_value_query'
+require 'fluent/test/driver/output'
+require 'fluent/test/helpers'
+
+class ParseMultipleValueQueryOutputTest < Test::Unit::TestCase
+  include Fluent::Test::Helpers
 
-class ParseMultipleValueQueryOutTest < Test::Unit::TestCase
   URL = 'http://example.com:80/?foo=bar&baz=qux&multiple[]=1&multiple[]=2&multiple[]=3&multiple2[]='.freeze
   URL_INCLUDE_JP = 'http://example.com:80/?foo=bar&baz=qux&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%AD%E3%82%B9%E3%82%AF&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%B7%E3%82%A7%E3%83%B3%E3%82%AB%E3%83%BC&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%B8%E3%83%A3%E3%82%AF%E3%82%BD%E3%83%B3'.freeze
   ONLY_QUERY_STRING_TEST = 'foo=bar&baz=qux&multiple[]=1&multiple[]=2&multiple[]=3&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%AD%E3%82%B9%E3%82%AF&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%B7%E3%82%A7%E3%83%B3%E3%82%AB%E3%83%BC&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%B8%E3%83%A3%E3%82%AF%E3%82%BD%E3%83%B3'.freeze
   REMOVE_EMPTY_KEY = 'http://example.com:80/?foo=bar&baz=qux&multiple[]=&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%AD%E3%82%B9%E3%82%AF&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%B7%E3%82%A7%E3%83%B3%E3%82%AB%E3%83%BC&%E3%81%BE%E3%81%84%E3%81%91%E3%82%8B%5B%5D=%E3%82%B8%E3%83%A3%E3%82%AF%E3%82%BD%E3%83%B3&multiple2[]'.freeze
   WITHOUT_HOST = '/test/url?foo=bar&baz=qux&multiple[]=1&multiple[]=2&multiple[]=3&multiple2[]='.freeze
 
-  def setup
-    Fluent::Test.setup
-  end
-
-  def create_driver(conf, tag)
-    Fluent::Test::OutputTestDriver.new(
-      Fluent::ParseMultipleValueQueryOutput, tag
-    ).configure(conf)
-  end
-
-  def emit(conf, record, tag = 'test')
-    d = create_driver(conf, tag)
-    d.run { d.emit(record) }
-    d.emits
+  def create_driver(conf)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::ParseMultipleValueQueryOutput).configure(conf)
   end
 
-  def test_configure
-    d = create_driver(%(
-      key                url
-      only_query_string  true
-    ), 'test')
-
-    assert_equal 'url',  d.instance.key
-    assert_equal true,   d.instance.only_query_string
+  def setup
+    Fluent::Test.setup
   end
 
-  def test_filter_record
-    conf = %(
-      key            url
-    )
-
-    record = {
-      'url' => URL
-    }
-
-    emits = emit(conf, record)
+  sub_test_case 'configure' do
+    test 'configure' do
+      d = create_driver(%(
+      key url
+      only_query_string true
+      ))
 
-    emits.each_with_index do |(tag, _time, emit_record), _i|
-      assert_equal 'parsed.test', tag
-      assert_equal URL,       emit_record['url']
-      assert_equal 'bar',     emit_record['foo']
-      assert_equal 'qux',     emit_record['baz']
-      assert_equal %w[1 2 3], emit_record['multiple']
-      assert_equal [''],      emit_record['multiple2']
+      assert_equal 'url', d.instance.key
+      assert_equal true,  d.instance.only_query_string
     end
   end
 
-  def test_jp_filter_record
-    conf = %(
-      key            url
-    )
-
-    record = {
-      'url' => URL_INCLUDE_JP
-    }
-
-    emits = emit(conf, record)
-
-    emits.each_with_index do |(tag, _time, emit_record), _i|
-      assert_equal 'parsed.test', tag
-      assert_equal URL_INCLUDE_JP, emit_record['url']
-      assert_equal 'bar',     emit_record['foo']
-      assert_equal 'qux',     emit_record['baz']
-      assert_equal %w[キスク シェンカー ジャクソン], emit_record['まいける']
+  sub_test_case 'emit events' do
+    test 'filter record' do
+      d = create_driver(%(
+        key url
+      ))
+      time = event_time
+
+      d.run(default_tag: 'test') do
+        d.feed(time, { 'url' => URL })
+      end
+      events = d.events
+      event = events.first
+
+      assert_equal 'parsed.test', event.first
+      assert_equal URL,           event[2]['url']
+      assert_equal 'bar',         event[2]['foo']
+      assert_equal 'qux',         event[2]['baz']
+      assert_equal %w[1 2 3],     event[2]['multiple']
+      assert_equal [''],          event[2]['multiple2']
     end
-  end
 
-  def test_only_query_string_filter_record
-    conf = %(
-      key                query_string
-      only_query_string  true
-    )
-
-    record = {
-      'query_string' => ONLY_QUERY_STRING_TEST
-    }
-
-    emits = emit(conf, record)
-
-    emits.each_with_index do |(tag, _time, emit_record), _i|
-      assert_equal 'parsed.test', tag
-      assert_equal ONLY_QUERY_STRING_TEST, emit_record['query_string']
-      assert_equal 'bar',     emit_record['foo']
-      assert_equal 'qux',     emit_record['baz']
-      assert_equal %w[1 2 3], emit_record['multiple']
-      assert_equal %w[キスク シェンカー ジャクソン], emit_record['まいける']
+    test 'jp filter record' do
+      d = create_driver(%(
+        key url
+      ))
+      time = event_time
+
+      d.run(default_tag: 'test') do
+        d.feed(time, { 'url' => URL_INCLUDE_JP })
+      end
+      events = d.events
+      event = events.first
+
+      assert_equal 'parsed.test',                    event.first
+      assert_equal URL_INCLUDE_JP,                   event[2]['url']
+      assert_equal 'bar',                            event[2]['foo']
+      assert_equal 'qux',                            event[2]['baz']
+      assert_equal %w[キスク シェンカー ジャクソン], event[2]['まいける']
     end
-  end
 
-  def test_remove_empty_array
-    conf = %(
-      key                 url
-      remove_empty_array  true
-    )
-
-    record = {
-      'url' => REMOVE_EMPTY_KEY
-    }
-
-    emits = emit(conf, record)
-
-    emits.each_with_index do |(tag, _time, emit_record), _i|
-      assert_equal 'parsed.test', tag
-      assert_equal REMOVE_EMPTY_KEY,    emit_record['url']
-      assert_equal 'bar',               emit_record['foo']
-      assert_equal 'qux',               emit_record['baz']
-      assert_equal nil,                 emit_record['multiple']
-      assert_equal nil,                 emit_record['multiple2']
+    test 'only query string filter record' do
+      d = create_driver(%(
+        key query_string
+        only_query_string true
+      ))
+      time = event_time
+
+      d.run(default_tag: 'test') do
+        d.feed(time, { 'query_string' => ONLY_QUERY_STRING_TEST })
+      end
+      events = d.events
+      event = events.first
+
+      assert_equal 'parsed.test',                    event.first
+      assert_equal ONLY_QUERY_STRING_TEST,           event[2]['query_string']
+      assert_equal 'bar',                            event[2]['foo']
+      assert_equal 'qux',                            event[2]['baz']
+      assert_equal %w[1 2 3],                        event[2]['multiple']
+      assert_equal %w[キスク シェンカー ジャクソン], event[2]['まいける']
     end
-  end
-
-  def test_tag_prefix
-    conf = %(
-      key                 url
-      tag_prefix          prefix.
-    )
 
-    record = {
-      'url' => URL
-    }
-
-    emits = emit(conf, record)
-
-    emits.each_with_index do |(tag, _time, emit_record), _i|
-      assert_equal 'prefix.test', tag
-      assert_equal URL,       emit_record['url']
-      assert_equal 'bar',     emit_record['foo']
-      assert_equal 'qux',     emit_record['baz']
-      assert_equal %w[1 2 3], emit_record['multiple']
+    test 'remove empty array' do
+      d = create_driver(%(
+        key url
+        remove_empty_array  true
+      ))
+      time = event_time
+
+      d.run(default_tag: 'test') do
+        d.feed(time, { 'url' => REMOVE_EMPTY_KEY })
+      end
+      events = d.events
+      event = events.first
+
+      assert_equal 'parsed.test',    event.first
+      assert_equal REMOVE_EMPTY_KEY, event[2]['url']
+      assert_equal 'bar',            event[2]['foo']
+      assert_equal 'qux',            event[2]['baz']
+      assert_equal nil,              event[2]['multiple']
+      assert_equal nil,              event[2]['multiple2']
     end
-  end
 
-  def test_sub_key
-    conf = %(
-      key                 url
-      sub_key             url_parsed
-    )
-
-    record = {
-      'url' => URL
-    }
-
-    emits = emit(conf, record)
-
-    emits.each_with_index do |(_tag, _time, emit_record), _i|
-      assert_equal URL,       emit_record['url']
-      assert_equal 'bar',     emit_record['url_parsed']['foo']
-      assert_equal 'qux',     emit_record['url_parsed']['baz']
-      assert_equal %w[1 2 3], emit_record['url_parsed']['multiple']
+    test 'tag prefix' do
+      d = create_driver(%(
+        key url
+        tag_prefix prefix.
+      ))
+      time = event_time
+
+      d.run(default_tag: 'test') do
+        d.feed(time, { 'url' => URL })
+      end
+      events = d.events
+      event = events.first
+
+      assert_equal 'prefix.test', event.first
+      assert_equal URL,           event[2]['url']
+      assert_equal 'bar',         event[2]['foo']
+      assert_equal 'qux',         event[2]['baz']
+      assert_equal %w[1 2 3],     event[2]['multiple']
     end
-  end
 
-  def test_without_host
-    conf = %(
-      key            url
-      without_host   true
-    )
-
-    record = {
-      'url' => WITHOUT_HOST
-    }
-
-    emits = emit(conf, record)
+    test 'sub key' do
+      d = create_driver(%(
+        key url
+        sub_key url_parsed
+      ))
+      time = event_time
+
+      d.run(default_tag: 'test') do
+        d.feed(time, { 'url' => URL })
+      end
+      events = d.events
+      event = events.first
+
+      assert_equal URL,           event[2]['url']
+      assert_equal 'bar',         event[2]['url_parsed']['foo']
+      assert_equal 'qux',         event[2]['url_parsed']['baz']
+      assert_equal %w[1 2 3],     event[2]['url_parsed']['multiple']
+    end
 
-    emits.each_with_index do |(tag, _time, emit_record), _i|
-      assert_equal 'parsed.test', tag
-      assert_equal 'bar',     emit_record['foo']
-      assert_equal 'qux',     emit_record['baz']
-      assert_equal %w[1 2 3], emit_record['multiple']
-      assert_equal [''],      emit_record['multiple2']
+    test 'without host' do
+      d = create_driver(%(
+        key url
+        without_host true
+      ))
+      time = event_time
+
+      d.run(default_tag: 'test') do
+        d.feed(time, { 'url' => WITHOUT_HOST })
+      end
+      events = d.events
+      event = events.first
+
+      assert_equal 'parsed.test', event.first
+      assert_equal 'bar',         event[2]['foo']
+      assert_equal 'qux',         event[2]['baz']
+      assert_equal %W[1 2 3],     event[2]['multiple']
+      assert_equal [''],          event[2]['multiple2']
     end
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-parse_multiple_value_query
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Hirokazu Hata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement