fluent-plugin-indicative 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 297d26519e12331031ab2f4b9ed4a170fad5dec9611c63f5ba2e47e602ad5b37
-  data.tar.gz: 3a88a5d6b99cee6b470210f4d87ca9981fef6b0054a06d2261704626183dbe7b
+  metadata.gz: a2d91e885b3638a46fae8fd381a7dcbedcc054d43e11f8c2e99eac1c691c9544
+  data.tar.gz: 90152aadeaedcb61989ce25e0bbdf682098c0e6621e102447352a50f98522083
 SHA512:
-  metadata.gz: d097056fd8859ad61f884e006e585cecb4638b799f663341ca6d3c06ed59a7fd01d605a80f7006a29ef1b8bc4094ba4d77fdbddc42aa46f265564fad10560f70
-  data.tar.gz: ca482d442059b2340f1769b9c7345772f944a842f493419e9c63723167d42c67b9ee27c4e7ac79838e216481283668a118398764c16b28cac5e352cf60dc9a2b
+  metadata.gz: 59d9539774cac95d2b87ee221cdbde3f757e9637258723fe1a6d6b85dc3cf43aff52cd31755c9f89e2558eaed9bcac3082273da446849c0c135482c5f974ca73
+  data.tar.gz: d12cd7b41f43304cae2cfea5f7343e7b55bf9256f9e84ebd7d51ce638ef5d5b566f9fa9ad9dd2b2aefe243d91359392de73f550c4def63ecb0fbf515f9b83f4e

data/fluent-plugin-indicative.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-indicative"
-  s.version     = "0.1.6"
+  s.version     = "0.1.7"
   s.authors     = ["Sam Millar"]
   s.email       = ["sam@millar.io"]
   s.homepage    = "https://github.com/millar/fluent-plugin-indicative"

data/lib/fluent/plugin/out_indicative.rb

@@ -5,8 +5,6 @@ require 'uri'
 
 require 'fluent/plugin/output'
 
-BATCH_SIZE = 15
-
 
 def flatten_hash(hash)
   hash.each_with_object({}) do |(k, v), h|
@@ -14,7 +12,16 @@ def flatten_hash(hash)
       flatten_hash(v).map do |h_k, h_v|
         h["#{k}.#{h_k}"] = h_v
       end
-    elsif !v.is_a? Array
+    elsif v.is_a? Array
+      # Indicative doesn't support arrays so we use the value of the array as a key and set it to true
+      v.each do |item|
+        if item.is_a?(Hash) && item.has_key?("key") && item.has_key?("value")
+          h["#{k}.#{item["key"]}"] = item["value"]
+        else
+          h["#{k}.#{item}"] = true
+        end
+      end
+    else
       h[k] = v
     end
    end
@@ -26,12 +33,13 @@ class Fluent::Plugin::IndicativeOutput < Fluent::Plugin::Output
 
   config_param :api_key, :string, secret: true
   config_param :api_url, :string, default: 'https://api.indicative.com/service/event/batch'
+  config_param :batch_size, :integer, default: 15
   config_param :event_name_key, :string
   config_param :event_time_key, :string
   config_param :event_unique_id_keys, :array, value_type: :string
 
   def process(tag, es)
-    es.each_slice(BATCH_SIZE) do |events|
+    es.each_slice(@batch_size) do |events|
       send_events(events.map {|time, record| record})
     end
   end
@@ -41,7 +49,7 @@ class Fluent::Plugin::IndicativeOutput < Fluent::Plugin::Output
     chunk.each do |time, record|
       records << record
     end
-    records.each_slice(BATCH_SIZE) do |events|
+    records.each_slice(@batch_size) do |events|
       send_events(events)
     end
   end

data/test/plugin/test_out_indicative.rb

@@ -77,4 +77,56 @@ class IndicativeOutputTest < Test::Unit::TestCase
     assert_equal 0, events.length
     assert_requested :post, d.instance.api_url, times: 1
   end
+
+  def test_array_transformation
+    d = create_driver(STREAM_CONFIG)
+    stub_request(:any, d.instance.api_url)
+    d.run(default_tag: 'test') do
+      d.feed({'event_name' => 'screen_view', 'created_at' => '2015-01-01T10:00:00.000Z', 'session_id' => 'a3bd2', 'experiments': ['a', 'c']})
+    end
+    events = d.events
+    assert_equal 0, events.length
+    assert_requested :post, d.instance.api_url,
+      headers: {'Content-Type' => 'application/json'}, body: {
+        'apiKey' => 'INDICATIVE_API_KEY',
+        'events' => [{
+          'eventName' => 'screen_view',
+          'eventUniqueId' => 'a3bd2',
+          'properties' => {
+            'event_name' => 'screen_view',
+            'created_at' => '2015-01-01T10:00:00.000Z',
+            'session_id' => 'a3bd2',
+            'experiments.a' => true,
+            'experiments.c' => true
+          },
+          'eventTime' => '2015-01-01T10:00:00+00:00'
+        }]
+      }.to_json, times: 1
+  end
+
+  def test_key_value_object_transformation
+    d = create_driver(STREAM_CONFIG)
+    stub_request(:any, d.instance.api_url)
+    d.run(default_tag: 'test') do
+      d.feed({'event_name' => 'screen_view', 'created_at' => '2015-01-01T10:00:00.000Z', 'session_id' => 'a3bd2', 'experiments': [{'key': 'a', 'value': 1}, {'key': 'b', 'value': 2}]})
+    end
+    events = d.events
+    assert_equal 0, events.length
+    assert_requested :post, d.instance.api_url,
+      headers: {'Content-Type' => 'application/json'}, body: {
+        'apiKey' => 'INDICATIVE_API_KEY',
+        'events' => [{
+          'eventName' => 'screen_view',
+          'eventUniqueId' => 'a3bd2',
+          'properties' => {
+            'event_name' => 'screen_view',
+            'created_at' => '2015-01-01T10:00:00.000Z',
+            'session_id' => 'a3bd2',
+            'experiments.a' => 1,
+            'experiments.b' => 2
+          },
+          'eventTime' => '2015-01-01T10:00:00+00:00'
+        }]
+      }.to_json, times: 1
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-indicative
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sam Millar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,8 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin to send events to Indicative