fluent-plugin-geoblipper 0.0.2 → 0.0.3

data/fluent-plugin-geoblipper.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-geoblipper"
-  gem.version     = "0.0.2"
+  gem.version     = "0.0.3"
   gem.authors     = ["Sean Dick", "Change.org"]
   gem.email       = ["sean@change.org"]
   gem.homepage    = "https://github.com/seanmdick/fluent-plugin-geoblipper"

data/lib/fluent/plugin/out_geoblipper.rb

@@ -13,6 +13,7 @@ class Fluent::GeoBlipperOutput < Fluent::BufferedOutput
   config_param :geodata_location, :string
   config_param :max_entries, :integer, :default => -1
   config_param :ip_key, :string, :default => 'ip'
+  config_param :extra_capture, :array, :default = []
 
   def start
     super
@@ -23,15 +24,24 @@ class Fluent::GeoBlipperOutput < Fluent::BufferedOutput
   def format(tag, time, record)
     address = record[@ip_key]
     loc = @geodata.city(address)
-
-    {latitude: loc.latitude, longitude: loc.longitude}.to_json + "\n" if loc
+    extra = {}
+    extra_capture.each do |key|
+      extra[key] = record[key]
+    end
+    if loc
+      {latitude: loc.latitude, longitude: loc.longitude}.merge(extra).to_json + "\n"
+    else
+      ""
+    end
   end
 
   def write(chunk)
     chunk.open do |io|
-      items = chunk.split("\n")
+      items = io.read.split("\n")
       entries = items.slice(0..@max_entries).map {|item| JSON.parse(item) }
-      @pubnub.publish(message: entries, channel: @pubnub_channel)
+      unless entries.empty?
+        @pubnub.publish(http_sync: true, message: entries, channel: @pubnub_channel)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoblipper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd