polish

Author: chillaq

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

@@ -30,37 +30,17 @@ def match?(args)
       rule_based_segment[:excluded][:segments].each do |segment|
         return false if segment[:type] == 'standard' and @segments_repository.in_segment?(segment[:name], args[:value])
 
-        if segment[:type] == 'rule-based'
-          return true if match_rbs(@rule_based_segments_repository.get_rule_based_segment(segment[:name])[:conditions], args)
-        end
+        return false if SplitIoClient::RuleBasedSegmentMatcher.new(@segments_repository, @rule_based_segments_repository, segment[:name], @config).match?(args)
       end
 
       matches = false
       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
-
-    private
-
-    def match_rbs(conditions, args)
-      conditions.each do |condition|
-        next if condition.empty?
-
-        return true if Helpers::EvaluatorHelper::matcher_type(SplitIoClient::Condition.new(condition, @config), 
-              @segments_repository, @rule_based_segments_repository).match?(
-                matching_key: args[:matching_key],
-                bucketing_key: args[:value],
-                attributes: args[:attributes]
-              )
-      end
-      return false
-    end
   end
 end

spec/engine/matchers/rule_based_segment_matcher_spec.rb

@@ -34,7 +34,26 @@
 
     it 'return true 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 => [
+                          "bilal@split.io",
+                          "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: 'bilal@split.io', attributes: {'email': 'bilal@split.io'})).to be true
-      expect(matcher.match?(value: 'bilal', attributes: {'email': 'bilal'})).to be false
+      expect(matcher.match?(value: 'bilal@split.io', attributes: {'email': 'bilal@split.io'})).to be false
+      expect(matcher.match?(value: 'bilal', attributes: {'email': 'bilal'})).to be true
     end
 
     it 'return true if condition matches' do