fluent-plugin-geoip 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ba51a787a4970750c7198634fd098dcb310c05a
-  data.tar.gz: 8e8fdc8b26e46c28f37bee711877e115df7293a0
+  metadata.gz: b35da517cb09039e887c3c2a4fc65878ea5c5de9
+  data.tar.gz: 69cd94d72b73b04b1f7344815c0b1aa96d98ba30
 SHA512:
-  metadata.gz: 65b5ecb8009f1317f2f15dc1be73a935ce4298658497d3b329452ae95f66628ad20ba74014905738bb6a09ec5d6bb5005a48f25f5716cd0608ea1c2316994ee4
-  data.tar.gz: b7eded32d4b0c8babb7f417902e4565c592ed2af89e0bb5253165263c45704eef6feeadf1bd1787936a9e2dc96e4fecefef2cf2738ba778428c41d600fc621ff
+  metadata.gz: b7083fe1c2cde0d12ed5da0954c3749d914ec0a78f26d4570cb8a3e62c7623d76e4711ea33788ddded0190dfc43a9dd7bd8f6c88329fd56022adc153cf651cd4
+  data.tar.gz: c4834cea64a1fbc55ea8b01cda60b3b7cc38f1a1daaaee66b2333e3c770a02f3cbaa04096e710406b221a890702ddf2b098b5f8f4f8cda238125a771c1781112

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.8.0"
+  spec.version       = "0.8.1"
   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/lib/fluent/plugin/geoip.rb

@@ -164,7 +164,13 @@ module Fluent
         position = placeholder_key.match(REGEXP_PLACEHOLDER_SINGLE)
         next if position.nil? or geodata[position[:record_key]].nil?
         keys = [position[:record_key]] + position[:geoip_key].split('.').map(&:to_sym)
-        placeholder[placeholder_key] = geodata.dig(*keys)
+        value = geodata.dig(*keys)
+        value = if [:latitude, :longitude].include?(keys.last)
+                  value || 0.0
+                else
+                  value
+                end
+        placeholder[placeholder_key] = value
       end
       placeholder
     end

data/test/plugin/test_filter_geoip.rb

@@ -13,6 +13,7 @@ class GeoipFilterTest < Test::Unit::TestCase
 
   def filter(config, messages, use_v1=false)
     d = create_driver(config, 'test', use_v1)
+    yield d if block_given?
     d.run {
       messages.each {|message|
         d.filter(message, @time)
@@ -22,6 +23,15 @@ class GeoipFilterTest < Test::Unit::TestCase
     filtered.map {|m| m[2] }
   end
 
+  def setup_geoip_mock(d)
+    geoip = d.instance.instance_variable_get(:@geoip)
+    db = Object.new
+    def db.lookup(ip)
+      {}
+    end
+    geoip.instance_variable_set(:@geoip, db)
+  end
+
   sub_test_case "configure" do
     test "empty" do
       assert_nothing_raised {
@@ -386,6 +396,32 @@ class GeoipFilterTest < Test::Unit::TestCase
       filtered = filter(config, messages, true)
       assert_equal(expected, filtered)
     end
+
+    def test_filter_when_latitude_longitude_is_nil
+      config = %[
+        backend_library   geoip2_c
+        geoip_lookup_key  host
+        <record>
+          latitude  ${location.latitude['host']}
+          longitude ${location.longitude['host']}
+        </record>
+      ]
+      messages = [
+        { "host" => "180.94.85.84", "message" => "nil latitude and longitude" }
+      ]
+      expected = [
+        {
+          "host" => "180.94.85.84",
+          "message" => "nil latitude and longitude",
+          "latitude" => 0.0,
+          "longitude" => 0.0
+        }
+      ]
+      filtered = filter(config, messages) do |d|
+        setup_geoip_mock(d)
+      end
+      assert_equal(expected, filtered)
+    end
   end
 
   sub_test_case "geoip2_compat" do
@@ -655,6 +691,32 @@ class GeoipFilterTest < Test::Unit::TestCase
       filtered = filter(config, messages, true)
       assert_equal(expected, filtered)
     end
+
+    def test_filter_when_latitude_longitude_is_nil
+      config = %[
+        backend_library   geoip2_compat
+        geoip_lookup_key  host
+        <record>
+          latitude  ${latitude['host']}
+          longitude ${longitude['host']}
+        </record>
+      ]
+      messages = [
+        { "host" => "180.94.85.84", "message" => "nil latitude and longitude" }
+      ]
+      expected = [
+        {
+          "host" => "180.94.85.84",
+          "message" => "nil latitude and longitude",
+          "latitude" => 0.0,
+          "longitude" => 0.0
+        }
+      ]
+      filtered = filter(config, messages) do |d|
+        setup_geoip_mock(d)
+      end
+      assert_equal(expected, filtered)
+    end
   end
 
   sub_test_case "geoip legacy" do
@@ -1008,6 +1070,32 @@ class GeoipFilterTest < Test::Unit::TestCase
       filtered = filter(config, messages, true)
       assert_equal(expected, filtered)
     end
+
+    def test_filter_when_latitude_longitude_is_nil
+      config = %[
+        backend_library   geoip
+        geoip_lookup_key  host
+        <record>
+          latitude  ${latitude['host']}
+          longitude ${longitude['host']}
+        </record>
+      ]
+      messages = [
+        { "host" => "180.94.85.84", "message" => "nil latitude and longitude" }
+      ]
+      expected = [
+        {
+          "host" => "180.94.85.84",
+          "message" => "nil latitude and longitude",
+          "latitude" => 0.0,
+          "longitude" => 0.0
+        }
+      ]
+      filtered = filter(config, messages) do |d|
+        setup_geoip_mock(d)
+      end
+      assert_equal(expected, filtered)
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoip
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Fluentd Filter plugin to add information about geographical location of IP