fluent-plugin-mixpanel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 491a99b98d20fddb7832d1057d7ff25c2dc89dba
-  data.tar.gz: 9a8b0b46a1f990178fd3352ac480cd884c779de4
+  metadata.gz: 9406e78fac736d2fd7b8b6b4dfa4645f741170db
+  data.tar.gz: 43835b93670babcdfe3d6cf184b6b65413507315
 SHA512:
-  metadata.gz: 94563b6483f2e5f6b4bff5953ed2a5d258c37839409de91ff8c552499bcbec900c055308b2712201c0a929a1d89a292178a12c0212ecb8411c6ff3e408fdce38
-  data.tar.gz: f8551e6232f9ea49f87585e3de4b9cd1f956b7c6f3b45f7350aac4e6d164977128485fff69e29a089fa6ae6f8d5e7f43a5a519f4c4f8202c23e36146e8adaab5
+  metadata.gz: 9aa1ecf98277f977a110929ea16356265fc02f858253fcf100f0f5c6f569e65766fce3f20809b0c72286971becb16fae7aa113529774ed5b166f7264898731c4
+  data.tar.gz: 33c231f32a0eed37ff3225ad41f93dfbb72c6e9383e7afb419fc76c037692e1ce3ad8de3f234aaef89480291b4d3a62224247ff0b69525d98bef6717708bd7f9

data/README.md

@@ -55,7 +55,7 @@ tracker.track("123", "event1", { key1: "value1", key2: "value2" })
 
 ### HttpMixpanelInput
 
-HttpMixpanelInput is very similar to [http Input Plugin](http://docs.fluentd.org/en/articles/in_http). Only difference is that it needs `access_control_allow_origin`, to accept [Cross-site HTTP requests](https://developer.mozilla.org/en-US/docs/HTTP/Access_control_CORS).
+HttpMixpanelInput has same configuration as [http Input Plugin](http://docs.fluentd.org/en/articles/in_http).
 
 ```
 <source>
@@ -65,7 +65,6 @@ HttpMixpanelInput is very similar to [http Input Plugin](http://docs.fluentd.org
   body_size_limit 10m
   keepalive_timeout 5
   add_http_headers true
-  access_control_allow_origin http://0.0.0.0:8000
 </source>
 ```
 

data/example/in_http_mixpanel.conf

@@ -5,7 +5,6 @@
   body_size_limit 10m
   keepalive_timeout 5
   add_http_headers true
-  access_control_allow_origin http://0.0.0.0:8000
 </source>
 
 <match mixpanel.**>

data/fluent-plugin-mixpanel.gemspec

@@ -4,11 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mixpanel"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Kazuyuki Honda"]
   spec.email         = ["hakobera@gmail.com"]
-  spec.summary       = %q{Fluentd plugin to send event track data to mixpanel}
-  spec.description   = %q{Fluentd plugin to send event track data to mixpanel}
+  spec.summary       = %q{Fluentd plugin to input/output event track data to mixpanel}
+  spec.description   = %q{Fluentd plugin to input/output event track data to mixpanel}
   spec.homepage      = "https://github.com/hakobera/fluent-plugin-mixpanel"
   spec.license       = "Apache License, Version 2.0"
 

data/lib/fluent/plugin/in_http_mixpanel.rb

@@ -4,15 +4,15 @@ require 'base64'
 class Fluent::HttpMixpanelInput < Fluent::HttpInput
   Fluent::Plugin.register_input('http_mixpanel', self)
 
-  config_param :access_control_allow_origin
   config_param :tag_prefix, :default => 'mixpanel'
 
   def on_request(path_info, params)
     data = Base64.decode64(params['data']).force_encoding('utf-8')
     json = JSON.parse(data)
+    props = json['properties']
     path = "/#{tag_prefix}.#{json['event']}"
-    params['json'] = json['properties'].to_json
-    params['time'] = (params['_'].to_i / 1000).to_s if params['_']
+    params['json'] = props.to_json
+    params['time'] = props['time'].to_s if props['time']
 
     ret = super(path, params)
     
@@ -20,12 +20,12 @@ class Fluent::HttpMixpanelInput < Fluent::HttpInput
       'Access-Control-Allow-Credentials' => true,
       'Access-Control-Allow-Headers' => 'X-Requested-With',
       'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS',
-      'Access-Control-Allow-Origin' => access_control_allow_origin,
+      'Access-Control-Allow-Origin' => params['HTTP_ORIGIN'],
       'Access-Control-Max-Age' => 1728000,
       'Cache-Control' => 'no-cache, no-store',
       'Content-type' => 'text/plain'
     }
 
-    [ret[0], headers, (ret[0] == 200 ? 1 : 0)]
+    [ret[0], headers, (ret[0] == '200 OK' ? '0' : '1')]
   end
 end

data/lib/fluent/plugin/out_mixpanel.rb

@@ -4,6 +4,7 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
   config_param :project_token, :string
   config_param :distinct_id_key, :string
   config_param :event_key, :string
+  config_param :ip_key, :string, :default => nil
 
   def initialize
     super
@@ -15,6 +16,7 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
     @project_tokey = conf['project_token']
     @distinct_id_key = conf['distinct_id_key']
     @event_key = conf['event_key']
+    @ip_key = conf['ip_key']
 
     if @project_token.empty?
       raise Fluent::ConfigError, "'project_token' must be specifed."
@@ -63,6 +65,11 @@ class Fluent::MixpanelOutput < Fluent::BufferedOutput
         return
       end
 
+      if !@ip_key.nil? and record[@ip_key]
+        record['ip'] = record[@ip_key]
+        record.delete(@ip_key)
+      end
+
       record.merge!(time: time.to_i)
       data['properties'] = record
       

data/test/plugin/test_in_http_mixpanel.rb

@@ -14,7 +14,6 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
     bind 127.0.0.1
     body_size_limit 10m
     keepalive_timeout 5
-    access_control_allow_origin http://foo.example
   ]
 
   def create_driver(conf=CONFIG)
@@ -28,7 +27,6 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
     assert_equal 10*1024*1024, d.instance.body_size_limit
     assert_equal 5, d.instance.keepalive_timeout
     assert_equal false, d.instance.add_http_headers    
-    assert_equal 'http://foo.example', d.instance.access_control_allow_origin
   end
 
   def test_time
@@ -44,10 +42,11 @@ 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 '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']
-        assert_equal d.instance.access_control_allow_origin, res.header['access-control-allow-origin']
+        assert_equal 'http://foo.example', res.header['access-control-allow-origin']
         assert_equal '1728000', res.header['access-control-max-age']
         assert_equal 'no-cache, no-store', res.header['cache-control']
       }
@@ -95,18 +94,17 @@ class HttpMixpanelInputTest < Test::Unit::TestCase
 
   def track(tag, params)
     event = tag.sub(/^mixpanel\.(.+)$/, '\1')
+    params['json']['time'] = params['time'] if params['time']
     data = {
       event: event,
       properties: params['json']
     }
     data = URI.escape(Base64.encode64(data.to_json))
     query = "data=#{data}"
-    query += "&ip=1"
-    query += "&_=#{params['time']}000" if params['time']
     path = "/track/?#{query}"
 
     http = Net::HTTP.new("127.0.0.1", PORT)
-    req = Net::HTTP::Get.new(path)
+    req = Net::HTTP::Get.new(path, { 'origin' => 'http://foo.example' })
     http.request(req)
   end
 

data/test/plugin/test_out_mixpanel.rb

@@ -41,6 +41,15 @@ class MixpanelOutputTest < Test::Unit::TestCase
     assert_equal 'event', d.instance.event_key
   end
 
+  def test_configure_with_ip_key
+    d = create_driver(CONFIG + 'ip_key ip')
+
+    assert_equal 'test_token', d.instance.project_token
+    assert_equal 'user_id', d.instance.distinct_id_key
+    assert_equal 'event', d.instance.event_key
+    assert_equal 'ip', d.instance.ip_key
+  end
+
   def test_write
     stub_mixpanel
     d = create_driver
@@ -79,6 +88,21 @@ class MixpanelOutputTest < Test::Unit::TestCase
     assert_equal "value2",   @out[1]['properties']['key2']
   end
 
+  def test_write_with_ip_key
+    stub_mixpanel
+    d = create_driver(CONFIG + 'ip_key ip_address')
+    time = Time.new('2014-01-01T01:23:45+00:00')
+    d.emit(sample_record.merge('ip_address' => '192.168.0.2'), time)
+    d.run
+
+    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 "192.168.0.2", @out[0]['properties']['ip']
+    assert_equal "value1",      @out[0]['properties']['key1']
+    assert_equal "value2",      @out[0]['properties']['key2']
+  end
+
   def test_request_error
     stub_mixpanel_unavailable
     d = create_driver

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mixpanel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kazuyuki Honda
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Fluentd plugin to send event track data to mixpanel
+description: Fluentd plugin to input/output event track data to mixpanel
 email:
 - hakobera@gmail.com
 executables: []
@@ -111,7 +111,7 @@ rubyforge_project:
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: Fluentd plugin to send event track data to mixpanel
+summary: Fluentd plugin to input/output event track data to mixpanel
 test_files:
 - test/helper.rb
 - test/plugin/test_in_http_mixpanel.rb