Added nil check for all matchers and updated specs

Author: Bilal Al

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

@@ -10,23 +10,23 @@ def initialize(attribute, start_value, end_value, logger, validator)
       super(logger)
       @validator = validator
       @attribute = attribute
-      @semver_start = SplitIoClient::Semver.new(start_value)
-      @semver_end = SplitIoClient::Semver.new(end_value)
+      @semver_start = SplitIoClient::Semver.build(start_value, logger)
+      @semver_end = SplitIoClient::Semver.build(end_value, logger)
       @logger = logger
     end
 
     def match?(args)
-      @logger.log_if_debug('[BetweenSemverMatcher] evaluating value and attributes.')
+      @logger.debug('[BetweenSemverMatcher] evaluating value and attributes.')
       return false unless @validator.valid_matcher_arguments(args)
 
-      value_to_match = args[:attributes][@attribute.to_sym]
-      unless value_to_match.is_a?(String)
-        @logger.log_if_debug('betweenStringMatcherData is required for BETWEEN_SEMVER matcher type')
+      value_to_match = SplitIoClient::Semver.build(args[:attributes][@attribute.to_sym],  @logger)
+      unless !value_to_match.nil? && !@semver_start.nil? && !@semver_end.nil?
+        @logger.error('betweenStringMatcherData is required for BETWEEN_SEMVER matcher type')
         return false
       end
-      matches = ([0, -1].include?(@semver_start.compare(SplitIoClient::Semver.new(value_to_match))) &&
-                 [0, 1].include?(@semver_end.compare(SplitIoClient::Semver.new(value_to_match))))
-      @logger.log_if_debug("[BetweenMatcher] #{value_to_match} matches -> #{matches}")
+      matches = ([0, -1].include?(@semver_start.compare(value_to_match)) &&
+                 [0, 1].include?(@semver_end.compare(value_to_match)))
+      @logger.debug("[BetweenMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end
   end

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

@@ -10,21 +10,21 @@ def initialize(attribute, string_value, logger, validator)
       super(logger)
       @validator = validator
       @attribute = attribute
-      @semver = SplitIoClient::Semver.new(string_value)
+      @semver = SplitIoClient::Semver.build(string_value, logger)
       @logger = logger
     end
 
     def match?(args)
-      @logger.log_if_debug('[EqualsToSemverMatcher] evaluating value and attributes.')
+      @logger.debug('[EqualsToSemverMatcher] evaluating value and attributes.')
       return false unless @validator.valid_matcher_arguments(args)
 
-      value_to_match = args[:attributes][@attribute.to_sym]
-      unless value_to_match.is_a?(String)
-        @logger.log_if_debug('stringMatcherData is required for EQUAL_TO_SEMVER matcher type')
+      value_to_match = SplitIoClient::Semver.build(args[:attributes][@attribute.to_sym],  @logger)
+      unless !value_to_match.nil? && !@semver.nil?
+        @logger.error('stringMatcherData is required for EQUAL_TO_SEMVER matcher type')
         return false
       end
-      matches = (@semver.version == SplitIoClient::Semver.new(value_to_match).version)
-      @logger.log_if_debug("[EqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
+      matches = (@semver.version == value_to_match.version)
+      @logger.debug("[EqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end
   end

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

@@ -10,21 +10,21 @@ def initialize(attribute, string_value, logger, validator)
       super(logger)
       @validator = validator
       @attribute = attribute
-      @semver = SplitIoClient::Semver.new(string_value)
+      @semver = SplitIoClient::Semver.build(string_value, logger)
       @logger = logger
     end
 
     def match?(args)
-      @logger.log_if_debug('[GreaterThanOrEqualsToSemverMatcher] evaluating value and attributes.')
+      @logger.debug('[GreaterThanOrEqualsToSemverMatcher] evaluating value and attributes.')
       return false unless @validator.valid_matcher_arguments(args)
 
-      value_to_match = args[:attributes][@attribute.to_sym]
-      unless value_to_match.is_a?(String)
-        @logger.log_if_debug('stringMatcherData is required for GREATER_THAN_OR_EQUAL_TO_SEMVER matcher type')
+      value_to_match = SplitIoClient::Semver.build(args[:attributes][@attribute.to_sym],  @logger)
+      unless !value_to_match.nil? && !@semver.nil?
+        @logger.error('stringMatcherData is required for GREATER_THAN_OR_EQUAL_TO_SEMVER matcher type')
         return false
       end
-      matches = [0, 1].include?(@semver.compare(SplitIoClient::Semver.new(value_to_match)))
-      @logger.log_if_debug("[GreaterThanOrEqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
+      matches = [0, 1].include?(@semver.compare(value_to_match))
+      @logger.debug("[GreaterThanOrEqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end
   end

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

@@ -15,16 +15,16 @@ def initialize(attribute, list_value, logger, validator)
     end
 
     def match?(args)
-      @logger.log_if_debug('[InListSemverMatcher] evaluating value and attributes.')
+      @logger.debug('[InListSemverMatcher] evaluating value and attributes.')
       return false unless @validator.valid_matcher_arguments(args) && args[:attributes][@attribute.to_sym].is_a?(String)
 
       value_to_match = SplitIoClient::Semver.build(args[:attributes][@attribute.to_sym], @logger)
       unless !value_to_match.nil? && @semver_list.all? { |n| !n.nil? }
-        @logger.log_if_debug('whitelistMatcherData is required for IN_LIST_SEMVER matcher type')
+        @logger.error('whitelistMatcherData is required for IN_LIST_SEMVER matcher type')
         return false
       end
       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}")
+      @logger.debug("[InListSemverMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end
   end

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

@@ -10,21 +10,21 @@ def initialize(attribute, string_value, logger, validator)
       super(logger)
       @validator = validator
       @attribute = attribute
-      @semver = SplitIoClient::Semver.new(string_value)
+      @semver = SplitIoClient::Semver.build(string_value, logger)
       @logger = logger
     end
 
     def match?(args)
-      @logger.log_if_debug('[LessThanOrEqualsToSemverMatcher] evaluating value and attributes.')
+      @logger.debug('[LessThanOrEqualsToSemverMatcher] evaluating value and attributes.')
       return false unless @validator.valid_matcher_arguments(args)
 
-      value_to_match = args[:attributes][@attribute.to_sym]
-      unless value_to_match.is_a?(String)
-        @logger.log_if_debug('stringMatcherData is required for LESS_THAN_OR_EQUAL_TO_SEMVER matcher type')
+      value_to_match = SplitIoClient::Semver.build(args[:attributes][@attribute.to_sym],  @logger)
+      unless !value_to_match.nil? && !@semver.nil?
+        @logger.error('stringMatcherData is required for LESS_THAN_OR_EQUAL_TO_SEMVER matcher type')
         return false
       end
-      matches = [0, -1].include?(@semver.compare(SplitIoClient::Semver.new(value_to_match)))
-      @logger.log_if_debug("[LessThanOrEqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
+      matches = [0, -1].include?(@semver.compare(value_to_match))
+      @logger.debug("[LessThanOrEqualsToSemverMatcher] #{value_to_match} matches -> #{matches}")
       matches
     end
   end

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

@@ -27,8 +27,8 @@ def initialize(version)
     # @return [type] Semver instance
     def self.build(version, logger)
       new(version)
-    rescue RuntimeError => e
-      logger.warn("Failed to parse Semver data:  #{e}")
+    rescue StandardError, NoMethodError => e
+      logger.error("Failed to parse Semver data:  #{e}")
       nil
     end
 

spec/cache/repositories/splits_repository_spec.rb

@@ -126,7 +126,7 @@
             }
         }]
       }
-      repository.update([split], [], -1)
+      repository.update([split.dup], [], -1)
       expect(repository.get_split('corge')[:conditions]).to eq [SplitIoClient::Cache::Repositories::SplitsRepository::DEFAULT_CONDITIONS_TEMPLATE]
 
       # test with multiple conditions

spec/engine/matchers/matches_between_semver_matcher_spec.rb

@@ -11,7 +11,7 @@
   let(:config) { SplitIoClient::SplitConfig.new }
 
   it 'initilized params' do
-    matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.logger, config.split_validator)
     expect(matcher.attribute).to eq("version")
     semver_start = matcher.instance_variable_get(:@semver_start)
     expect(semver_start.instance_variable_get(:@version)).to eq("2.1.8")
@@ -20,20 +20,20 @@
   end
 
   it 'matches' do
-    matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.logger, config.split_validator)
     expect(matcher.match?(:attributes=>{"version": "2.1.8+rc"})).to eq(true)
     expect(matcher.match?(:attributes=>{"version": "2.1.9"})).to eq(true)
     expect(matcher.match?(:attributes=>{"version": "2.1.11-rc12"})).to eq(true)
   end
 
   it 'does not match' do
-    matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.logger, config.split_validator)
     expect(matcher.match?(:attributes=>{"version": "2.1.5"})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": "2.1.12-rc1"})).to eq(false)
   end
 
   it 'invalid attribute' do
-    matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:betweenStringMatcherData][:start], raw[:betweenStringMatcherData][:end], config.logger, config.split_validator)
     expect(matcher.match?(:attributes=>{"version": 2.1})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": nil})).to eq(false)
   end

spec/engine/matchers/matches_equal_to_semver_matcher_spec.rb

@@ -11,28 +11,27 @@
   let(:config) { SplitIoClient::SplitConfig.new }
 
   it 'initilized params' do
-    matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:stringMatcherData], config.logger, config.split_validator)
     expect(matcher.attribute).to eq("version")
     semver = matcher.instance_variable_get(:@semver)
     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)
+    matcher = described_class.new("version", raw[:stringMatcherData], config.logger, config.split_validator)
     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)
+    matcher = described_class.new("version", raw[:stringMatcherData], config.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
 
   it 'invalid attribute' do
-    matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:stringMatcherData], config.logger, config.split_validator)
     expect(matcher.match?(:attributes=>{"version": 2.1})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": nil})).to eq(false)
   end
-
 end

spec/engine/matchers/matches_greater_than_or_equal_to_semver_matcher_spec.rb

@@ -11,28 +11,28 @@
   let(:config) { SplitIoClient::SplitConfig.new }
 
   it 'initilized params' do
-    matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:stringMatcherData], config.logger, config.split_validator)
     expect(matcher.attribute).to eq("version")
     semver = matcher.instance_variable_get(:@semver)
     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)
+    matcher = described_class.new("version", raw[:stringMatcherData], config.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.5"})).to eq(true)
     expect(matcher.match?(:attributes=>{"version": "2.1.5-rc1"})).to eq(true)
   end
 
   it 'does not match' do
-    matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:stringMatcherData], config.logger, config.split_validator)
     expect(matcher.match?(:attributes=>{"version": "2.1.11"})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": "2.2.0"})).to eq(false)
   end
 
   it 'invalid attribute' do
-    matcher = described_class.new("version", raw[:stringMatcherData], config.split_logger, config.split_validator)
+    matcher = described_class.new("version", raw[:stringMatcherData], config.logger, config.split_validator)
     expect(matcher.match?(:attributes=>{"version": 2.1})).to eq(false)
     expect(matcher.match?(:attributes=>{"version": nil})).to eq(false)
   end