kameleoon-client-ruby 2.0.0 → 2.1.0

data/lib/kameleoon/targeting/conditions/custom_datum.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+require 'json'
 require 'kameleoon/targeting/condition'
 require 'kameleoon/exceptions'
 
@@ -14,7 +16,7 @@ module Kameleoon
         @index = json_condition['customDataIndex']
 
         if json_condition['valueMatchType'].nil?
-          raise Exception::NotFoundError.new('valueMatchType'), 'valueMatchType missed'
+          raise Exception::NotFound.new('valueMatchType'), 'valueMatchType missed'
         end
 
         @operator = json_condition['valueMatchType']
@@ -24,10 +26,22 @@ module Kameleoon
         @type = ConditionType::CUSTOM_DATUM
 
         if json_condition['include'].nil? && json_condition['isInclude'].nil?
-          raise Exception::NotFoundError.new('include / isInclude missed'), 'include / isInclude missed'
+          raise Exception::NotFound.new('include / isInclude missed'), 'include / isInclude missed'
         end
 
         @include = json_condition['include'] || json_condition['isInclude']
+
+        @op = {
+          Operator::MATCH.to_s => method(:op_match),
+          Operator::CONTAINS.to_s => method(:op_contains),
+          Operator::EXACT.to_s => method(:op_exact),
+          Operator::EQUAL.to_s => method(:op_equal),
+          Operator::GREATER.to_s => method(:op_greater),
+          Operator::LOWER.to_s => method(:op_lower),
+          Operator::IS_TRUE.to_s => method(:op_is_true),
+          Operator::IS_FALSE.to_s => method(:op_is_false),
+          Operator::AMONG_VALUES.to_s => method(:op_among_values),
+        }[@operator]
       end
 
       def check(datas)
@@ -35,32 +49,53 @@ module Kameleoon
         custom_data = datas.select { |data| data.instance == DataType::CUSTOM && data.id == @index }.last
         if custom_data.nil?
           is_targeted = (@operator == Operator::UNDEFINED.to_s)
-        else
-          case @operator
-          when Operator::MATCH.to_s
-            is_targeted = !Regexp.new(@value.to_s).match(custom_data.value.to_s).nil?
-          when Operator::CONTAINS.to_s
-            is_targeted = custom_data.value.to_s.include? @value
-          when Operator::EXACT.to_s
-            is_targeted = custom_data.value.to_s == @value.to_s
-          when Operator::EQUAL.to_s
-            is_targeted = custom_data.value.to_f == @value.to_f
-          when Operator::GREATER.to_s
-            is_targeted = custom_data.value.to_f > @value.to_f
-          when Operator::LOWER.to_s
-            is_targeted = custom_data.value.to_f < @value.to_f
-          when Operator::IS_TRUE.to_s
-            is_targeted = custom_data.value == 'true'
-          when Operator::IS_FALSE.to_s
-            is_targeted = custom_data.value == 'false'
-          when Operator::AMONG_VALUES.to_s
-            is_targeted = @value.scan(/"([^"]*)"/).flatten.include?(custom_data.value)
-          else
-            raise KameleoonError.new("Undefined operator #{@operator}"), "Undefined operator #{@operator}"
-          end
+        elsif @operator != Operator::UNDEFINED.to_s
+          raise KameleoonError.new("Undefined operator #{@operator}"), "Undefined operator #{@operator}" if @op.nil?
+
+          is_targeted = @op.call(custom_data.values)
         end
         is_targeted
       end
+
+      private
+
+      def op_match(values)
+        re = Regexp.new(@value.to_s)
+        values.any? { |v| re.match(v) }
+      end
+
+      def op_contains(values)
+        values.any? { |v| v.to_s.include? @value.to_s }
+      end
+
+      def op_exact(values)
+        values.include? @value.to_s
+      end
+
+      def op_equal(values)
+        values.any? { |v| v.to_f == @value.to_f }
+      end
+
+      def op_greater(values)
+        values.any? { |v| v.to_f > @value.to_f }
+      end
+
+      def op_lower(values)
+        values.any? { |v| v.to_f < @value.to_f }
+      end
+
+      def op_is_true(values)
+        values.any? { |v| v.to_s == 'true' }
+      end
+
+      def op_is_false(values)
+        values.any? { |v| v.to_s == 'false' }
+      end
+
+      def op_among_values(values)
+        all_matches = JSON.parse(@value.to_s).map(&:to_s).to_set
+        values.any? { |v| all_matches.include?(v) }
+      end
     end
   end
 end

data/lib/kameleoon/targeting/conditions/exclusive_experiment.rb

@@ -12,7 +12,7 @@ module Kameleoon
 
       def initialize(json_condition)
         if json_condition['targetingType'].nil?
-          raise Exception::NotFoundError.new('targetingType'), 'targetingType missed'
+          raise Exception::NotFound.new('targetingType'), 'targetingType missed'
         end
 
         @type = json_condition['targetingType']

data/lib/kameleoon/targeting/conditions/target_experiment.rb

@@ -14,13 +14,13 @@ module Kameleoon
         super(json_condition)
 
         if json_condition['experiment'].nil?
-          raise Exception::NotFoundError.new('experiment'), 'experiment missed'
+          raise Exception::NotFound.new('experiment'), 'experiment missed'
         end
 
         @experiment = json_condition['experiment']
 
         if json_condition['variationMatchType'].nil?
-          raise Exception::NotFoundError.new('variationMatchType'), 'variationMatchType missed'
+          raise Exception::NotFound.new('variationMatchType'), 'variationMatchType missed'
         end
 
         @operator = json_condition['variationMatchType']

data/lib/kameleoon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kameleoon
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kameleoon-client-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Kameleoon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Kameleoon Client Ruby Software Development Kit
 email:
 - sdk@kameleoon.com
@@ -64,8 +78,8 @@ files:
 - lib/kameleoon/client.rb
 - lib/kameleoon/configuration/experiment.rb
 - lib/kameleoon/configuration/feature_flag.rb
-- lib/kameleoon/configuration/feature_flag_v2.rb
 - lib/kameleoon/configuration/rule.rb
+- lib/kameleoon/configuration/settings.rb
 - lib/kameleoon/configuration/variable.rb
 - lib/kameleoon/configuration/variation.rb
 - lib/kameleoon/configuration/variation_exposition.rb
@@ -73,7 +87,15 @@ files:
 - lib/kameleoon/data.rb
 - lib/kameleoon/exceptions.rb
 - lib/kameleoon/factory.rb
+- lib/kameleoon/hybrid/manager.rb
+- lib/kameleoon/real_time/real_time_configuration_service.rb
+- lib/kameleoon/real_time/real_time_event.rb
+- lib/kameleoon/real_time/sse_client.rb
+- lib/kameleoon/real_time/sse_message.rb
+- lib/kameleoon/real_time/sse_request.rb
 - lib/kameleoon/request.rb
+- lib/kameleoon/storage/cache.rb
+- lib/kameleoon/storage/cache_factory.rb
 - lib/kameleoon/storage/variation_storage.rb
 - lib/kameleoon/storage/visitor_variation.rb
 - lib/kameleoon/targeting/condition.rb

data/lib/kameleoon/configuration/feature_flag_v2.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'rule'
-require_relative 'variation'
-
-module Kameleoon
-  # Module which contains all internal data of SDK
-  module Configuration
-    # Class for manage all feature flags v2 with rules
-    class FeatureFlagV2
-      attr_accessor :id, :feature_key, :variations, :default_variation_key, :rules
-
-      def self.create_from_array(array)
-        array&.map { |it| FeatureFlagV2.new(it) }
-      end
-
-      def initialize(hash)
-        @id = hash['id']
-        @feature_key = hash['featureKey']
-        @default_variation_key = hash['defaultVariationKey']
-        @variations = Variation.create_from_array(hash['variations'])
-        @rules = Rule.create_from_array(hash['rules'])
-      end
-
-      def get_variation_key(key)
-        variations.select { |v| v.key == key }.first
-      end
-    end
-  end
-end