fluent-plugin-parse_cookie 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ec24c3f1406c0f76e9bf509d099a2c30ea3c46b
-  data.tar.gz: ae6e8851749631f18f8358d76800966c406a6a0c
+SHA256:
+  metadata.gz: 723ea5910a732d5ff1eef0aac02f40e3b43cb75c973fd3bc306f021988b71f2a
+  data.tar.gz: 164d8768a79a57d7de035ecdf82e4b8c985533ffcfd11e07dd9354f74ffa13dc
 SHA512:
-  metadata.gz: e148c332941e9aeef2ac7c35a93c9f824e406368878815b81d7a8a8cac3a59c0298c594660b07ea914d397458b120d890e44e2003a0323f2c1b27f26f9ba3e86
-  data.tar.gz: 38470db1db6904f700338a0a42257f830c421b4ff8ad3289e5c718cb04f2f6570fb16fc40af1c57d7706dc6fa5cd592caf366e6ef353ca6c6cc628b3bbf3d5fc
+  metadata.gz: c2cd6989c2575049c231ec612110d3f3dbd5d192fd14438b79ffaf47a50b8f3b36c311fbfa7ddaeccce3dabc79ad0b008f90670800b762fee2ea1314cd0e6038
+  data.tar.gz: aeb0ed7fb68b9a3a3fda055d5cac8077735b83787c064d48992d5c93d65fd5f3e9ee44e46cffdedc7be12b373c1b2ed5358065af145758dd0b8c11221a6d80a6

data/Rakefile

@@ -1,9 +1,9 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
-end
+end

data/fluent-plugin-parse_cookie.gemspec

@@ -1,28 +1,27 @@
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'fluent/plugin/parse_cookie/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "fluent-plugin-parse_cookie"
+  spec.name          = 'fluent-plugin-parse_cookie'
   spec.version       = Fluent::ParseCookie::VERSION
-  spec.authors       = ["Hirokazu Hata"]
-  spec.email         = ["h.hata.ai.t@gmail.com"]
-  spec.summary       = %q{Fluentd plugin to parse cookie}
-  spec.description   = %q{Fluentd plugin to parse cookie}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Hirokazu Hata']
+  spec.email         = ['h.hata.ai.t@gmail.com']
+  spec.summary       = 'Fluentd plugin to parse cookie'
+  spec.description   = 'Fluentd plugin to parse cookie'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "fluentd"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "pry-nav"
-  spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "rr"
-  spec.add_development_dependency "timecop"
+  spec.add_dependency 'fluentd', '~> 0.12.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rr'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'test-unit'
 end

data/lib/fluent/plugin/out_parse_cookie.rb

@@ -1,22 +1,20 @@
 module Fluent
   class ParseCookieOutput < Output
-  	Fluent::Plugin.register_output('parse_cookie', self)
-  	config_param :key,                    :string
-    config_param :tag_prefix,             :string, :default => 'parsed_cookie.'
-    config_param :remove_empty_array,     :bool, :default => false
-    config_param :single_value_to_string, :bool, :default => false
-    config_param :remove_cookie,          :bool, :default => false
-    config_param :sub_key,                :string, :default => nil
+    Fluent::Plugin.register_output('parse_cookie', self)
+    config_param :key, :string
+    config_param :tag_prefix,             :string, default: 'parsed_cookie.'
+    config_param :remove_empty_array,     :bool, default: false
+    config_param :single_value_to_string, :bool, default: false
+    config_param :remove_cookie,          :bool, default: false
+    config_param :sub_key,                :string, default: nil
 
     def initialize
       super
       require 'cgi'
     end
 
-	  # Define `log` method for v0.10.42 or earlier
-    unless method_defined?(:log)
-      define_method("log") { $log }
-    end
+    # Define `log` method for v0.10.42 or earlier
+    define_method('log') { $log } unless method_defined?(:log)
 
     def configure(conf)
       super
@@ -31,16 +29,16 @@ module Fluent
     end
 
     def emit(tag, es, chain)
-      es.each {|time, record|
+      es.each do |time, record|
         t = tag.dup
         new_record = parse_cookie(record)
 
         t = @tag_prefix + t unless @tag_prefix.nil?
 
         Engine.emit(t, time, new_record)
-      }
+      end
       chain.next
-    rescue => e
+    rescue StandardError => e
       log.warn("out_parse_cookie: error_class:#{e.class} error_message:#{e.message} tag:#{tag} es:#{es} bactrace:#{e.backtrace.first}")
     end
 
@@ -48,29 +46,27 @@ module Fluent
       if record[key]
         parsed_cookie = CGI::Cookie.parse(record[key])
         hash = {}
-        parsed_cookie.each do |k,array|
-          hash.merge!({k => array.select {|v| v.class == String }})
+        parsed_cookie.each do |k, array|
+          hash.merge!(k => array.select { |v| v.class == String })
         end
 
-        hash = hash.select {|k, v| v != []} if remove_empty_array == true
+        hash = hash.reject { |_k, v| v == [] } if remove_empty_array == true
 
         if single_value_to_string == true
           hash.each do |k, v|
-            if v.count == 1
-              hash[k] = v[0]
-            end
+            hash[k] = v[0] if v.count == 1
           end
         end
 
         target = sub_key ? (record[sub_key] ||= {}) : record
 
         target.merge!(hash)
-        
+
         record.delete(key) if remove_cookie
       end
-      return record
-    rescue => e
+      record
+    rescue StandardError => e
       log.warn("out_parse_cookie: error_class:#{e.class} error_message:#{e.message} tag:#{tag} record:#{record} bactrace:#{e.backtrace.first}")
     end
   end
-end
+end

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

@@ -1,5 +1,5 @@
 module Fluent
   module ParseCookie
-    VERSION = "0.0.3"
+    VERSION = '1.0.0'.freeze
   end
 end

data/test/helper.rb

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

data/test/plugin/test_out_parse_cookie.rb

@@ -1,20 +1,13 @@
 require 'helper'
 require 'rr'
-require 'timecop'
 require 'pry-byebug'
 require 'fluent/plugin/out_parse_cookie'
 
 class ParseCookieOutputTest < Test::Unit::TestCase
-
-  COOKIE = 'temporary=tmp; empty=; __test=miahcel; array=123; array=abc; array=1a2b'
+  COOKIE = 'temporary=tmp; empty=; __test=miahcel; array=123; array=abc; array=1a2b'.freeze
 
   def setup
     Fluent::Test.setup
-    Timecop.freeze(@time)
-  end
-
-  teardown do
-    Timecop.return
   end
 
   def create_driver(conf, tag)
@@ -23,16 +16,16 @@ class ParseCookieOutputTest < Test::Unit::TestCase
     ).configure(conf)
   end
 
-  def emit(conf, record, tag='test')
+  def emit(conf, record, tag = 'test')
     d = create_driver(conf, tag)
-    d.run {d.emit(record)}
-    emits = d.emits
+    d.run { d.emit(record) }
+    d.emits
   end
 
   def test_configure
-    d = create_driver(%[
+    d = create_driver(%(
       key                cookie
-    ], "test")
+    ), 'test')
 
     assert_equal 'cookie',          d.instance.key
     assert_equal 'parsed_cookie.',  d.instance.tag_prefix
@@ -40,158 +33,158 @@ class ParseCookieOutputTest < Test::Unit::TestCase
   end
 
   def test_parse_cookie
-    conf = %[
+    conf = %(
       key            cookie
-    ]
+    )
 
     record = {
-      'cookie' => COOKIE,
+      'cookie' => COOKIE
     }
 
     emits = emit(conf, record)
 
-    emits.each_with_index do |(tag, time, record), i|
+    emits.each_with_index do |(tag, _time, emit_record), _i|
       assert_equal 'parsed_cookie.test',                     tag
-      assert_equal ['tmp'],                                  record['temporary']
-      assert_equal [],                                       record['empty']
-      assert_equal ['miahcel'],                              record['__test']
-      assert_equal ['123', 'abc', '1a2b'],                   record['array']
-      assert_equal COOKIE,                                   record['cookie']
+      assert_equal ['tmp'],                                  emit_record['temporary']
+      assert_equal [],                                       emit_record['empty']
+      assert_equal ['miahcel'],                              emit_record['__test']
+      assert_equal %w[123 abc 1a2b], emit_record['array']
+      assert_equal COOKIE, emit_record['cookie']
     end
   end
 
   def test_delete_cookie
-    conf = %[
+    conf = %(
       key            cookie
       remove_cookie  true
-    ]
+    )
 
     record = {
-      'cookie' => COOKIE,
+      'cookie' => COOKIE
     }
 
     emits = emit(conf, record)
 
-    emits.each_with_index do |(tag, time, record), i|
-      assert_equal 'parsed_cookie.test',              tag
-      assert_equal ['tmp'],       record['temporary']
-      assert_equal [],            record['empty']
-      assert_equal ['miahcel'],     record['__test']
-      assert_equal ['123', 'abc', '1a2b'],     record['array']
-      assert_equal nil,     record['cookie']
+    emits.each_with_index do |(tag, _time, emit_record), _i|
+      assert_equal 'parsed_cookie.test', tag
+      assert_equal ['tmp'],       emit_record['temporary']
+      assert_equal [],            emit_record['empty']
+      assert_equal ['miahcel'], emit_record['__test']
+      assert_equal %w[123 abc 1a2b], emit_record['array']
+      assert_equal nil, emit_record['cookie']
     end
   end
 
   def test_add_tag_prefix
-    conf = %[
+    conf = %(
       key            cookie
       tag_prefix     add_tag.
-    ]
+    )
 
     record = {
-      'cookie' => COOKIE,
+      'cookie' => COOKIE
     }
 
     emits = emit(conf, record)
 
-    emits.each_with_index do |(tag, time, record), i|
-      assert_equal 'add_tag.test',              tag
-      assert_equal ['tmp'],       record['temporary']
-      assert_equal [],            record['empty']
-      assert_equal ['miahcel'],     record['__test']
-      assert_equal ['123', 'abc', '1a2b'],     record['array']
-      assert_equal COOKIE,     record['cookie']
+    emits.each_with_index do |(tag, _time, emit_record), _i|
+      assert_equal 'add_tag.test', tag
+      assert_equal ['tmp'],       emit_record['temporary']
+      assert_equal [],            emit_record['empty']
+      assert_equal ['miahcel'], emit_record['__test']
+      assert_equal %w[123 abc 1a2b], emit_record['array']
+      assert_equal COOKIE, emit_record['cookie']
     end
   end
 
   def test_remove_empty_array
-    conf = %[
+    conf = %(
       key                 cookie
       remove_empty_array  true
-    ]
+    )
 
     record = {
-      'cookie' => COOKIE,
+      'cookie' => COOKIE
     }
 
     emits = emit(conf, record)
 
-    emits.each_with_index do |(tag, time, record), i|
-      assert_equal 'parsed_cookie.test',              tag
-      assert_equal ['tmp'],       record['temporary']
-      assert_equal nil,            record['empty']
-      assert_equal ['miahcel'],     record['__test']
-      assert_equal ['123', 'abc', '1a2b'],     record['array']
-      assert_equal COOKIE,     record['cookie']
+    emits.each_with_index do |(tag, _time, emit_record), _i|
+      assert_equal 'parsed_cookie.test', tag
+      assert_equal ['tmp'], emit_record['temporary']
+      assert_equal nil, emit_record['empty']
+      assert_equal ['miahcel'], emit_record['__test']
+      assert_equal %w[123 abc 1a2b], emit_record['array']
+      assert_equal COOKIE, emit_record['cookie']
     end
   end
 
   def test_single_value_to_string
-    conf = %[
+    conf = %(
       key                     cookie
       single_value_to_string  true
-    ]
+    )
 
     record = {
-      'cookie' => COOKIE,
+      'cookie' => COOKIE
     }
 
     emits = emit(conf, record)
 
-    emits.each_with_index do |(tag, time, record), i|
-      assert_equal 'parsed_cookie.test',              tag
-      assert_equal 'tmp',       record['temporary']
-      assert_equal [],            record['empty']
-      assert_equal 'miahcel',     record['__test']
-      assert_equal ['123', 'abc', '1a2b'],     record['array']
-      assert_equal COOKIE,     record['cookie']
+    emits.each_with_index do |(tag, _time, emit_record), _i|
+      assert_equal 'parsed_cookie.test', tag
+      assert_equal 'tmp', emit_record['temporary']
+      assert_equal [],            emit_record['empty']
+      assert_equal 'miahcel',     emit_record['__test']
+      assert_equal %w[123 abc 1a2b], emit_record['array']
+      assert_equal COOKIE, emit_record['cookie']
     end
   end
 
   def test_remove_empty_array_single_value_to_string
-    conf = %[
+    conf = %(
       key                     cookie
       remove_empty_array      true
       single_value_to_string  true
-    ]
+    )
 
     record = {
-      'cookie' => COOKIE,
+      'cookie' => COOKIE
     }
 
     emits = emit(conf, record)
 
-    emits.each_with_index do |(tag, time, record), i|
-      assert_equal 'parsed_cookie.test',              tag
-      assert_equal 'tmp',       record['temporary']
-      assert_equal nil,            record['empty']
-      assert_equal 'miahcel',     record['__test']
-      assert_equal ['123', 'abc', '1a2b'],     record['array']
-      assert_equal COOKIE,     record['cookie']
+    emits.each_with_index do |(tag, _time, emit_record), _i|
+      assert_equal 'parsed_cookie.test', tag
+      assert_equal 'tmp', emit_record['temporary']
+      assert_equal nil, emit_record['empty']
+      assert_equal 'miahcel', emit_record['__test']
+      assert_equal %w[123 abc 1a2b], emit_record['array']
+      assert_equal COOKIE, emit_record['cookie']
     end
   end
 
   def test_sub_key
-    conf = %[
+    conf = %(
       key                     cookie
       sub_key                 cookie_parsed
       remove_empty_array      true
       single_value_to_string  true
-    ]
+    )
 
     record = {
-      'cookie' => COOKIE,
+      'cookie' => COOKIE
     }
 
     emits = emit(conf, record)
 
-    emits.each_with_index do |(tag, time, record), i|
-      assert_equal 'parsed_cookie.test',              tag
-      assert_equal 'tmp',       record['cookie_parsed']['temporary']
-      assert_equal nil,            record['cookie_parsed']['empty']
-      assert_equal 'miahcel',     record['cookie_parsed']['__test']
-      assert_equal ['123', 'abc', '1a2b'],     record['cookie_parsed']['array']
-      assert_equal COOKIE,     record['cookie']
+    emits.each_with_index do |(tag, _time, emit_record), _i|
+      assert_equal 'parsed_cookie.test', tag
+      assert_equal 'tmp', emit_record['cookie_parsed']['temporary']
+      assert_equal nil, emit_record['cookie_parsed']['empty']
+      assert_equal 'miahcel', emit_record['cookie_parsed']['__test']
+      assert_equal %w[123 abc 1a2b], emit_record['cookie_parsed']['array']
+      assert_equal COOKIE, emit_record['cookie']
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-parse_cookie
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Hirokazu Hata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -174,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to parse cookie