fluent-plugin-decode_location 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7696e324681561250bf52e77f0d5bc73ba457d1
-  data.tar.gz: 0197fc55126f7c46f396b291774460f36d1398f9
+  metadata.gz: c4000d3f3de2940e56bdd3ada17a2ec58ac4fb9d
+  data.tar.gz: 2e96f1ca0f3a01898d70247b8546d6a0b25a7fc3
 SHA512:
-  metadata.gz: 46318e05963391dcac2bfcbc7cd2002af6e9013ddf190856f3db9eaca8e088f1de6d8530f54279c555c29a328dd349e2335438930cd9dbca2d1d1c3b9ea5233b
-  data.tar.gz: 3db1613ab27392e4ab795d741b2b456524c69d98895d470446be9e5c28d14cb32443e6066a9d882370d3c4389b97447de50fc3175113aed3a27dd7a930d71283
+  metadata.gz: 0540dcb543acb2c4508b6fc9b90e1ccb1cd3e590acfa8a763a9299bd68d2c0723bbf3b096242d336b2d4bbd1074765e41dc9ac98185c292af6550a1ee5c85842
+  data.tar.gz: 63f91c13032be0a7ff917265b0043e1f88d944982f4450025edd05a4ec35c873a84bb9172e4a63e7c5f7f100380a4306905681b8f64947fd83b757d87c8e0c5e

data/CHANGELOG.md

@@ -1,2 +1,8 @@
+## 0.0.3 (2015/04/02)
+Added gem dependency
+
+## 0.0.2 (2015/04/02)
+Fixed finding keys for ruby 1.9.1, Fixed city special chars encoding
+
 ## 0.0.1 (2015/04/02)
 Initial release

data/fluent-plugin-decode_location.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "fluentd"
+  spec.add_dependency "base62"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"

data/lib/fluent/plugin/decode_location/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module DecodeLocation
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
   end
 end

data/lib/fluent/plugin/out_decode_location.rb

@@ -50,15 +50,15 @@ module Fluent
       source = record
 
       key.split('.').each do |v|
-        if source[v.to_sym]   
-          source = source[v.to_sym]
-        else 
+        if source[v] || source[v.to_sym]
+          source = source[v] ? source[v] : source[v.to_sym]
+        else
           record['break'] = true
           source = nil
           break
         end
       end
-      
+
       if source
         hash = {}
         city = ''
@@ -67,6 +67,11 @@ module Fluent
           exploded = source.split(":|")
           source = exploded[0]
           city = exploded[1]
+
+          if city.is_a?(String)
+            city = Base64.decode64(city)
+            city.force_encoding('utf-8')
+          end
         end
 
         array = source.to_i.base62_encode.gsub(SEPARATOR_DASH, '-').gsub(SEPARATOR_DOT, '.').split(SEPARATOR)
@@ -76,7 +81,7 @@ module Fluent
         hash['continent'] = array[2] ? array[2] : ''
         hash['countryCode'] = array[3] ? array[3] : ''
         hash['province'] = array[4] ? array[4] : ''
-        hash['city'] = city ? Base64.decode64(city) : ''
+        hash['city'] = city
 
         target = sub_key ? (record[sub_key] ||= {}) : record
 
@@ -86,5 +91,6 @@ module Fluent
     rescue => e
       log.warn("out_decode_location: error_class:#{e.class} error_message:#{e.message} tag:#{tag} record:#{record} bactrace:#{e.backtrace.first}")
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-decode_location
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - L. Srednicki
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base62
+  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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement