polish

splitio · May 2, 2024 · 50fe596 · 50fe596
1 parent 581d6e3
commit 50fe596
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/lib/splitclient-rb/cache/repositories/splits_repository.rb b/lib/splitclient-rb/cache/repositories/splits_repository.rb
@@ -29,7 +29,7 @@ class SplitsRepository < Repository
               size: 100
               }
           ],
-          label: "unsupported matcher type"
+          label: "targeting rule type unsupported by sdk"
         }]
 
         def initialize(config, flag_sets_repository, flag_set_filter)

diff --git a/lib/splitclient-rb/engine/matchers/between_semver_matcher.rb b/lib/splitclient-rb/engine/matchers/between_semver_matcher.rb
@@ -19,7 +19,7 @@ def match?(args)
       return false unless verify_semver_arg?(args, 'BetweenSemverMatcher')
 
       value_to_match = SplitIoClient::Semver.build(args[:attributes][@attribute.to_sym], @logger)
-      unless !value_to_match.nil? && !@semver_start.nil? && !@semver_end.nil?
+      if value_to_match.nil? || @semver_start.nil? || @semver_end.nil?
         @logger.error('betweenStringMatcherData is required for BETWEEN_SEMVER matcher type')
         return false
 

diff --git a/lib/splitclient-rb/engine/matchers/in_list_semver_matcher.rb b/lib/splitclient-rb/engine/matchers/in_list_semver_matcher.rb
@@ -10,15 +10,20 @@ def initialize(attribute, list_value, logger, validator)
       super(logger)
       @validator = validator
       @attribute = attribute
-      @semver_list = list_value.map { |item| SplitIoClient::Semver.build(item, logger) }
+      @semver_list = []
+
+      list_value.map do |item|
+        version = SplitIoClient::Semver.build(item, logger)
+        @semver_list << version unless version.nil?
+      end
       @logger = logger
     end
 
     def match?(args)
       return false unless verify_semver_arg?(args, 'InListSemverMatcher')
 
       value_to_match = SplitIoClient::Semver.build(args[:attributes][@attribute.to_sym], @logger)
-      unless !value_to_match.nil? && @semver_list.all? { |n| !n.nil? }
+      if value_to_match.nil?
         @logger.error('whitelistMatcherData is required for IN_LIST_SEMVER matcher type')
         return false
       end

diff --git a/lib/splitclient-rb/engine/matchers/semver.rb b/lib/splitclient-rb/engine/matchers/semver.rb
@@ -60,7 +60,8 @@ def compare(to_compare)
       return 0 if @version == to_compare.version
 
       # Compare major, minor, and patch versions numerically
-      return compare_attributes(to_compare) if compare_attributes(to_compare) != 0
+      result = compare_attributes(to_compare)
+      return result if result != 0
 
       # Compare pre-release versions lexically
       compare_pre_release(to_compare)