splitclient-rb 4.3.0.canary.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b65d200504de0d0e0c33db504df5d40bde0a023b
-  data.tar.gz: 8b483c1b5ba41fe2745a992e018ba14dbce4e3cb
+  metadata.gz: 1b62b60ce935de1b5345ec16107e6911321abf9c
+  data.tar.gz: 2ed5525256582608b165f9a42a056657fb6fc24c
 SHA512:
-  metadata.gz: 7506af68ad2f63241782631576a73eaa845701dfc7dbbfc6274a9afde8eabf3cf3c830eae4e2b1ec8734ceee64f15fc6c57bed268662595b0e92f5760133f748
-  data.tar.gz: 600ea370b948fcb2de1f1bbcf6f07b85cc39daa93f894675b62e0bce1b801a9c4b943fcf205b6a9324238323fc4d29e4898059d749f3564cb6913ecffb4f4770
+  metadata.gz: 837b99afc42609f08b51eee920c0b9492da45fb93e3ddfe187f0edc454e36077684e1bef54312a3a31e529d7fba2b10730179cc7e82a88becc4dc4e9d2435acf
+  data.tar.gz: cb785d0b3152892b86fa24a7b3369247ee4d17ffd2a4e9d01452bdb3d4e7b7eedb7648793ce8eb5c9e51d3ce2911256ce1da5e9bea7ad285d90f1a6bee913708

data/CHANGES.txt

@@ -1,8 +1,9 @@
-4.3.0 (Sept 14th, 2017)
+4.3.0 (Oct 13th, 2017)
 - Add impression listener
 - Add support for client shutdown (destroy())
 - Add "time" to the routed impressions
 - Add support to apply attribute matcher to the traffic type
+- Add support for string matchers to match on matching keys
 
 4.2.3 (August 4, 2017)
 - Use ENV vars in producer

data/Detailed-README.md

@@ -480,6 +480,14 @@ end
 
 By doing that SDK will recreate threads for each new worker, besides master.
 
+## Proxy support
+
+SDK respects http_proxy environment variable, all you need to do to use proxy is assign your proxy address to that variable in the format:
+
+```
+http_proxy=http://username:password@hostname:port
+```
+
 ## Framework support
 
 Currently SDK supports:

data/lib/splitclient-rb.rb

@@ -43,7 +43,6 @@ require 'splitclient-rb/engine/parser/condition'
 require 'splitclient-rb/engine/parser/partition'
 require 'splitclient-rb/engine/parser/split_adapter'
 require 'splitclient-rb/engine/parser/evaluator'
-require 'splitclient-rb/engine/matchers/attribute_matcher'
 require 'splitclient-rb/engine/matchers/combiners'
 require 'splitclient-rb/engine/matchers/combining_matcher'
 require 'splitclient-rb/engine/matchers/all_keys_matcher'

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

@@ -2,20 +2,14 @@ module SplitIoClient
   #
   # class to implement the all keys matcher
   #
-  class AllKeysMatcher < NoMethodError
-    attr_reader :matcher_type
-
-    def initialize
-      @matcher_type = 'ALL_KEYS'
-    end
+  class AllKeysMatcher
+    MATCHER_TYPE = 'ALL_KEYS'.freeze
 
     #
     # evaluates if the key matches the matcher
     #
-    # @param key [string] key value to be matched
-    #
     # @return [boolean] true for all instances
-    def match?(_matching_key, _bucketing_key, _evaluator, _attributes)
+    def match?(_args)
       true
     end
 
@@ -24,7 +18,7 @@ module SplitIoClient
     #
     # @param obj [object] object to be evaluated
     #
-    # @returns [boolean] true if obj equals the matcher
+    # @return [boolean] true if obj equals the matcher
     def equals?(obj)
       if obj.nil?
         false
@@ -37,6 +31,10 @@ module SplitIoClient
       end
     end
 
+    def string_type?
+      false
+    end
+
     #
     # function to print string value for this matcher
     #

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

@@ -1,25 +1,25 @@
 module SplitIoClient
+  class BetweenMatcher
+    MATCHER_TYPE = 'BETWEEN'.freeze
 
-  class BetweenMatcher < NoMethodError
-
-    attr_reader :matcher_type
+    attr_reader :attribute
 
     def initialize(attribute_hash)
-      @matcher_type = "BETWEEN"
       @attribute = attribute_hash[:attribute]
       @data_type = attribute_hash[:data_type]
-      @start_value = get_formatted_value attribute_hash[:start_value], true
-      @end_value = get_formatted_value attribute_hash[:end_value], true
+      @start_value = formatted_value(attribute_hash[:start_value], true)
+      @end_value = formatted_value(attribute_hash[:end_value], true)
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
-      matches = false
-      if !value.nil?
-        param_value = get_formatted_value(value)
-        matches = param_value.is_a?(Integer) ? ((param_value >= @start_value) && (param_value <= @end_value)) : false
-      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])
+      return false unless value.is_a?(Integer)
 
-      matches
+      (@start_value..@end_value).include? value
     end
 
     def equals?(obj)
@@ -34,18 +34,23 @@ module SplitIoClient
       end
     end
 
+    def string_type?
+      false
+    end
+
     private
-    def get_formatted_value(value, is_sdk_data = false)
+
+    def formatted_value(value, sdk_data = false)
       case @data_type
-        when "NUMBER"
-          return value
-        when "DATETIME"
-          value = value/1000 if is_sdk_data
-          return SplitIoClient::Utilities.to_milis_zero_out_from_seconds value
-        else
-          @logger.error('Invalid data type')
+      when 'NUMBER'
+        value
+      when 'DATETIME'
+        value = value / 1000 if sdk_data
+
+        SplitIoClient::Utilities.to_milis_zero_out_from_seconds(value)
+      else
+        @logger.error('Invalid data type')
       end
     end
   end
-
 end

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

@@ -1,13 +1,9 @@
 module SplitIoClient
-
   #
   # class to represent combiner values
   #
-  class Combiners < NoMethodError
-
+  class Combiners
     # available combiners of the sdk
-    AND = 'AND'
-
+    AND = 'AND'.freeze
   end
-
-end
+end

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

@@ -2,63 +2,59 @@ module SplitIoClient
   #
   # class to implement the combining matcher
   #
-  class CombiningMatcher < NoMethodError
+  class CombiningMatcher
+    MATCHER_TYPE = 'COMBINING_MATCHER'.freeze
 
-    #
-    # list of matcher within the combiner
-    #
-    @matcher_list = []
-
-    #
-    # combiner value
-    #
-    @combiner = ''
-
-    def initialize(combiner, delegates)
-      unless delegates.nil?
-        @matcher_list = delegates
-      end
-      unless combiner.nil?
-        @combiner = combiner
-      end
+    def initialize(combiner = '', matchers = [])
+      @combiner = combiner
+      @matchers = matchers
     end
 
     #
     # evaluates if the key matches the matchers within the combiner
     #
-    # @param key [string] key value to be matched
+    # @param matching_key [string] key value to be matched
+    # @param bucketing_key [string] bucketing key to be matched
+    # @param evaluator [instance of Evaluator class]
+    # @param attributes [hash]
     #
-    # @return [boolean] match value for combiner delegates
-    def match?(matching_key, bucketing_key, evaluator, attributes)
-      if @matcher_list.empty?
-        return false
-      end
+    # @return [boolean]
+    def match?(args)
+      return false if @matchers.empty?
 
       case @combiner
-        when Combiners::AND
-          return and_eval(matching_key, bucketing_key, evaluator, attributes)
-        else
-          @logger.error('Invalid combiner type')
-          return false
+      when Combiners::AND
+        return eval_and(args)
+      else
+        @logger.error('Invalid combiner type')
       end
+
+      false
     end
 
     #
     # auxiliary method to evaluate each of the matchers within the combiner
     #
-    # @param key [string] key value to be matched
+    # @param matching_key [string] key value to be matched
+    # @param bucketing_key [string] bucketing key to be matched
     # @param evaluator [Evaluator] used in dependency_matcher
     # @param attributes [hash]  attributes to pass to the treatment class
     #
     # @return [boolean] match value for combiner delegates
-    def and_eval(matching_key, bucketing_key, evaluator, attributes)
-      @matcher_list.each do |delegate|
-        matched = delegate.match?(matching_key, bucketing_key, evaluator, attributes)
-
-        return false unless matched
+    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]
+      @matchers.all? do |matcher|
+        if match_with_key?(matcher)
+          matcher.match?(value: args[:matching_key])
+        else
+          matcher.match?(args)
+        end
       end
+    end
 
-      true
+    def match_with_key?(matcher)
+      matcher.respond_to?(:attribute) && matcher.attribute.nil? && matcher.string_type?
     end
 
     #
@@ -84,14 +80,7 @@ module SplitIoClient
     #
     # @reutrn [string] string value of this matcher
     def to_s
-      result = ''
-      @matcher_list.each_with_index do |matcher, i|
-        result += matcher.to_s
-        result += ' ' + @combiner if i != 0
-      end
-      result
+      @matcher_list.map(&:to_s).join("#{@combiner} ")
     end
-
   end
-
 end

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

@@ -1,17 +1,21 @@
 module SplitIoClient
   class ContainsAllMatcher < SetMatcher
-    def self.matcher_type
-      'CONTAINS_ALL'.freeze
-    end
+    MATCHER_TYPE = 'CONTAINS_ALL'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, remote_array)
       super(attribute, remote_array)
     end
 
-    def match?(data, bucketing_key, _evaluator, _attributes)
+    def match?(args)
       return false if @remote_set.empty?
 
-      @remote_set.subset? local_set(data)
+      @remote_set.subset? local_set(args[:attributes], @attribute)
+    end
+
+    def string_type?
+      false
     end
   end
 end

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

@@ -1,15 +1,19 @@
 module SplitIoClient
   class ContainsAnyMatcher < SetMatcher
-    def self.matcher_type
-      'CONTAINS_ANY'.freeze
-    end
+    MATCHER_TYPE = 'CONTAINS_ANY'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, remote_array)
       super(attribute, remote_array)
     end
 
-    def match?(data, bucketing_key, _evaluator, _attributes)
-      local_set(data).intersect? @remote_set
+    def match?(args)
+      local_set(args[:attributes], @attribute).intersect? @remote_set
+    end
+
+    def string_type?
+      false
     end
   end
 end

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

@@ -1,18 +1,30 @@
 module SplitIoClient
   class ContainsMatcher
-    def self.matcher_type
-      'CONTAINS_WITH'.freeze
-    end
+    MATCHER_TYPE = 'CONTAINS_WITH'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, substr_list)
       @attribute = attribute
       @substr_list = substr_list
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
+    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 = args[:value] || args[:attributes].fetch(@attribute) do |a|
+        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
+      end
+
       return false if @substr_list.empty?
 
       @substr_list.any? { |substr| value.to_s.include? substr }
     end
+
+    def string_type?
+      true
+    end
   end
 end

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

@@ -1,16 +1,20 @@
 module SplitIoClient
   class DependencyMatcher
-    def self.matcher_type
-      'IN_SPLIT_TREATMENT'.freeze
-    end
+    MATCHER_TYPE = 'IN_SPLIT_TREATMENT'.freeze
 
     def initialize(split, treatments)
       @split = split
       @treatments = treatments
     end
 
-    def match?(matching_key, bucketing_key, evaluator, attributes)
-      @treatments.include? evaluator.call({ matching_key: matching_key, bucketing_key: bucketing_key }, @split, attributes)[:treatment]
+    def match?(args)
+      keys = { matching_key: args[:matching_key], bucketing_key: args[:bucketing_key] }
+
+      @treatments.include?(args[:evaluator].call(keys, @split, args[:attributes])[:treatment])
+    end
+
+    def string_type?
+      false
     end
   end
 end

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

@@ -1,18 +1,26 @@
 module SplitIoClient
   class EndsWithMatcher
-    def self.matcher_type
-      'ENDS_WITH'.freeze
-    end
+    MATCHER_TYPE = 'ENDS_WITH'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, suffix_list)
       @attribute = attribute
       @suffix_list = suffix_list
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
+    def match?(args)
+      value = args[:value] || args[:attributes].fetch(@attribute) do |a|
+        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
+      end
+
       return false if @suffix_list.empty?
 
       @suffix_list.any? { |suffix| value.to_s.end_with? suffix }
     end
+
+    def string_type?
+      true
+    end
   end
 end

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

@@ -1,19 +1,27 @@
 module SplitIoClient
   class EqualToBooleanMatcher
-    def self.matcher_type
-      'EQUAL_TO_BOOLEAN'.freeze
-    end
+    MATCHER_TYPE = 'EQUAL_TO_BOOLEAN'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, boolean)
       @attribute = attribute
       @boolean = boolean
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
+    def match?(args)
+      value = args[:attributes].fetch(@attribute) do |a|
+        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
+      end
+
       value = false if value.to_s.downcase == 'false'
       value = true if value.to_s.downcase == 'true'
 
       value == @boolean
     end
+
+    def string_type?
+      false
+    end
   end
 end

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

@@ -1,22 +1,23 @@
 module SplitIoClient
+  class EqualToMatcher
+    MATCHER_TYPE = 'EQUAL_TO'.freeze
 
-  class EqualToMatcher < NoMethodError
-
-    attr_reader :matcher_type
+    attr_reader :attribute
 
     def initialize(attribute_hash)
-      @matcher_type = "EQUAL_TO"
       @attribute = attribute_hash[:attribute]
       @data_type = attribute_hash[:data_type]
-      @value = get_formatted_value attribute_hash[:value], true
+      @value = formatted_value(attribute_hash[:value], true)
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
-      matches = false
-      if !value.nil?
-        param_value = get_formatted_value(value)
-        matches = param_value.is_a?(Integer) ? (param_value == @value) : false
-      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])
+
+      value.is_a?(Integer) ? (value == @value) : false
     end
 
     def equals?(obj)
@@ -31,19 +32,23 @@ module SplitIoClient
       end
     end
 
+    def string_type?
+      false
+    end
+
     private
-    def get_formatted_value(value, is_sdk_data = false)
+
+    def formatted_value(value, sdk_data = false)
       case @data_type
-        when "NUMBER"
-          return value
-        when "DATETIME"
-          value = value/1000 if is_sdk_data
-          return SplitIoClient::Utilities.to_milis_zero_out_from_hour value
-        else
-          @logger.error('Invalid data type')
+      when 'NUMBER'
+        value
+      when 'DATETIME'
+        value = value / 1000 if sdk_data
+
+        SplitIoClient::Utilities.to_milis_zero_out_from_hour value
+      else
+        @logger.error('Invalid data type')
       end
     end
-
   end
-
 end

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

@@ -1,15 +1,19 @@
 module SplitIoClient
   class EqualToSetMatcher < SetMatcher
-    def self.matcher_type
-      'EQUAL_TO_SET'.freeze
-    end
+    MATCHER_TYPE = 'EQUAL_TO_SET'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, remote_array)
       super(attribute, remote_array)
     end
 
-    def match?(data, bucketing_key, _evaluator, _attributes)
-      local_set(data) == @remote_set
+    def match?(args)
+      local_set(args[:attributes], @attribute) == @remote_set
+    end
+
+    def string_type?
+      false
     end
   end
 end

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

@@ -1,22 +1,23 @@
 module SplitIoClient
+  class GreaterThanOrEqualToMatcher
+    MATCHER_TYPE = 'GREATER_THAN_OR_EQUAL_TO'.freeze
 
-  class GreaterThanOrEqualToMatcher < NoMethodError
-
-    attr_reader :matcher_type
+    attr_reader :attribute
 
     def initialize(attribute_hash)
-      @matcher_type = "GREATER_THAN_OR_EQUAL_TO"
       @attribute = attribute_hash[:attribute]
       @data_type = attribute_hash[:data_type]
-      @value = get_formatted_value attribute_hash[:value], true
+      @value = formatted_value(attribute_hash[:value], true)
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
-      matches = false
-      if !value.nil?
-        param_value = get_formatted_value(value)
-        matches = param_value.is_a?(Integer) ? (param_value >= @value) : false
-      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])
+
+      value.is_a?(Integer) ? (value >= @value) : false
     end
 
     def equals?(obj)
@@ -31,19 +32,22 @@ module SplitIoClient
       end
     end
 
+    def string_type?
+      false
+    end
+
     private
-    def get_formatted_value(value, is_sdk_data = false)
+
+    def formatted_value(value, sdk_data = false)
       case @data_type
-        when "NUMBER"
-          return value
-        when "DATETIME"
-          value = value/1000 if is_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
-        else
-          @logger.error('Invalid data type')
+      when 'NUMBER'
+        return 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)
+      else
+        @logger.error('Invalid data type')
       end
     end
-
   end
-
 end

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

@@ -1,22 +1,23 @@
 module SplitIoClient
+  class LessThanOrEqualToMatcher
+    MATCHER_TYPE = 'LESS_THAN_OR_EQUAL_TO'.freeze
 
-  class LessThanOrEqualToMatcher < NoMethodError
-
-    attr_reader :matcher_type
+    attr_reader :attribute
 
     def initialize(attribute_hash)
-      @matcher_type = "LESS_THAN_OR_EQUAL_TO"
       @attribute = attribute_hash[:attribute]
       @data_type = attribute_hash[:data_type]
-      @value = get_formatted_value attribute_hash[:value], true
+      @value = formatted_value(attribute_hash[:value], true)
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
-      matches = false
-      if !value.nil?
-        param_value = get_formatted_value(value)
-        matches = param_value.is_a?(Integer) ? (param_value <= @value) : false
-      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])
+
+      value.is_a?(Integer) ? (value <= @value) : false
     end
 
     def equals?(obj)
@@ -31,19 +32,22 @@ module SplitIoClient
       end
     end
 
+    def string_type?
+      false
+    end
+
     private
-    def get_formatted_value(value, is_sdk_data = false)
+
+    def formatted_value(value, sdk_data = false)
       case @data_type
-        when "NUMBER"
-          return value
-        when "DATETIME"
-          value = value/1000 if is_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
-        else
-          @logger.error('Invalid data type')
+      when 'NUMBER'
+        return 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)
+      else
+        @logger.error('Invalid data type')
       end
     end
-
   end
-
 end

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

@@ -1,16 +1,24 @@
 module SplitIoClient
   class MatchesStringMatcher
-    def self.matcher_type
-      'MATCHES_STRING'.freeze
-    end
+    MATCHER_TYPE = 'MATCHES_STRING'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, regexp_string)
       @attribute = attribute
       @regexp_string = @regexp_string.is_a?(Regexp) ? regexp_string : Regexp.new(regexp_string)
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
+    def match?(args)
+      value = args[:value] || args[:attributes].fetch(@attribute) do |a|
+        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
+      end
+
       (value =~ @regexp_string) != nil
     end
+
+    def string_type?
+      true
+    end
   end
 end

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

@@ -1,16 +1,12 @@
 module SplitIoClient
-
   #
   # class to implement the negation of a matcher
   #
-  class NegationMatcher < NoMethodError
-
-    @matcher = nil
+  class NegationMatcher
+    MATCHER_TYPE = 'NEGATION_MATCHER'.freeze
 
-    def initialize(matcher)
-      unless matcher.nil?
-        @matcher = matcher
-      end
+    def initialize(matcher = nil)
+      @matcher = matcher
     end
 
     #
@@ -19,8 +15,20 @@ module SplitIoClient
     # @param key [string] key value to be matched
     #
     # @return [boolean] evaluation of the negation matcher
-    def match?(matching_key, bucketing_key, evaluator, attributes)
-      !@matcher.match?(matching_key, bucketing_key, evaluator, attributes)
+    def match?(args)
+      !@matcher.match?(args)
+    end
+
+    def respond_to?(method)
+      @matcher.respond_to? method
+    end
+
+    def attribute
+      @matcher.attribute
+    end
+
+    def string_type?
+      @matcher.string_type?
     end
 
     #
@@ -46,9 +54,7 @@ module SplitIoClient
     #
     # @reutrn [string] string value of this matcher
     def to_s
-      'not ' + @matcher.to_s
+      "not #{@matcher}"
     end
-
   end
-
 end

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

@@ -1,19 +1,23 @@
 module SplitIoClient
   class PartOfSetMatcher < SetMatcher
-    def self.matcher_type
-      'PART_OF_SET'.freeze
-    end
+    MATCHER_TYPE = 'PART_OF_SET'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, remote_array)
       super(attribute, remote_array)
     end
 
-    def match?(data, bucketing_key, _evaluator, _attributes)
-      @local_set = local_set(data)
+    def match?(args)
+      @local_set = local_set(args[:attributes], @attribute)
 
       return false if @local_set.empty?
 
       @local_set.subset? @remote_set
     end
+
+    def string_type?
+      false
+    end
   end
 end

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

@@ -1,12 +1,16 @@
+require 'set'
+
 module SplitIoClient
   class SetMatcher
     protected
 
     def initialize(attribute, remote_array)
+      @attribute = attribute
       @remote_set = remote_array.to_set
     end
 
-    def local_set(data)
+    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]
 

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

@@ -1,18 +1,26 @@
 module SplitIoClient
   class StartsWithMatcher
-    def self.matcher_type
-      'STARTS_WITH'.freeze
-    end
+    MATCHER_TYPE = 'STARTS_WITH'.freeze
+
+    attr_reader :attribute
 
     def initialize(attribute, prefix_list)
       @attribute = attribute
       @prefix_list = prefix_list
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
+    def match?(args)
+      value = args[:value] || args[:attributes].fetch(@attribute) do |a|
+        args[:attributes][a.to_s] || args[:attributes][a.to_sym]
+      end
+
       return false if @prefix_list.empty?
 
       @prefix_list.any? { |prefix| value.to_s.start_with? prefix }
     end
+
+    def string_type?
+      true
+    end
   end
 end

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

@@ -1,14 +1,11 @@
 module SplitIoClient
-
   #
   # class to implement the user defined matcher
   #
-  class UserDefinedSegmentMatcher < NoMethodError
-
-    attr_reader :matcher_type
+  class UserDefinedSegmentMatcher
+    MATCHER_TYPE = 'IN_SEGMENT'.freeze
 
     def initialize(segments_repository, segment_name)
-      @matcher_type = "IN_SEGMENT"
       @segments_repository = segments_repository
       @segment_name = segment_name
     end
@@ -19,8 +16,8 @@ module SplitIoClient
     # @param key [string] key value to be matched
     #
     # @return [boolean] evaluation of the key against the segment
-    def match?(matching_key, _bucketing_key, _evaluator, attributes)
-      @segments_repository.in_segment?(@segment_name, matching_key)
+    def match?(args)
+      @segments_repository.in_segment?(@segment_name, args[:value] || args[:matching_key])
     end
 
     #
@@ -40,5 +37,9 @@ module SplitIoClient
         false
       end
     end
+
+    def string_type?
+      false
+    end
   end
 end

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

@@ -1,33 +1,36 @@
 module SplitIoClient
-
   #
   # class to implement the user defined matcher
   #
   class WhitelistMatcher < NoMethodError
+    MATCHER_TYPE = 'WHITELIST_MATCHER'
 
-    attr_reader :matcher_type
-
-    # variable that contains the keys of the whitelist
-    @whitelist = []
+    attr_reader :attribute
 
     def initialize(whitelist_data)
-      if whitelist_data.instance_of? Array
-        @whitelist = whitelist_data unless whitelist_data.nil?
-      elsif whitelist_data.instance_of? Hash
-        @matcher_type = "ATTR_WHITELIST"
+      @whitelist = case whitelist_data
+      when Array
+        whitelist_data
+      when Hash
+        @matcher_type = 'ATTR_WHITELIST'
         @attribute = whitelist_data[:attribute]
-        @whitelist = whitelist_data[:value] unless whitelist_data[:value].nil?
+
+        whitelist_data[:value]
+      else
+        []
       end
     end
 
-    def match?(value, _matching_key, _bucketing_key, _evaluator)
-      matches = false
-      
-      if !value.nil?
-        matches = @whitelist.include?(value)
-      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?
 
-      matches
+      return @whitelist.include?(args[:value] || args[:attributes][@attribute.to_sym])
+
+      false
     end
 
     #
@@ -48,14 +51,16 @@ module SplitIoClient
       end
     end
 
+    def string_type?
+      true
+    end
+
     #
     # function to print string value for this matcher
     #
     # @reutrn [string] string value of this matcher
     def to_s
-      'in segment ' + @whitelist.to_s
+      "in segment #{@whitelist}"
     end
-
   end
-
 end

data/lib/splitclient-rb/engine/parser/condition.rb

@@ -17,7 +17,7 @@ module SplitIoClient
     end
 
     def create_condition_matcher(matchers)
-      CombiningMatcher.new(combiner, matchers) unless combiner.nil?
+      CombiningMatcher.new(combiner, matchers) if combiner
     end
 
     #

data/lib/splitclient-rb/engine/parser/evaluator.rb

@@ -58,23 +58,21 @@ module SplitIoClient
               in_rollout = true
             end
 
-            begin
-              matcher = SplitIoClient::AttributeMatcher.new(
-                condition.data[:matcherGroup][:matchers][0][:keySelector][:attribute],
-                matcher_type(condition)
-              )
-            rescue NoMethodError
-              matcher = SplitIoClient::AttributeMatcher.new(nil, matcher_type(condition))
-            end
-            if matcher.match?(keys[:matching_key], keys[:bucketing_key], self, attributes)
-              key = keys[:bucketing_key] ? keys[:bucketing_key] : keys[:matching_key]
-              result = Splitter.get_treatment(key, split[:seed], condition.partitions, split[:algo])
+            condition_matched = matcher_type(condition).match?(
+              matching_key: keys[:matching_key],
+              bucketing_key: keys[:bucketing_key],
+              evaluator: self,
+              attributes: attributes
+            )
 
-              if result.nil?
-                return treatment_hash(Models::Label::NO_RULE_MATCHED, split[:defaultTreatment], split[:changeNumber])
-              else
-                return treatment_hash(c[:label], result, split[:changeNumber])
-              end
+            next unless condition_matched
+
+            result = Splitter.get_treatment(key, split[:seed], condition.partitions, split[:algo])
+
+            if result.nil?
+              return treatment_hash(Models::Label::NO_RULE_MATCHED, split[:defaultTreatment], split[:changeNumber])
+            else
+              return treatment_hash(c[:label], result, split[:changeNumber])
             end
           end
 

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '4.3.0.canary.2'
+  VERSION = '4.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 4.3.0.canary.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Split Software
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -283,7 +283,6 @@ files:
 - lib/splitclient-rb/engine/api/splits.rb
 - lib/splitclient-rb/engine/evaluator/splitter.rb
 - lib/splitclient-rb/engine/matchers/all_keys_matcher.rb
-- lib/splitclient-rb/engine/matchers/attribute_matcher.rb
 - lib/splitclient-rb/engine/matchers/between_matcher.rb
 - lib/splitclient-rb/engine/matchers/combiners.rb
 - lib/splitclient-rb/engine/matchers/combining_matcher.rb
@@ -346,9 +345,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2

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

@@ -1,20 +0,0 @@
-module SplitIoClient
-  class AttributeMatcher
-    def initialize(attribute, matcher)
-      @attribute = attribute
-      @matcher = matcher
-    end
-
-    def match?(matching_key, bucketing_key = nil, evaluator = nil, attributes = {})
-      if @attribute != nil
-        return false unless attributes
-
-        value = attributes.fetch(@attribute) { |name| attributes[name.to_s] || attributes[name.to_sym] }
-
-        @matcher.match?(value, bucketing_key, nil, nil)
-      else
-        @matcher.match?(matching_key, bucketing_key, evaluator, attributes)
-      end
-    end
-  end
-end