fluent-plugin-geoip-filter 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66323e536e52cde459016c031e10cbbef45c70cd
-  data.tar.gz: 2353e40eb98e052b194ece4d6b547b9853620bc0
+  metadata.gz: 7b9c9b328b7585a2a68f166ab6c59078e15849df
+  data.tar.gz: a4939e9e3e6a83314f273178eecf77f9b776b311
 SHA512:
-  metadata.gz: efd2c312b13edaff3fea5cecab51cf07770c12f7314252495104b5ff3a7bdf84efd9a8af53fd21c9c8b3a5e8b6de2fb3a65be1920a2a1079ca43e6b5f62a2753
-  data.tar.gz: f4e884d8c97e45f0add5368b87ced49bdcb2bfa3ea3c277f1afbd7567b9e1c7b86a5079cd97bcd5acd8f98b880921b63e36898df853bc0ae326d44dcc51589b9
+  metadata.gz: 013d91b782a4501a4527e08b4c4d28957b7c09c973ee46dc17b12ef4e8fc502b2cb70ee66d4d572aecfbd87c441a7c8bcf2edfecf06b9cf6f961b246eef45125
+  data.tar.gz: c656d0d723c058651821e33c53b30addafa3728813545c0380637b2f867e44a4894fb489cd51ac4a0ae0c5203f4053944290be2cb0ed1236f2d8f3a33388ce10

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 
 rvm:
-  - 2.3.0
+  - 2.4.2
+  - 2.3.5
   - 2.2
-  - 2.0
-  - 1.9.3
+  - 2.1
 
 before_script:
   - wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz

data/README.md

@@ -7,6 +7,14 @@
 [Fluentd](http://fluentd.org) filter plugin to add geoip.
 
 
+## Requirements
+
+| fluent-plugin-geoip-filter | fluentd    | ruby   |
+|----------------------------|------------|--------|
+| >= 1.0.0                   | >= v0.14.0 | >= 2.1 |
+| < 1.0.0                    | >= v0.12.0 | >= 1.9 |
+
+
 ## Installation
 
 ```bash

data/fluent-plugin-geoip-filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-geoip-filter"
-  spec.version       = "0.3.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["Yuri Umezaki"]
   spec.email         = ["bungoume@gmail.com"]
   spec.homepage      = "https://github.com/bungoume/fluent-plugin-geoip-filter"
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "fluentd", ">= 0.12"
+  spec.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
   spec.add_runtime_dependency "geoip", ">= 1.5.0"
   spec.add_runtime_dependency "lru_redux", ">= 1.0.0"
   spec.add_development_dependency "bundler"

data/lib/fluent/plugin/filter_geoip.rb

@@ -1,9 +1,10 @@
 require 'geoip'
 require 'lru_redux'
+require 'fluent/plugin/filter'
 
-module Fluent
+module Fluent::Plugin
   class GeoipFilter < Filter
-    Plugin.register_filter('geoip', self)
+    Fluent::Plugin.register_filter('geoip', self)
 
     def initialize
       @geoip_cache = LruRedux::Cache.new(8192)
@@ -65,5 +66,5 @@ module Fluent
       ret
     end
 
-  end if defined?(Filter) # Support only >= v0.12
+  end
 end

data/test/helper.rb

@@ -21,8 +21,10 @@ unless ENV.has_key?('VERBOSE')
   }
   $log = nulllogger
 end
-
+require 'fluent/test/helpers'
+require 'fluent/test/driver/filter'
 require 'fluent/plugin/filter_geoip'
 
 class Test::Unit::TestCase
+  include Fluent::Test::Helpers
 end

data/test/plugin/test_filter_geoip.rb

@@ -11,8 +11,8 @@ class GeoipFilterTest < Test::Unit::TestCase
     out_key geo
   ]
 
-  def create_driver(conf=CONFIG,tag='test',use_v1=true)
-    Fluent::Test::FilterTestDriver.new(Fluent::GeoipFilter, tag).configure(conf, use_v1)
+  def create_driver(conf=CONFIG)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::GeoipFilter).configure(conf)
   end
 
   def test_configure
@@ -25,13 +25,12 @@ class GeoipFilterTest < Test::Unit::TestCase
     d1 = create_driver(CONFIG)
     ip_iddr = '93.184.216.34'
 
-    d1.run do
-      d1.emit({'client_ip' => ip_iddr})
+    d1.run(default_tag: 'test') do
+      d1.feed({'client_ip' => ip_iddr})
     end
-    emits = d1.emits
+    emits = d1.filtered
     assert_equal 1, emits.length
-    assert_equal 'test', emits[0][0] # tag
-    geo_object = emits[0][2]['geo']
+    geo_object = emits[0][1]['geo']
     assert_equal [-70.8228, 42.150800000000004], geo_object['coordinates']
     assert_equal 'US', geo_object['country_code']
     assert_equal 'Norwell', geo_object['city']
@@ -39,21 +38,20 @@ class GeoipFilterTest < Test::Unit::TestCase
   end
 
   def test_emit_flatten
-    d1 =     d1 = create_driver(%[
+    d1 = create_driver(%[
       @type geoip
       key_name ip_iddr
       flatten
-    ], 'test')
+    ])
     ip_iddr = '93.184.216.34'
 
-    d1.run do
-      d1.emit({'ip_iddr' => ip_iddr})
+    d1.run(default_tag: 'test') do
+      d1.feed({'ip_iddr' => ip_iddr})
     end
 
-    emits = d1.emits
+    emits = d1.filtered
     assert_equal 1, emits.length
-    assert_equal 'test', emits[0][0] # tag
-    geo_object = emits[0][2]
+    geo_object = emits[0][1]
     assert_equal [-70.8228, 42.150800000000004], geo_object['geo_coordinates']
     assert_equal 'US', geo_object['geo_country_code']
     assert_equal 'Norwell', geo_object['geo_city']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoip-filter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Yuri Umezaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: geoip
   requirement: !ruby/object:Gem::Requirement