kameleoon-client-ruby 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b09a20582d3f5baec0e552fe725f308fc5731817a4dc2910f750d929f977f86
-  data.tar.gz: b01b8e3b105369853763de7b6a470296604dbb6f5172c72b28eac3a78038dd88
+  metadata.gz: e0deee13cb73acd60d605f479ab0e2ebf374e38e7516d9bea0590b0adbdd7f53
+  data.tar.gz: 7c06c8d843f6f291d946375d495a3d573e31f932942c5b6edb2f86abf4d9183f
 SHA512:
-  metadata.gz: 117d9b2a6b2079b20c544ed7c26238ffb5fe0b5a045402be2139415572a1afc82d771f00471d9898fb2331c4d3353dcf8dbb17160235fd0a16a65e20c95890b7
-  data.tar.gz: 8a2467851b689b61c9bfec87c8de9a5a4a383930a1dcdb117403e0566343f127ba3890c5aaffba7a62970c0b3350f765c652950005c92af25073cf8c2426709f
+  metadata.gz: 8d14ce02c0a2577988a0161292683e9a455c9532dda0fd69e5428d0f0a2bd08bb38114cf8b161d4a123921e08429cf1db126f7b3033d43a0889c4f6eea2d064b
+  data.tar.gz: de09c74c6587cbd9f53f44a6673b1d3e2832d3aa135376405d0e7eaef9933bc0891243cc34cb039d2eb72b8b8fa5eeb5045b9e4c69b4a4979aabcae154e8361b

data/lib/kameleoon/client.rb

@@ -121,11 +121,11 @@ module Kameleoon
           experiment['deviations'].each do |key, value|
             threshold -= value
             if threshold < 0
-              post_beacon("experimentTracking", visitor_code, experiment_id, key)
+              track_experiment(visitor_code, experiment_id, key)
               return key.to_s.to_i
             end
           end
-          post_beacon("experimentTracking", visitor_code, experiment_id, REFERENCE, true)
+          track_experiment(visitor_code, experiment_id, REFERENCE, true)
           raise Exception::NotActivated.new(visitor_code)
         end
         raise Exception::NotTargeted.new(visitor_code)
@@ -182,7 +182,7 @@ module Kameleoon
     # @param [String] visitor_code Optional field - Visitor code, without visitor code it flush all of the data
     #
     def flush(visitor_code = nil)
-      post_beacon("dataTracking", visitor_code)
+      track_data(visitor_code)
     end
 
     ##
@@ -231,7 +231,7 @@ module Kameleoon
           connexion_options = { :connect_timeout => (timeout.to_f / 1000.0) }
           request_options = {
             :path => get_experiment_register_url(visitor_code, id),
-            :body => (select_data_to_sent(visitor_code).values.map { |data| data.obtain_full_post_text_line }.join("\n") || "").encode("UTF-8")
+            :body => (data_not_sent(visitor_code).values.map { |data| data.obtain_full_post_text_line }.join("\n") || "").encode("UTF-8")
           }
           log "Activate feature request: " + request_options.inspect
           log "Activate feature connexion:" + connexion_options.inspect
@@ -251,10 +251,10 @@ module Kameleoon
         if feature_flag['targetingSegment'].nil? || feature_flag['targetingSegment'].check_tree(visitor_data)
           threshold = obtain_hash_double(visitor_code, {}, id)
           if threshold <= feature_flag['expositionRate']
-            post_beacon("experimentTracking", visitor_code, id, feature_flag["variationsId"].first)
+            track_experiment(visitor_code, id, feature_flag["variationsId"].first)
             return true
           else
-            post_beacon("experimentTracking", visitor_code, id, REFERENCE, true)
+            track_experiment(visitor_code, id, REFERENCE, true)
             return false
           end
         else
@@ -472,6 +472,10 @@ module Kameleoon
       url
     end
 
+    def get_data_register_url(visitor_code)
+      "/dataTracking?" + URI.encode_www_form(get_common_ssx_parameters(visitor_code))
+    end
+
     def get_feature_flag(feature_key)
       if feature_key.is_a?(String)
         feature_flag = @feature_flags.select { |ff| ff['identificationKey'] == feature_key}.first
@@ -486,21 +490,48 @@ module Kameleoon
       feature_flag
     end
 
-    def post_beacon(type = "dataTracking", visitor_code = nil, experiment_id = nil, variation_id = nil, none_variation = false)
+    def track_experiment(visitor_code, experiment_id, variation_id = nil, none_variation = false)
+      data_not_sent = data_not_sent(visitor_code)
+      options = {
+        :path => get_experiment_register_url(visitor_code, experiment_id, variation_id, none_variation),
+        :body => ((data_not_sent.values[0] || []).map{ |it| it.obtain_full_post_text_line }.join("\n") || "").encode("UTF-8"),
+        :head => { "Content-Type" => "text/plain"}
+      }
+      trial = 0
+      log "Start post tracking experiment: " + data_not_sent.inspect
+      Thread.new do
+        EM.synchrony do
+          while trial < 10
+            request = EM::Synchrony.sync post(options, @tracking_url)
+            log "Request " + request.inspect
+            if is_successful(request)
+              (data_not_sent.values[0] || []).each { |it| it.sent = true }
+              EM.stop
+            end
+            trial += 1
+          end
+          EM.stop
+        end
+        log "Post to experiment tracking is done after " + trial.to_s + " trials"
+        Thread.exit
+      end
+    end
+
+    def track_data(visitor_code = nil)
       Thread.new do
         EM.synchrony do
-          entries = select_data_to_sent(visitor_code)
-          log "Start post to tracking: " + entries.inspect
           trials = 10
           concurrency = 1
-          while !entries.empty? && trials > 0
-            log "Trials amount left: " + trials.to_s
-            EM::Synchrony::Iterator.new(entries, concurrency).map do |entry, iter|
+          data_not_sent = data_not_sent(visitor_code)
+          log "Start post tracking data: " + data_not_sent.inspect
+          while trials > 0 && !data_not_sent.empty?
+            EM::Synchrony::Iterator.new(data_not_sent, concurrency).map do |entry, iter|
               options = {
-                :path => build_beacon_path(type, entry.first || visitor_code, experiment_id, variation_id, none_variation),
+                :path => get_data_register_url(entry.first),
                 :body => (entry.last.map { |data| data.obtain_full_post_text_line }.join("\n") || "").encode("UTF-8"),
                 :head => { "Content-Type" => "text/plain" }
               }
+              log "Post tracking data for visitor_code: " + entry.first + " with options: " + options.inspect
               request = post(options, @tracking_url)
               request.callback {
                 if is_successful(request)
@@ -510,17 +541,17 @@ module Kameleoon
               }
               request.errback { iter.return(request) }
             end
-            entries = select_data_to_sent(visitor_code)
+            data_not_sent = data_not_sent(visitor_code)
             trials -= 1
           end
-          log "Post to tracking done"
+          log "Post to data tracking is done."
           EM.stop
         end
         Thread.exit
       end
     end
 
-    def select_data_to_sent(visitor_code)
+    def data_not_sent(visitor_code = nil)
       if visitor_code.nil?
         @data.select {|key, values| values.any? {|data| !data.sent}}
       else
@@ -528,16 +559,6 @@ module Kameleoon
       end
     end
 
-    def build_beacon_path(type, visitor_code, experiment_id = nil, variation_id = nil, none_variation = nil)
-      if type == "dataTracking"
-        return "/dataTracking?" + URI.encode_www_form(get_common_ssx_parameters(visitor_code))
-      elsif type == "experimentTracking"
-        return get_experiment_register_url(visitor_code, experiment_id, variation_id, none_variation)
-      else
-        raise TypeError("Unknown type for post_beacon: " + type.to_s)
-      end
-    end
-
     def log(text)
       if @verbose_mode
         print "Kameleoon Log: " + text.to_s + "\n"

data/lib/kameleoon/request.rb

@@ -42,9 +42,9 @@ module Kameleoon
 
     def add_user_agent(request_options)
       if request_options[:head].nil?
-        request_options[:head] = {'User-Agent' => 'kameleoon-client-ruby/' + Kameleoon::VERSION}
+        request_options[:head] = {'Kameleoon-Client' => 'sdk/ruby/' + Kameleoon::VERSION}
       else
-        request_options[:head].store('User-Agent', 'kameleoon-client-ruby/' + Kameleoon::VERSION)
+        request_options[:head].store('Kameleoon-Client', 'sdk/ruby/' + Kameleoon::VERSION)
       end
     end
   end

data/lib/kameleoon/version.rb

@@ -1,3 +1,3 @@
 module Kameleoon
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kameleoon-client-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Kameleoon - Guillaume Grandjean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request