fluent-plugin-extract_query_params 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32f3e0844504fd247eaf57b22a5e97c10c618ab1
-  data.tar.gz: 2e611333c38bd4116627c5bd8353b3bb0196ee13
+  metadata.gz: 993a35a9a1e1b944a3cde32b2b770054a261d217
+  data.tar.gz: e7a782eb22c24c36426ac9923dae9828e73697e1
 SHA512:
-  metadata.gz: df7fbd3104671eb2673ba43e5f4fcf00bf428356863af19e94d110f35bce6613561e71b1e012b5a0ab090e8892fe4ae543bbb88dc2a94d69bac161c9d36b8e98
-  data.tar.gz: 55867405a6ca98f174fe6dbcc97c0e2c9f3e751557564d00fd321f6bc1e897fe9a3bdc8fbc990b77968b18de09d815b2e67649dd90eb6c3fc03ff561dabfd5f9
+  metadata.gz: a1e100c5cbf7ebe173431b5afd06557d1277aa27316ec54d0d92ac1bb3a81abf6d7930c31657686ef5520e5119707db4ec1c2f401801367ff875ddb32574a943
+  data.tar.gz: c281cdc98702219c3761f9c298cc597f18b65381f194286ae621c716750fa89e7c995152d8a141614fef72ddce658f6f459e03312d36153ea6e278abb04bdf72

data/.travis.yml

@@ -1,11 +1,13 @@
+sudo: false
 language: ruby
 
 rvm:
   - 2.1
   - 2.2
+  - 2.3.1
 
 gemfile:
-  - gemfiles/fluentd_0.10.gemfile
-  - gemfiles/fluentd_0.12.gemfile
+  - gemfiles/fluentd_0.14.gemfile
 
+before_script: gem update bundler
 script: bundle exec rake test

data/Appraisals

@@ -1,7 +1,3 @@
-appraise 'fluentd-0.10' do
-  gem 'fluentd', '0.10.61' # the last version of 0.10.x
-end
-
-appraise 'fluentd-0.12' do
-  gem 'rails', '~> 0.12.0'
+appraise 'fluentd-0.14' do
+  gem 'fluentd', '~> 0.14.0'
 end

data/README.md

@@ -14,7 +14,7 @@ fluentd `< 0.12`:
 
 ```
 <match test.**>
-  type extract_query_params
+  @type extract_query_params
 
   key            url
   add_tag_prefix extracted.
@@ -26,10 +26,9 @@ fluentd `>= 0.12`:
 
 ```
 <filter test.**>
-  type extract_query_params
+  @type extract_query_params
 
   key            url
-  add_tag_prefix extracted.
   only           foo, baz
 </match>
 ```

data/fluent-plugin-extract_query_params.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-extract_query_params'
-  gem.version       = '0.0.12'
+  gem.version       = '0.1.0'
   gem.authors       = ['Kentaro Kuribayashi']
   gem.email         = ['kentarok@gmail.com']
   gem.homepage      = 'http://github.com/kentaro/fluent-plugin-extract_query_params'
@@ -18,6 +18,6 @@ Gem::Specification.new do |gem|
   end
 
   gem.add_development_dependency 'rake'
-  gem.add_runtime_dependency     'fluentd'
-  gem.add_runtime_dependency     'appraisal'
+  gem.add_development_dependency 'appraisal'
+  gem.add_runtime_dependency     'fluentd', ['>= 0.14.8', '< 2']
 end

data/gemfiles/{fluentd_0.10.gemfile → fluentd_0.14.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "fluentd", "0.10.61"
+gem "fluentd", "~> 0.14.0"
 
 gemspec :path => "../"

data/lib/fluent/plugin/filter_extract_query_params.rb

@@ -1,28 +1,36 @@
-module Fluent
-  class ExtractQueryParamsFilter < Filter
+require "fluent/plugin/filter"
+require "fluent/plugin/query_params_extractor"
+
+module Fluent::Plugin
+  class ExtractQueryParamsFilter < Fluent::Plugin::Filter
 
     Fluent::Plugin.register_filter('extract_query_params', self)
 
+    desc "point a key whose value contains URL string."
     config_param :key,    :string
-    config_param :only,   :string, :default => nil
-    config_param :except, :string, :default => nil
-    config_param :discard_key, :bool, :default => false
-    config_param :add_field_prefix, :string, :default => nil
-    config_param :permit_blank_key, :bool, :default => false
-
-    config_param :add_url_scheme, :bool, :default => false
-    config_param :add_url_host, :bool, :default => false
-    config_param :add_url_port, :bool, :default => false
-    config_param :add_url_path, :bool, :default => false
+    desc "If set, only the key/value whose key is included only will be added to the record."
+    config_param :only,   :string, default: nil
+    desc "If set, the key/value whose key is included except will NOT be added to the record."
+    config_param :except, :string, default: nil
+    desc "If set to true, the original key url will be discarded from the record."
+    config_param :discard_key, :bool, default: false
+    desc "Prefix of fields."
+    config_param :add_field_prefix, :string, default: nil
+    desc "If set to true, permit blank key."
+    config_param :permit_blank_key, :bool, default: false
 
-    def initialize
-      super
-      require 'fluent/plugin/query_params_extractor'
-    end
+    desc "If set to true, scheme (use url_scheme key) will be added to the record."
+    config_param :add_url_scheme, :bool, default: false
+    desc "If set to true, host (use url_host key) will be added to the record."
+    config_param :add_url_host, :bool, default: false
+    desc "If set to true, port (use url_port key) will be added to the record."
+    config_param :add_url_port, :bool, default: false
+    desc "If set to true, path (use url_path key) will be added to the record."
+    config_param :add_url_path, :bool, default: false
 
     def configure(conf)
       super
-      @extractor = QueryParamsExtractor.new(self, conf)
+      @extractor = Fluent::Plugin::QueryParamsExtractor.new(self, conf)
     end
 
     def filter(tag, time, record)

data/lib/fluent/plugin/out_extract_query_params.rb

@@ -1,34 +1,39 @@
-module Fluent
-  class ExtractQueryParamsOutput < Output
+require "fluent/plugin/output"
+require "fluent/plugin/query_params_extractor"
+
+module Fluent::Plugin
+  class ExtractQueryParamsOutput < Fluent::Plugin::Output
     include Fluent::HandleTagNameMixin
 
     Fluent::Plugin.register_output('extract_query_params', self)
 
-    # To support Fluentd v0.10.57 or earlier
-    unless method_defined?(:router)
-      define_method("router") { Fluent::Engine }
-    end
+    helpers :event_emitter
 
+    desc "point a key whose value contains URL string."
     config_param :key,    :string
-    config_param :only,   :string, :default => nil
-    config_param :except, :string, :default => nil
-    config_param :discard_key, :bool, :default => false
-    config_param :add_field_prefix, :string, :default => nil
-    config_param :permit_blank_key, :bool, :default => false
-
-    config_param :add_url_scheme, :bool, :default => false
-    config_param :add_url_host, :bool, :default => false
-    config_param :add_url_port, :bool, :default => false
-    config_param :add_url_path, :bool, :default => false
-
-    def initialize
-      require 'fluent/plugin/query_params_extractor'
-      super
-    end
+    desc "If set, only the key/value whose key is included only will be added to the record."
+    config_param :only,   :string, default: nil
+    desc "If set, the key/value whose key is included except will NOT be added to the record."
+    config_param :except, :string, default: nil
+    desc "If set to true, the original key url will be discarded from the record."
+    config_param :discard_key, :bool, default: false
+    desc "Prefix of fields."
+    config_param :add_field_prefix, :string, default: nil
+    desc "If set to true, permit blank key."
+    config_param :permit_blank_key, :bool, default: false
+
+    desc "If set to true, scheme (use url_scheme key) will be added to the record."
+    config_param :add_url_scheme, :bool, default: false
+    desc "If set to true, host (use url_host key) will be added to the record."
+    config_param :add_url_host, :bool, default: false
+    desc "If set to true, port (use url_port key) will be added to the record."
+    config_param :add_url_port, :bool, default: false
+    desc "If set to true, path (use url_path key) will be added to the record."
+    config_param :add_url_path, :bool, default: false
 
     def configure(conf)
       super
-      @extractor = QueryParamsExtractor.new(self, conf)
+      @extractor = Fluent::Plugin::QueryParamsExtractor.new(self, conf)
     end
 
     def filter_record(tag, time, record)
@@ -36,14 +41,12 @@ module Fluent
       super(tag, time, record)
     end
 
-    def emit(tag, es, chain)
+    def process(tag, es)
       es.each do |time, record|
         t = tag.dup
         filter_record(t, time, record)
         router.emit(t, time, record)
       end
-
-      chain.next
     end
   end
 end

data/lib/fluent/plugin/query_params_extractor.rb

@@ -2,7 +2,7 @@ require 'uri'
 require 'cgi/util'
 require 'webrick'
 
-module Fluent
+module Fluent::Plugin
   class QueryParamsExtractor
 
     attr_reader :log
@@ -10,9 +10,9 @@ module Fluent
     def initialize(plugin, conf)
       @log = plugin.log
 
-      if plugin.is_a?(Fluent::Output)
+      if plugin.is_a?(Fluent::Plugin::Output)
         unless have_tag_option?(plugin)
-          raise ConfigError, "out_extract_query_params: At least one of remove_tag_prefix/remove_tag_suffix/add_tag_prefix/add_tag_suffix is required to be set."
+          raise Fluent::ConfigError, "out_extract_query_params: At least one of remove_tag_prefix/remove_tag_suffix/add_tag_prefix/add_tag_suffix is required to be set."
         end
       end
 

data/test/plugin/test_filter_extract_query_params.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
+require 'fluent/plugin/filter_extract_query_params'
 
-if Gem::Version.new(Fluent::VERSION) > Gem::Version.new('0.12')
 class ExtractQueryParamsFilterTest < Test::Unit::TestCase
   URL = 'http://example.com:80/?foo=bar&baz=qux&%E3%83%A2%E3%83%AA%E3%82%B9=%E3%81%99%E3%81%9F%E3%81%98%E3%81%8A'
   QUERY_ONLY = '?foo=bar&baz=qux&%E3%83%A2%E3%83%AA%E3%82%B9=%E3%81%99%E3%81%9F%E3%81%98%E3%81%8A'
@@ -10,21 +10,20 @@ class ExtractQueryParamsFilterTest < Test::Unit::TestCase
     @time = Fluent::Engine.now
   end
 
-  def create_driver(conf, tag = 'test')
-    Fluent::Test::FilterTestDriver.new(
-      Fluent::ExtractQueryParamsFilter, tag
+  def create_driver(conf)
+    Fluent::Test::Driver::Filter.new(
+      Fluent::Plugin::ExtractQueryParamsFilter
     ).configure(conf)
   end
 
   def filter(config, messages)
-    d = create_driver(config, 'test')
-    d.run {
+    d = create_driver(config)
+    d.run(default_tag: "test") {
       messages.each {|message|
-        d.filter(message, @time)
+        d.feed(@time, message)
       }
     }
-    filtered = d.filtered_as_array
-    filtered.map {|m| m[2] }
+    d.filtered_records
   end
 
   def test_configure
@@ -329,4 +328,3 @@ class ExtractQueryParamsFilterTest < Test::Unit::TestCase
     assert_equal(expected, filtered[0])
   end
 end
-end

data/test/plugin/test_out_extract_query_params.rb

@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
-
 require 'test_helper'
+require 'fluent/plugin/out_extract_query_params'
 
 class ExtractQueryParamsOutputTest < Test::Unit::TestCase
   URL = 'http://example.com:80/?foo=bar&baz=qux&%E3%83%A2%E3%83%AA%E3%82%B9=%E3%81%99%E3%81%9F%E3%81%98%E3%81%8A'
@@ -10,9 +9,9 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
     Fluent::Test.setup
   end
 
-  def create_driver(conf, tag = 'test')
-    Fluent::Test::OutputTestDriver.new(
-      Fluent::ExtractQueryParamsOutput, tag
+  def create_driver(conf)
+    Fluent::Test::Driver::Output.new(
+      Fluent::Plugin::ExtractQueryParamsOutput
     ).configure(conf)
   end
 
@@ -41,7 +40,6 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_tag_prefix extracted.
     ])
 
-    tag    = 'test'
     record = {
       'url' => URL,
     }
@@ -60,7 +58,6 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_tag_prefix extracted.
     ])
 
-    tag    = 'test'
     record = {
       'url' => URL,
     }
@@ -82,7 +79,6 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       only           foo, baz
     ])
 
-    tag    = 'test'
     record = { 'url' => URL }
     d.instance.filter_record('test', Time.now, record)
 
@@ -99,7 +95,6 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       except         baz, モリス
     ])
 
-    tag    = 'test'
     record = { 'url' => URL }
     d.instance.filter_record('test', Time.now, record)
 
@@ -116,7 +111,6 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       discard_key true
     ])
 
-    tag    = 'test'
     record = { 'url' => URL }
     d.instance.filter_record('test', Time.now, record)
 
@@ -133,14 +127,14 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_tag_prefix extracted.
       only           foo, baz
     ])
-    d.run { d.emit('url' => URL) }
-    emits = d.emits
-
-    assert_equal 1, emits.count
-    assert_equal 'extracted.test', emits[0][0]
-    assert_equal URL,              emits[0][2]['url']
-    assert_equal 'bar',            emits[0][2]['foo']
-    assert_equal 'qux',            emits[0][2]['baz']
+    d.run(default_tag: "test") { d.feed('url' => URL) }
+    events = d.events
+
+    assert_equal 1, events.count
+    assert_equal 'extracted.test', events[0][0]
+    assert_equal URL,              events[0][2]['url']
+    assert_equal 'bar',            events[0][2]['foo']
+    assert_equal 'qux',            events[0][2]['baz']
   end
 
   def test_emit_multi
@@ -149,16 +143,16 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_tag_prefix extracted.
       only           foo, baz
     ])
-    d.run do
-      d.emit('url' => URL)
-      d.emit('url' => URL)
-      d.emit('url' => URL)
+    d.run(default_tag: "test") do
+      d.feed('url' => URL)
+      d.feed('url' => URL)
+      d.feed('url' => URL)
     end
-    emits = d.emits
+    events = d.events
 
-    assert_equal 3, emits.count
+    assert_equal 3, events.count
 
-    emits.each do |e|
+    events.each do |e|
       assert_equal 'extracted.test', e[0]
       assert_equal URL,              e[2]['url']
       assert_equal 'bar',            e[2]['foo']
@@ -172,12 +166,12 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_tag_prefix extracted.
       only           foo, baz
     ])
-    d.run { d.emit('url' => URL) }
-    emits = d.emits
+    d.run(default_tag: "test") { d.feed('url' => URL) }
+    events = d.events
 
-    assert_equal 1, emits.count
-    assert_equal 'extracted.test', emits[0][0]
-    assert_equal URL,              emits[0][2]['url']
+    assert_equal 1, events.count
+    assert_equal 'extracted.test', events[0][0]
+    assert_equal URL,              events[0][2]['url']
   end
 
   def test_emit_with_invalid_url
@@ -185,12 +179,12 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       key            url
       add_tag_prefix extracted.
     ])
-    d.run { d.emit('url' => 'invalid url') }
-    emits = d.emits
+    d.run(default_tag: "test") { d.feed('url' => 'invalid url') }
+    events = d.events
 
-    assert_equal 1, emits.count
-    assert_equal 'extracted.test', emits[0][0]
-    assert_equal 'invalid url',    emits[0][2]['url']
+    assert_equal 1, events.count
+    assert_equal 'extracted.test', events[0][0]
+    assert_equal 'invalid url',    events[0][2]['url']
   end
 
   DIRTY_PATH_BLANK_1 = '/dummy?&baz=qux'
@@ -212,93 +206,93 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       key            path
       add_tag_prefix a.
     ])
-    d.run {
-      d.emit({ 'path' => DIRTY_PATH_BLANK_1 })
-      d.emit({ 'path' => DIRTY_PATH_BLANK_2 })
-      d.emit({ 'path' => DIRTY_PATH_BLANK_3 })
-      d.emit({ 'path' => DIRTY_PATH_BLANK_4 })
-      d.emit({ 'path' => DIRTY_PATH_KEY_ONLY_1 })
-      d.emit({ 'path' => DIRTY_PATH_KEY_ONLY_2 })
-      d.emit({ 'path' => DIRTY_PATH_KEY_ONLY_3 })
-      d.emit({ 'path' => DIRTY_PATH_VALUE_ONLY_1 })
-      d.emit({ 'path' => DIRTY_PATH_VALUE_ONLY_2 })
-      d.emit({ 'path' => DIRTY_PATH_BASE64_1 })
-      d.emit({ 'path' => DIRTY_PATH_BASE64_2 })
-      d.emit({ 'path' => DIRTY_PATH_BASE64_3 })
-      d.emit({ 'path' => DIRTY_PATH_BASE64_4 })
+    d.run(default_tag: "test") {
+      d.feed({ 'path' => DIRTY_PATH_BLANK_1 })
+      d.feed({ 'path' => DIRTY_PATH_BLANK_2 })
+      d.feed({ 'path' => DIRTY_PATH_BLANK_3 })
+      d.feed({ 'path' => DIRTY_PATH_BLANK_4 })
+      d.feed({ 'path' => DIRTY_PATH_KEY_ONLY_1 })
+      d.feed({ 'path' => DIRTY_PATH_KEY_ONLY_2 })
+      d.feed({ 'path' => DIRTY_PATH_KEY_ONLY_3 })
+      d.feed({ 'path' => DIRTY_PATH_VALUE_ONLY_1 })
+      d.feed({ 'path' => DIRTY_PATH_VALUE_ONLY_2 })
+      d.feed({ 'path' => DIRTY_PATH_BASE64_1 })
+      d.feed({ 'path' => DIRTY_PATH_BASE64_2 })
+      d.feed({ 'path' => DIRTY_PATH_BASE64_3 })
+      d.feed({ 'path' => DIRTY_PATH_BASE64_4 })
     }
-    emits = d.emits
+    events = d.events
 
-    assert_equal 13, emits.count
+    assert_equal 13, events.count
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 2, r.size
     assert_equal DIRTY_PATH_BLANK_1, r['path']
     assert_equal 'qux',              r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 2, r.size
     assert_equal DIRTY_PATH_BLANK_2, r['path']
     assert_equal 'bar',              r['foo']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_BLANK_3, r['path']
     assert_equal 'bar',              r['foo']
     assert_equal 'qux',              r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 2, r.size
     assert_equal DIRTY_PATH_BLANK_4, r['path']
     assert_equal 'qux',              r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_KEY_ONLY_1, r['path']
     assert_equal '',                    r['foo']
     assert_equal 'qux',                 r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_KEY_ONLY_2, r['path']
     assert_equal '',                    r['foo']
     assert_equal 'qux',                 r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_KEY_ONLY_3, r['path']
     assert_equal '',                    r['foo']
     assert_equal 'qux',                 r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 2, r.size
     assert_equal DIRTY_PATH_VALUE_ONLY_1, r['path']
     assert_equal 'qux',                   r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 2, r.size
     assert_equal DIRTY_PATH_VALUE_ONLY_2, r['path']
     assert_equal 'qux',                   r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_BASE64_1, r['path']
     assert_equal 'qux',               r['baz']
     assert_equal 'ZXh0cmE=',          r['foo']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_BASE64_2, r['path']
     assert_equal 'qux',               r['baz']
     assert_equal 'ZXh0cmE=',          r['foo']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_BASE64_3, r['path']
     assert_equal 'qux',               r['baz']
     assert_equal 'cGFkZGluZw==',      r['foo']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_BASE64_4, r['path']
     assert_equal 'qux',               r['baz']
@@ -311,21 +305,21 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_tag_prefix   a.
       permit_blank_key yes
     ])
-    d.run {
-      d.emit({ 'path' => DIRTY_PATH_VALUE_ONLY_1 })
-      d.emit({ 'path' => DIRTY_PATH_VALUE_ONLY_2 })
+    d.run(default_tag: "test") {
+      d.feed({ 'path' => DIRTY_PATH_VALUE_ONLY_1 })
+      d.feed({ 'path' => DIRTY_PATH_VALUE_ONLY_2 })
     }
-    emits = d.emits
+    events = d.events
 
-    assert_equal 2, emits.count
+    assert_equal 2, events.count
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_VALUE_ONLY_1, r['path']
     assert_equal 'bar',                   r['']
     assert_equal 'qux',                   r['baz']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 3, r.size
     assert_equal DIRTY_PATH_VALUE_ONLY_2, r['path']
     assert_equal 'bar',                   r['']
@@ -341,20 +335,20 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
 
     raw_multibytes_src = '/path/to/ほげぽす/x?a=b'
 
-    d.run {
-      d.emit({ 'path' => raw_multibytes_src.dup.encode('sjis').force_encoding('ascii-8bit') })
-      d.emit({ 'path' => raw_multibytes_src.dup.encode('eucjp').force_encoding('ascii-8bit') })
+    d.run(default_tag: "test") {
+      d.feed({ 'path' => raw_multibytes_src.dup.encode('sjis').force_encoding('ascii-8bit') })
+      d.feed({ 'path' => raw_multibytes_src.dup.encode('eucjp').force_encoding('ascii-8bit') })
     }
-    emits = d.emits
+    events = d.events
 
     # nothing raised is correct
-    assert_equal 2, emits.count
+    assert_equal 2, events.count
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 2, r.size
     assert_equal 'b', r['a']
 
-    r = emits.shift[2]
+    r = events.shift[2]
     assert_equal 2, r.size
     assert_equal 'b', r['a']
   end
@@ -369,7 +363,6 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_url_port true
       add_url_path true
     ])
-    tag    = 'test'
     record = {
       'url' => URL,
     }
@@ -397,7 +390,6 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_url_path true
     ])
 
-    tag    = 'test'
     record = {
       'url' => URL,
     }
@@ -426,7 +418,6 @@ class ExtractQueryParamsOutputTest < Test::Unit::TestCase
       add_url_port true
       add_url_path true
     ])
-    tag    = 'test'
     record = {
       'url' => QUERY_ONLY,
     }

data/test/test_helper.rb

@@ -1,25 +1,9 @@
+require 'bundler/setup'
 require 'test/unit'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
+$LOAD_PATH.unshift(__dir__)
 
 require 'fluent/test'
-
-unless ENV.has_key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  }
-  $log = nulllogger
-end
-
-require 'fluent/plugin/out_extract_query_params'
-
-if Gem::Version.new(Fluent::VERSION) > Gem::Version.new('0.12')
-  require 'fluent/plugin/filter_extract_query_params'
-end
-
-class Test::Unit::TestCase
-end
+require 'fluent/test/driver/output'
+require 'fluent/test/driver/filter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-extract_query_params
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Kentaro Kuribayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fluentd
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,19 +53,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Fluentd plugin to extract key/values from URL query parameters.
 email:
 - kentarok@gmail.com
@@ -81,8 +87,7 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-extract_query_params.gemspec
-- gemfiles/fluentd_0.10.gemfile
-- gemfiles/fluentd_0.12.gemfile
+- gemfiles/fluentd_0.14.gemfile
 - lib/fluent/plugin/filter_extract_query_params.rb
 - lib/fluent/plugin/out_extract_query_params.rb
 - lib/fluent/plugin/query_params_extractor.rb
@@ -109,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to extract key/values from URL query parameters

data/gemfiles/fluentd_0.12.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 0.12.0"
-
-gemspec :path => "../"