fluent-plugin-qqwry 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b7b4e4a05362dd611e2ca9bd8d9cf1fb8fa5b5
-  data.tar.gz: 811fcc85eaa7dae22545904f30f4687a2c11a152
+  metadata.gz: 61d2a4ca5c4fd25a4d3c2747e056452f4e777c58
+  data.tar.gz: b41d0f0fcd94506d6d79d538d6f7b85678331777
 SHA512:
-  metadata.gz: 054d4542cb901f72524851855e6229cd52311580ab4cd5a9b75e88e1448ab4b11989f086239d6582061ef787d096179b0bce034e9b88f796d69dc1dea6de46e7
-  data.tar.gz: 7ca2d977db399a85c87c1531a74d62a4fe23e42e6f49c67cc046c63f6bacf5dbcca58ece36d834db44954c0186967034cf2df13a70ed3ccf6c7bdd7e2c5ba61c
+  metadata.gz: 37ce14c2207e4e5360a96fb1c782f68ea341278577893e8c307c3d1bdcc4a24fc93ae0676042c2b40efc51dffed475cbc46793e4926352579b0dfe8b11b9f042
+  data.tar.gz: fa229efc868de9dc6a9764458d08a97ff717c1fa387fc007aa8ab832510352dfff9e9233a08fa65056cdd2abc5f9b11efd0547f181bce8afc2f50299ac2154fa

data/fluent-plugin-qqwry.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-qqwry"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Chris Song"]
   spec.email         = ["fakechris@gmail.com"]
   spec.summary       = %q{Fluentd Output plugin to add information about geographical location of IP addresses with QQWry databases.}
@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "fluentd"
   spec.add_runtime_dependency "fluent-mixin-rewrite-tag-name"
   spec.add_runtime_dependency "qqwry"
+  spec.add_runtime_dependency "yajl"
 end

data/lib/fluent/plugin/out_qqwry.rb

@@ -6,7 +6,7 @@ class Fluent::QQWryOutput < Fluent::BufferedOutput
   REGEXP_JSON = /(^[\[\{].+[\]\}]$|^[\d\.\-]+$)/
   REGEXP_PLACEHOLDER_SINGLE = /^\$\{(?<qqwry_key>-?[^\[]+)\['(?<record_key>-?[^']+)'\]\}$/
   REGEXP_PLACEHOLDER_SCAN = /(\$\{[^\}]+?\})/
-  QQWRY_KEYS = %w(city latitude longitude country_code3 country_code country_name dma_code area_code region)
+  QQWRY_KEYS = %w(area country)
 
   config_param :qqwry_database, :string, :default => File.dirname(__FILE__) + '/../../../data/qqwry.dat'
   config_param :qqwry_lookup_key, :string, :default => 'host'
@@ -29,6 +29,7 @@ class Fluent::QQWryOutput < Fluent::BufferedOutput
 
   def initialize
     require 'qqwry'
+    require 'yajl'
 
     super
   end
@@ -159,7 +160,7 @@ class Fluent::QQWryOutput < Fluent::BufferedOutput
     @placeholder_keys.each do |placeholder_key|
       position = placeholder_key.match(REGEXP_PLACEHOLDER_SINGLE)
       next if position.nil? or geodata[position[:record_key]].nil?
-      placeholder.store(placeholder_key, geodata[position[:record_key]][position[:qqwry_key].to_sym])
+      placeholder.store(placeholder_key, geodata[position[:record_key]].send(position[:qqwry_key].to_sym))
     end
     return placeholder
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-qqwry
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Chris Song
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - fakechris@gmail.com