fluent-plugin-decode_location 0.0.1 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a7696e324681561250bf52e77f0d5bc73ba457d1
4
- data.tar.gz: 0197fc55126f7c46f396b291774460f36d1398f9
3
+ metadata.gz: c4000d3f3de2940e56bdd3ada17a2ec58ac4fb9d
4
+ data.tar.gz: 2e96f1ca0f3a01898d70247b8546d6a0b25a7fc3
5
5
  SHA512:
6
- metadata.gz: 46318e05963391dcac2bfcbc7cd2002af6e9013ddf190856f3db9eaca8e088f1de6d8530f54279c555c29a328dd349e2335438930cd9dbca2d1d1c3b9ea5233b
7
- data.tar.gz: 3db1613ab27392e4ab795d741b2b456524c69d98895d470446be9e5c28d14cb32443e6066a9d882370d3c4389b97447de50fc3175113aed3a27dd7a930d71283
6
+ metadata.gz: 0540dcb543acb2c4508b6fc9b90e1ccb1cd3e590acfa8a763a9299bd68d2c0723bbf3b096242d336b2d4bbd1074765e41dc9ac98185c292af6550a1ee5c85842
7
+ data.tar.gz: 63f91c13032be0a7ff917265b0043e1f88d944982f4450025edd05a4ec35c873a84bb9172e4a63e7c5f7f100380a4306905681b8f64947fd83b757d87c8e0c5e
@@ -1,2 +1,8 @@
1
+ ## 0.0.3 (2015/04/02)
2
+ Added gem dependency
3
+
4
+ ## 0.0.2 (2015/04/02)
5
+ Fixed finding keys for ruby 1.9.1, Fixed city special chars encoding
6
+
1
7
  ## 0.0.1 (2015/04/02)
2
8
  Initial release
@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
17
17
  spec.require_paths = ["lib"]
18
18
 
19
19
  spec.add_dependency "fluentd"
20
+ spec.add_dependency "base62"
20
21
  spec.add_development_dependency "bundler"
21
22
  spec.add_development_dependency "rake"
22
23
  spec.add_development_dependency "pry"
@@ -1,5 +1,5 @@
1
1
  module Fluent
2
2
  module DecodeLocation
3
- VERSION = "0.0.1"
3
+ VERSION = "0.0.3"
4
4
  end
5
5
  end
@@ -50,15 +50,15 @@ module Fluent
50
50
  source = record
51
51
 
52
52
  key.split('.').each do |v|
53
- if source[v.to_sym]
54
- source = source[v.to_sym]
55
- else
53
+ if source[v] || source[v.to_sym]
54
+ source = source[v] ? source[v] : source[v.to_sym]
55
+ else
56
56
  record['break'] = true
57
57
  source = nil
58
58
  break
59
59
  end
60
60
  end
61
-
61
+
62
62
  if source
63
63
  hash = {}
64
64
  city = ''
@@ -67,6 +67,11 @@ module Fluent
67
67
  exploded = source.split(":|")
68
68
  source = exploded[0]
69
69
  city = exploded[1]
70
+
71
+ if city.is_a?(String)
72
+ city = Base64.decode64(city)
73
+ city.force_encoding('utf-8')
74
+ end
70
75
  end
71
76
 
72
77
  array = source.to_i.base62_encode.gsub(SEPARATOR_DASH, '-').gsub(SEPARATOR_DOT, '.').split(SEPARATOR)
@@ -76,7 +81,7 @@ module Fluent
76
81
  hash['continent'] = array[2] ? array[2] : ''
77
82
  hash['countryCode'] = array[3] ? array[3] : ''
78
83
  hash['province'] = array[4] ? array[4] : ''
79
- hash['city'] = city ? Base64.decode64(city) : ''
84
+ hash['city'] = city
80
85
 
81
86
  target = sub_key ? (record[sub_key] ||= {}) : record
82
87
 
@@ -86,5 +91,6 @@ module Fluent
86
91
  rescue => e
87
92
  log.warn("out_decode_location: error_class:#{e.class} error_message:#{e.message} tag:#{tag} record:#{record} bactrace:#{e.backtrace.first}")
88
93
  end
94
+
89
95
  end
90
96
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-decode_location
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - L. Srednicki
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
+ - !ruby/object:Gem::Dependency
28
+ name: base62
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ">="
32
+ - !ruby/object:Gem::Version
33
+ version: '0'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: bundler
29
43
  requirement: !ruby/object:Gem::Requirement