splitclient-rb 1.0.3 → 1.0.4.wip

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e5b4a2d803a9467000def80b168f34909b87db
-  data.tar.gz: 2f5f6385d8bba688b501b68d63a1a0f30af063ab
+  metadata.gz: 0e5324edf62d055631e1ca02815169b09fc0b922
+  data.tar.gz: fb7d2a857376a2af0447810111929d0d1451d8d1
 SHA512:
-  metadata.gz: 509d8611a21232b241550ebde3815aa440144bf4ae096a0182250078a0eb2d9961234dfc8515621fdbb503126794151a27d278049e1a79aea40520b188848d07
-  data.tar.gz: da1a62bec54e13514ce31067d13f9f613a29b2ef4b6b1ba47dc38c849df89f194bd0640a063c3d19f3424efca36283cd731e56e7210fc3d3b3506ac5b1e90885
+  metadata.gz: b0b42997a3b7ba035856ddf5ccf70e6cbdc5fc9758b54f1582609d12b11c88d93a8ccf5ff4df623588634eb53ff3a9013601275fcd881ddfd5522cc810f0c1a1
+  data.tar.gz: 6a2f0e5ec5b12f627165ee199d66bed3df07daf9f564b7baf8b48637da8a52e9e8e405918c013998e298ebd36d4c5ab6c840795b020aed4832a3d4aab5fe79e8

data/CHANGES.txt

@@ -1,3 +1,9 @@
+1.0.4
+
+- added support for AND combiner on conditions
+- added events_uri as config param which defines the metrics post url
+- updated metrics post default endpoint to be https://events.split.io/api/
+
 1.0.3
 - fixed refresh rate intervals issue
 - fixed datetime bug for split definitions created directly from api

data/NEWS

@@ -1,3 +1,7 @@
+1.0.4
+
+Added AND combiner for conditions support. Added events_uri config param which is the url where the metrics post are send to.
+
 1.0.3
 
 This version of the gem fixes two minor bugs related to the config option for the refresh rates, as well as an inconsistency for the split definitions that are not created from the web app, but directly from the api instead.

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

@@ -17,7 +17,7 @@ module SplitIoClient
     # @param key [string] key value to be matched
     #
     # @return [boolean] true for all instances
-    def match?(key)
+    def match?(key, attributes)
       true
     end
 

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

@@ -12,7 +12,7 @@ module SplitIoClient
       @end_value = get_formatted_value attribute_hash[:end_value], true
     end
 
-    def match?(attributes)
+    def match?(key, attributes)
       matches = false
       if (!attributes.nil? && attributes.key?(@attribute.to_sym))
         param_value = get_formatted_value(attributes[@attribute.to_sym])

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

@@ -31,16 +31,17 @@ module SplitIoClient
     # @param key [string] key value to be matched
     #
     # @return [boolean] match value for combiner delegates
-    def match?(key)
+    def match?(key, attributes)
       if @matcher_list.empty?
         return false
       end
 
       case @combiner
         when Combiners::AND
-          return and_eval(key)
+          return and_eval(key, attributes)
         else
-          #throws error
+          @logger.error('Invalid combiner type')
+          return false
       end
     end
 
@@ -50,10 +51,10 @@ module SplitIoClient
     # @param key [string] key value to be matched
     #
     # @return [boolean] match value for combiner delegates
-    def and_eval(key)
+    def and_eval(key, attributes)
       result = true
       @matcher_list.each do |delegate|
-        result &= (delegate.match?(key))
+        result &= delegate.match? key, attributes
       end
       result
     end
@@ -91,4 +92,4 @@ module SplitIoClient
 
   end
 
-end
+end

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

@@ -11,7 +11,7 @@ module SplitIoClient
       @value = get_formatted_value attribute_hash[:value], true
     end
 
-    def match?(attributes)
+    def match?(key, attributes)
       matches = false
       if (!attributes.nil? && attributes.key?(@attribute.to_sym))
         param_value = get_formatted_value(attributes[@attribute.to_sym])

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

@@ -11,7 +11,7 @@ module SplitIoClient
       @value = get_formatted_value attribute_hash[:value], true
     end
 
-    def match?(attributes)
+    def match?(key, attributes)
       matches = false
       if (!attributes.nil? && attributes.key?(@attribute.to_sym))
         param_value = get_formatted_value(attributes[@attribute.to_sym])

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

@@ -11,7 +11,7 @@ module SplitIoClient
       @value = get_formatted_value attribute_hash[:value], true
     end
 
-    def match?(attributes)
+    def match?(key, attributes)
       matches = false
       if (!attributes.nil? && attributes.key?(@attribute.to_sym))
         param_value = get_formatted_value(attributes[@attribute.to_sym])

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

@@ -19,8 +19,8 @@ module SplitIoClient
     # @param key [string] key value to be matched
     #
     # @return [boolean] evaluation of the negation matcher
-    def match?(key)
-      !@matcher.match?(key)
+    def match?(key, attributes)
+      !@matcher.match?(key, attributes)
     end
 
     #
@@ -51,4 +51,4 @@ module SplitIoClient
 
   end
 
-end
+end

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

@@ -22,7 +22,7 @@ module SplitIoClient
     # @param key [string] key value to be matched
     #
     # @return [boolean] evaluation of the key against the segment
-    def match?(key)
+    def match?(key, attributes)
       matches = false
       unless @segment.users.nil?
         matches = @segment.users.include?(key)

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

@@ -20,10 +20,10 @@ module SplitIoClient
       end
     end
 
-    def match?(whitelist_data)
+    def match?(key, whitelist_data)
       matches = false
       if !(@matcher_type == "ATTR_WHITELIST")
-        matches = @whitelist.include?(whitelist_data)
+        matches = @whitelist.include?(key)
       else
         if (!whitelist_data.nil? && whitelist_data.key?(@attribute.to_sym))
           value = whitelist_data[@attribute.to_sym]

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

@@ -16,6 +16,10 @@ module SplitIoClient
       @partitions = set_partitions
     end
 
+    def create_condition_matcher matchers
+      CombiningMatcher.new(combiner, matchers) unless combiner.nil?
+    end
+
     #
     # @return [object] the combiner value for this condition
     def combiner
@@ -34,77 +38,64 @@ module SplitIoClient
       @data[:matcherGroup][:matchers]
     end
 
-    #
-    # @return [object] the segment for this condition in case it has a segment matcher
-    def matcher_segment
-      result = nil
-      if self.matcher == 'IN_SEGMENT'
-        result = (@data[:matcherGroup][:matchers].first[:userDefinedSegmentMatcherData])[:segmentName]
-      end
-      result
+    def matcher_all_keys params
+      AllKeysMatcher.new
     end
 
-    #
-    # @return [object] the whitelist for this condition in case it has a whitelist matcher
-    def matcher_whitelist
-      result = nil
-      if self.matcher == 'WHITELIST'
-        is_user_whitelist = ( (@data[:matcherGroup][:matchers].first[:keySelector]).nil? || (@data[:matcherGroup][:matchers].first[:keySelector])[:attribute].nil? )
-        #is_attribute_whitelist? = !is_user_whitelist?
-        if is_user_whitelist
-          result = (@data[:matcherGroup][:matchers].first[:whitelistMatcherData])[:whitelist]
-        else
-          attribute = (@data[:matcherGroup][:matchers].first[:keySelector])[:attribute]
-          white_list = (@data[:matcherGroup][:matchers].first[:whitelistMatcherData])[:whitelist]
-          result =  {attribute: attribute, value: white_list}
-        end
-      end
-      result
+    #returns UserDefinedSegmentMatcher[object]
+    def matcher_in_segment params
+      matcher = params[:matcher]
+      segments = params[:segments]
+      segment = segments.get_segment(matcher[:userDefinedSegmentMatcherData][:segmentName])
+      segment.is_empty? ? UserDefinedSegmentMatcher.new(nil) : UserDefinedSegmentMatcher.new(segment)
     end
 
-    def matcher_equal
+    #returns WhitelistMatcher[object] the whitelist for this condition in case it has a whitelist matcher
+    def matcher_whitelist params
       result = nil
-      if self.matcher == 'EQUAL_TO'
-        attribute = (@data[:matcherGroup][:matchers].first[:keySelector])[:attribute]
-        value = (@data[:matcherGroup][:matchers].first[:unaryNumericMatcherData])[:value]
-        data_type = (@data[:matcherGroup][:matchers].first[:unaryNumericMatcherData])[:dataType]
-        result = {attribute: attribute, value: value, data_type: data_type}
+      matcher = params[:matcher]
+      is_user_whitelist = ((matcher[:keySelector]).nil? || (matcher[:keySelector])[:attribute].nil?)
+      if is_user_whitelist
+        result = (matcher[:whitelistMatcherData])[:whitelist]
+      else
+        attribute = (matcher[:keySelector])[:attribute]
+        white_list = (matcher[:whitelistMatcherData])[:whitelist]
+        result =  {attribute: attribute, value: white_list}
       end
-      result
+      WhitelistMatcher.new(result)
     end
 
-    def matcher_greater_than_or_equal
-      result = nil
-      if self.matcher == 'GREATER_THAN_OR_EQUAL_TO'
-        attribute = (@data[:matcherGroup][:matchers].first[:keySelector])[:attribute]
-        value = (@data[:matcherGroup][:matchers].first[:unaryNumericMatcherData])[:value]
-        data_type = (@data[:matcherGroup][:matchers].first[:unaryNumericMatcherData])[:dataType]
-        result = {attribute: attribute, value: value, data_type: data_type}
-      end
-      result
+    def matcher_equal_to params
+      matcher = params[:matcher]
+      attribute = (matcher[:keySelector])[:attribute]
+      value = (matcher[:unaryNumericMatcherData])[:value]
+      data_type = (matcher[:unaryNumericMatcherData])[:dataType]
+      EqualToMatcher.new({attribute: attribute, value: value, data_type: data_type})
     end
 
-    def matcher_less_than_or_equal
-      result = nil
-      if self.matcher == 'LESS_THAN_OR_EQUAL_TO'
-        attribute = (@data[:matcherGroup][:matchers].first[:keySelector])[:attribute]
-        value = (@data[:matcherGroup][:matchers].first[:unaryNumericMatcherData])[:value]
-        data_type = (@data[:matcherGroup][:matchers].first[:unaryNumericMatcherData])[:dataType]
-        result = {attribute: attribute, value: value, data_type: data_type}
-      end
-      result
+    def matcher_greater_than_or_equal_to params
+      matcher = params[:matcher]
+      attribute = (matcher[:keySelector])[:attribute]
+      value = (matcher[:unaryNumericMatcherData])[:value]
+      data_type = (matcher[:unaryNumericMatcherData])[:dataType]
+      GreaterThanOrEqualToMatcher.new({attribute: attribute, value: value, data_type: data_type})
     end
 
-    def matcher_between
-      result = nil
-      if self.matcher == 'BETWEEN'
-        attribute = (@data[:matcherGroup][:matchers].first[:keySelector])[:attribute]
-        start_value = (@data[:matcherGroup][:matchers].first[:betweenMatcherData])[:start]
-        end_value = (@data[:matcherGroup][:matchers].first[:betweenMatcherData])[:end]
-        data_type = (@data[:matcherGroup][:matchers].first[:betweenMatcherData])[:dataType]
-        result = {attribute: attribute, start_value: start_value, end_value: end_value, data_type: data_type}
-      end
-      result
+    def matcher_less_than_or_equal_to params
+      matcher = params[:matcher]
+      attribute = (matcher[:keySelector])[:attribute]
+      value = (matcher[:unaryNumericMatcherData])[:value]
+      data_type = (matcher[:unaryNumericMatcherData])[:dataType]
+      LessThanOrEqualToMatcher.new({attribute: attribute, value: value, data_type: data_type})
+    end
+
+    def matcher_between params
+      matcher = params[:matcher]
+      attribute = (matcher[:keySelector])[:attribute]
+      start_value = (matcher[:betweenMatcherData])[:start]
+      end_value = (matcher[:betweenMatcherData])[:end]
+      data_type = (matcher[:betweenMatcherData])[:dataType]
+      BetweenMatcher.new({attribute: attribute, start_value: start_value, end_value: end_value, data_type: data_type})
     end
 
     #

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

@@ -144,7 +144,7 @@ module SplitIoClient
     #
     # @return [object] response to the request
     def post_api(path, param)
-      @api_client.post (@config.base_uri + path) do |req|
+      @api_client.post (@config.events_uri + path) do |req|
         req.headers['Authorization'] = 'Bearer ' + @api_key
         req.headers['Content-Type'] = 'application/json'
         req.headers['SplitSDKVersion'] = SplitIoClient::SplitClient.sdk_version
@@ -153,7 +153,7 @@ module SplitIoClient
         req.body = param.to_json
         req.options.timeout = @config.read_timeout
         req.options.open_timeout = @config.connection_timeout
-        @config.logger.debug("POST #{@config.base_uri + path} #{req.body}") if @config.debug_enabled
+        @config.logger.debug("POST #{@config.events_uri + path} #{req.body}") if @config.debug_enabled
       end
     end
 

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

@@ -80,27 +80,21 @@ module SplitIoClient
     # @return treatment [object] treatment for this user key, split pair
     def get_split_treatment(id, name, default_treatment, attributes = nil)
       split = get_split(name)
-      attribute_matchers = ["ATTR_WHITELIST", "EQUAL_TO", "GREATER_THAN_OR_EQUAL_TO", "LESS_THAN_OR_EQUAL_TO", "BETWEEN"]
-
       if !split.is_empty? && split.status == 'ACTIVE' && !split.killed?
-        split.conditions.each do |c|
-          unless c.is_empty?
-            matcher = get_matcher_type(c)
-            matches = attribute_matchers.include?(matcher.matcher_type) ? matcher.match?(attributes) : matcher.match?(id)
+        split.conditions.each do |condit|
+          unless condit.is_empty?
+            matcher = get_matcher_type condit
+            matches = matcher.match? id, attributes
             if matches
-              result = Splitter.get_treatment(id, split.seed, c.partitions) #'true match - running split'
-              if result.nil?
-                return default_treatment
-              else
-                return result
-              end
+              treatment = Splitter.get_treatment id, split.seed, condit.partitions
+              result = treatment.nil? ? default_treatment : treatment
+              return result
             end
           end
         end
       elsif !split.is_empty? && split.status == 'ARCHIVED'
         return Treatments::CONTROL
       end
-
       default_treatment
     end
 
@@ -110,32 +104,19 @@ module SplitIoClient
     # @param contidion [object] a condition object
     #
     # @return matcher [object] the matcher object for the given condition
-    def get_matcher_type(condition)
-      final_matcher = nil
-
-      case condition.matcher
-        when 'ALL_KEYS'
-          final_matcher = AllKeysMatcher.new
-        when 'IN_SEGMENT'
-          segment = @segments.get_segment(condition.matcher_segment)
-          final_matcher = segment.is_empty? ? UserDefinedSegmentMatcher.new(nil) : UserDefinedSegmentMatcher.new(segment)
-        when 'WHITELIST'
-          final_matcher = WhitelistMatcher.new(condition.matcher_whitelist)
-        when 'EQUAL_TO'
-          final_matcher = EqualToMatcher.new(condition.matcher_equal)
-        when 'GREATER_THAN_OR_EQUAL_TO'
-          final_matcher = GreaterThanOrEqualToMatcher.new(condition.matcher_greater_than_or_equal)
-        when 'LESS_THAN_OR_EQUAL_TO'
-          final_matcher = LessThanOrEqualToMatcher.new(condition.matcher_less_than_or_equal)
-        when 'BETWEEN'
-          final_matcher = BetweenMatcher.new(condition.matcher_between)
-        else
-          @logger.error('Invalid matcher type')
+    def get_matcher_type(condit)
+      matchers = []
+      condit.matchers.each do |matcher|
+        matchers << condit.send("matcher_#{matcher[:matcherType].downcase}", {matcher: matcher, segments: @segments})
       end
+      final_matcher = condit.create_condition_matcher matchers
 
-      final_matcher
+      if final_matcher.nil?
+        @logger.error('Invalid matcher type')
+      else
+        final_matcher
+      end
     end
-
   end
 
 end

data/lib/splitclient-rb/split_config.rb

@@ -12,6 +12,7 @@ module SplitIoClient
     #
     # @param opts [Hash] optional hash with configuration options
     # @option opts [String] :base_uri ("https://sdk.split.io/api/") The base URL for split API end points
+    # @option opts [String] :events_uri ("https://events.split.io/api/") The events URL for events end points
     # @option opts [Int] :read_timeout (10) The read timeout for network connections in seconds.
     # @option opts [Int] :connection_timeout (2) The connect timeout for network connections in seconds.
     # @option opts [Object] :local_store A cache store for the Faraday HTTP caching library. Defaults to the Rails cache in a Rails environment, or a thread-safe in-memory store otherwise.
@@ -25,6 +26,7 @@ module SplitIoClient
     # @return [type] SplitConfig with configuration options
     def initialize(opts = {})
       @base_uri = (opts[:base_uri] || SplitConfig.default_base_uri).chomp('/')
+      @events_uri = (opts[:events_uri] || SplitConfig.default_events_uri).chomp('/')
       @local_store = opts[:local_store] || SplitConfig.default_local_store
       @connection_timeout = opts[:connection_timeout] || SplitConfig.default_connection_timeout
       @read_timeout = opts[:read_timeout] || SplitConfig.default_read_timeout
@@ -44,6 +46,12 @@ module SplitIoClient
     # @return [String] The configured base URL for the split API end points
     attr_reader :base_uri
 
+    #
+    # The base URL for split events API end points
+    #
+    # @return [String] The configured URL for the events API end points
+    attr_reader :events_uri
+
     #
     # The store for the Faraday HTTP caching library. Stores should respond to
     # 'read', 'write' and 'delete' requests.
@@ -100,6 +108,10 @@ module SplitIoClient
       'https://sdk.split.io/api/'
     end
 
+    def self.default_events_uri
+      'https://events.split.io/api/'
+    end
+
     # @return [LocalStore] configuration value for local cache store
     def self.default_local_store
       defined?(Rails) && Rails.respond_to?(:cache) ? Rails.cache : LocalStore.new

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '1.0.3'
+  VERSION = '1.0.4.wip'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4.wip
 platform: ruby
 authors:
 - Split Software
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -253,9 +253,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2