kameleoon-client-ruby 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887e6709dff33fa410a8e34a32577d8ad1ffe56fa52cadd24bd1734c68d2e46b
-  data.tar.gz: e42d4d944e8c1549eae488f74e7b5c8891bf41f35dcce02133bfc68cee969463
+  metadata.gz: b70d1fc8cd47248dd68ba217e9a860577008e008cac7e6f562ab1856b3dc24c3
+  data.tar.gz: 03ddd4ce4f1ea480bc5adfc347c9f2168af952cc9036ce5cff494af9699a4dfe
 SHA512:
-  metadata.gz: 3cf8ee8561091145b530082e2ce86614b41f9c63c70b644518c5a9d3738e659084526003ad298cdf320da0570cc7d55b551b3b80e680877a1c4c0bd984bc1b9f
-  data.tar.gz: 4c9e4873467d1f2578be20f8246a47ad3810401251fb9e3dd34d3baad073184c6083fa0a35893c95e308a3482ebb3b42d58e1fd8e82c9400fa554ebbd1e16d63
+  metadata.gz: d3d39ad2e27a0312ff090f58a93cba6aa69450fd7763fbdc1375bd146bf1af909dde84815073fc7cf7d60b8aa123cb4cc139e8dee19c30aba3a88ae021475633
+  data.tar.gz: bfb92b7c42f02fde8d90484efef51abe294eaece630e97e7d0168e7974dd89d06b9069e9226c23bc2cf25755a2c1d4e41c87d114a1093b6e391a04d440f60de7

data/lib/kameleoon/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'kameleoon/targeting/models'
 require 'kameleoon/request'
 require 'kameleoon/exceptions'
@@ -32,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 = []
@@ -119,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'])
@@ -262,6 +266,7 @@ 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! || []
         unless feature_flag['targetingSegment'].nil? || feature_flag['targetingSegment'].check_tree(visitor_data)
           raise Exception::NotTargeted.new(visitor_code)
@@ -269,7 +274,7 @@ module Kameleoon
 
         if is_feature_flag_scheduled(feature_flag, Time.now.to_i)
           threshold = obtain_hash_double(visitor_code, {}, id)
-          if threshold <= feature_flag['expositionRate']
+          if threshold >= 1 - feature_flag['expositionRate']
             track_experiment(visitor_code, id, feature_flag["variations"].first['id'])
             true
           else
@@ -314,21 +319,23 @@ module Kameleoon
     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"
+    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.")
+        log('Scheduled job to fetch configuration is starting.')
         fetch_configuration_job_graphql
       end
       @scheduler.schedule '0s' do
-        log("Start-up, fetching is starting")
+        log('Start-up, fetching is starting')
         fetch_configuration_job_graphql
       end
     end
@@ -337,7 +344,7 @@ module Kameleoon
       EM.synchrony do
         obtain_access_token
         @experiments = obtain_experiments_graphql(@site_code) || @experiments
-        @feature_flags = obtain_feature_flags_graphql(@site_code) || @feature_flags
+        @feature_flags = obtain_feature_flags_graphql(@site_code, @environment) || @feature_flags
         EM.stop
       end
     end
@@ -479,9 +486,9 @@ module Kameleoon
       experiments
     end
 
-    def obtain_feature_flags_graphql(site_id, per_page = -1)
+    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)).map { |it| JSON.parse(it.response)['data']['featureFlags']['edges'] }.flatten.map do |feature_flag|
+      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
@@ -580,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
@@ -671,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}}

data/lib/kameleoon/exceptions.rb

@@ -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

@@ -4,7 +4,7 @@ module Kameleoon
     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 } 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 } }",
+          "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": [{
@@ -13,13 +13,15 @@ module Kameleoon
                           "operator": "IN",
                           "parameters": ["ACTIVE", "DEVIATED", "USED_AS_PERSONALIZATION"]
                       }
-                  }, {
+                  }, 
+                  {
                       "condition": {
                           "field": "type",
                           "operator": "IN",
                           "parameters": ["SERVER_SIDE", "HYBRID"]
                       }
-                  }, {
+                  }, 
+                  {
                       "condition": {
                           "field": "siteCode",
                           "operator": "IN",
@@ -35,10 +37,10 @@ module Kameleoon
       }'
     end
     
-    def self.query_feature_flags(site_code)
+    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 } 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 } }",
+          "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": [{
@@ -47,13 +49,21 @@ module Kameleoon
                           "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",

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

@@ -34,7 +34,7 @@ module Kameleoon
 
       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

data/lib/kameleoon/version.rb

@@ -1,3 +1,3 @@
 module Kameleoon
-  VERSION = '1.0.9'
+  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.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Kameleoon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request