splitclient-rb 6.0.1.pre.rc2-java → 6.1.0-java

data/lib/splitclient-rb/engine/matchers/between_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
-  class BetweenMatcher
-    MATCHER_TYPE = 'BETWEEN'.freeze
+  class BetweenMatcher < Matcher
+    MATCHER_TYPE = 'BETWEEN'
 
     attr_reader :attribute
 
@@ -12,30 +14,17 @@ module SplitIoClient
     end
 
     def match?(args)
-      return false if !args.key?(:attributes) && !args.key?(:value)
-      return false if args.key?(:value) && args[:value].nil?
-      return false if args.key?(:attributes) && args[:attributes].nil?
+      SplitLogger.log_if_debug('[BetweenMatcher] evaluating value and attributes.')
+
+      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
 
       value = formatted_value(args[:value] || args[:attributes][@attribute.to_sym])
+      SplitLogger.log_if_debug("[BetweenMatcher] Value from parameters: #{value}.")
       return false unless value.is_a?(Integer)
 
-      (@start_value..@end_value).include? value
-    end
-
-    def equals?(obj)
-      if obj.nil?
-        false
-      elsif !obj.instance_of?(BetweenMatcher)
-        false
-      elsif self.equal?(obj)
-        true
-      else
-        false
-      end
-    end
-
-    def string_type?
-      false
+      matches = (@start_value..@end_value).cover? value
+      SplitLogger.log_if_debug("[BetweenMatcher] is #{value} between #{@start_value} and #{@end_value} -> #{matches} .")
+      matches
     end
 
     private
@@ -45,7 +34,7 @@ module SplitIoClient
       when 'NUMBER'
         value
       when 'DATETIME'
-        value = value / 1000 if sdk_data
+        value /= 1000 if sdk_data
 
         SplitIoClient::Utilities.to_milis_zero_out_from_seconds(value)
       else

data/lib/splitclient-rb/engine/matchers/combiners.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   #
   # class to represent combiner values
   #
   class Combiners
     # available combiners of the sdk
-    AND = 'AND'.freeze
+    AND = 'AND'
   end
 end

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   #
   # class to implement the combining matcher
   #
-  class CombiningMatcher
-    MATCHER_TYPE = 'COMBINING_MATCHER'.freeze
+  class CombiningMatcher < Matcher
+    MATCHER_TYPE = 'COMBINING_MATCHER'
 
     def initialize(combiner = '', matchers = [])
       @combiner = combiner
@@ -20,12 +22,18 @@ module SplitIoClient
     #
     # @return [boolean]
     def match?(args)
-      return false if @matchers.empty?
+      if @matchers.empty?
+        SplitLogger.log_if_debug('[CombiningMatcher] Matchers Empty')
+        return false
+      end
 
       case @combiner
       when Combiners::AND
-        return eval_and(args)
+        matches = eval_and(args)
+        SplitLogger.log_if_debug("[CombiningMatcher] Combiner AND result -> #{matches}")
+        return matches
       else
+        SplitLogger.log_if_debug("[CombiningMatcher] Invalid Combiner Type - Combiner -> #{@combiner}")
         @logger.error('Invalid combiner type')
       end
 
@@ -43,7 +51,9 @@ module SplitIoClient
     # @return [boolean] match value for combiner delegates
     def eval_and(args)
       # Convert all keys to symbols
-      args[:attributes] = args[:attributes].inject({}){ |memo, (k,v)| memo[k.to_sym] = v; memo } if args && args[:attributes]
+      if args && args[:attributes]
+        args[:attributes] = args[:attributes].each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v }
+      end
       @matchers.all? do |matcher|
         if match_with_key?(matcher)
           matcher.match?(value: args[:matching_key])
@@ -57,28 +67,10 @@ module SplitIoClient
       matcher.respond_to?(:attribute) && matcher.attribute.nil? && matcher.string_type?
     end
 
-    #
-    # evaluates if the given object equals the matcher
-    #
-    # @param obj [object] object to be evaluated
-    #
-    # @returns [boolean] true if obj equals the matcher
-    def equals?(obj)
-      if obj.nil?
-        false
-      elsif !obj.instance_of?(CombiningMatcher)
-        false
-      elsif self.equal?(obj)
-        true
-      else
-        false
-      end
-    end
-
     #
     # function to print string value for this matcher
     #
-    # @reutrn [string] string value of this matcher
+    # @return [string] string value of this matcher
     def to_s
       @matcher_list.map(&:to_s).join("#{@combiner} ")
     end

data/lib/splitclient-rb/engine/matchers/contains_all_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class ContainsAllMatcher < SetMatcher
-    MATCHER_TYPE = 'CONTAINS_ALL'.freeze
+    MATCHER_TYPE = 'CONTAINS_ALL'
 
     attr_reader :attribute
 
@@ -9,13 +11,14 @@ module SplitIoClient
     end
 
     def match?(args)
-      return false if @remote_set.empty?
-
-      @remote_set.subset? local_set(args[:attributes], @attribute)
-    end
+      if @remote_set.empty?
+        SplitLogger.log_if_debug('[ContainsAllMatcher] Remote Set Empty')
+        return false
+      end
 
-    def string_type?
-      false
+      matches = @remote_set.subset? local_set(args[:attributes], @attribute)
+      SplitLogger.log_if_debug("[ContainsAllMatcher] Remote Set #{@remote_set} contains #{@attribute} -> #{matches}")
+      matches
     end
   end
 end

data/lib/splitclient-rb/engine/matchers/contains_any_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class ContainsAnyMatcher < SetMatcher
-    MATCHER_TYPE = 'CONTAINS_ANY'.freeze
+    MATCHER_TYPE = 'CONTAINS_ANY'
 
     attr_reader :attribute
 
@@ -9,11 +11,10 @@ module SplitIoClient
     end
 
     def match?(args)
-      local_set(args[:attributes], @attribute).intersect? @remote_set
-    end
-
-    def string_type?
-      false
+      matches = local_set(args[:attributes], @attribute).intersect? @remote_set
+      SplitLogger.log_if_debug("[ContainsAnyMatcher] Remote Set #{@remote_set} contains any \
+        #{@attribute} or #{args[:attributes]}-> #{matches}")
+      matches
     end
   end
 end

data/lib/splitclient-rb/engine/matchers/contains_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class ContainsMatcher
-    MATCHER_TYPE = 'CONTAINS_WITH'.freeze
+    MATCHER_TYPE = 'CONTAINS_WITH'
 
     attr_reader :attribute
 
@@ -10,21 +12,30 @@ module SplitIoClient
     end
 
     def match?(args)
-      return false if !args.key?(:attributes) && !args.key?(:value)
-      return false if args.key?(:value) && args[:value].nil?
-      return false if args.key?(:attributes) && args[:attributes].nil?
+      SplitLogger.log_if_debug('[ContainsMatcher] evaluating value and attributes.')
 
-      value = args[:value] || args[:attributes].fetch(@attribute) do |a|
-        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
-      end
+      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
 
+      value = get_value(args)
+
+      SplitLogger.log_if_debug("[ContainsMatcher] Value from parameters: #{value}.")
       return false if @substr_list.empty?
 
-      @substr_list.any? { |substr| value.to_s.include? substr }
+      matches = @substr_list.any? { |substr| value.to_s.include? substr }
+      SplitLogger.log_if_debug("[ContainsMatcher] #{@value} contains any of #{@substr_list} -> #{matches} .")
+      matches
     end
 
     def string_type?
       true
     end
+
+    private
+
+    def get_value(args)
+      args[:value] || args[:attributes].fetch(@attribute) do |a|
+        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
+      end
+    end
   end
 end

data/lib/splitclient-rb/engine/matchers/dependency_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class DependencyMatcher
-    MATCHER_TYPE = 'IN_SPLIT_TREATMENT'.freeze
+    MATCHER_TYPE = 'IN_SPLIT_TREATMENT'
 
     def initialize(split, treatments)
       @split = split
@@ -9,8 +11,11 @@ module SplitIoClient
 
     def match?(args)
       keys = { matching_key: args[:matching_key], bucketing_key: args[:bucketing_key] }
-
-      @treatments.include?(args[:evaluator].call(keys, @split, args[:attributes])[:treatment])
+      evaluate = args[:evaluator].call(keys, @split, args[:attributes])
+      matches = @treatments.include?(evaluate[:treatment])
+      SplitLogger.log_if_debug("[dependencyMatcher] Parent split #{@split} evaluated to #{evaluate[:treatment]} \
+        with label #{evaluate[:label]}. #{@split} evaluated treatment is part of [#{@treatments}] ? #{matches}.")
+      matches
     end
 
     def string_type?

data/lib/splitclient-rb/engine/matchers/ends_with_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class EndsWithMatcher
-    MATCHER_TYPE = 'ENDS_WITH'.freeze
+    MATCHER_TYPE = 'ENDS_WITH'
 
     attr_reader :attribute
 
@@ -10,17 +12,30 @@ module SplitIoClient
     end
 
     def match?(args)
-      value = args[:value] || args[:attributes].fetch(@attribute) do |a|
-        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
-      end
+      value = get_value(args)
 
-      return false if @suffix_list.empty?
+      SplitLogger.log_if_debug("[EndsWithMatcher] Value from parameters: #{value}.")
+
+      if @suffix_list.empty?
+        SplitLogger.log_if_debug('[EndsWithMatcher] Sufix List empty.')
+        return false
+      end
 
-      @suffix_list.any? { |suffix| value.to_s.end_with? suffix }
+      matches = @suffix_list.any? { |suffix| value.to_s.end_with? suffix }
+      SplitLogger.log_if_debug("[EndsWithMatcher] #{value} ends with any #{@suffix_list}")
+      matches
     end
 
     def string_type?
       true
     end
+
+    private
+
+    def get_value(args)
+      args[:value] || args[:attributes].fetch(@attribute) do |a|
+        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
+      end
+    end
   end
 end

data/lib/splitclient-rb/engine/matchers/equal_to_boolean_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class EqualToBooleanMatcher
-    MATCHER_TYPE = 'EQUAL_TO_BOOLEAN'.freeze
+    MATCHER_TYPE = 'EQUAL_TO_BOOLEAN'
 
     attr_reader :attribute
 
@@ -10,18 +12,25 @@ module SplitIoClient
     end
 
     def match?(args)
-      value = args[:attributes].fetch(@attribute) do |a|
-        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
-      end
+      value = get_value(args)
+      value = false if value.to_s.casecmp('false').zero?
+      value = true if value.to_s.casecmp('true').zero?
 
-      value = false if value.to_s.downcase == 'false'
-      value = true if value.to_s.downcase == 'true'
-
-      value == @boolean
+      matches = value == @boolean
+      SplitLogger.log_if_debug("[EqualToBooleanMatcher] #{value} equals to #{@boolean} -> #{matches}")
+      matches
     end
 
     def string_type?
       false
     end
+
+    private
+
+    def get_value(args)
+      args[:attributes].fetch(@attribute) do |a|
+        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
+      end
+    end
   end
 end

data/lib/splitclient-rb/engine/matchers/equal_to_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
-  class EqualToMatcher
-    MATCHER_TYPE = 'EQUAL_TO'.freeze
+  class EqualToMatcher < Matcher
+    MATCHER_TYPE = 'EQUAL_TO'
 
     attr_reader :attribute
 
@@ -11,29 +13,15 @@ module SplitIoClient
     end
 
     def match?(args)
-      return false if !args.key?(:attributes) && !args.key?(:value)
-      return false if args.key?(:value) && args[:value].nil?
-      return false if args.key?(:attributes) && args[:attributes].nil?
-
-      value = formatted_value(args[:value] || args[:attributes][@attribute.to_sym])
+      SplitLogger.log_if_debug('[EqualsToMatcher] evaluating value and attributes.')
 
-      value.is_a?(Integer) ? (value == @value) : false
-    end
+      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
 
-    def equals?(obj)
-      if obj.nil?
-        false
-      elsif !obj.instance_of?(EqualToMatcher)
-        false
-      elsif self.equal?(obj)
-        true
-      else
-        false
-      end
-    end
+      value = formatted_value(args[:value] || args[:attributes][@attribute.to_sym])
 
-    def string_type?
-      false
+      matches = value.is_a?(Integer) ? (value == @value) : false
+      SplitLogger.log_if_debug("[EqualsToMatcher] #{value} equals to #{@value} -> #{matches}")
+      matches
     end
 
     private
@@ -43,7 +31,7 @@ module SplitIoClient
       when 'NUMBER'
         value
       when 'DATETIME'
-        value = value / 1000 if sdk_data
+        value /= 1000 if sdk_data
 
         SplitIoClient::Utilities.to_milis_zero_out_from_hour value
       else

data/lib/splitclient-rb/engine/matchers/equal_to_set_matcher.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class EqualToSetMatcher < SetMatcher
-    MATCHER_TYPE = 'EQUAL_TO_SET'.freeze
+    MATCHER_TYPE = 'EQUAL_TO_SET'
 
     attr_reader :attribute
 
@@ -9,11 +11,10 @@ module SplitIoClient
     end
 
     def match?(args)
-      local_set(args[:attributes], @attribute) == @remote_set
-    end
-
-    def string_type?
-      false
+      set = local_set(args[:attributes], @attribute)
+      matches = set == @remote_set
+      SplitLogger.log_if_debug("[EqualsToSetMatcher] #{set} equals to #{@remote_set} -> #{matches}")
+      matches
     end
   end
 end