splitclient-rb 6.4.1 → 7.0.0

data/lib/splitclient-rb/engine/api/client.rb

@@ -7,17 +7,21 @@ module SplitIoClient
     class Client
       RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
 
+      def initialize(config)
+        @config = config
+      end
+
       def get_api(url, api_key, params = {})
         api_client.get(url, params) do |req|
           req.headers = common_headers(api_key).merge('Accept-Encoding' => 'gzip')
 
-          req.options[:timeout] = SplitIoClient.configuration.read_timeout
-          req.options[:open_timeout] = SplitIoClient.configuration.connection_timeout
+          req.options[:timeout] = @config.read_timeout
+          req.options[:open_timeout] = @config.connection_timeout
 
-          SplitLogger.log_if_debug("GET #{url} proxy: #{api_client.proxy}")
+          @config.split_logger.log_if_debug("GET #{url} proxy: #{api_client.proxy}")
         end
       rescue StandardError => e
-        SplitIoClient.configuration.logger.warn("#{e}\nURL:#{url}\nparams:#{params}")
+        @config.logger.warn("#{e}\nURL:#{url}\nparams:#{params}")
         raise e, 'Split SDK failed to connect to backend to retrieve information', e.backtrace
       end
 
@@ -29,14 +33,14 @@ module SplitIoClient
 
           req.body = data.to_json
 
-          req.options[:timeout] = SplitIoClient.configuration.read_timeout
-          req.options[:open_timeout] = SplitIoClient.configuration.connection_timeout
+          req.options[:timeout] = @config.read_timeout
+          req.options[:open_timeout] = @config.connection_timeout
 
-          SplitLogger.log_if_transport("POST #{url} #{req.body}")
-          SplitLogger.log_if_debug("POST #{url}")
+          @config.split_logger.log_if_transport("POST #{url} #{req.body}")
+          @config.split_logger.log_if_debug("POST #{url}")
         end
       rescue StandardError => e
-        SplitIoClient.configuration.logger.warn("#{e}\nURL:#{url}\ndata:#{data}\nparams:#{params}")
+        @config.logger.warn("#{e}\nURL:#{url}\ndata:#{data}\nparams:#{params}")
         raise e, 'Split SDK failed to connect to backend to post information', e.backtrace
       end
 
@@ -73,15 +77,15 @@ module SplitIoClient
       def common_headers(api_key)
         {
           'Authorization' => "Bearer #{api_key}",
-          'SplitSDKVersion' => "#{SplitIoClient.configuration.language}-#{SplitIoClient.configuration.version}",
-          'SplitSDKMachineName' => SplitIoClient.configuration.machine_name,
-          'SplitSDKMachineIP' => SplitIoClient.configuration.machine_ip,
+          'SplitSDKVersion' => "#{@config.language}-#{@config.version}",
+          'SplitSDKMachineName' => @config.machine_name,
+          'SplitSDKMachineIP' => @config.machine_ip,
           'Referer' => referer
         }
       end
 
       def referer
-        result = "#{SplitIoClient.configuration.language}-#{SplitIoClient.configuration.version}"
+        result = "#{@config.language}-#{@config.version}"
 
         result = "#{result}::#{SplitIoClient::SplitConfig.machine_hostname}" unless SplitIoClient::SplitConfig.machine_hostname == 'localhost'
 

data/lib/splitclient-rb/engine/api/events.rb

@@ -3,19 +3,20 @@
 module SplitIoClient
   module Api
     class Events < Client
-      def initialize(api_key)
+      def initialize(api_key, config)
+        super(config)
         @api_key = api_key
       end
 
       def post(events)
         if events.empty?
-          SplitLogger.log_if_debug('No events to report')
+          @config.split_logger.log_if_debug('No events to report')
           return
         end
 
-        events.each_slice(SplitIoClient.configuration.events_queue_size) do |events_slice|
+        events.each_slice(@config.events_queue_size) do |events_slice|
           response = post_api(
-            "#{SplitIoClient.configuration.events_uri}/events/bulk",
+            "#{@config.events_uri}/events/bulk",
             @api_key,
             events_slice.map { |event| formatted_event(event[:e]) },
             'SplitSDKMachineIP' => events_slice[0][:m][:i],
@@ -24,9 +25,9 @@ module SplitIoClient
           )
 
           if response.success?
-            SplitLogger.log_if_debug("Events reported: #{events_slice.size}")
+            @config.split_logger.log_if_debug("Events reported: #{events_slice.size}")
           else
-            SplitLogger.log_error("Unexpected status code while posting events: #{response.status}." \
+            @config.logger.error("Unexpected status code while posting events: #{response.status}." \
             ' - Check your API key and base URI')
             raise 'Split SDK failed to connect to backend to post events'
           end

data/lib/splitclient-rb/engine/api/impressions.rb

@@ -3,23 +3,24 @@
 module SplitIoClient
   module Api
     class Impressions < Client
-      def initialize(api_key)
+      def initialize(api_key, config)
         @api_key = api_key
+        @config = config
       end
 
       def post(impressions)
         if impressions.empty?
-          SplitLogger.log_if_debug('No impressions to report')
+          @config.split_logger.log_if_debug('No impressions to report')
           return
         end
 
         impressions_by_ip(impressions).each do |ip, impressions_ip|
-          response = post_api("#{SplitIoClient.configuration.events_uri}/testImpressions/bulk", @api_key, impressions_ip, 'SplitSDKMachineIP' => ip)
+          response = post_api("#{@config.events_uri}/testImpressions/bulk", @api_key, impressions_ip, 'SplitSDKMachineIP' => ip)
 
           if response.success?
-            SplitLogger.log_if_debug("Impressions reported: #{total_impressions(impressions)}")
+            @config.split_logger.log_if_debug("Impressions reported: #{total_impressions(impressions)}")
           else
-            SplitLogger.log_error("Unexpected status code while posting impressions: #{response.status}." \
+            @config.logger.error("Unexpected status code while posting impressions: #{response.status}." \
             ' - Check your API key and base URI')
             raise 'Split SDK failed to connect to backend to post impressions'
           end

data/lib/splitclient-rb/engine/api/metrics.rb

@@ -3,7 +3,8 @@
 module SplitIoClient
   module Api
     class Metrics < Client
-      def initialize(api_key, metrics_repository)
+      def initialize(api_key, metrics_repository, config)
+        super(config)
         @api_key = api_key
         @metrics_repository = metrics_repository
       end
@@ -17,12 +18,12 @@ module SplitIoClient
 
       def post_latencies
         if @metrics_repository.latencies.empty?
-          SplitLogger.log_if_debug('No latencies to report.')
+          @config.split_logger.log_if_debug('No latencies to report.')
         else
           @metrics_repository.latencies.each do |name, latencies|
             metrics_time = { name: name, latencies: latencies }
 
-            response = post_api("#{SplitIoClient.configuration.events_uri}/metrics/time", @api_key, metrics_time)
+            response = post_api("#{@config.events_uri}/metrics/time", @api_key, metrics_time)
 
             log_status(response, metrics_time.size)
           end
@@ -33,12 +34,12 @@ module SplitIoClient
 
       def post_counts
         if @metrics_repository.counts.empty?
-          SplitLogger.log_if_debug('No counts to report.')
+          @config.split_logger.log_if_debug('No counts to report.')
         else
           @metrics_repository.counts.each do |name, count|
             metrics_count = { name: name, delta: count }
 
-            response = post_api("#{SplitIoClient.configuration.events_uri}/metrics/counter", @api_key, metrics_count)
+            response = post_api("#{@config.events_uri}/metrics/counter", @api_key, metrics_count)
 
             log_status(response, metrics_count.size)
           end
@@ -48,9 +49,9 @@ module SplitIoClient
 
       def log_status(response, info_to_log)
         if response.success?
-          SplitLogger.log_if_debug("Metric time reported: #{info_to_log}")
+          @config.split_logger.log_if_debug("Metric time reported: #{info_to_log}")
         else
-          SplitLogger.log_error("Unexpected status code while posting time metrics: #{response.status}" \
+          @config.logger.error("Unexpected status code while posting time metrics: #{response.status}" \
           ' - Check your API key and base URI')
           raise 'Split SDK failed to connect to backend to post metrics'
         end

data/lib/splitclient-rb/engine/api/segments.rb

@@ -6,7 +6,8 @@ module SplitIoClient
     class Segments < Client
       METRICS_PREFIX = 'segmentChangeFetcher'
 
-      def initialize(api_key, metrics, segments_repository)
+      def initialize(api_key, metrics, segments_repository, config)
+        super(config)
         @metrics = metrics
         @api_key = api_key
         @segments_repository = segments_repository
@@ -23,7 +24,7 @@ module SplitIoClient
             segment = fetch_segment_changes(name, since)
             @segments_repository.add_to_segment(segment)
 
-            SplitLogger.log_if_debug("Segment #{name} fetched before: #{since}, \
+            @config.split_logger.log_if_debug("Segment #{name} fetched before: #{since}, \
               till: #{@segments_repository.get_change_number(name)}")
 
             break if since.to_i >= @segments_repository.get_change_number(name).to_i
@@ -39,28 +40,28 @@ module SplitIoClient
       private
 
       def fetch_segment_changes(name, since)
-        response = get_api("#{SplitIoClient.configuration.base_uri}/segmentChanges/#{name}", @api_key, since: since)
+        response = get_api("#{@config.base_uri}/segmentChanges/#{name}", @api_key, since: since)
         if response.success?
           segment = JSON.parse(response.body, symbolize_names: true)
           @segments_repository.set_change_number(name, segment[:till])
           @metrics.count(METRICS_PREFIX + '.status.' + response.status.to_s, 1)
 
-          SplitLogger.log_if_debug("\'#{segment[:name]}\' segment retrieved.")
+          @config.split_logger.log_if_debug("\'#{segment[:name]}\' segment retrieved.")
           unless segment[:added].empty?
-            SplitLogger.log_if_debug("\'#{segment[:name]}\' #{segment[:added].size} added keys")
+            @config.split_logger.log_if_debug("\'#{segment[:name]}\' #{segment[:added].size} added keys")
           end
           unless segment[:removed].empty?
-            SplitLogger.log_if_debug("\'#{segment[:name]}\' #{segment[:removed].size} removed keys")
+            @config.split_logger.log_if_debug("\'#{segment[:name]}\' #{segment[:removed].size} removed keys")
           end
-          SplitLogger.log_if_transport(segment.to_s)
+          @config.split_logger.log_if_transport(segment.to_s)
 
           segment
         elsif response.status == 403
-            SplitIoClient.configuration.logger.error('Factory Instantiation: You passed a browser type api_key, ' \
+            @config.logger.error('Factory Instantiation: You passed a browser type api_key, ' \
               'please grab an api key from the Split console that is of type sdk')
-            SplitIoClient.configuration.valid_mode =  false
+            @config.valid_mode =  false
         else
-          SplitLogger.log_error("Unexpected status code while fetching segments: #{response.status}." \
+          @config.logger.error("Unexpected status code while fetching segments: #{response.status}." \
           "Since #{since} - Check your API key and base URI")
           @metrics.count(METRICS_PREFIX + '.status.' + response.status.to_s, 1)
           raise 'Split SDK failed to connect to backend to fetch segments'

data/lib/splitclient-rb/engine/api/splits.rb

@@ -6,7 +6,8 @@ module SplitIoClient
     class Splits < Client
       METRICS_PREFIX = 'splitChangeFetcher'
 
-      def initialize(api_key, metrics)
+      def initialize(api_key, metrics, config)
+        super(config)
         @api_key = api_key
         @metrics = metrics
       end
@@ -14,16 +15,16 @@ module SplitIoClient
       def since(since)
         start = Time.now
 
-        response = get_api("#{SplitIoClient.configuration.base_uri}/splitChanges", @api_key, since: since)
+        response = get_api("#{@config.base_uri}/splitChanges", @api_key, since: since)
 
         if response.success?
           result = splits_with_segment_names(response.body)
 
           @metrics.count(METRICS_PREFIX + '.status.' + response.status.to_s, 1)
           unless result[:splits].empty?
-            SplitLogger.log_if_debug("#{result[:splits].length} splits retrieved. since=#{since}")
+            @config.split_logger.log_if_debug("#{result[:splits].length} splits retrieved. since=#{since}")
           end
-          SplitLogger.log_if_transport(result.to_s)
+          @config.split_logger.log_if_transport(result.to_s)
 
           latency = (Time.now - start) * 1000.0
           @metrics.time(METRICS_PREFIX + '.time', latency)
@@ -31,7 +32,7 @@ module SplitIoClient
           result
         else
           @metrics.count(METRICS_PREFIX + '.status.' + response.status.to_s, 1)
-          SplitLogger.log_error("Unexpected status code while fetching splits: #{response.status}. " \
+          @config.logger.error("Unexpected status code while fetching splits: #{response.status}. " \
           'Check your API key and base URI')
           raise 'Split SDK failed to connect to backend to fetch split definitions'
         end

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

@@ -12,7 +12,7 @@ module SplitIoClient
     #
     # @return [boolean] true for all instances
     def match?(_args)
-      SplitLogger.log_if_debug('[AllKeysMatcher] is always -> true')
+      @logger.log_if_debug('[AllKeysMatcher] is always -> true')
       true
     end
 

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

@@ -6,7 +6,9 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute_hash)
+    def initialize(attribute_hash, logger, validator)
+      super(logger)
+      @validator = validator
       @attribute = attribute_hash[:attribute]
       @data_type = attribute_hash[:data_type]
       @start_value = formatted_value(attribute_hash[:start_value], true)
@@ -14,16 +16,16 @@ module SplitIoClient
     end
 
     def match?(args)
-      SplitLogger.log_if_debug('[BetweenMatcher] evaluating value and attributes.')
+      @logger.log_if_debug('[BetweenMatcher] evaluating value and attributes.')
 
-      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
+      return false unless @validator.valid_matcher_arguments(args)
 
       value = formatted_value(args[:value] || args[:attributes][@attribute.to_sym])
-      SplitLogger.log_if_debug("[BetweenMatcher] Value from parameters: #{value}.")
+      @logger.log_if_debug("[BetweenMatcher] Value from parameters: #{value}.")
       return false unless value.is_a?(Integer)
 
       matches = (@start_value..@end_value).cover? value
-      SplitLogger.log_if_debug("[BetweenMatcher] is #{value} between #{@start_value} and #{@end_value} -> #{matches} .")
+      @logger.log_if_debug("[BetweenMatcher] is #{value} between #{@start_value} and #{@end_value} -> #{matches} .")
       matches
     end
 

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

@@ -7,7 +7,8 @@ module SplitIoClient
   class CombiningMatcher < Matcher
     MATCHER_TYPE = 'COMBINING_MATCHER'
 
-    def initialize(combiner = '', matchers = [])
+    def initialize(logger, combiner = '', matchers = [])
+      super(logger)
       @combiner = combiner
       @matchers = matchers
     end
@@ -23,17 +24,17 @@ module SplitIoClient
     # @return [boolean]
     def match?(args)
       if @matchers.empty?
-        SplitLogger.log_if_debug('[CombiningMatcher] Matchers Empty')
+        @logger.log_if_debug('[CombiningMatcher] Matchers Empty')
         return false
       end
 
       case @combiner
       when Combiners::AND
         matches = eval_and(args)
-        SplitLogger.log_if_debug("[CombiningMatcher] Combiner AND result -> #{matches}")
+        @logger.log_if_debug("[CombiningMatcher] Combiner AND result -> #{matches}")
         return matches
       else
-        SplitLogger.log_if_debug("[CombiningMatcher] Invalid Combiner Type - Combiner -> #{@combiner}")
+        @logger.log_if_debug("[CombiningMatcher] Invalid Combiner Type - Combiner -> #{@combiner}")
         @logger.error('Invalid combiner type')
       end
 

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

@@ -6,18 +6,18 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array)
-      super(attribute, remote_array)
+    def initialize(attribute, remote_array, logger)
+      super(attribute, remote_array, logger)
     end
 
     def match?(args)
       if @remote_set.empty?
-        SplitLogger.log_if_debug('[ContainsAllMatcher] Remote Set Empty')
+        @logger.log_if_debug('[ContainsAllMatcher] Remote Set Empty')
         return false
       end
 
       matches = @remote_set.subset? local_set(args[:attributes], @attribute)
-      SplitLogger.log_if_debug("[ContainsAllMatcher] Remote Set #{@remote_set} contains #{@attribute} -> #{matches}")
+      @logger.log_if_debug("[ContainsAllMatcher] Remote Set #{@remote_set} contains #{@attribute} -> #{matches}")
       matches
     end
   end

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

@@ -6,13 +6,13 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array)
-      super(attribute, remote_array)
+    def initialize(attribute, remote_array, logger)
+      super(attribute, remote_array, logger)
     end
 
     def match?(args)
       matches = local_set(args[:attributes], @attribute).intersect? @remote_set
-      SplitLogger.log_if_debug("[ContainsAnyMatcher] Remote Set #{@remote_set} contains any \
+      @logger.log_if_debug("[ContainsAnyMatcher] Remote Set #{@remote_set} contains any \
         #{@attribute} or #{args[:attributes]}-> #{matches}")
       matches
     end

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

@@ -6,23 +6,25 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, substr_list)
+    def initialize(attribute, substr_list, logger, validator)
       @attribute = attribute
       @substr_list = substr_list
+      @logger = logger
+      @validator = validator
     end
 
     def match?(args)
-      SplitLogger.log_if_debug('[ContainsMatcher] evaluating value and attributes.')
+      @logger.log_if_debug('[ContainsMatcher] evaluating value and attributes.')
 
-      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
+      return false unless @validator.valid_matcher_arguments(args)
 
       value = get_value(args)
 
-      SplitLogger.log_if_debug("[ContainsMatcher] Value from parameters: #{value}.")
+      @logger.log_if_debug("[ContainsMatcher] Value from parameters: #{value}.")
       return false if @substr_list.empty?
 
       matches = @substr_list.any? { |substr| value.to_s.include? substr }
-      SplitLogger.log_if_debug("[ContainsMatcher] #{@value} contains any of #{@substr_list} -> #{matches} .")
+      @logger.log_if_debug("[ContainsMatcher] #{@value} contains any of #{@substr_list} -> #{matches} .")
       matches
     end
 

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

@@ -4,16 +4,17 @@ module SplitIoClient
   class DependencyMatcher
     MATCHER_TYPE = 'IN_SPLIT_TREATMENT'
 
-    def initialize(split, treatments)
+    def initialize(split, treatments, logger)
       @split = split
       @treatments = treatments
+      @logger = logger
     end
 
     def match?(args)
       keys = { matching_key: args[:matching_key], bucketing_key: args[:bucketing_key] }
       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]} \
+      @logger.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

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

@@ -6,23 +6,24 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, suffix_list)
+    def initialize(attribute, suffix_list, logger)
       @attribute = attribute
       @suffix_list = suffix_list
+      @logger = logger
     end
 
     def match?(args)
       value = get_value(args)
 
-      SplitLogger.log_if_debug("[EndsWithMatcher] Value from parameters: #{value}.")
+      @logger.log_if_debug("[EndsWithMatcher] Value from parameters: #{value}.")
 
       if @suffix_list.empty?
-        SplitLogger.log_if_debug('[EndsWithMatcher] Sufix List empty.')
+        @logger.log_if_debug('[EndsWithMatcher] Sufix List empty.')
         return false
       end
 
       matches = @suffix_list.any? { |suffix| value.to_s.end_with? suffix }
-      SplitLogger.log_if_debug("[EndsWithMatcher] #{value} ends with any #{@suffix_list}")
+      @logger.log_if_debug("[EndsWithMatcher] #{value} ends with any #{@suffix_list}")
       matches
     end
 

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

@@ -6,9 +6,10 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, boolean)
+    def initialize(attribute, boolean, logger)
       @attribute = attribute
       @boolean = boolean
+      @logger = logger
     end
 
     def match?(args)
@@ -17,7 +18,7 @@ module SplitIoClient
       value = true if value.to_s.casecmp('true').zero?
 
       matches = value == @boolean
-      SplitLogger.log_if_debug("[EqualToBooleanMatcher] #{value} equals to #{@boolean} -> #{matches}")
+      @logger.log_if_debug("[EqualToBooleanMatcher] #{value} equals to #{@boolean} -> #{matches}")
       matches
     end
 

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

@@ -6,21 +6,23 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute_hash)
+    def initialize(attribute_hash, logger, validator)
+      super(logger)
+      @validator = validator
       @attribute = attribute_hash[:attribute]
       @data_type = attribute_hash[:data_type]
       @value = formatted_value(attribute_hash[:value], true)
     end
 
     def match?(args)
-      SplitLogger.log_if_debug('[EqualsToMatcher] evaluating value and attributes.')
+      @logger.log_if_debug('[EqualsToMatcher] evaluating value and attributes.')
 
-      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
+      return false unless @validator.valid_matcher_arguments(args)
 
       value = formatted_value(args[:value] || args[:attributes][@attribute.to_sym])
 
       matches = value.is_a?(Integer) ? (value == @value) : false
-      SplitLogger.log_if_debug("[EqualsToMatcher] #{value} equals to #{@value} -> #{matches}")
+      @logger.log_if_debug("[EqualsToMatcher] #{value} equals to #{@value} -> #{matches}")
       matches
     end
 

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

@@ -6,14 +6,14 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, remote_array)
-      super(attribute, remote_array)
+    def initialize(attribute, remote_array, logger)
+      super(attribute, remote_array, logger)
     end
 
     def match?(args)
       set = local_set(args[:attributes], @attribute)
       matches = set == @remote_set
-      SplitLogger.log_if_debug("[EqualsToSetMatcher] #{set} equals to #{@remote_set} -> #{matches}")
+      @logger.log_if_debug("[EqualsToSetMatcher] #{set} equals to #{@remote_set} -> #{matches}")
       matches
     end
   end

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

@@ -6,21 +6,23 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute_hash)
+    def initialize(attribute_hash, logger, validator)
+      super(logger)
+      @validator = validator
       @attribute = attribute_hash[:attribute]
       @data_type = attribute_hash[:data_type]
       @value = formatted_value(attribute_hash[:value], true)
     end
 
     def match?(args)
-      SplitLogger.log_if_debug('[GreaterThanOrEqualToMatcher] evaluating value and attributes.')
+      @logger.log_if_debug('[GreaterThanOrEqualToMatcher] evaluating value and attributes.')
 
-      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
+      return false unless @validator.valid_matcher_arguments(args)
 
       value = formatted_value(args[:value] || args[:attributes][@attribute.to_sym])
 
       matches = value.is_a?(Integer) ? (value >= @value) : false
-      SplitLogger.log_if_debug("[GreaterThanOrEqualToMatcher] #{value} greater than or equal to #{@value} -> #{matches}")
+      @logger.log_if_debug("[GreaterThanOrEqualToMatcher] #{value} greater than or equal to #{@value} -> #{matches}")
       matches
     end
 

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

@@ -6,21 +6,23 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute_hash)
+    def initialize(attribute_hash, logger, validator)
+      super(logger)
+      @validator = validator
       @attribute = attribute_hash[:attribute]
       @data_type = attribute_hash[:data_type]
       @value = formatted_value(attribute_hash[:value], true)
     end
 
     def match?(args)
-      SplitLogger.log_if_debug('[LessThanOrEqualToMatcher] evaluating value and attributes.')
+      @logger.log_if_debug('[LessThanOrEqualToMatcher] evaluating value and attributes.')
 
-      return false unless SplitIoClient::Validators.valid_matcher_arguments(args)
+      return false unless @validator.valid_matcher_arguments(args)
 
       value = formatted_value(args[:value] || args[:attributes][@attribute.to_sym])
 
       matches = value.is_a?(Integer) ? (value <= @value) : false
-      SplitLogger.log_if_debug("[LessThanOrEqualToMatcher] #{value} less than or equal to #{@value} -> #{matches}")
+      @logger.log_if_debug("[LessThanOrEqualToMatcher] #{value} less than or equal to #{@value} -> #{matches}")
       matches
     end
 

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

@@ -5,6 +5,10 @@ module SplitIoClient
   # class to implement the all keys matcher
   #
   class Matcher
+    def initialize(logger)
+      @logger = logger
+    end
+
     #
     # evaluates if the given object equals the matcher
     #

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

@@ -6,9 +6,10 @@ module SplitIoClient
 
     attr_reader :attribute
 
-    def initialize(attribute, regexp_string)
+    def initialize(attribute, regexp_string, logger)
       @attribute = attribute
       @regexp_string = @regexp_string.is_a?(Regexp) ? regexp_string : Regexp.new(regexp_string)
+      @logger = logger
     end
 
     def match?(args)
@@ -17,7 +18,7 @@ module SplitIoClient
       end
 
       matches = !(value =~ @regexp_string).nil?
-      SplitLogger.log_if_debug("[MatchesStringMatcher] #{value} matches #{@regexp_string} -> #{matches}")
+      @logger.log_if_debug("[MatchesStringMatcher] #{value} matches #{@regexp_string} -> #{matches}")
       matches
     end