Merge branch 'development' into sse-retries

Author: sanzmauro

lib/splitclient-rb/cache/senders/impressions_adapter/redis_sender.rb

@@ -14,12 +14,12 @@ def initialize(config)
         def record_uniques_key(uniques)
           return if uniques.nil? || uniques == {}
 
-          formatted = uniques_formatter(uniques).to_json
-
-          unless formatted.nil?
-            size = @adapter.add_to_queue(unique_keys_key, formatted)
-            @adapter.expire(unique_keys_key, EXPIRE_SECONDS) if formatted.size == size
+          size = 0
+          uniques.each do |key, value|
+            size = @adapter.add_to_queue(unique_keys_key, { f: key, ks: value.to_a }.to_json)
           end
+
+          @adapter.expire(unique_keys_key, EXPIRE_SECONDS) if uniques.length == size
         rescue StandardError => e
           @config.log_found_exception(__method__.to_s, e)
         end
@@ -54,23 +54,6 @@ def impressions_count_key
         def unique_keys_key
           "#{@config.redis_namespace}.uniquekeys"
         end
-
-        def uniques_formatter(uniques)
-          return if uniques.nil? || uniques.empty?
-
-          to_return = []
-          uniques.each do |key, value|
-            to_return << {
-              f: key,
-              k: value.to_a
-            }
-          end
-
-          to_return
-        rescue StandardError => e
-          @config.log_found_exception(__method__.to_s, e)
-          nil
-        end
       end
     end
   end

spec/cache/senders/impressions_sender_adapter_spec.rb

@@ -23,17 +23,19 @@
 
       result = config.cache_adapter.get_from_queue(unique_keys_key, 0)
 
-      expect(result.size).to eq(1)
-      data = JSON.parse(result[0], symbolize_names: true)
+      expect(result.size).to eq(3)
 
-      expect(data[0][:f]).to eq('feature-name-1')
-      expect(data[0][:k].to_s).to eq('["key-1", "key-2", "key-3", "key-4"]')
+      data = JSON.parse(result[0], symbolize_names: true)
+      expect(data[:f]).to eq('feature-name-1')
+      expect(data[:ks].to_s).to eq('["key-1", "key-2", "key-3", "key-4"]')
 
-      expect(data[1][:f]).to eq('feature-name-2')
-      expect(data[1][:k].to_s).to eq('["key-1", "key-2", "key-3", "key-4"]')
+      data1 = JSON.parse(result[1], symbolize_names: true)
+      expect(data1[:f]).to eq('feature-name-2')
+      expect(data1[:ks].to_s).to eq('["key-1", "key-2", "key-3", "key-4"]')
 
-      expect(data[2][:f]).to eq('feature-name-3')
-      expect(data[2][:k].to_s).to eq('["key-1", "key-2", "key-3", "key-4"]')
+      data2 = JSON.parse(result[2], symbolize_names: true)
+      expect(data2[:f]).to eq('feature-name-3')
+      expect(data2[:ks].to_s).to eq('["key-1", "key-2", "key-3", "key-4"]')
     end
 
     it 'record_uniques_key when uniques is nil or empty' do

spec/engine/impressions/redis_unique_keys_tracker_spec.rb

@@ -36,7 +36,7 @@
     end
 
     result = config.cache_adapter.get_from_queue(key, 0)
-    expect(result.size).to eq(10)
+    expect(result.size).to eq(20)
 
     10.times do |i|
       data = JSON.parse(result[i], symbolize_names: true)
@@ -63,11 +63,11 @@
     sleep 1
 
     result = config.cache_adapter.get_from_queue(key, 0)
-    expect(result.size).to eq(1)
+    expect(result.size).to eq(10)
 
     10.times do |i|
-      data = JSON.parse(result[0], symbolize_names: true)
-      expect(data.size).to eq(10)
+      data = JSON.parse(result[i], symbolize_names: true)
+      expect(data[:ks].size).to eq(2)
     end
 
     cache.clear

splitclient-rb.gemspec

@@ -57,7 +57,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'jwt', '>= 1.0.0', '< 3.0'
   spec.add_runtime_dependency 'lru_redux', '~> 1.1'
   spec.add_runtime_dependency 'net-http-persistent', '>= 2.9', '< 5.0'
-  spec.add_runtime_dependency 'redis', '>= 4.0.0', '< 5.0'
+  spec.add_runtime_dependency 'redis', '>= 4.0.0', '< 6.0'
   spec.add_runtime_dependency 'socketry', '>= 0.4', '< 1.0'
   spec.add_runtime_dependency 'thread_safe', '~> 0.3'
 end