fluent-plugin-geoip 0.2.0 → 0.3.0

data/README.md

@@ -53,6 +53,7 @@ $ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-geoip
     latitude        ${latitude['host']}
     longitude       ${longitude['host']}
     country_code3   ${country_code3['host']}
+    country_code2   ${country_code2['host']}
     country         ${country_code['host']}
     country_name    ${country_name['host']}
     dma             ${dma_code['host']}
@@ -168,6 +169,7 @@ Provides these placeholders for adding field of geolocate results.
 * ${latitude[lookup_field]}
 * ${longitude[lookup_field]}
 * ${country_code3[lookup_field]}
+* ${country_code2[lookup_field]}
 * ${country_code[lookup_field]}
 * ${country_name[lookup_field]}
 * ${dma_code[lookup_field]}

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.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Kentaro Yoshida"]
   spec.email         = ["y.ken.studio@gmail.com"]
   spec.summary       = %q{Fluentd Output plugin to add information about geographical location of IP addresses with Maxmind GeoIP databases.}

data/lib/fluent/plugin/out_geoip.rb

@@ -6,7 +6,7 @@ class Fluent::GeoipOutput < Fluent::BufferedOutput
   REGEXP_JSON = /(^[\[\{].+[\]\}]$|^[\d\.\-]+$)/
   REGEXP_PLACEHOLDER_SINGLE = /^\$\{(?<geoip_key>-?[^\[]+)\['(?<record_key>-?[^']+)'\]\}$/
   REGEXP_PLACEHOLDER_SCAN = /(\$\{[^\}]+?\})/
-  GEOIP_KEYS = %w(city latitude longitude country_code3 country_code country_name dma_code area_code region)
+  GEOIP_KEYS = %w(city latitude longitude country_code3 country_code2 country_code country_name dma_code area_code region)
 
   config_param :geoip_database, :string, :default => File.dirname(__FILE__) + '/../../../data/GeoLiteCity.dat'
   config_param :geoip_lookup_key, :string, :default => 'host'

data/test/plugin/test_out_geoip.rb

@@ -184,14 +184,14 @@ class GeoipOutputTest < Test::Unit::TestCase
       add_tag_prefix    geoip.
     ], 'input.access')
     d1.run do
-      d1.emit({'from' => {'ip' => '66.102.3.80'}, 'to' => {'ip' => '125.54.95.42'}})
+      d1.emit({'from' => {'ip' => '66.102.3.80'}, 'to' => {'ip' => '125.54.15.42'}})
       d1.emit({'message' => 'missing field'})
     end
     emits = d1.emits
     assert_equal 2, emits.length
     assert_equal 'geoip.access', emits[0][0] # tag
     assert_equal 'Mountain View', emits[0][2]['from_city']
-    assert_equal 'Musashino', emits[0][2]['to_city']
+    assert_equal 'Tokorozawa', emits[0][2]['to_city']
     assert_equal nil, emits[1][2]['from_city']
     assert_equal nil, emits[1][2]['to_city']
   end
@@ -205,7 +205,7 @@ class GeoipOutputTest < Test::Unit::TestCase
       add_tag_prefix    geoip.
     ], 'input.access')
     d1.run do
-      d1.emit({'from' => {'ip' => '66.102.3.80'}, 'to' => {'ip' => '125.54.95.42'}})
+      d1.emit({'from' => {'ip' => '66.102.3.80'}, 'to' => {'ip' => '125.54.15.42'}})
       d1.emit({'from' => {'ip' => '66.102.3.80'}})
       d1.emit({'message' => 'missing field'})
     end
@@ -214,7 +214,7 @@ class GeoipOutputTest < Test::Unit::TestCase
     assert_equal 'geoip.access', emits[0][0] # tag
     assert_equal 'Mountain View', emits[0][2]['from_city']
     assert_equal 'United States', emits[0][2]['from_country']
-    assert_equal 'Musashino', emits[0][2]['to_city']
+    assert_equal 'Tokorozawa', emits[0][2]['to_city']
     assert_equal 'Japan', emits[0][2]['to_country']
 
     assert_equal 'Mountain View', emits[1][2]['from_city']
@@ -307,7 +307,7 @@ class GeoipOutputTest < Test::Unit::TestCase
       tag               geoip.${tag}
     ], 'input.access')
     d1.run do
-      d1.emit({'from' => {'ip' => '66.102.3.80'}, 'to' => {'ip' => '125.54.95.42'}})
+      d1.emit({'from' => {'ip' => '66.102.3.80'}, 'to' => {'ip' => '125.54.15.42'}})
       d1.emit({'message' => 'missing field'})
     end
     emits = d1.emits
@@ -316,7 +316,7 @@ class GeoipOutputTest < Test::Unit::TestCase
     assert_equal 'geoip.access', emits[0][0] # tag
     assert_equal 'Mountain View', emits[0][2]['from_city']
     assert_equal 'United States', emits[0][2]['from_country']
-    assert_equal 'Musashino', emits[0][2]['to_city']
+    assert_equal 'Tokorozawa', emits[0][2]['to_city']
     assert_equal 'Japan', emits[0][2]['to_country']
     assert_equal ['United States','Japan'], emits[0][2]['string_array']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoip
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler