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

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
-  class GreaterThanOrEqualToMatcher
-    MATCHER_TYPE = 'GREATER_THAN_OR_EQUAL_TO'.freeze
+  class GreaterThanOrEqualToMatcher < Matcher
+    MATCHER_TYPE = 'GREATER_THAN_OR_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('[GreaterThanOrEqualToMatcher] 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?(GreaterThanOrEqualToMatcher)
-        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("[GreaterThanOrEqualToMatcher] #{value} greater than or equal to #{@value} -> #{matches}")
+      matches
     end
 
     private
@@ -41,10 +29,10 @@ module SplitIoClient
     def formatted_value(value, sdk_data = false)
       case @data_type
       when 'NUMBER'
-        return value
+        value
       when 'DATETIME'
-        value = value / 1000 if sdk_data # sdk returns already miliseconds, turning to seconds to do a correct zero_our
-        return SplitIoClient::Utilities.to_milis_zero_out_from_seconds(value)
+        value /= 1000 if sdk_data # sdk returns already miliseconds, turning to seconds to do a correct zero_hour
+        SplitIoClient::Utilities.to_milis_zero_out_from_seconds(value)
       else
         @logger.error('Invalid data type')
       end

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
-  class LessThanOrEqualToMatcher
-    MATCHER_TYPE = 'LESS_THAN_OR_EQUAL_TO'.freeze
+  class LessThanOrEqualToMatcher < Matcher
+    MATCHER_TYPE = 'LESS_THAN_OR_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('[LessThanOrEqualToMatcher] 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?(LessThanOrEqualToMatcher)
-        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("[LessThanOrEqualToMatcher] #{value} less than or equal to #{@value} -> #{matches}")
+      matches
     end
 
     private
@@ -41,10 +29,10 @@ module SplitIoClient
     def formatted_value(value, sdk_data = false)
       case @data_type
       when 'NUMBER'
-        return value
+        value
       when 'DATETIME'
-        value = value / 1000 if sdk_data # sdk returns already miliseconds, turning to seconds to do a correct zero_our
-        return SplitIoClient::Utilities.to_milis_zero_out_from_seconds(value)
+        value /= 1000 if sdk_data # sdk returns already miliseconds, turning to seconds to do a correct zero_hour
+        SplitIoClient::Utilities.to_milis_zero_out_from_seconds(value)
       else
         @logger.error('Invalid data type')
       end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module SplitIoClient
+  #
+  # class to implement the all keys matcher
+  #
+  class Matcher
+    #
+    # evaluates if the given object equals the matcher
+    #
+    # @param obj [object] object to be evaluated
+    #
+    # @return [boolean] true if obj equals the matcher
+    def equals?(obj)
+      if obj.nil?
+        false
+      elsif !obj.instance_of?(self.class)
+        false
+      elsif equal?(obj)
+        true
+      else
+        false
+      end
+    end
+
+    def string_type?
+      false
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class MatchesStringMatcher
-    MATCHER_TYPE = 'MATCHES_STRING'.freeze
+    MATCHER_TYPE = 'MATCHES_STRING'
 
     attr_reader :attribute
 
@@ -14,7 +16,9 @@ module SplitIoClient
         args[:attributes][a.to_s] || args[:attributes][a.to_sym]
       end
 
-      (value =~ @regexp_string) != nil
+      matches = !(value =~ @regexp_string).nil?
+      SplitLogger.log_if_debug("[MatchesStringMatcher] #{value} matches #{@regexp_string} -> #{matches}")
+      matches
     end
 
     def string_type?

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   #
   # class to implement the negation of a matcher
   #
-  class NegationMatcher
-    MATCHER_TYPE = 'NEGATION_MATCHER'.freeze
+  class NegationMatcher < Matcher
+    MATCHER_TYPE = 'NEGATION_MATCHER'
 
     def initialize(matcher = nil)
       @matcher = matcher
@@ -16,7 +18,9 @@ module SplitIoClient
     #
     # @return [boolean] evaluation of the negation matcher
     def match?(args)
-      !@matcher.match?(args)
+      matches = !@matcher.match?(args)
+      SplitLogger.log_if_debug("[NegationMatcherMatcher] Matcher #{@matcher} Arguments #{args} -> #{matches}")
+      matches
     end
 
     def respond_to?(method)
@@ -31,28 +35,10 @@ module SplitIoClient
       @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?(NegationMatcher)
-        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
       "not #{@matcher}"
     end

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

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

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

@@ -1,7 +1,13 @@
+# frozen_string_literal: true
+
 require 'set'
 
 module SplitIoClient
   class SetMatcher
+    def string_type?
+      false
+    end
+
     protected
 
     def initialize(attribute, remote_array)
@@ -12,7 +18,7 @@ module SplitIoClient
     def local_set(data, attribute)
       data = data.fetch(attribute) { |a| data[a.to_s] || data[a.to_sym] }
       # Allow user to pass individual elements as well
-      local_array = data.kind_of?(Array) ? data : [data]
+      local_array = data.is_a?(Array) ? data : [data]
 
       local_array.to_set
     end

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   class StartsWithMatcher
-    MATCHER_TYPE = 'STARTS_WITH'.freeze
+    MATCHER_TYPE = 'STARTS_WITH'
 
     attr_reader :attribute
 
@@ -10,17 +12,28 @@ 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]
+      if @prefix_list.empty?
+        SplitLogger.log_if_debug('[StartsWithMatcher] Prefix List is empty.')
+        return false
       end
 
-      return false if @prefix_list.empty?
+      value = get_value(args)
 
-      @prefix_list.any? { |prefix| value.to_s.start_with? prefix }
+      matches = @prefix_list.any? { |prefix| value.to_s.start_with? prefix }
+      SplitLogger.log_if_debug("[StartsWithMatcher] #{value} matches any of #{@prefix_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/user_defined_segment_matcher.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   #
   # class to implement the user defined matcher
   #
-  class UserDefinedSegmentMatcher
-    MATCHER_TYPE = 'IN_SEGMENT'.freeze
+  class UserDefinedSegmentMatcher < Matcher
+    MATCHER_TYPE = 'IN_SEGMENT'
 
     def initialize(segments_repository, segment_name)
       @segments_repository = segments_repository
@@ -17,29 +19,9 @@ module SplitIoClient
     #
     # @return [boolean] evaluation of the key against the segment
     def match?(args)
-      @segments_repository.in_segment?(@segment_name, args[:value] || args[:matching_key])
-    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?(UserDefinedSegmentMatcher)
-        false
-      elsif self.equal?(obj)
-        true
-      else
-        false
-      end
-    end
-
-    def string_type?
-      false
+      matches = @segments_repository.in_segment?(@segment_name, args[:value] || args[:matching_key])
+      SplitLogger.log_if_debug("[InSegmentMatcher] #{@segment_name} is in segment -> #{matches}")
+      matches
     end
   end
 end

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

@@ -1,54 +1,36 @@
+# frozen_string_literal: true
+
 module SplitIoClient
   #
   # class to implement the user defined matcher
   #
-  class WhitelistMatcher < NoMethodError
+  class WhitelistMatcher < Matcher
     MATCHER_TYPE = 'WHITELIST_MATCHER'
 
     attr_reader :attribute
 
     def initialize(whitelist_data)
       @whitelist = case whitelist_data
-      when Array
-        whitelist_data
-      when Hash
-        @matcher_type = 'ATTR_WHITELIST'
-        @attribute = whitelist_data[:attribute]
+                   when Array
+                     whitelist_data
+                   when Hash
+                     @matcher_type = 'ATTR_WHITELIST'
+                     @attribute = whitelist_data[:attribute]
 
-        whitelist_data[:value]
-      else
-        []
-      end
+                     whitelist_data[:value]
+                   else
+                     []
+                   end
     end
 
     def match?(args)
-      return @whitelist.include?(args[:value] || args[:matching_key]) unless @matcher_type == 'ATTR_WHITELIST'
-
-      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?
+      return matches_user_whitelist(args) unless @matcher_type == 'ATTR_WHITELIST'
 
-      return @whitelist.include?(args[:value] || args[:attributes][@attribute.to_sym])
+      SplitLogger.log_if_debug('[WhitelistMatcher] evaluating value and attributes.')
 
-      false
-    end
+      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
 
-    #
-    # 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?(WhitelistMatcher)
-        false
-      elsif self.equal?(obj)
-        true
-      else
-        false
-      end
+      matches_attr_whitelist(args)
     end
 
     def string_type?
@@ -58,9 +40,25 @@ module SplitIoClient
     #
     # 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
       "in segment #{@whitelist}"
     end
+
+    private
+
+    def matches_user_whitelist(args)
+      matches = @whitelist.include?(args[:value] || args[:matching_key])
+      SplitLogger.log_if_debug("[WhitelistMatcher] #{@whitelist} include \
+        #{args[:value] || args[:matching_key]} -> #{matches}")
+      matches
+    end
+
+    def matches_attr_whitelist(args)
+      matches = @whitelist.include?(args[:value] || args[:attributes][@attribute.to_sym])
+      SplitLogger.log_if_debug("[WhitelistMatcher] #{@whitelist} include \
+        #{args[:value] || args[:attributes][@attribute.to_sym]} -> #{matches}")
+      matches
+    end
   end
 end