fluent-plugin-geoip 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6064156b8f481d751a7f1ee92c5e80b189c52f2c
-  data.tar.gz: 95e5509ad5ec16ff48e9d71687caa205bd4dbf85
+  metadata.gz: 2ba51a787a4970750c7198634fd098dcb310c05a
+  data.tar.gz: 8e8fdc8b26e46c28f37bee711877e115df7293a0
 SHA512:
-  metadata.gz: c3fcd73dcac19ab974974099f05147e1ba082cf339b0c45ae00971049cadf94cf6d8c1a438351c0c08cd7a51f5fcba03c01013760ff21422275757cc7adcd270
-  data.tar.gz: f6d8bb596b0c423e041d69f520cbb0fd6268c7a36bf7910e32b1a189fe2c5da560a6c41f2f95fa5a93b83c70cce1edf999994bac65f28a0f88b7f0fdc01e3bd6
+  metadata.gz: 65b5ecb8009f1317f2f15dc1be73a935ce4298658497d3b329452ae95f66628ad20ba74014905738bb6a09ec5d6bb5005a48f25f5716cd0608ea1c2316994ee4
+  data.tar.gz: b7eded32d4b0c8babb7f417902e4565c592ed2af89e0bb5253165263c45704eef6feeadf1bd1787936a9e2dc96e4fecefef2cf2738ba778428c41d600fc621ff

data/.travis.yml

@@ -6,14 +6,14 @@ env:
   global:
     DOCKER_COMPOSE_VERSION: 1.8.1
   matrix:
-    - TARGET_RUBY_VERSION=2.1 BUNDLE_GEMFILE=/app/Gemfile
-    - TARGET_RUBY_VERSION=2.2 BUNDLE_GEMFILE=/app/Gemfile
-    - TARGET_RUBY_VERSION=2.3 BUNDLE_GEMFILE=/app/Gemfile
-    - TARGET_RUBY_VERSION=2.4 BUNDLE_GEMFILE=/app/Gemfile
-    - TARGET_RUBY_VERSION=2.1 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v0.12.gemfile
-    - TARGET_RUBY_VERSION=2.2 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v0.12.gemfile
-    - TARGET_RUBY_VERSION=2.3 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v0.12.gemfile
-    - TARGET_RUBY_VERSION=2.4 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v0.12.gemfile
+    - TARGET_RUBY_VERSION=2.1 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v1.0_with_backport_dig.gemfile
+    - TARGET_RUBY_VERSION=2.2 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v1.0_with_backport_dig.gemfile
+    - TARGET_RUBY_VERSION=2.3 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v1.0_without_backport_dig.gemfile
+    - TARGET_RUBY_VERSION=2.4 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v1.0_without_backport_dig.gemfile
+    - TARGET_RUBY_VERSION=2.1 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v0.12_with_backport_dig.gemfile
+    - TARGET_RUBY_VERSION=2.2 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v0.12_with_backport_dig.gemfile
+    - TARGET_RUBY_VERSION=2.3 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v0.12_without_backport_dig.gemfile
+    - TARGET_RUBY_VERSION=2.4 BUNDLE_GEMFILE=/app/gemfiles/fluentd_v0.12_without_backport_dig.gemfile
 
 before_install:
   #- sudo apt-get update

data/Appraisals

@@ -1,4 +1,17 @@
-appraise "fluentd v0.12" do
+appraise "fluentd v0.12 with backport_dig" do
   gem "fluentd", "~> 0.12.0"
+  gem "backport_dig", "~> 1.0.0"
 end
 
+appraise "fluentd v0.12 without backport_dig" do
+  gem "fluentd", "~> 0.12.0"
+end
+
+appraise "fluentd v1.0 with backport_dig" do
+  gem "fluentd", "~> 1.0.0"
+  gem "backport_dig", "~> 1.0.0"
+end
+
+appraise "fluentd v1.0 without backport_dig" do
+  gem "fluentd", "~> 1.0.0"
+end

data/README.md

@@ -28,6 +28,8 @@ $ sudo apt-get install libmaxminddb-dev
 # for OS X
 $ brew install geoip
 $ brew install libmaxminddb
+$ bundle config build.geoip-c --with-geoip-dir=/usr/local/include/
+$ bundle config build.geoip2_c --with-opt-include=/usr/local/include/
 ```
 
 ## Installation

data/data/COPYRIGHT.txt

@@ -0,0 +1 @@
+Database and Contents Copyright (c) 2017 MaxMind, Inc.

data/data/LICENSE.txt

@@ -0,0 +1,3 @@
+This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
+
+This database incorporates GeoNames [http://www.geonames.org] geographical data, which is made available under the Creative Commons Attribution 3.0 License. To view a copy of this license, visit http://www.creativecommons.org/licenses/by/3.0/us/.

data/data/README.txt

@@ -0,0 +1 @@
+Latitude and longitude are not precise and should not be used to identify a particular street address or household.

data/fluent-plugin-geoip.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-geoip"
-  spec.version       = "0.7.0"
+  spec.version       = "0.8.0"
   spec.authors       = ["Kentaro Yoshida"]
   spec.email         = ["y.ken.studio@gmail.com"]
   spec.summary       = %q{Fluentd Filter plugin to add information about geographical location of IP addresses with Maxmind GeoIP databases.}

data/gemfiles/fluentd_v0.12_with_backport_dig.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "fluentd", "~> 0.12.0"
+gem "backport_dig", "~> 1.0.0"
+
+gemspec path: "../"

data/gemfiles/{fluentd_v0.12.gemfile → fluentd_v0.12_without_backport_dig.gemfile}

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

data/gemfiles/fluentd_v1.0_with_backport_dig.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "fluentd", "~> 1.0.0"
+gem "backport_dig", "~> 1.0.0"
+
+gemspec path: "../"

data/gemfiles/fluentd_v1.0_without_backport_dig.gemfile

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

data/lib/fluent/plugin/geoip.rb

@@ -1,6 +1,14 @@
 require 'geoip'
 require 'yajl'
-require 'dig_rb'
+unless {}.respond_to?(:dig)
+  begin
+    # backport_dig is faster than dig_rb so prefer backport_dig.
+    # And Fluentd v1.0.1 uses backport_dig
+    require 'backport_dig'
+  rescue LoadError
+    require 'dig_rb'
+  end
+end
 
 module Fluent
   class GeoIP

data/test/plugin/test_filter_geoip.rb

@@ -177,13 +177,13 @@ class GeoipFilterTest < Test::Unit::TestCase
       messages = [
         {'host' => '203.0.113.1', 'message' => 'invalid ip'},
         {'host' => '0', 'message' => 'invalid ip'},
-        {'host' => '8.8.8.8', 'message' => 'google public dns'}
+        {'host' => '66.102.3.80', 'message' => 'google bot'}
       ]
       expected = [
         {'host' => '203.0.113.1', 'message' => 'invalid ip'},
         {'host' => '0', 'message' => 'invalid ip'},
-        {'host' => '8.8.8.8', 'message' => 'google public dns',
-         'geoip_city' => 'Mountain View', 'geopoint' => [-122.0838, 37.386]}
+        {'host' => '66.102.3.80', 'message' => 'google bot',
+         'geoip_city' => 'Mountain View', 'geopoint' => [-122.0574, 37.419200000000004]}
       ]
       filtered = filter(config, messages)
       assert_equal(expected, filtered)
@@ -446,13 +446,13 @@ class GeoipFilterTest < Test::Unit::TestCase
       messages = [
         {'host' => '203.0.113.1', 'message' => 'invalid ip'},
         {'host' => '0', 'message' => 'invalid ip'},
-        {'host' => '8.8.8.8', 'message' => 'google public dns'}
+        {'host' => '66.102.3.80', 'message' => 'google bot'}
       ]
       expected = [
         {'host' => '203.0.113.1', 'message' => 'invalid ip'},
         {'host' => '0', 'message' => 'invalid ip'},
-        {'host' => '8.8.8.8', 'message' => 'google public dns',
-         'geoip_city' => 'Mountain View', 'geopoint' => [-122.0838, 37.386]}
+        {'host' => '66.102.3.80', 'message' => 'google bot',
+         'geoip_city' => 'Mountain View', 'geopoint' => [-122.0574, 37.419200000000004]}
       ]
       filtered = filter(config, messages)
       assert_equal(expected, filtered)
@@ -746,13 +746,13 @@ class GeoipFilterTest < Test::Unit::TestCase
       messages = [
         {'host' => '203.0.113.1', 'message' => 'invalid ip'},
         {'host' => '0', 'message' => 'invalid ip'},
-        {'host' => '8.8.8.8', 'message' => 'google public dns'}
+        {'host' => '66.102.3.80', 'message' => 'google bot'}
       ]
       expected = [
         {'host' => '203.0.113.1', 'message' => 'invalid ip'},
         {'host' => '0', 'message' => 'invalid ip'},
-        {'host' => '8.8.8.8', 'message' => 'google public dns',
-         'geoip_city' => 'Mountain View', 'geopoint' => [-122.08380126953125, 37.38600158691406]}
+        {'host' => '66.102.3.80', 'message' => 'google bot',
+         'geoip_city' => 'Mountain View', 'geopoint' => [-122.05740356445312, 37.4192008972168]}
       ]
       filtered = filter(config, messages)
       assert_equal(expected, filtered)

data/test/plugin/test_out_geoip.rb

@@ -229,7 +229,7 @@ class GeoipOutputTest < Test::Unit::TestCase
         # 203.0.113.1 is a test address described in RFC5737
         d1.emit({'host' => '203.0.113.1', 'message' => 'invalid ip'})
         d1.emit({'host' => '0', 'message' => 'invalid ip'})
-        d1.emit({'host' => '8.8.8.8', 'message' => 'google public dns'})
+        d1.emit({'host' => '66.102.3.80', 'message' => 'google bot'})
       end
       emits = d1.emits
       assert_equal 3, emits.length
@@ -240,7 +240,7 @@ class GeoipOutputTest < Test::Unit::TestCase
       assert_equal nil, emits[1][2]['geoip_city']
       assert_equal nil, emits[1][2]['geopoint']
       assert_equal 'Mountain View', emits[2][2]['geoip_city']
-      assert_equal [-122.0838, 37.386], emits[2][2]['geopoint']
+      assert_equal [-122.0574, 37.419200000000004], emits[2][2]['geopoint']
     end
 
     def test_emit_record_directive
@@ -523,7 +523,7 @@ class GeoipOutputTest < Test::Unit::TestCase
         # 203.0.113.1 is a test address described in RFC5737
         d1.emit({'host' => '203.0.113.1', 'message' => 'invalid ip'})
         d1.emit({'host' => '0', 'message' => 'invalid ip'})
-        d1.emit({'host' => '8.8.8.8', 'message' => 'google public dns'})
+        d1.emit({'host' => '66.102.3.80', 'message' => 'google bot'})
       end
       emits = d1.emits
       assert_equal 3, emits.length
@@ -534,7 +534,7 @@ class GeoipOutputTest < Test::Unit::TestCase
       assert_equal nil, emits[1][2]['geoip_city']
       assert_equal nil, emits[1][2]['geopoint']
       assert_equal 'Mountain View', emits[2][2]['geoip_city']
-      assert_equal [-122.0838, 37.386], emits[2][2]['geopoint']
+      assert_equal [-122.0574, 37.419200000000004], emits[2][2]['geopoint']
     end
 
     def test_emit_record_directive
@@ -848,7 +848,7 @@ class GeoipOutputTest < Test::Unit::TestCase
         # 203.0.113.1 is a test address described in RFC5737
         d1.emit({'host' => '203.0.113.1', 'message' => 'invalid ip'})
         d1.emit({'host' => '0', 'message' => 'invalid ip'})
-        d1.emit({'host' => '8.8.8.8', 'message' => 'google public dns'})
+        d1.emit({'host' => '66.102.3.80', 'message' => 'google bot'})
       end
       emits = d1.emits
       assert_equal 3, emits.length
@@ -859,7 +859,8 @@ class GeoipOutputTest < Test::Unit::TestCase
       assert_equal nil, emits[1][2]['geoip_city']
       assert_equal nil, emits[1][2]['geopoint']
       assert_equal 'Mountain View', emits[2][2]['geoip_city']
-      assert_equal [-122.08380126953125, 37.38600158691406], emits[2][2]['geopoint']
+      assert_equal [-122.05740356445312, 37.4192008972168], emits[2][2]['geopoint']
+
     end
 
     def test_emit_multiple_key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoip
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,14 +164,21 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- data/COPYRIGHT.txt
+- data/GeoLite2-City.mmdb
 - data/GeoLiteCity.dat
+- data/LICENSE.txt
+- data/README.txt
 - docker-compose.yml
 - dockerfiles/Dockerfile-ruby2.1
 - dockerfiles/Dockerfile-ruby2.2
 - dockerfiles/Dockerfile-ruby2.3
 - dockerfiles/Dockerfile-ruby2.4
 - fluent-plugin-geoip.gemspec
-- gemfiles/fluentd_v0.12.gemfile
+- gemfiles/fluentd_v0.12_with_backport_dig.gemfile
+- gemfiles/fluentd_v0.12_without_backport_dig.gemfile
+- gemfiles/fluentd_v1.0_with_backport_dig.gemfile
+- gemfiles/fluentd_v1.0_without_backport_dig.gemfile
 - lib/fluent/plugin/filter_geoip.rb
 - lib/fluent/plugin/geoip.rb
 - lib/fluent/plugin/out_geoip.rb
@@ -198,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Fluentd Filter plugin to add information about geographical location of IP