kameleoon-client-ruby 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 283250365ae9bf4087ebffeb7a4de0e31cca91f06a865cdd4ad2cae1f88c692c
-  data.tar.gz: 31ab8ddbd1ef7524b41019a0afe442a47ee5b5e9e1d50649ed04aab625d7c3a3
+  metadata.gz: 92e73ac3d81e29ddfc093e8da1a47f42b9970ea6e8717e0752be511b759db17a
+  data.tar.gz: 710361f25b6338e35bb668bb30f116c931efddd21fdb272fa5367add4d82db22
 SHA512:
-  metadata.gz: 23f61dd193ad1bb7477ee44e0e2eb5c16bec625748b9ebdde37a9a6b9e71a4610a98c218a4e76addb66a5a55ecf2bcae1764f2aac8d9f9f8ebb6bbc3be86e318
-  data.tar.gz: d27d91e39fb5bc968ba414016642de07baef8ef7888f1d93969ae5fb67f07b903ba60b981de9387fa5c6eb20e99bd647d965fea0123841348f67a8aa66840f99
+  metadata.gz: 24db6ec9d63c160690506060d703661f77c5b60160fc585117b91460e74185a095f0b52156b268ba18d445797a584c9bd92e824c2bbecf8533d08e09cf89dab6
+  data.tar.gz: ab2f4e530b33235f7105158414ff77ce52f5b824632e4cae53ed06425f32be6f22719dcae86d7d5660cbd09ea4c090672ee5a237828a6db0e0772e80d65032c5

data/lib/kameleoon/data/manager/page_view_visit.rb

@@ -12,7 +12,7 @@ module Kameleoon
       def initialize(page_view, count = 1, timestamp = nil)
         @page_view = page_view
         @count = count
-        @last_timestamp = timestamp != nil ? timestamp : Time.new.to_i
+        @last_timestamp = timestamp.nil? ? Time.new.to_i : timestamp
       end
 
       # Not thread-save method, should be called in synchronized code
@@ -20,10 +20,11 @@ module Kameleoon
       def overwrite(page_view)
         @page_view = page_view
         @count += 1
+        @last_timestamp = Time.new.to_i
       end
 
       # Not thread-save method, should be called in synchronized code
-      def merge (page_view_visit)
+      def merge(page_view_visit)
         @count += page_view_visit.count
         @last_timestamp = [@last_timestamp, page_view_visit.last_timestamp].max
       end

data/lib/kameleoon/data/manager/visitor.rb

@@ -24,7 +24,7 @@ module Kameleoon
       attr_reader :data, :is_unique_identifier
 
       def to_s
-        "Visitor{}"
+        'Visitor{}'
       end
 
       def initialize(source = nil)
@@ -52,7 +52,10 @@ module Kameleoon
 
       def count_sendable_data
         count_sendable_data = @data.count_sendable_data
-        Logging::KameleoonLogger.debug('CALL/RETURN: Visitor.count_sendable_data -> (count_sendable_data: %s)', count_sendable_data)
+        Logging::KameleoonLogger.debug(
+          'CALL/RETURN: Visitor.count_sendable_data -> (count_sendable_data: %s)',
+          count_sendable_data
+        )
         count_sendable_data
       end
 
@@ -82,7 +85,10 @@ module Kameleoon
 
       def operating_system
         operating_system = @data.operating_system
-        Logging::KameleoonLogger.debug('CALL/RETURN: Visitor.operating_system -> (operating_system: %s)', operating_system)
+        Logging::KameleoonLogger.debug(
+          'CALL/RETURN: Visitor.operating_system -> (operating_system: %s)',
+          operating_system
+        )
         operating_system
       end
 
@@ -122,7 +128,14 @@ module Kameleoon
       end
 
       def mapping_identifier=(value)
-        @data.mapping_identifier = value
+        return unless @data.mapping_identifier.nil?
+
+        @data.mutex.with_write_lock do
+          if @data.mapping_identifier.nil?
+            @data.mapping_identifier = value
+            Logging::KameleoonLogger.debug('CALL/RETURN: Visitor.mapping_identifier = %s', value)
+          end
+        end
       end
 
       def custom_data

data/lib/kameleoon/kameleoon_client.rb

@@ -83,6 +83,7 @@ module Kameleoon
         Logging::KameleoonLogger.log_level = Logging::LogLevel::INFO
       end
 
+      ObjectSpace.define_finalizer(self, method(:dispose))
       Logging::KameleoonLogger.info("RETURN: KameleoonClient.new(site_code: '%s', config: %s)",
                                     site_code, config)
     end

data/lib/kameleoon/managers/remote_data/remote_data_manager.rb

@@ -42,12 +42,20 @@ module Kameleoon
           filter = Types::RemoteVisitorDataFilter.new unless filter.is_a?(Types::RemoteVisitorDataFilter)
           is_unique_identifier = @visitor_manger.get_visitor(visitor_code)&.is_unique_identifier || false
           response = @network_manager.get_remote_visitor_data(visitor_code, filter, is_unique_identifier, timeout)
-          (data_to_add, data_to_return) = parse_custom_data_array(visitor_code, response)
+          remote_visitor_data = parse_custom_data_array(visitor_code, response)
+          remote_visitor_data.mark_data_as_sent(@data_manager.data_file.custom_data_info)
+          data_to_add = remote_visitor_data.collect_data_to_add
           if add_data && !data_to_add.empty?
             # Cannot use `VisitorManager.add_data` because it could use remote visitor data for mapping.
             visitor = @visitor_manger.get_or_create_visitor(visitor_code)
             visitor.add_data(*data_to_add, overwrite: false)
           end
+          if filter.visitor_code && !remote_visitor_data.visitor_code.nil?
+            # We apply visitor code from the latest visit fetched from Data API
+            visitor = @visitor_manger.get_or_create_visitor(visitor_code)
+            visitor.mapping_identifier = remote_visitor_data.visitor_code
+          end
+          data_to_return = remote_visitor_data.collect_data_to_return
           Logging::KameleoonLogger.debug(
             "RETURN: RemoteDataManager.get_visitor_data(visitor_code: '%s', add_data: %s, filter: %s," \
               ' timeout: %s) -> (visitor_data: %s)',
@@ -59,9 +67,7 @@ module Kameleoon
         ##
         # helper method used by `get_remote_visitor_data`
         def parse_custom_data_array(visitor_code, response)
-          remote_visitor_data = RemoteVisitorData.new(JSON.parse(response))
-          remote_visitor_data.mark_data_as_sent(@data_manager.data_file.custom_data_info)
-          [remote_visitor_data.collect_data_to_add, remote_visitor_data.collect_data_to_return]
+          RemoteVisitorData.new(JSON.parse(response))
         rescue StandardError => e
           Logging::KameleoonLogger.error("Parsing of remote visitor data of '#{visitor_code}' failed: #{e}")
           raise

data/lib/kameleoon/managers/remote_data/remote_visitor_data.rb

@@ -16,7 +16,7 @@ module Kameleoon
     module RemoteData
       class RemoteVisitorData
         attr_reader :custom_data_dict, :page_view_visits, :conversions, :experiments, :device, :browser,
-                    :operating_system, :geolocation, :previous_visitor_visits, :kcs_heat
+                    :operating_system, :geolocation, :previous_visitor_visits, :kcs_heat, :visitor_code
 
         def initialize(hash)
           current_visit = hash['currentVisit']
@@ -68,18 +68,20 @@ module Kameleoon
         private
 
         def parse_visit(hash)
+          @visitor_code = hash['visitorCode'] if @visitor_code.nil?
           custom_data_events = hash['customDataEvents']
-          parse_custom_data(custom_data_events) if custom_data_events != nil && custom_data_events.size.positive?
+          parse_custom_data(custom_data_events) if !custom_data_events.nil? && custom_data_events.size.positive?
           page_events = hash['pageEvents']
-          parse_pages(page_events) if page_events != nil && page_events.size.positive?
+          parse_pages(page_events) if !page_events.nil? && page_events.size.positive?
           experiment_events = hash['experimentEvents']
-          parse_experiments(experiment_events) if experiment_events != nil && experiment_events.size.positive?
+          parse_experiments(experiment_events) if !experiment_events.nil? && experiment_events.size.positive?
           conversion_events = hash['conversionEvents']
-          parse_conversions(conversion_events) if conversion_events != nil && conversion_events.size.positive?
+          parse_conversions(conversion_events) if !conversion_events.nil? && conversion_events.size.positive?
           geolocation_events = hash['geolocationEvents']
-          @geolocation = parse_geolocation(geolocation_events) if @geolocation.nil? && geolocation_events != nil && geolocation_events.size.positive?
+          @geolocation = parse_geolocation(geolocation_events) if @geolocation.nil? && !geolocation_events.nil? && \
+                                                                  geolocation_events.size.positive?
           static_data_events = hash['staticDataEvent']
-          parse_static_data(static_data_events) if static_data_events != nil
+          parse_static_data(static_data_events) unless static_data_events.nil?
         end
 
         def parse_custom_data(custom_data_events)

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

@@ -13,15 +13,17 @@ module Kameleoon
         super(json_condition, json_condition['title'])
       end
 
-      def check(page_view_visit_storage)
-        return false unless page_view_visit_storage.is_a?(Kameleoon::DataManager::DataMapStorage)
+      def check(page_view_visits)
+        return false unless page_view_visits.is_a?(Kameleoon::DataManager::DataMapStorage)
 
-        is_targeted = false
-        page_view_visit_storage.enumerate do |visit|
-          is_targeted = visit.is_a?(Kameleoon::DataManager::PageViewVisit) && check_targeting(visit.page_view.title)
-          break if is_targeted
+        latest = nil
+        page_view_visits.enumerate do |visit|
+          if visit.is_a?(Kameleoon::DataManager::PageViewVisit) \
+            && (latest.nil? || visit.last_timestamp > latest.last_timestamp)
+            latest = visit
+          end
         end
-        is_targeted
+        !latest.nil? && latest.is_a?(Kameleoon::DataManager::PageViewVisit) && check_targeting(latest.page_view.title)
       end
     end
   end

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

@@ -13,22 +13,17 @@ module Kameleoon
         super(json_condition, json_condition['url'])
       end
 
-      def check(page_view_visit_storage)
-        return false unless page_view_visit_storage.is_a?(Kameleoon::DataManager::DataMapStorage)
-        return !page_view_visit_storage.get(condition_value).nil? if operator == Operator::EXACT
+      def check(page_view_visits)
+        return false unless page_view_visits.is_a?(Kameleoon::DataManager::DataMapStorage)
 
-        is_targeted = false
-        page_view_visit_storage.enumerate do |visit|
-          is_targeted = check_page_view_visit(visit)
-          break if is_targeted
+        latest = nil
+        page_view_visits.enumerate do |visit|
+          if visit.is_a?(Kameleoon::DataManager::PageViewVisit) \
+            && (latest.nil? || visit.last_timestamp > latest.last_timestamp)
+            latest = visit
+          end
         end
-        is_targeted
-      end
-
-      private
-
-      def check_page_view_visit(visit)
-        visit.is_a?(Kameleoon::DataManager::PageViewVisit) && check_targeting(visit.page_view.url)
+        !latest.nil? && latest.is_a?(Kameleoon::DataManager::PageViewVisit) && check_targeting(latest.page_view.url)
       end
     end
   end

data/lib/kameleoon/types/remote_visitor_data_filter.rb

@@ -5,7 +5,7 @@ module Kameleoon
   module Types
     class RemoteVisitorDataFilter
       attr_reader :previous_visit_amount, :current_visit, :custom_data, :page_views, :geolocation, :device, :browser,
-                  :operating_system, :conversions, :experiments, :kcs
+                  :operating_system, :conversions, :experiments, :kcs, :visitor_code
 
       def to_s
         "RemoteVisitorDataFilter{previous_visit_amount:#{@previous_visit_amount}," \
@@ -17,13 +17,15 @@ module Kameleoon
           "browser:#{@browser}," \
           "operating_system:#{@operating_system}," \
           "conversions:#{@conversions}," \
-          "experiments:#{@experiments},kcs:#{@kcs}}"
+          "experiments:#{@experiments}," \
+          "kcs:#{@kcs}," \
+          "visitor_code:#{@visitor_code}}"
       end
 
       def initialize(
         previous_visit_amount: 1, current_visit: true, custom_data: true, page_views: false,
         geolocation: false, device: false, browser: false, operating_system: false, conversions: false,
-        experiments: false, kcs: false
+        experiments: false, kcs: false, visitor_code: true
       )
         @previous_visit_amount = previous_visit_amount
         @current_visit = current_visit
@@ -36,6 +38,7 @@ module Kameleoon
         @conversions = conversions
         @experiments = experiments
         @kcs = kcs
+        @visitor_code = visitor_code
       end
     end
   end

data/lib/kameleoon/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Kameleoon
-  SDK_VERSION = '3.5.0'
+  SDK_VERSION = '3.6.0'
   SDK_NAME = 'RUBY'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kameleoon-client-ruby
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Kameleoon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request