splitclient-rb 3.2.4.pre.rc3 → 3.2.4.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 223bd7fc20de406557f2f8a839ba8d85e27b4e52
-  data.tar.gz: 18ce388d744623aafcc90fb03cf2db3fc3b47900
+  metadata.gz: 3fcfc0670fd1ea2517cd392450ec947e25f8ae4d
+  data.tar.gz: d999ecfac859bf65b85b25dc9f3ab3b485bb9170
 SHA512:
-  metadata.gz: fd7ef95547add97314006955983b49c14f51fa0e4886601ef8c3bfb0b7c23b842074e774a083523a0722718214b0087d5f8465448034c230ca5ecfc7451a2163
-  data.tar.gz: d61aaabb2ec095d7fbcd7d32d6e975362a12ad116f2768fb62c6e1f07ae70d19a684996c2150a256fbd050f1f6a105bcda94c04a61696c4fb24651dc36e9bba3
+  metadata.gz: 53e00571074cf289db886f2504c39c49e66a540328be0707be24e1c728cdb6f8139867ff3d558cc89e466575e88a4462df3d7556491e07837a9de876143a600f
+  data.tar.gz: 9f0322943f9a3c300b6411e471abf8d029e8dedf4e1f3a68aee66222d42e0c99d93080f3618e06fb33c068fc563e2a158173eb8e6c222eef7f00553349b57b6b

data/CHANGES.txt

@@ -4,6 +4,8 @@
 - Allow passing non-string values to get_treatment/get_treatments
 - Better logging when returning CONTROL and label:Exception as well as when restarting threads
 - Add exception logging when failed to clear impressions keys or fetch impressions keys
+- Fix Redis naming issues (key_name -> keyName)
+- Fix negation matcher
 
 3.2.3
 - Fix Redis namespace issue to align with the spec

data/lib/engine/matchers/all_keys_matcher.rb

@@ -1,14 +1,12 @@
 module SplitIoClient
-
   #
   # class to implement the all keys matcher
   #
   class AllKeysMatcher < NoMethodError
-
     attr_reader :matcher_type
 
     def initialize
-      @matcher_type = "ALL_KEYS"
+      @matcher_type = 'ALL_KEYS'
     end
 
     #
@@ -17,7 +15,7 @@ module SplitIoClient
     # @param key [string] key value to be matched
     #
     # @return [boolean] true for all instances
-    def match?(key, attributes)
+    def match?(_key, _attributes)
       true
     end
 
@@ -30,7 +28,7 @@ module SplitIoClient
     def equals?(obj)
       if obj.nil?
         false
-      elsif self.equal?(obj)
+      elsif equal?(obj)
         true
       elsif !obj.instance_of?(AllKeysMatcher)
         false
@@ -46,7 +44,5 @@ module SplitIoClient
     def to_s
       'in segment all'
     end
-
   end
-
 end

data/lib/engine/parser/condition.rb

@@ -1,10 +1,8 @@
 module SplitIoClient
-
   #
   # acts as dto for a condition structure
   #
   class Condition < NoMethodError
-
     #
     # definition of the condition
     #
@@ -16,7 +14,7 @@ module SplitIoClient
       @partitions = set_partitions
     end
 
-    def create_condition_matcher matchers
+    def create_condition_matcher(matchers)
       CombiningMatcher.new(combiner, matchers) unless combiner.nil?
     end
 
@@ -38,20 +36,24 @@ module SplitIoClient
       @data[:matcherGroup][:matchers]
     end
 
-    def matcher_all_keys params
-      AllKeysMatcher.new
+    def negation_matcher(matcher)
+      NegationMatcher.new(matcher)
     end
 
-    #returns UserDefinedSegmentMatcher[object]
-    def matcher_in_segment params
+    def matcher_all_keys(_params)
+      @matcher_all_keys ||= AllKeysMatcher.new
+    end
+
+    # returns UserDefinedSegmentMatcher[object]
+    def matcher_in_segment(params)
       matcher = params[:matcher]
       segment_name = matcher[:userDefinedSegmentMatcherData] && matcher[:userDefinedSegmentMatcherData][:segmentName]
 
       UserDefinedSegmentMatcher.new(params[:segments_repository], segment_name)
     end
 
-    #returns WhitelistMatcher[object] the whitelist for this condition in case it has a whitelist matcher
-    def matcher_whitelist params
+    # returns WhitelistMatcher[object] the whitelist for this condition in case it has a whitelist matcher
+    def matcher_whitelist(params)
       result = nil
       matcher = params[:matcher]
       is_user_whitelist = ((matcher[:keySelector]).nil? || (matcher[:keySelector])[:attribute].nil?)
@@ -60,42 +62,42 @@ module SplitIoClient
       else
         attribute = (matcher[:keySelector])[:attribute]
         white_list = (matcher[:whitelistMatcherData])[:whitelist]
-        result =  {attribute: attribute, value: white_list}
+        result =  { attribute: attribute, value: white_list }
       end
       WhitelistMatcher.new(result)
     end
 
-    def matcher_equal_to params
+    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})
+      EqualToMatcher.new(attribute: attribute, value: value, data_type: data_type)
     end
 
-    def matcher_greater_than_or_equal_to params
+    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})
+      GreaterThanOrEqualToMatcher.new(attribute: attribute, value: value, data_type: data_type)
     end
 
-    def matcher_less_than_or_equal_to params
+    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})
+      LessThanOrEqualToMatcher.new(attribute: attribute, value: value, data_type: data_type)
     end
 
-    def matcher_between params
+    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})
+      BetweenMatcher.new(attribute: attribute, start_value: start_value, end_value: end_value, data_type: data_type)
     end
 
     #
@@ -106,9 +108,7 @@ module SplitIoClient
 
     #
     # @return [object] the array of partitions for this condition
-    def partitions
-      @partitions
-    end
+    attr_reader :partitions
 
     #
     # converts the partitions hash for this condition into an array of partition objects

data/lib/engine/parser/split_treatment.rb

@@ -46,10 +46,11 @@ module SplitIoClient
 
           @segments_repository.adapter.pipelined do
             condition.matchers.each do |matcher|
-              matchers << condition.send(
-                "matcher_#{matcher[:matcherType].downcase}",
-                matcher: matcher, segments_repository: @segments_repository
-              )
+              matchers << if matcher[:negate]
+                condition.negation_matcher(matcher_instance(matcher[:matcherType], condition, matcher))
+              else
+                matcher_instance(matcher[:matcherType], condition, matcher)
+              end
             end
           end
 
@@ -65,6 +66,13 @@ module SplitIoClient
         def treatment(label, treatment, change_number = nil)
           { label: label, treatment: treatment, change_number: change_number }
         end
+
+        def matcher_instance(type, condition, matcher)
+          condition.send(
+            "matcher_#{type.downcase}",
+            matcher: matcher, segments_repository: @segments_repository
+          )
+        end
       end
     end
   end

data/lib/splitclient-rb/clients/split_client.rb

@@ -85,12 +85,12 @@ module SplitIoClient
         if @config.impressions_queue_size > 0 && store_impressions && split
           # Disable impressions if @config.impressions_queue_size == -1
           @impressions_repository.add(split_name,
-            'key_name' => matching_key,
-            'bucketing_key' => bucketing_key,
+            'keyName' => matching_key,
+            'bucketingKey' => bucketing_key,
             'treatment' => treatment_label_change_number[:treatment],
             'label' => @config.labels_enabled ? treatment_label_change_number[:label] : nil,
             'time' => (Time.now.to_f * 1000.0).to_i,
-            'change_number' => treatment_label_change_number[:change_number]
+            'changeNumber' => treatment_label_change_number[:change_number]
           )
         end
 

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '3.2.4-rc3'
+  VERSION = '3.2.4-rc4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 3.2.4.pre.rc3
+  version: 3.2.4.pre.rc4
 platform: ruby
 authors:
 - Split Software
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler