polish

Author: chillaq

lib/splitclient-rb/cache/repositories/splits_repository.rb

@@ -43,10 +43,7 @@ def initialize(config, flag_sets_repository, flag_set_filter)
           end
           @flag_sets = flag_sets_repository
           @flag_set_filter = flag_set_filter
-          unless @config.mode.equal?(:consumer)
-            @adapter.set_string(namespace_key('.splits.till'), '-1')
-            @adapter.initialize_map(namespace_key('.segments.registered'))
-          end
+          initialize_keys
         end
 
         def update(to_add, to_delete, new_change_number)
@@ -127,10 +124,7 @@ def clear
           @tt_cache.clear
 
           @adapter.clear(namespace_key)
-          unless @config.mode.equal?(:consumer)
-            @adapter.set_string(namespace_key('.splits.till'), '-1')
-            @adapter.initialize_map(namespace_key('.segments.registered'))
-          end
+          initialize_keys
         end
 
         def kill(change_number, split_name, default_treatment)
@@ -171,6 +165,13 @@ def flag_set_filter
 
         private
 
+        def initialize_keys
+          unless @config.mode.equal?(:consumer)
+            @adapter.set_string(namespace_key('.splits.till'), '-1')
+            @adapter.initialize_map(namespace_key('.segments.registered'))
+          end
+        end
+
         def add_feature_flag(split)
           return unless split[:name]
           existing_split = get_split(split[:name])

lib/splitclient-rb/engine/api/splits.rb

@@ -59,6 +59,7 @@ def since(since, since_rbs, fetch_options = { cache_control_headers: false, till
             result = convert_to_newSPEC(result)
           end
 
+          result[:rbs][:d] = check_rbs_data(result[:rbs][:d])
           result = objects_with_segment_names(result)
 
           if @spec_version == SplitIoClient::Spec::FeatureFlags::SPEC_VERSION
@@ -97,6 +98,15 @@ def clear_storage
 
       private
 
+      def check_rbs_data(rbs_data)
+        rbs_data.each do |rb_segment|
+          rb_segment[:excluded] = {:keys => [], :segments => []} if rb_segment[:excluded].nil?
+          rb_segment[:excluded][:keys] = [] if rb_segment[:excluded][:keys].nil?
+          rb_segment[:excluded][:segments] = [] if rb_segment[:excluded][:segments].nil?
+        end
+        rbs_data
+      end
+
       def objects_with_segment_names(parsed_objects)
         parsed_objects[:segment_names] = Set.new
         parsed_objects[:segment_names] =

lib/splitclient-rb/engine/matchers/rule_based_segment_matcher.rb

@@ -25,20 +25,10 @@ def match?(args)
       rule_based_segment = @rule_based_segments_repository.get_rule_based_segment(@segment_name)
       return false if rule_based_segment.nil?
 
-      if args[:value].nil? or args[:value].empty?
-        key = args[:matching_key]
-      else
-        key = args[:value]   
-      end
+      key = update_key(args)
       return false if rule_based_segment[:excluded][:keys].include?(key)
 
-      rule_based_segment[:excluded][:segments].each do |segment|
-        return false if segment[:type] == 'standard' and @segments_repository.in_segment?(segment[:name], key)
-        
-        if segment[:type] == 'rule-based'
-          return false if match_rbs(@rule_based_segments_repository.get_rule_based_segment(segment[:name]), args)
-        end
-      end
+      return false unless check_excluded_segments(rule_based_segment)
 
       matches = false
       rule_based_segment[:conditions].each do |c|
@@ -54,13 +44,31 @@ def match?(args)
 
     private
 
-    def match_rbs(rule_based_segment, args)      
-      rbs_matcher = RuleBasedSegmentMatcher.new(@segments_repository, @rule_based_segments_repository, rule_based_segment[:name], @config)
-      return rbs_matcher.match?(
-                  matching_key: args[:matching_key],
-                  bucketing_key: args[:value],
-                  attributes: args[:attributes]
-              )
+    def check_excluded_segments(rule_based_segment)
+      rule_based_segment[:excluded][:segments].each do |segment|
+        return false if segment[:type] == 'standard' && @segments_repository.in_segment?(segment[:name], key)
+
+        return false if segment[:type] == 'rule-based' && match_rbs(
+          @rule_based_segments_repository.get_rule_based_segment(segment[:name]), args
+        )
+      end
+      True
+    end
+
+    def update_key(args)
+      if args[:value].nil? || args[:value].empty?
+        args[:matching_key]
+      else
+        args[:value]
+      end
+    end
+
+    def match_rbs(rule_based_segment, args)
+      rbs_matcher = RuleBasedSegmentMatcher.new(@segments_repository, @rule_based_segments_repository,
+                                                rule_based_segment[:name], @config)
+      rbs_matcher.match?(matching_key: args[:matching_key],
+                         bucketing_key: args[:value],
+                         attributes: args[:attributes])
     end
   end
 end

lib/splitclient-rb/helpers/evaluator_helper.rb

@@ -8,7 +8,9 @@ def self.matcher_type(condition, segments_repository, rb_segment_repository)
         segments_repository.adapter.pipelined do
           condition.matchers.each do |matcher|
             matchers << if matcher[:negate]
-                          condition.negation_matcher(matcher_instance(matcher[:matcherType], condition, matcher, segments_repository, rb_segment_repository))
+                          condition.negation_matcher(matcher_instance(matcher[:matcherType], condition,
+                                                                      matcher, segments_repository,
+                                                                      rb_segment_repository))
                         else
                           matcher_instance(matcher[:matcherType], condition, matcher, segments_repository, rb_segment_repository)
                         end

lib/splitclient-rb/helpers/repository_helper.rb

@@ -13,12 +13,7 @@ def self.update_feature_flag_repository(feature_flag_repository, feature_flags,
             next
           end
 
-          unless feature_flag.key?(:impressionsDisabled)
-            feature_flag[:impressionsDisabled] = false
-            if config.debug_enabled
-              config.logger.debug("feature flag (#{feature_flag[:name]}) does not have impressionsDisabled field, setting it to false")
-            end
-          end
+          feature_flag = self.check_impressions_disabled(feature_flag, config)
 
           config.logger.debug("storing feature flag (#{feature_flag[:name]})") if config.debug_enabled
           to_add.push(feature_flag)
@@ -27,6 +22,16 @@ def self.update_feature_flag_repository(feature_flag_repository, feature_flags,
         feature_flag_repository.update(to_add, to_delete, change_number)
       end
 
+      def self.check_impressions_disabled(feature_flag, config)
+        unless feature_flag.key?(:impressionsDisabled)
+          feature_flag[:impressionsDisabled] = false
+          if config.debug_enabled
+            config.logger.debug("feature flag (#{feature_flag[:name]}) does not have impressionsDisabled field, setting it to false")
+          end
+        end
+        feature_flag
+      end
+
       def self.update_rule_based_segment_repository(rule_based_segment_repository, rule_based_segments, change_number, config)
         to_add = []
         to_delete = []

lib/splitclient-rb/helpers/util.rb

@@ -6,7 +6,8 @@ class Util
       def self.segment_names_by_object(object, matcher_type)
         object[:conditions].each_with_object(Set.new) do |condition, names|
           condition[:matcherGroup][:matchers].each do |matcher|
-            next if matcher[:userDefinedSegmentMatcherData].nil? or matcher[:matcherType] != matcher_type
+            next if matcher[:userDefinedSegmentMatcherData].nil? || matcher[:matcherType] != matcher_type
+
             names << matcher[:userDefinedSegmentMatcherData][:segmentName]
           end
         end

lib/splitclient-rb/sse/workers/splits_worker.rb

@@ -4,7 +4,8 @@ module SplitIoClient
   module SSE
     module Workers
       class SplitsWorker
-        def initialize(synchronizer, config, feature_flags_repository, telemetry_runtime_producer, segment_fetcher, rule_based_segment_repository)
+        def initialize(synchronizer, config, feature_flags_repository, telemetry_runtime_producer,
+                       segment_fetcher, rule_based_segment_repository)
           @synchronizer = synchronizer
           @config = config
           @feature_flags_repository = feature_flags_repository
@@ -68,12 +69,11 @@ def perform
         def update_feature_flag(notification)
           return true if @feature_flags_repository.get_change_number.to_i >= notification.data['changeNumber']
           return false unless !notification.data['d'].nil? && @feature_flags_repository.get_change_number == notification.data['pcn']
-          new_split = return_object_from_json(notification)
-          SplitIoClient::Helpers::RepositoryHelper.update_feature_flag_repository(@feature_flags_repository,
-                                                                                  [new_split],
-                                                                                  notification.data['changeNumber'], @config, false)
-          fetch_segments_if_not_exists(Helpers::Util.segment_names_by_object(new_split, "IN_SEGMENT"), @feature_flags_repository)
-          if fetch_rule_based_segments_if_not_exists(Helpers::Util.segment_names_by_object(new_split, "IN_RULE_BASED_SEGMENT"), notification.data['changeNumber'])
+
+          update_feature_flag_repository(notification)
+          fetch_segments_if_not_exists(Helpers::Util.segment_names_by_object(new_split, 'IN_SEGMENT'), @feature_flags_repository)
+          if fetch_rule_based_segments_if_not_exists(Helpers::Util.segment_names_by_object(new_split, 'IN_RULE_BASED_SEGMENT'),
+                                                     notification.data['changeNumber'])
             return true
           end
 
@@ -86,18 +86,26 @@ def update_feature_flag(notification)
           false
         end
 
+        def update_feature_flag_repository(notification)
+          new_split = return_object_from_json(notification)
+          SplitIoClient::Helpers::RepositoryHelper.update_feature_flag_repository(@feature_flags_repository, [new_split],
+                                                                                  notification.data['changeNumber'], @config, false)
+        end
+
         def update_rule_based_segment(notification)
           return true if @rule_based_segment_repository.get_change_number.to_i >= notification.data['changeNumber']
-          return false unless !notification.data['d'].nil? && @rule_based_segment_repository.get_change_number == notification.data['pcn']
+          return false unless !notification.data['d'].nil? &&
+                              @rule_based_segment_repository.get_change_number == notification.data['pcn']
 
           new_rb_segment = return_object_from_json(notification)
           SplitIoClient::Helpers::RepositoryHelper.update_rule_based_segment_repository(@rule_based_segment_repository,
-                                                                                  [new_rb_segment],
-                                                                                  notification.data['changeNumber'], @config)
-          fetch_segments_if_not_exists(Helpers::Util.segment_names_by_object(new_rb_segment, "IN_SEGMENT"), @rule_based_segment_repository)
+                                                                                        [new_rb_segment],
+                                                                                        notification.data['changeNumber'], @config)
+          fetch_segments_if_not_exists(Helpers::Util.segment_names_by_object(new_rb_segment, 'IN_SEGMENT'),
+                                       @rule_based_segment_repository)
 
-# TODO: enable when telemetry spec is added
-#          @telemetry_runtime_producer.record_updates_from_sse(Telemetry::Domain::Constants::SPLITS)
+          # TODO: enable when telemetry spec is added
+          # @telemetry_runtime_producer.record_updates_from_sse(Telemetry::Domain::Constants::SPLITS)
 
           true
         rescue StandardError => e
@@ -110,11 +118,9 @@ def kill_feature_flag(notification)
           return if @feature_flags_repository.get_change_number.to_i > notification.data['changeNumber']
 
           @config.logger.debug("feature_flags_worker kill #{notification.data['splitName']}, #{notification.data['changeNumber']}")
-          @feature_flags_repository.kill(
-            notification.data['changeNumber'],
-            notification.data['splitName'],
-            notification.data['defaultTreatment']
-          )
+          @feature_flags_repository.kill(notification.data['changeNumber'],
+                                         notification.data['splitName'],
+                                         notification.data['defaultTreatment'])
           @synchronizer.fetch_splits(notification.data['changeNumber'], 0)
         end
 
@@ -124,17 +130,15 @@ def return_object_from_json(notification)
         end
 
         def fetch_segments_if_not_exists(segment_names, object_repository)
-          
           return if segment_names.nil?
 
           object_repository.set_segment_names(segment_names)
           @segment_fetcher.fetch_segments_if_not_exists(segment_names)
         end
 
         def fetch_rule_based_segments_if_not_exists(segment_names, change_number)
-          if segment_names.nil? or segment_names.empty? or @rule_based_segment_repository.contains?(segment_names.to_a)
-            return false 
-          end
+          return false if segment_names.nil? || segment_names.empty? || @rule_based_segment_repository.contains?(segment_names.to_a)
+
           @synchronizer.fetch_splits(0, change_number)
 
           true