polish

Author: chillaq

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

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

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

@@ -34,6 +34,7 @@ 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}")
@@ -44,8 +45,10 @@ def match?(args)
 
     def check_excluded_segments(rule_based_segment, key, args)
       rule_based_segment[:excluded][:segments].each do |segment|
-        return false if segment[:type] == SplitIoClient::Engine::Models::SegmentType::STANDARD && @segments_repository.in_segment?(segment[:name], key)
-
+        if segment[:type] == SplitIoClient::Engine::Models::SegmentType::STANDARD &&
+           @segments_repository.in_segment?(segment[:name], key)
+          return false
+        end
         return false if segment[:type] == SplitIoClient::Engine::Models::SegmentType::RULE_BASED_SEGMENT && match_rbs(
           @rule_based_segments_repository.get_rule_based_segment(segment[:name]), args
         )

lib/splitclient-rb/helpers/util.rb

@@ -14,12 +14,10 @@ def self.segment_names_by_object(object, matcher_type)
       end
 
       def self.segment_names_in_rb_segment(object, matcher_type)
-        names = Set.new 
+        names = Set.new
         names.merge segment_names_by_object(object, matcher_type)
         object[:excluded][:segments].each do |segment|
-            if segment[:type] == SplitIoClient::Engine::Models::SegmentType::STANDARD
-              names.add(segment[:name])
-            end
+          names.add(segment[:name]) if segment[:type] == SplitIoClient::Engine::Models::SegmentType::STANDARD
         end
         names
       end