Merge branch 'feature/rule-based-segments' into rbs-integrations-tests

Author: chillaq

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

@@ -22,13 +22,11 @@ class RuleBasedSegmentsRepository < Repository
                   booleanMatcherData: nil,
                   stringMatcherData: nil
               }]
-          },
-          label: "targeting rule type unsupported by sdk"
+          }
         }]
 
         def initialize(config)
           super(config)
-          @tt_cache = {}
           @adapter = case @config.cache_adapter.class.to_s
           when 'SplitIoClient::Cache::Adapters::RedisAdapter'
             SplitIoClient::Cache::Adapters::CacheAdapter.new(@config)
@@ -79,8 +77,6 @@ def exists?(name)
         end
 
         def clear
-          @tt_cache.clear
-
           @adapter.clear(namespace_key)
         end
 

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

@@ -56,7 +56,11 @@ def eval_and(args)
 
       @matchers.all? do |matcher|
         if match_with_key?(matcher)
-          matcher.match?(value: args[:matching_key])
+          key = args[:value]
+          if args[:matching_key] != nil
+            key = args[:matching_key]
+          end
+          matcher.match?(value: key)
         else
           matcher.match?(args)
         end

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

@@ -44,11 +44,9 @@ def match?(args)
       rule_based_segment[:conditions].each do |c|
         condition = SplitIoClient::Condition.new(c, @config)
         next if condition.empty?
-
         matches = Helpers::EvaluatorHelper.matcher_type(condition, @segments_repository, @rule_based_segments_repository).match?(args)
       end
       @logger.debug("[InRuleSegmentMatcher] #{@segment_name} is in rule based segment -> #{matches}")
-
       matches
     end
 

spec/engine/matchers/rule_based_segment_matcher_spec.rb

@@ -32,9 +32,28 @@
       expect(matcher.match?(value: 'key2')).to be false
     end
 
-    it 'return true if excluded rb segment is matched' do
+    it 'return false if excluded rb segment is matched' do
       rbs_repositoy = SplitIoClient::Cache::Repositories::RuleBasedSegmentsRepository.new(config)
-      rbs = {:name => 'sample_rule_based_segment', :trafficTypeName => 'tt_name_1', :conditions => [], :excluded => {:keys => [], :segments => [{:name => 'no_excludes', :type => 'rule-based'}]}}
+      rbs = {:name => 'sample_rule_based_segment', :trafficTypeName => 'tt_name_1', :conditions => [{
+              :matcherGroup => {
+                :combiner => "AND",
+                :matchers => [
+                  {
+                    :matcherType => "WHITELIST",
+                    :negate => false,
+                    :userDefinedSegmentMatcherData => nil,
+                    :whitelistMatcherData => {
+                        :whitelist => [
+                          "[email protected]",
+                          "bilal"
+                        ]
+                    },
+                    :unaryNumericMatcherData => nil,
+                    :betweenMatcherData => nil
+                  }
+                ]
+              }
+            }], :excluded => {:keys => [], :segments => [{:name => 'no_excludes', :type => 'rule-based'}]}}
       rbs2 = {:name => 'no_excludes', :trafficTypeName => 'tt_name_1', 
           :conditions => [{
               :matcherGroup => {
@@ -60,8 +79,8 @@
 
       rbs_repositoy.update([rbs, rbs2], [], -1)
       matcher = described_class.new(segments_repository, rbs_repositoy, 'sample_rule_based_segment', config)
-      expect(matcher.match?(value: '[email protected]', attributes: {'email': '[email protected]'})).to be true
-      expect(matcher.match?(value: 'bilal', attributes: {'email': 'bilal'})).to be false
+      expect(matcher.match?(value: '[email protected]', attributes: {'email': '[email protected]'})).to be false
+      expect(matcher.match?(value: 'bilal', attributes: {'email': 'bilal'})).to be true
     end
 
     it 'return true if condition matches' do