Fixed compare logic in semver, equalto and inlist matchers.

Author: Bilal Al

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

@@ -23,7 +23,7 @@ def match?(args)
         @logger.log_if_debug('stringMatcherData is required for EQUAL_TO_SEMVER matcher type')
         return false
       end
-      matches = @semver.compare(SplitIoClient::Semver.new(value_to_match)).zero?
+      matches = (@semver.version == SplitIoClient::Semver.new(value_to_match).version)
       @logger.log_if_debug("[EqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end

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

@@ -23,7 +23,7 @@ def match?(args)
         @logger.log_if_debug('whitelistMatcherData is required for IN_LIST_SEMVER matcher type')
         return false
       end
-      matches = (@semver_list.map { |item| item.compare(value_to_match) }).any?(&:zero?)
+      matches = (@semver_list.map { |item| item.version == value_to_match.version }).any? { |item| item == true }
       @logger.log_if_debug("[InListSemverMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end

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

@@ -6,18 +6,17 @@ class Semver
     PRE_RELEASE_DELIMITER = '-'
     VALUE_DELIMITER = '.'
 
-    attr_reader :major, :minor, :patch, :pre_release, :is_stable, :old_version, :version
+    attr_reader :major, :minor, :patch, :pre_release, :is_stable, :version
 
     def initialize(version)
       @major = 0
       @minor = 0
       @patch = 0
       @pre_release = []
       @is_stable = false
-      @old_version = version
-      @version = ""
-      @metadata = ""
-      parse
+      @version = ''
+      @metadata = ''
+      parse(version)
     end
 
     #
@@ -34,15 +33,16 @@ def self.build(version, logger)
     end
 
     #
-    # Check if there is any metadata characters in self._old_version.
+    # Check if there is any metadata characters in version.
     #
     # @return [type] String semver without the metadata
     #
-    def remove_metadata_if_exists
-      index = @old_version.index(METADATA_DELIMITER)
-      return @old_version if index.nil?
-      @metadata = @old_version[index+1,@old_version.length]
-      @old_version[0, index]
+    def remove_metadata_if_exists(old_version)
+      index = old_version.index(METADATA_DELIMITER)
+      return old_version if index.nil?
+
+      @metadata = old_version[index + 1, old_version.length]
+      old_version[0, index]
     end
 
     # Compare the current Semver object to a given Semver object, return:
@@ -70,10 +70,10 @@ def integer?(value)
     end
 
     #
-    # Parse the string in self._old_version to update the other internal variables
+    # Parse the string in version to update the other internal variables
     #
-    def parse
-      without_metadata = remove_metadata_if_exists
+    def parse(old_version)
+      without_metadata = remove_metadata_if_exists(old_version)
 
       index = without_metadata.index(PRE_RELEASE_DELIMITER)
       if index.nil?
@@ -103,8 +103,8 @@ def assign_major_minor_and_patch(version)
       @minor = parts[1].to_i
       @patch = parts[2].to_i
       @version = "#{@major}#{VALUE_DELIMITER}#{@minor}#{VALUE_DELIMITER}#{@patch}"
-      @version += "#{PRE_RELEASE_DELIMITER}#{@pre_release.join('.')}" if !@pre_release.empty?
-      @version += "#{METADATA_DELIMITER}#{@metadata}" if !@metadata.empty?
+      @version += "#{PRE_RELEASE_DELIMITER}#{@pre_release.join('.')}" unless @pre_release.empty?
+      @version += "#{METADATA_DELIMITER}#{@metadata}" unless @metadata.empty?
     end
 
     #

spec/engine/matchers/matches_between_semver_matcher_spec.rb

@@ -14,9 +14,9 @@
     matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.split_logger, config.split_validator)
     expect(matcher.attribute).to eq("version")
     semver_start = matcher.instance_variable_get(:@semver_start)
-    expect(semver_start.instance_variable_get(:@old_version)).to eq("2.1.8")
+    expect(semver_start.instance_variable_get(:@version)).to eq("2.1.8")
     semver_end = matcher.instance_variable_get(:@semver_end)
-    expect(semver_end.instance_variable_get(:@old_version)).to eq("2.1.11")
+    expect(semver_end.instance_variable_get(:@version)).to eq("2.1.11")
   end
 
   it 'matches' do

spec/engine/matchers/matches_equal_to_semver_matcher_spec.rb

@@ -14,17 +14,17 @@
     matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
     expect(matcher.attribute).to eq("version")
     semver = matcher.instance_variable_get(:@semver)
-    expect(semver.instance_variable_get(:@old_version)).to eq("2.1.8")
+    expect(semver.instance_variable_get(:@version)).to eq("2.1.8")
   end
 
   it 'matches' do
     matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
-    expect(matcher.match?(:attributes=>{"version": "2.1.8+rc"})).to eq(true)
     expect(matcher.match?(:attributes=>{"version": "2.1.8"})).to eq(true)
   end
 
   it 'does not match' do
     matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
+    expect(matcher.match?(:attributes=>{"version": "2.1.8+rc"})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": "2.1.5"})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": "2.1.5-rc1"})).to eq(false)
   end

spec/engine/matchers/matches_greater_than_or_equal_to_semver_matcher_spec.rb

@@ -14,7 +14,7 @@
     matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
     expect(matcher.attribute).to eq("version")
     semver = matcher.instance_variable_get(:@semver)
-    expect(semver.instance_variable_get(:@old_version)).to eq("2.1.8")
+    expect(semver.instance_variable_get(:@version)).to eq("2.1.8")
   end
 
   it 'matches' do

spec/engine/matchers/matches_in_list_semver_matcher_spec.rb

@@ -14,18 +14,19 @@
     matcher = described_class.new("version", raw[:whitelistMatcherData][:whitelist], config.split_logger, config.split_validator)
     expect(matcher.attribute).to eq("version")
     semver_list = matcher.instance_variable_get(:@semver_list)
-    expect(semver_list[0].instance_variable_get(:@old_version)).to eq("2.1.8")
-    expect(semver_list[1].instance_variable_get(:@old_version)).to eq("2.1.11")
+    expect(semver_list[0].instance_variable_get(:@version)).to eq("2.1.8")
+    expect(semver_list[1].instance_variable_get(:@version)).to eq("2.1.11")
   end
 
   it 'matches' do
     matcher = described_class.new("version", raw[:whitelistMatcherData][:whitelist], config.split_logger, config.split_validator)
-    expect(matcher.match?(:attributes=>{"version": "2.1.8+rc"})).to eq(true)
+    expect(matcher.match?(:attributes=>{"version": "2.1.8"})).to eq(true)
     expect(matcher.match?(:attributes=>{"version": "2.1.11"})).to eq(true)
   end
 
   it 'does not match' do
     matcher = described_class.new("version", raw[:whitelistMatcherData][:whitelist], config.split_logger, config.split_validator)
+    expect(matcher.match?(:attributes=>{"version": "2.1.8+rc"})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": "2.1.7"})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": "2.1.11-rc12"})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": "2.1.8-rc1"})).to eq(false)

spec/engine/matchers/matches_less_than_or_equal_to_semver_matcher_spec.rb

@@ -14,7 +14,7 @@
     matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
     expect(matcher.attribute).to eq("version")
     semver = matcher.instance_variable_get(:@semver)
-    expect(semver.instance_variable_get(:@old_version)).to eq("2.1.8")
+    expect(semver.instance_variable_get(:@version)).to eq("2.1.8")
   end
 
   it 'matches' do