vwo-sdk 1.5.0 → 1.15.0

data/lib/vwo/services/operand_evaluator.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -89,7 +89,7 @@ class VWO
       # @param [String] :custom_variables_value   Value from the custom_variables
       #
       # @return [Boolean]
-      def evaluate_operand?(operand, custom_variables)
+      def evaluate_custom_variable?(operand, custom_variables)
         # Extract custom_variable_key and custom_variables_value from operand
 
         operand_key, operand = get_key_value(operand)
@@ -109,6 +109,14 @@ class VWO
         # Call the self method corresponding to operand_type to evaluate the result
         public_send("#{operand_type}?", operand_value, custom_variables_value)
       end
+
+      def evaluate_user?(operand, custom_variables)
+        users = operand.split(',')
+        users.each do |user|
+          return true if user.strip == custom_variables['_vwo_user_id']
+        end
+        false
+      end
     end
   end
 end

data/lib/vwo/services/segment_evaluator.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,7 +50,9 @@ class VWO
         elsif operator == OperatorTypes::OR
           sub_dsl.any? { |y| evaluate_util(y, custom_variables) }
         elsif operator == OperandTypes::CUSTOM_VARIABLE
-          @operand_evaluator.evaluate_operand?(sub_dsl, custom_variables)
+          @operand_evaluator.evaluate_custom_variable?(sub_dsl, custom_variables)
+        elsif operator == OperandTypes::USER
+          @operand_evaluator.evaluate_user?(sub_dsl, custom_variables)
         end
       end
 
@@ -66,35 +68,12 @@ class VWO
       #
       def evaluate(campaign_key, user_id, dsl, custom_variables)
         result = evaluate_util(dsl, custom_variables) if valid_value?(dsl)
-        if result
-          @logger.log(
-            LogLevelEnum::INFO,
-            format(
-              LogMessageEnum::InfoMessages::USER_PASSED_PRE_SEGMENTATION,
-              file: FileNameEnum::SegmentEvaluator,
-              user_id: user_id,
-              campaign_key: campaign_key,
-              custom_variables: custom_variables
-            )
-          )
-        else
-          @logger.log(
-            LogLevelEnum::INFO,
-            format(
-              LogMessageEnum::InfoMessages::USER_FAILED_PRE_SEGMENTATION,
-              file: FileNameEnum::SegmentEvaluator,
-              user_id: user_id,
-              campaign_key: campaign_key,
-              custom_variables: custom_variables
-            )
-          )
-        end
         result
       rescue StandardError => e
         @logger.log(
           LogLevelEnum::ERROR,
           format(
-            LogMessageEnum::ErrorMessages::PRE_SEGMENTATION_ERROR,
+            LogMessageEnum::ErrorMessages::SEGMENTATION_ERROR,
             file: FileNameEnum::SegmentEvaluator,
             user_id: user_id,
             campaign_key: campaign_key,

data/lib/vwo/services/settings_file_manager.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ class VWO
 
       PROTOCOL = 'https'
       HOSTNAME = ::VWO::CONSTANTS::ENDPOINTS::BASE_URL
-      PATH = ::VWO::CONSTANTS::ENDPOINTS::ACCOUNT_SETTINGS
 
       def initialize(account_id, sdk_key)
         @account_id = account_id
@@ -40,7 +39,7 @@ class VWO
       #                       as received from the server,
       #                       nil if no settings_file is found or sdk_key is incorrect
 
-      def get_settings_file
+      def get_settings_file(is_via_webhook = false)
         is_valid_key = valid_number?(@account_id) || valid_string?(@account_id)
 
         unless is_valid_key && valid_string?(@sdk_key)
@@ -48,7 +47,12 @@ class VWO
           return '{}'
         end
 
-        vwo_server_url = "#{PROTOCOL}://#{HOSTNAME}#{PATH}"
+        if is_via_webhook
+          path = ::VWO::CONSTANTS::ENDPOINTS::WEBHOOK_SETTINGS_URL
+        else
+          path = ::VWO::CONSTANTS::ENDPOINTS::SETTINGS_URL
+        end
+        vwo_server_url = "#{PROTOCOL}://#{HOSTNAME}#{path}"
 
         settings_file_response = ::VWO::Utils::Request.get(vwo_server_url, params)
 

data/lib/vwo/services/settings_file_processor.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,6 +44,11 @@ class VWO
         )
       end
 
+      def update_settings_file(settings_file)
+        @settings_file = settings_file
+        process_settings_file
+      end
+
       def get_settings_file
         @settings_file
       end

data/lib/vwo/services/usage_stats.rb

@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class VWO
+  module Services
+    class UsageStats
+      attr_reader :usage_stats
+      # Initialize the UsageStats
+      def initialize(stats, is_development_mode = false)
+        @usage_stats = {}
+        unless is_development_mode
+          @usage_stats = stats
+          @usage_stats[:_l] = 1 if @usage_stats.length > 0
+        end
+      end
+    end
+  end
+end

data/lib/vwo/user_storage.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/campaign.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -142,6 +142,113 @@ class VWO
           campaign['key'] == campaign_key
         end
       end
+
+      #  fetch campaigns from settings
+      #
+      #  [string|array|nil] :campaign_key
+      #  [Hash]             :settings_file
+      #  [string]           :goal_identifier
+      #  [string]           :goal_type_to_track
+      #  @return[Hash]
+      def get_campaigns(settings_file, campaign_key, goal_identifier, goal_type_to_track = 'ALL')
+        campaigns = []
+        if campaign_key.nil?
+          campaigns = get_campaigns_for_goal(settings_file, goal_identifier, goal_type_to_track)
+        elsif campaign_key.is_a?(Array)
+          campaigns = get_campaigns_from_campaign_keys(campaign_key, settings_file, goal_identifier, goal_type_to_track)
+        elsif campaign_key.is_a?(String)
+          campaign = get_campaign_for_campaign_key_and_goal(campaign_key, settings_file, goal_identifier, goal_type_to_track)
+          if campaign
+            campaigns = [campaign]
+          end
+        end
+        if campaigns.length() == 0
+          VWO::Logger.get_instance.log(
+            LogLevelEnum::ERROR,
+            format(
+              LogMessageEnum::ErrorMessages::NO_CAMPAIGN_FOUND,
+              file: FileNameEnum::CampaignUtil,
+              goal_identifier: goal_identifier
+            )
+          )
+        end
+        return campaigns
+      end
+
+      # fetch all running campaigns (having goal identifier goal_type_to_track and goal type CUSTOM|REVENUE|ALL) from settings
+      #
+      #  [Hash]             :settings_file
+      #  [string]           :goal_identifier
+      #  [string]           :goal_type_to_track
+      #  @return[Hash]
+      def get_campaigns_for_goal(settings_file, goal_identifier, goal_type_to_track = 'ALL')
+        campaigns = []
+        if settings_file
+          settings_file['campaigns'].each do |campaign|
+            if campaign.key?(:status) && campaign[:status] != 'RUNNING'
+              next
+            end
+            goal = get_campaign_goal(campaign, goal_identifier)
+            if validate_goal(goal, goal_type_to_track)
+              campaigns.push(campaign)
+            end
+          end
+        end
+        campaigns
+      end
+
+      def validate_goal(goal, goal_type_to_track)
+        result = goal && (
+          goal_type_to_track == 'ALL' ||
+            (
+              GOAL_TYPES.has_value?(goal['type']) &&
+                (GOAL_TYPES.key? goal_type_to_track) &&
+                goal['type'] == GOAL_TYPES[goal_type_to_track]
+            )
+        )
+        return result
+      end
+
+      def get_campaigns_from_campaign_keys(campaign_keys, settings_file, goal_identifier, goal_type_to_track = 'ALL')
+        campaigns = []
+        campaign_keys.each do |campaign_key|
+
+          campaign = get_campaign_for_campaign_key_and_goal(campaign_key, settings_file, goal_identifier, goal_type_to_track)
+          if campaign
+            campaigns.push(campaign)
+          end
+        end
+        campaigns
+      end
+
+      def get_campaign_for_campaign_key_and_goal(campaign_key, settings_file, goal_identifier, goal_type_to_track)
+        campaign = get_running_campaign(campaign_key, settings_file)
+        if campaign
+          goal = get_campaign_goal(campaign, goal_identifier)
+          if validate_goal(goal, goal_type_to_track)
+            return campaign
+          end
+        end
+        nil
+      end
+
+      def get_running_campaign(campaign_key, settings_file)
+        campaign = get_campaign(settings_file, campaign_key)
+        if campaign.nil? || (campaign['status'] != 'RUNNING')
+          @logger.log(
+            LogLevelEnum::ERROR,
+            format(
+              LogMessageEnum::ErrorMessages::CAMPAIGN_NOT_RUNNING,
+              file: FILE,
+              campaign_key: campaign_key,
+              api_name: ApiMethods::TRACK
+            )
+          )
+          nil
+        end
+        return campaign
+      end
+
     end
   end
 end

data/lib/vwo/utils/custom_dimensions.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,13 +26,36 @@ class VWO
       include VWO::Enums
       include VWO::Utils::Impression
 
-      def get_url_params(settings_file, tag_key, tag_value, user_id)
+      def get_url_params(settings_file, tag_key, tag_value, user_id, sdk_key)
         url = HTTPS_PROTOCOL + ENDPOINTS::BASE_URL + ENDPOINTS::PUSH
         tag = { 'u' => {} }
         tag['u'][tag_key] = tag_value
 
         params = get_common_properties(user_id, settings_file)
-        params.merge!('url' => url, 'tags' => JSON.generate(tag))
+        params.merge!('url' => url, 'tags' => JSON.generate(tag), 'env' => sdk_key)
+
+        VWO::Logger.get_instance.log(
+          LogLevelEnum::DEBUG,
+          format(
+            LogMessageEnum::DebugMessages::PARAMS_FOR_PUSH_CALL,
+            file: FileNameEnum::CustomDimensionsUtil,
+            properties: JSON.generate(params)
+          )
+        )
+        params
+      end
+
+      def get_batch_event_url_params(settings_file, tag_key, tag_value, user_id)
+        tag = { 'u' => {} }
+        tag['u'][tag_key] = tag_value
+
+        account_id = settings_file['accountId']
+        params = {
+          'eT' => 3,
+          't' => JSON.generate(tag),
+          'u' => generator_for(user_id, account_id),
+          'sId' => get_current_unix_timestamp
+        }
 
         VWO::Logger.get_instance.log(
           LogLevelEnum::DEBUG,

data/lib/vwo/utils/feature.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/function.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/vwo/utils/impression.rb

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Wingify Software Pvt. Ltd.
+# Copyright 2019-2021 Wingify Software Pvt. Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,16 +31,17 @@ class VWO
 
       # Creates the impression from the arguments passed
       #
-      # @param[Hash]                        :settings_file           Settings file object
+      # @param[Hash]                        :settings_file          Settings file object
       # @param[String]                      :campaign_id            Campaign identifier
       # @param[String]                      :variation_id           Variation identifier
       # @param[String]                      :user_id                User identifier
+      # @param[String]                      :sdk_key                SDK Key
       # @param[String]                      :goal_id                Goal identifier, if building track impression
       # @param[String|Float|Integer|nil)    :revenue                Number value, in any representation, if building track impression
       #
       # @return[nil|Hash]                                           None if campaign ID or variation ID is invalid,
       #                                                             Else Properties(dict)
-      def create_impression(settings_file, campaign_id, variation_id, user_id, goal_id = nil, revenue = nil)
+      def create_impression(settings_file, campaign_id, variation_id, user_id, sdk_key, goal_id = nil, revenue = nil, usage_stats = {})
         return unless valid_number?(campaign_id) && valid_string?(user_id)
 
         is_track_user_api = true
@@ -51,17 +52,19 @@ class VWO
           account_id: account_id,
           experiment_id: campaign_id,
           ap: PLATFORM,
-          uId: CGI.escape(user_id.encode('utf-8')),
           combination: variation_id,
           random: get_random_number,
           sId: get_current_unix_timestamp,
-          u: generator_for(user_id, account_id)
+          u: generator_for(user_id, account_id),
+          env: sdk_key
         }
         # Version and SDK constants
         sdk_version = Gem.loaded_specs['vwo_sdk'] ? Gem.loaded_specs['vwo_sdk'].version : VWO::SDK_VERSION
         impression['sdk'] = 'ruby'
         impression['sdk-v'] = sdk_version
 
+        impression = usage_stats.merge(impression)
+
         url = HTTPS_PROTOCOL + ENDPOINTS::BASE_URL
         logger = VWO::Logger.get_instance
 
@@ -107,9 +110,57 @@ class VWO
           'ap' => PLATFORM,
           'sId' => get_current_unix_timestamp,
           'u' => generator_for(user_id, account_id),
-          'account_id' => account_id,
-          'uId' => CGI.escape(user_id.encode('utf-8'))
+          'account_id' => account_id
+        }
+      end
+
+      # Creates properties for the bulk impression event
+      #
+      # @param[Hash]                        :settings_file          Settings file object
+      # @param[String]                      :campaign_id            Campaign identifier
+      # @param[String]                      :variation_id           Variation identifier
+      # @param[String]                      :user_id                User identifier
+      # @param[String]                      :sdk_key                SDK Key
+      # @param[String]                      :goal_id                Goal identifier, if building track impression
+      # @param[String|Float|Integer|nil)    :revenue                Number value, in any representation, if building track impression
+      #
+      # @return[nil|Hash]                                           None if campaign ID or variation ID is invalid,
+      #                                                             Else Properties(dict)
+      def create_bulk_event_impression(settings_file, campaign_id, variation_id, user_id, goal_id = nil, revenue = nil)
+        return unless valid_number?(campaign_id) && valid_string?(user_id)
+        is_track_user_api = true
+        is_track_user_api = false unless goal_id.nil?
+        account_id = settings_file['accountId']
+        impression = {
+          eT: is_track_user_api ? 1 : 2,
+          e: campaign_id,
+          c: variation_id,
+          u: generator_for(user_id, account_id),
+          sId: get_current_unix_timestamp
         }
+        logger = VWO::Logger.get_instance
+        if is_track_user_api
+          logger.log(
+            LogLevelEnum::DEBUG,
+            format(
+              LogMessageEnum::DebugMessages::IMPRESSION_FOR_TRACK_USER,
+              file: FileNameEnum::ImpressionUtil,
+              properties: JSON.generate(impression)
+            )
+          )
+        else
+          impression['g'] = goal_id
+          impression['r'] = revenue if revenue
+          logger.log(
+            LogLevelEnum::DEBUG,
+            format(
+              LogMessageEnum::DebugMessages::IMPRESSION_FOR_TRACK_GOAL,
+              file: FileNameEnum::ImpressionUtil,
+              properties: JSON.generate(impression)
+            )
+          )
+        end
+        impression
       end
     end
   end