fluent-plugin-mixpanel 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d484a01b3b20513d87cef2561d3472e2cf4447b1
-  data.tar.gz: 56622c0ebdfc8cfb822e542cecd31516ffec9079
+  metadata.gz: e1511b088e5a44ccfaaf5496c9c6016ed9d0868b
+  data.tar.gz: 1af1398470ca349149446515f2c23ad41e0bb3b8
 SHA512:
-  metadata.gz: 6a5c41e85c1d43fdd6ec3b2ecde7425fc210e1bb6c980a4ecb8967c96a97aeaa4617cdc6bcc7f384ccc015d3281bb8bb7a05df797c3f1beb65b65644b2000ef5
-  data.tar.gz: 5cbbe5f96c417112b3b80ae6006767664865758922de36b9ac4f4df197bab68145be69d5b79fa965ea69c3345cf120551ae7fde7d33f07f0c5386ebfc0f7d5bf
+  metadata.gz: eb42e76500502a2c4e883041abc18c234f69a687f90bffced64cf578d483d30d5c86f3bb81bec9ee4240bc41a3da4296b863b71e9513b2436f9bd72b5df3e0a3
+  data.tar.gz: 57418f562b980b1a061c765e9ff78e773f276b3cf77016a1b7dcae23aa514f018b13a77111989c58986e469c65e76bec2f01867e03a20a1d0a4250ffe46160a6

data/fluent-plugin-mixpanel.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mixpanel"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Kazuyuki Honda"]
   spec.email         = ["hakobera@gmail.com"]
   spec.summary       = %q{Fluentd plugin to input/output event track data to mixpanel}

data/lib/fluent/plugin/in_http_mixpanel.rb

@@ -26,6 +26,6 @@ class Fluent::HttpMixpanelInput < Fluent::HttpInput
       'Content-type' => 'text/plain'
     }
 
-    [ret[0], headers, (ret[0] == '200 OK' ? '0' : '1')]
+    [ret[0], headers, (ret[0] == '200 OK' ? '1' : '0')]
   end
 end

data/lib/fluent/plugin/out_mixpanel.rb

@@ -45,32 +45,39 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
     records = []
     chunk.msgpack_each do |tag, time, record|
       data = {}
+      prop = data['properties'] = record.dup
 
-      if record[@distinct_id_key]
-        data['distinct_id'] = record[@distinct_id_key]
-        record.delete(@distinct_id_key)
-      else
-        log.warn('no distinct_id')
-        return
-      end
+      # Ignore token in record
+      prop.delete('token')
 
       if @event_map_tag
         data['event'] = tag.gsub(/^#{@remove_tag_prefix}(\.)?/, '')
       elsif record[@event_key]
         data['event'] = record[@event_key]
-        record.delete(@event_key)
+        prop.delete(@event_key)
       else 
         log.warn('no event')
         return
       end
 
+      # Ignore browswer only special event
+      return if data['event'].start_with?('mp_')
+
+      if record[@distinct_id_key]
+        data['distinct_id'] = record[@distinct_id_key]
+        prop.delete(@distinct_id_key)
+      else
+        log.warn('no distinct_id')
+        return
+      end
+
       if !@ip_key.nil? and record[@ip_key]
-        record['ip'] = record[@ip_key]
-        record.delete(@ip_key)
+        prop['ip'] = record[@ip_key]
+        prop.delete(@ip_key)
       end
 
-      record.merge!(time: time.to_i)
-      data['properties'] = record
+      prop.select! {|key, _| !key.start_with?('mp_') }
+      prop.merge!('time' => time.to_i)
       
       records << data
     end

data/test/plugin/test_in_http_mixpanel.rb

@@ -42,7 +42,7 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
       d.expected_emits.each {|tag,time,record|
         res = track("#{tag}", {"json"=>record})
         assert_equal "200", res.code
-        assert_equal '0', res.body
+        assert_equal '1', res.body
         assert_equal 'true', res.header['access-control-allow-credentials']
         assert_equal 'X-Requested-With', res.header['access-control-allow-headers']
         assert_equal 'GET, POST, OPTIONS', res.header['access-control-allow-methods']

data/test/plugin/test_out_mixpanel.rb

@@ -66,6 +66,7 @@ class MixpanelOutputTest < Test::Unit::TestCase
     d.emit(sample_record, time)
     d.run
 
+    assert_equal "test_token", @out[0]['properties']['token']
     assert_equal "123",     @out[0]['properties']['distinct_id']
     assert_equal "event1",  @out[0]['event']
     assert_equal time.to_i, @out[0]['properties']['time']
@@ -140,6 +141,48 @@ class MixpanelOutputTest < Test::Unit::TestCase
     assert_equal "value2",        @out[0]['properties']['key2']
   end
 
+  def test_write_ignore_special_event
+    stub_mixpanel
+    d = create_driver(CONFIG + "event_key event")
+    time = Time.new('2014-01-01T01:23:45+00:00')
+    d.emit({ user_id: '123', event: 'mp_page_view' }, time)
+    d.run
+
+    assert_equal 0, @out.length
+  end
+
+  def test_write_ignore_special_property
+    stub_mixpanel
+    d = create_driver(CONFIG + "event_key event")
+    time = Time.new('2014-01-01T01:23:45+00:00')
+    d.emit(sample_record.merge('mp_event' => '3'), time)
+    d.run
+
+    assert_equal "test_token", @out[0]['properties']['token']
+    assert_equal "123",     @out[0]['properties']['distinct_id']
+    assert_equal "event1",  @out[0]['event']
+    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal "value1",  @out[0]['properties']['key1']
+    assert_equal "value2",  @out[0]['properties']['key2']
+    assert_equal false, @out[0]['properties'].key?('mp_event')
+  end
+
+  def test_write_delete_supried_token
+    stub_mixpanel
+    d = create_driver(CONFIG + "event_key event")
+    time = Time.new('2014-01-01T01:23:45+00:00')
+    d.emit(sample_record.merge('token' => '123'), time)
+    d.run
+
+    assert_equal "test_token", @out[0]['properties']['token']
+    assert_equal "123",     @out[0]['properties']['distinct_id']
+    assert_equal "event1",  @out[0]['event']
+    assert_equal time.to_i, @out[0]['properties']['time']
+    assert_equal "value1",  @out[0]['properties']['key1']
+    assert_equal "value2",  @out[0]['properties']['key2']
+    assert_equal false, @out[0]['properties'].key?('mp_event')
+  end
+
   def test_request_error
     stub_mixpanel_unavailable
     d = create_driver(CONFIG + "event_key event")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mixpanel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kazuyuki Honda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd