kameleoon-client-ruby 1.0.7 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a893238d33ee61086e79cb093d442dfefb16fac9e757ea7353d60458869cd13
-  data.tar.gz: 8485bb0f875a2fa286a03fe872b88dea170477200fc1429d84b5d28711463885
+  metadata.gz: b70d1fc8cd47248dd68ba217e9a860577008e008cac7e6f562ab1856b3dc24c3
+  data.tar.gz: 03ddd4ce4f1ea480bc5adfc347c9f2168af952cc9036ce5cff494af9699a4dfe
 SHA512:
-  metadata.gz: 0ff7b4461c7c4bbf8a7c5399450db7920bae12e65ed9eb604718f9e51fd33a79f24c4803e144ba7260946b1f9c50e2832ff55459c190d33eb2a65658b5c0575e
-  data.tar.gz: f8e17afae3086d5b0402a30b7121febed07b16eb58a05e3082d73100c4e28d778746c353bce2bd50620b0dc267e8eb427b89e30dd066f9f951519cc5c67b77a4
+  metadata.gz: d3d39ad2e27a0312ff090f58a93cba6aa69450fd7763fbdc1375bd146bf1af909dde84815073fc7cf7d60b8aa123cb4cc139e8dee19c30aba3a88ae021475633
+  data.tar.gz: bfb92b7c42f02fde8d90484efef51abe294eaece630e97e7d0168e7974dd89d06b9069e9226c23bc2cf25755a2c1d4e41c87d114a1093b6e391a04d440f60de7

data/README.md

@@ -1,22 +1,7 @@
-# Kameleoon RUBY SDK
+# Kameleoon Ruby SDK
 
-This is the repository for the Kameleoon Ruby SDK.
+## Getting Started
 
-### How to build and install Kameleoon Gem locally
-#### Prerequisite:
-* [Install ruby](https://www.ruby-lang.org/en/documentation/installation)
+Our SDK gives you the possibility of running experiments and activating feature flags on your Ruby platform. Integrating our SDK into your applications is easy, and its footprint (in terms of memory and network usage) is low.
 
-#### Build and install the gem:
-* Run `./buildAndInstallGem.sh`
-
-### How to run tests
-#### Prerequisite:
-* Build and install Kameleoon Gem locally (infos above).
-* Install rake: `gem install rake`
-
-#### Run Tests:
-##### Unit
-* Run `./test.sh -u`
-##### Integration
-Make sure you kill manually the server test app after the tests are done.
-* Run `./test.sh -i`
+You can refer to the [SDK reference](https://developers.kameleoon.com/ruby-sdk.html#reference) to check out all possible features of the SDK. Also make sure you check out our [Getting started tutorial](https://developers.kameleoon.com/ruby-sdk.html#getting-started) which we have prepared to walk you through the installation and implementation.

data/lib/kameleoon/client.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 require 'kameleoon/targeting/models'
 require 'kameleoon/request'
 require 'kameleoon/exceptions'
 require 'kameleoon/cookie'
+require 'kameleoon/query_graphql'
 require 'rufus/scheduler'
 require 'yaml'
 require 'json'
 require 'em-synchrony'
 require 'objspace'
+require 'time'
 
 module Kameleoon
   ##
@@ -30,6 +34,7 @@ module Kameleoon
       @client_id = client_id || config['client_id']
       @client_secret = client_secret || config['client_secret']
       @data_maximum_size = config['visitor_data_maximum_size'] || 500 # mb
+      @environment = config['environment'] || DEFAULT_ENVIRONMENT
       @verbose_mode = config['verbose_mode'] || false
       @experiments = []
       @feature_flags = []
@@ -83,8 +88,10 @@ module Kameleoon
     # @raise [Kameleoon::Exception::ExperimentConfigurationNotFound] Raise when experiment configuration is not found
     # @raise [Kameleoon::Exception::NotActivated] The visitor triggered the experiment, but did not activate it. Usually, this happens because the user has been associated with excluded traffic
     # @raise [Kameleoon::Exception::NotTargeted] The visitor is not targeted by the experiment, as the associated targeting segment conditions were not fulfilled. He should see the reference variation
+    # @raise [Kameleoon::Exception::VisitorCodeNotValid] If the visitor code is empty or longer than 255 chars
     #
     def trigger_experiment(visitor_code, experiment_id, timeout = @default_timeout)
+      check_visitor_code(visitor_code)
       experiment = @experiments.find { |experiment| experiment['id'].to_s == experiment_id.to_s }
       if experiment.nil?
         raise Exception::ExperimentConfigurationNotFound.new(experiment_id)
@@ -115,6 +122,7 @@ module Kameleoon
         end
         variation_id.to_i
       else
+        check_site_code_enable(experiment)
         visitor_data = @data.select { |key, value| key.to_s == visitor_code }.values.flatten! || []
         if experiment['targetingSegment'].nil? || experiment['targetingSegment'].check_tree(visitor_data)
           threshold = obtain_hash_double(visitor_code, experiment['respoolTime'], experiment['id'])
@@ -143,7 +151,10 @@ module Kameleoon
     # @param [String] visitor_code Visitor code
     # @param [...Data] data Data to associate with the visitor code
     #
+    # @raise [Kameleoon::Exception::VisitorCodeNotValid] If the visitor code is empty or longer than 255 chars
+    #
     def add_data(visitor_code, *args)
+      check_visitor_code(visitor_code)
       while ObjectSpace.memsize_of(@data) > @data_maximum_size * (2**20) do
         @data.shift
       end
@@ -167,7 +178,10 @@ module Kameleoon
     # @param [Integer] goal_id Id of the goal
     # @param [Float] revenue Optional - Revenue of the conversion.
     #
+    # @raise [Kameleoon::Exception::VisitorCodeNotValid] If the visitor code is empty or longer than 255 chars
+    #
     def track_conversion(visitor_code, goal_id, revenue = 0.0)
+      check_visitor_code(visitor_code)
       add_data(visitor_code, Conversion.new(goal_id, revenue))
       flush(visitor_code)
     end
@@ -181,7 +195,10 @@ module Kameleoon
     #
     # @param [String] visitor_code Optional field - Visitor code, without visitor code it flush all of the data
     #
+    # @raise [Kameleoon::Exception::VisitorCodeNotValid] If the visitor code is not null and empty or longer than 255 chars
+    #
     def flush(visitor_code = nil)
+      check_visitor_code(visitor_code) unless visitor_code.nil?
       track_data(visitor_code)
     end
 
@@ -203,9 +220,9 @@ module Kameleoon
     def obtain_variation_associated_data(variation_id)
       variation = @experiments.map { |experiment| experiment['variations'] }.flatten.select { |variation| variation['id'].to_i == variation_id.to_i }.first
       if variation.nil?
-        raise Exception::VariationNotFound.new(variation_id)
+        raise Exception::VariationConfigurationNotFound.new(variation_id)
       else
-        variation['customJson']
+        JSON.parse(variation['customJson'])
       end
     end
 
@@ -221,8 +238,10 @@ module Kameleoon
     #
     # @raise [Kameleoon::Exception::FeatureConfigurationNotFound]
     # @raise [Kameleoon::Exception::NotTargeted]
+    # @raise [Kameleoon::Exception::VisitorCodeNotValid] If the visitor code is empty or longer than 255 chars
     #
     def activate_feature(visitor_code, feature_key, timeout = @default_timeout)
+      check_visitor_code(visitor_code)
       feature_flag = get_feature_flag(feature_key)
       id = feature_flag['id']
       if @blocking
@@ -247,18 +266,23 @@ module Kameleoon
         result.to_s != "null"
 
       else
+        check_site_code_enable(feature_flag)
         visitor_data = @data.select { |key, value| key.to_s == visitor_code }.values.flatten! || []
-        if feature_flag['targetingSegment'].nil? || feature_flag['targetingSegment'].check_tree(visitor_data)
+        unless feature_flag['targetingSegment'].nil? || feature_flag['targetingSegment'].check_tree(visitor_data)
+          raise Exception::NotTargeted.new(visitor_code)
+        end
+
+        if is_feature_flag_scheduled(feature_flag, Time.now.to_i)
           threshold = obtain_hash_double(visitor_code, {}, id)
-          if threshold <= feature_flag['expositionRate']
-            track_experiment(visitor_code, id, feature_flag["variationsId"].first)
-            return true
+          if threshold >= 1 - feature_flag['expositionRate']
+            track_experiment(visitor_code, id, feature_flag["variations"].first['id'])
+            true
           else
             track_experiment(visitor_code, id, REFERENCE, true)
-            return false
+            false
           end
         else
-          raise Exception::NotTargeted.new(visitor_code)
+          false
         end
       end
     end
@@ -276,39 +300,52 @@ module Kameleoon
     #
     def obtain_feature_variable(feature_key, variable_key)
       feature_flag = get_feature_flag(feature_key)
-      custom_json = feature_flag["variations"].first['customJson'][variable_key.to_s]
+      custom_json = JSON.parse(feature_flag["variations"].first['customJson'])[variable_key.to_s]
       if custom_json.nil?
         raise Exception::FeatureVariableNotFound.new("Feature variable not found")
       end
       case custom_json['type']
       when "Boolean"
-        return !!custom_json['value']
+        return custom_json['value'].downcase == "true"
       when "String"
-        return custom_json['value'].to_s
-      when "Number"
-        return custom_json['value'].to_f
-      when "Json"
         return custom_json['value']
+      when "Number"
+        return custom_json['value'].to_i
+      when "JSON"
+        return JSON.parse(custom_json['value'])
       else
         raise TypeError.new("Unknown type for feature variable")
       end
     end
 
     private
-    API_SSX_URL = "https://api-ssx.kameleoon.com"
+
+    API_SSX_URL = 'https://api-ssx.kameleoon.com'
     REFERENCE = 0
+    STATUS_ACTIVE = 'ACTIVE'
+    FEATURE_STATUS_DEACTIVATED = 'DEACTIVATED'
+    DEFAULT_ENVIRONMENT = 'production'
     attr :site_code, :client_id, :client_secret, :access_token, :experiments, :feature_flags, :scheduler, :data,
          :blocking, :tracking_url, :default_timeout, :interval, :memory_limit, :verbose_mode
 
     def fetch_configuration
       @scheduler = Rufus::Scheduler.singleton
       @scheduler.every @interval do
-        log("Scheduled job to fetch configuration is starting.")
-        fetch_configuration_job
+        log('Scheduled job to fetch configuration is starting.')
+        fetch_configuration_job_graphql
       end
       @scheduler.schedule '0s' do
-        log("Start-up, fetching is starting")
-        fetch_configuration_job
+        log('Start-up, fetching is starting')
+        fetch_configuration_job_graphql
+      end
+    end
+
+    def fetch_configuration_job_graphql
+      EM.synchrony do
+        obtain_access_token
+        @experiments = obtain_experiments_graphql(@site_code) || @experiments
+        @feature_flags = obtain_feature_flags_graphql(@site_code, @environment) || @feature_flags
+        EM.stop
       end
     end
 
@@ -387,8 +424,8 @@ module Kameleoon
     end
 
     def complete_experiment(experiment)
-      unless experiment['variationsId'].nil?
-        experiment['variations'] = experiment['variationsId'].map { |variationId| obtain_variation(variationId) }
+      unless experiment['variations'].nil?
+        experiment['variations'] = experiment['variations'].map { |variationId| obtain_variation(variationId) }
       end
       unless experiment['targetingSegmentId'].nil?
         experiment['targetingSegment'] = Kameleoon::Targeting::Segment.new(obtain_segment(experiment['targetingSegmentId']))
@@ -396,6 +433,44 @@ module Kameleoon
       experiment
     end
 
+    # fetching segment for both types: experiments and feature_flags (campaigns)
+    def complete_campaign_graphql(campaign)
+      campaign['id'] = campaign['id'].to_i
+      campaign['status'] = campaign['status']
+      unless campaign['deviations'].nil?
+        campaign['deviations'] = Hash[*campaign['deviations'].map { |it| [ it['variationId'] == '0' ? 'origin' : it['variationId'], it['value'] ] }.flatten]
+      end
+      unless campaign['respoolTime'].nil?
+        campaign['respoolTime'] = Hash[*campaign['respoolTime'].map { |it| [ it['variationId'] == '0' ? 'origin' : it['variationId'], it['value'] ] }.flatten]
+      end
+      unless campaign['variations'].nil?
+        campaign['variations'] = campaign['variations'].map { |it| {'id' => it['id'].to_i, 'customJson' => it['customJson']} }
+      end
+      unless campaign['segment'].nil?
+        campaign['targetingSegment'] = Kameleoon::Targeting::Segment.new((campaign['segment']))
+      end
+      campaign
+    end
+
+    def complete_experiment(experiment)
+      unless experiment['variations'].nil?
+        experiment['variations'] = experiment['variations'].map { |variationId| obtain_variation(variationId) }
+      end
+      unless experiment['targetingSegmentId'].nil?
+        experiment['targetingSegment'] = Kameleoon::Targeting::Segment.new(obtain_segment(experiment['targetingSegmentId']))
+      end
+      experiment
+    end
+
+    def obtain_experiments_graphql(site_code, per_page = -1)
+      log "Fetching experiments GraphQL"
+      experiments = fetch_all_graphql("v1/graphql?perPage=#{per_page}", Kameleoon::Query.query_experiments(site_code)).map { |it| JSON.parse(it.response)['data']['experiments']['edges'] }.flatten.map do |experiment|
+          complete_campaign_graphql(experiment['node'])
+      end
+      log "Experiment are fetched: " + experiments.inspect
+      experiments
+    end
+
     def obtain_tests(site_id, per_page = -1)
       log "Fetching experiments"
       query_values = { 'perPage' => per_page }
@@ -411,12 +486,21 @@ module Kameleoon
       experiments
     end
 
+    def obtain_feature_flags_graphql(site_id, environment = @environment, per_page = -1)
+      log "Fetching feature flags GraphQL"
+      feature_flags = fetch_all_graphql("v1/graphql?perPage=#{per_page}", Kameleoon::Query.query_feature_flags(site_code, environment)).map { |it| JSON.parse(it.response)['data']['featureFlags']['edges'] }.flatten.map do |feature_flag|
+          complete_campaign_graphql(feature_flag['node'])
+      end
+      log "Feature flags are fetched: " + feature_flags.inspect
+      feature_flags
+    end
+
     def obtain_feature_flags(site_id, per_page = -1)
       log "Fetching feature flags"
       query_values = { 'perPage' => per_page }
       filters = [
         hash_filter('siteId', 'EQUAL', [site_id]),
-        hash_filter('status', 'EQUAL', ['ACTIVE'])
+        hash_filter('status', 'IN', ['ACTIVE', 'PAUSED'])
       ]
       feature_flags = fetch_all('feature-flags', query_values, filters).map { |it| JSON.parse(it.response) }.flatten.map do |ff|
         complete_experiment(ff)
@@ -425,6 +509,19 @@ module Kameleoon
       feature_flags
     end
 
+    def fetch_all_graphql(path, query_graphql = {})
+      results = []
+      current_page = 1
+      loop do
+        http = fetch_one_graphql(path, query_graphql)
+        break if http == false
+        results.push(http)
+        break if http.response_header["X-Pagination-Page-Count"].to_i <= current_page
+        current_page += 1
+      end
+      results
+    end
+
     def fetch_all(path, query_values = {}, filters = [])
       results = []
       current_page = 1
@@ -439,6 +536,15 @@ module Kameleoon
       results
     end
 
+    def fetch_one_graphql(path, query_graphql = {})
+      request = EM::Synchrony.sync post({ :path => path, :body => query_graphql, :head => hash_headers })
+      unless is_successful(request)
+        log "Failed to fetch" + request.inspect
+        return false
+      end
+      request
+    end
+
     def fetch_one(path, query_values = {}, filters = [])
       unless filters.empty?
         query_values['filter'] = filters.to_json
@@ -481,6 +587,8 @@ module Kameleoon
         feature_flag = @feature_flags.select { |ff| ff['identificationKey'] == feature_key}.first
       elsif feature_key.is_a?(Integer)
         feature_flag = @feature_flags.select { |ff| ff['id'].to_i == feature_key}.first
+        print "\nPassing `feature_key` with type of `int` to `activate_feature` or `obtain_feature_variable` "\
+        "is deprecated, it will be removed in next releases. This is necessary to support multi-environment feature\n"
       else
         raise TypeError.new("Feature key should be a String or an Integer.")
       end
@@ -490,6 +598,20 @@ module Kameleoon
       feature_flag
     end
 
+    def is_feature_flag_scheduled(feature_flag, date)
+      current_status = feature_flag['status'] == STATUS_ACTIVE
+      if feature_flag['featureStatus'] == FEATURE_STATUS_DEACTIVATED || feature_flag['schedules'].empty?
+        return current_status
+      end
+      feature_flag['schedules'].each do |schedule|
+        if (schedule['dateStart'].nil? || Time.parse(schedule['dateStart']).to_i < date) &&
+           (schedule['dateEnd'].nil? || Time.parse(schedule['dateEnd']).to_i > date)
+          return true
+        end
+      end
+      false
+    end
+
     def track_experiment(visitor_code, experiment_id, variation_id = nil, none_variation = false)
       data_not_sent = data_not_sent(visitor_code)
       options = {
@@ -498,6 +620,7 @@ module Kameleoon
         :head => { "Content-Type" => "text/plain"}
       }
       trial = 0
+      success = false
       log "Start post tracking experiment: " + data_not_sent.inspect
       Thread.new do
         EM.synchrony do
@@ -507,12 +630,18 @@ module Kameleoon
             if is_successful(request)
               (data_not_sent.values[0] || []).each { |it| it.sent = true }
               EM.stop
+              success = true
+              break
             end
             trial += 1
           end
           EM.stop
         end
-        log "Post to experiment tracking is done after " + trial.to_s + " trials"
+        if success
+          log "Post to experiment tracking is done after " + (trial + 1).to_s + " trials"
+        elsif 
+          log "Post to experiment tracking is failed after " + trial.to_s + " trials"          
+        end
         Thread.exit
       end
     end
@@ -551,6 +680,12 @@ module Kameleoon
       end
     end
 
+    def check_site_code_enable(exp_or_ff)
+      unless exp_or_ff['site'].nil? || exp_or_ff['site']['isKameleoonEnabled']
+        raise Exception::SiteCodeDisabled.new(site_code)
+      end
+    end
+
     def data_not_sent(visitor_code = nil)
       if visitor_code.nil?
         @data.select {|key, values| values.any? {|data| !data.sent}}
@@ -565,4 +700,4 @@ module Kameleoon
       end
     end
   end
-end
+end

data/lib/kameleoon/cookie.rb

@@ -26,10 +26,18 @@ module Kameleoon
       identifier = visitor_code.to_s
       identifier += container_id.to_s
       if !respool_times.nil? && !respool_times.empty?
-        identifier += respool_times.values.sort.join.to_s
+        identifier += respool_times.sort.to_h.values.join.to_s
       end
       (Digest::SHA256.hexdigest(identifier.encode('UTF-8')).to_i(16) / (BigDecimal("2") ** BigDecimal("256"))).round(16)
     end
+    
+    def check_visitor_code(visitor_code) 
+      if visitor_code.nil?
+        check_default_visitor_code('')
+      elsif
+        check_default_visitor_code(visitor_code)
+      end
+    end
 
     private
 
@@ -43,6 +51,7 @@ module Kameleoon
       if default_visitor_code.nil?
         return
       end
+      default_visitor_code = default_visitor_code.to_s
       if default_visitor_code.length == 0
         raise Kameleoon::Exception::VisitorCodeNotValid.new("Empty visitor Code")
       end

data/lib/kameleoon/data.rb

@@ -1,4 +1,3 @@
-
 module Kameleoon
   NONCE_LENGTH = 16
 
@@ -29,6 +28,17 @@ module Kameleoon
     def obtain_full_post_text_line
       raise KameleoonError.new("ToDo: implement this method.")
     end
+
+    def encode(url)
+      encoded_url = CGI.escape(url)
+      encoded_url.gsub! "%27", "'"
+      encoded_url.gsub! "%21", "!"
+      encoded_url.gsub! "+", "%20"
+      encoded_url.gsub! "%2A", "*"
+      encoded_url.gsub! "%28", "("
+      encoded_url.gsub! "%29", ")"
+      encoded_url
+    end
   end
 
   class CustomData < Data
@@ -63,7 +73,7 @@ module Kameleoon
     def obtain_full_post_text_line
       to_encode = "[[\"" + @value.to_s.gsub("\"", "\\\"") + "\",1]]"
       nonce = Kameleoon::Utils.generate_random_string(NONCE_LENGTH)
-      "eventType=customData&index=" + @id.to_s + "&valueToCount=" + URI.encode_www_form_component(to_encode) + "&overwrite=true&nonce=" + nonce
+      "eventType=customData&index=" + @id.to_s + "&valueToCount=" + encode(to_encode) + "&overwrite=true&nonce=" + nonce
     end
   end
 
@@ -101,9 +111,9 @@ module Kameleoon
       nonce = Kameleoon::Utils.generate_random_string(NONCE_LENGTH)
       referrer_text = ""
       unless @referrer.nil?
-        referrer_text = "&referrers=[" + @referrer + "]"
+        referrer_text = "&referrers=[" + @referrer.to_s + "]"
       end
-      "eventType=page&href=" + @url + "&title=" + @title + "&keyPages=[]" + referrer_text + "&nonce=" + nonce
+      "eventType=page&href=" + encode(@url) + "&title=" + @title + "&keyPages=[]" + referrer_text + "&nonce=" + nonce
     end
   end
 

data/lib/kameleoon/exceptions.rb

@@ -10,7 +10,7 @@ module Kameleoon
         super(value.to_s + " not found.")
       end
     end
-    class VariationNotFound < NotFound
+    class VariationConfigurationNotFound < NotFound
       def initialize(id = "")
         super("Variation " + id.to_s)
       end
@@ -50,5 +50,10 @@ module Kameleoon
         super("Visitor code not valid: " + message)
       end
     end
+    class SiteCodeDisabled < KameleoonError
+      def initialize(message = "")
+        super("Site with siteCode '" + message + "' is disabled")
+      end
+    end
   end
 end

data/lib/kameleoon/query_graphql.rb

@@ -0,0 +1,76 @@
+module Kameleoon
+  module Query
+    
+    def self.query_experiments(site_code)
+      '{
+          "operationName": "getExperiments",
+          "query": "query getExperiments($first: Int, $after: String, $filter: FilteringExpression, $sort: [SortingParameter!]) { experiments(first: $first, after: $after, filter: $filter, sort: $sort) { edges { node { id name type site { id code isKameleoonEnabled } status variations { id customJson } deviations { variationId value } respoolTime {variationId value } segment { id name conditionsData { firstLevelOrOperators firstLevel { orOperators conditions { targetingType isInclude ... on CustomDataTargetingCondition { customDataIndex value valueMatchType } } } } } __typename } __typename } pageInfo { endCursor hasNextPage __typename } totalCount __typename } }",
+          "variables": {
+              "filter": {
+                  "and": [{
+                      "condition": {
+                          "field": "status",
+                          "operator": "IN",
+                          "parameters": ["ACTIVE", "DEVIATED", "USED_AS_PERSONALIZATION"]
+                      }
+                  }, 
+                  {
+                      "condition": {
+                          "field": "type",
+                          "operator": "IN",
+                          "parameters": ["SERVER_SIDE", "HYBRID"]
+                      }
+                  }, 
+                  {
+                      "condition": {
+                          "field": "siteCode",
+                          "operator": "IN",
+                          "parameters": ["' + site_code + '"]
+                      }
+                  }]
+              },
+              "sort": [{
+                  "field": "id",
+                  "direction": "ASC"
+              }]
+          }
+      }'
+    end
+    
+    def self.query_feature_flags(site_code, environment)
+      '{
+          "operationName": "getFeatureFlags",
+          "query": "query getFeatureFlags($first: Int, $after: String, $filter: FilteringExpression, $sort: [SortingParameter!]) { featureFlags(first: $first, after: $after, filter: $filter, sort: $sort) { edges { node { id name site { id code isKameleoonEnabled } bypassDeviation status variations { id customJson } respoolTime { variationId value } expositionRate identificationKey featureFlagSdkLanguageType featureStatus schedules { dateStart dateEnd } segment { id name conditionsData { firstLevelOrOperators firstLevel { orOperators conditions { targetingType isInclude ... on CustomDataTargetingCondition { customDataIndex value valueMatchType } } } } } __typename } __typename } pageInfo { endCursor hasNextPage __typename } totalCount __typename } }",
+          "variables": {
+              "filter": {
+                  "and": [{
+                      "condition": {
+                          "field": "featureStatus",
+                          "operator": "IN",
+                          "parameters": ["ACTIVATED", "SCHEDULED", "DEACTIVATED"]
+                      }
+                  }, 
+                  {
+                      "condition": {
+                          "field": "siteCode",
+                          "operator": "IN",
+                          "parameters": ["' + site_code + '"]
+                      }
+                  }, 
+                  {
+                    "condition": {
+                        "field": "environment.key",
+                        "operator": "IN",
+                        "parameters": ["' + environment + '"]
+                    }
+                }]
+              },
+              "sort": [{
+                  "field": "id",
+                  "direction": "ASC"
+              }]
+          }
+      }'
+    end
+  end
+end

data/lib/kameleoon/targeting/condition_factory.rb

@@ -1,4 +1,3 @@
-require 'kameleoon/targeting/models'
 require 'kameleoon/targeting/conditions/custom_datum'
 
 module Kameleoon

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

@@ -1,6 +1,5 @@
 require 'kameleoon/targeting/condition'
 require 'kameleoon/exceptions'
-require 'kameleoon/targeting/models'
 
 module Kameleoon
   #@api private
@@ -20,22 +19,22 @@ module Kameleoon
         end
         @operator = json_condition['valueMatchType']
 
-        if json_condition['value'].nil?
-          raise Exception::NotFoundError.new('value')
-        end
+        # if json_condition['value'].nil?
+        #   raise Exception::NotFoundError.new('value')
+        # end
         @value = json_condition['value']
 
         @type = ConditionType::CUSTOM_DATUM
 
-        if json_condition['include'].nil?
-          raise Exception::NotFoundError.new('include')
+        if json_condition['include'].nil? && json_condition['isInclude'].nil?
+          raise Exception::NotFoundError.new('include / isInclude missed')
         end
-        @include = json_condition['include']
+        @include = json_condition['include'] || json_condition['isInclude']
       end
 
       def check(datas)
         is_targeted = false
-        custom_data = datas.select { |data| data.instance == DataType::CUSTOM && data.id == @index }.first
+        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
@@ -65,11 +64,11 @@ module Kameleoon
               is_targeted = true
             end
           when Operator::IS_TRUE.to_s
-            if custom_data.value == true
+            if custom_data.value == 'true'
               is_targeted = true
             end
           when Operator::IS_FALSE.to_s
-            if custom_data.value == false
+            if custom_data.value == 'false'
               is_targeted = true
             end
           else

data/lib/kameleoon/targeting/models.rb

@@ -23,7 +23,7 @@ module Kameleoon
             if hash["id"].nil?
               raise Kameleoon::Exception::NotFound.new("id")
             end
-            @id = hash["id"]
+            @id = hash["id"].to_i
             if hash["conditionsData"].nil?
               raise Kameleoon::Exception::NotFound.new(hash["conditionsData"])
             end

data/lib/kameleoon/targeting/tree_builder.rb

@@ -1,5 +1,4 @@
 require 'kameleoon/targeting/condition_factory'
-require 'kameleoon/targeting/models'
 
 module Kameleoon
   #@api private

data/lib/kameleoon/version.rb

@@ -1,3 +1,3 @@
 module Kameleoon
-  VERSION = '1.0.7'
+  VERSION = '1.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kameleoon-client-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.10
 platform: ruby
 authors:
-- Kameleoon - Guillaume Grandjean
+- Kameleoon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -54,7 +54,7 @@ dependencies:
         version: '3.7'
 description: Kameleoon Client Ruby Software Development Kit
 email:
-- ggrandjean@kameleoon.com
+- sdk@kameleoon.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -66,6 +66,7 @@ files:
 - lib/kameleoon/data.rb
 - lib/kameleoon/exceptions.rb
 - lib/kameleoon/factory.rb
+- lib/kameleoon/query_graphql.rb
 - lib/kameleoon/request.rb
 - lib/kameleoon/targeting/condition.rb
 - lib/kameleoon/targeting/condition_factory.rb