universal-track-manager 0.7.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab3d168614b9fa1d687a98de280261c1c0940e4ad106507d6179fdcbfd3fa612
-  data.tar.gz: acce233bb495d17f8e86542ee5317d281a6e254f31804549dc2491aa392999c5
+  metadata.gz: 3502ff3b3d704f5b5dfeb4c13e58ce428440cbadcc919e4520ff52b984c48d67
+  data.tar.gz: 9bea1196733eb210f5a6f13d6cf9ea6d611ef2a4e4adf026632f1d96a917994d
 SHA512:
-  metadata.gz: 12f3938c8acb97e7cada43aa75e7dc7656df2a27929d3e7ee7b5cd258b38dd71afa9ca99dfe05dac91fba9d9a430b73132ebf8034ba20fa266810d21664a9a91
-  data.tar.gz: 774fde495321f64ee56ffc1ed039ea3ec25ee8d8c92d4e2e68bccd342f9171c280a4d78d0b6d199ed34f52ab26cf22485e2f1ff196d7587a09505f6b19ef0f33
+  metadata.gz: 7366b077ae76ae1d634281dec71e89dfbecb126d2e025f98339f933db911067d17e3a9c1b1274c2c035d482c37cf458e463561733521987f4fb952ee3a5f6ed6
+  data.tar.gz: 84d7cdfa15d0fd2a7e2b6fb7480352e9573707c6170c32a3ea58baba35f930d74ef1f2dee4317c677bc9891eedfbe1375351d147940515e4bee02ee4216c7125

data/lib/generators/templates/create_universal_track_manager_tables.rb

@@ -14,6 +14,7 @@ class CreateUniversalTrackManagerTables < ActiveRecord::Migration<%= migration_v
         # this table gets automatically populated by inbound traffic
 #GENERATOR INSERTS CAMPAIGN COLUMNS HERE
         t.string :sha1, limit: 40
+        t.boolean :gclid_present
         t.timestamps
       end
 

data/lib/generators/templates/universal_track_manager.rb

@@ -4,6 +4,7 @@ UniversalTrackManager.configure do |config|
   config.track_user_agent = true
   #GENERATOR INSERTS CAMPAIGN COLUMN CONFIG HERE
 
-  # config.track_referrer = false
-
+  config.campaign_columns = 'utm_source,utm_medium,utm_campaign,utm_term,utm_content'
+  # config.track_referrer = true
+  # config.track_gclid_present = true # be sure to add gclid to campaign_columns
 end

data/lib/universal_track_manager/controllers/concerns/universal_track_manager_concern.rb

@@ -55,14 +55,28 @@ module UniversalTrackManagerConcern
       begin
         existing_visit = UniversalTrackManager::Visit.find(session['visit_id'])
 
-        evict_visit!(existing_visit) if any_utm_params? && !existing_visit.matches_all_utms?(permitted_utm_params)
+        if any_utm_params? && !existing_visit.matches_all_utms?(permitted_utm_params)
+          evict_visit!(existing_visit)
+        end
 
-        evict_visit!(existing_visit) if existing_visit.ip_v4_address != ip_address
-        evict_visit!(existing_visit) if existing_visit.browser && existing_visit.browser.name != user_agent
+        if existing_visit.ip_v4_address != ip_address
+          evict_visit!(existing_visit)
 
-        if UniversalTrackManager.track_http_referrer? && existing_visit.referer != request.referer
+        end
+
+        if existing_visit.browser &&
+          existing_visit.browser.name != user_agent
           evict_visit!(existing_visit)
         end
+
+
+        if (UniversalTrackManager.track_http_referrer? &&
+          (request.referrer &&
+            !request.referrer.include?(request.host) &&
+          existing_visit.referer != request.referer))
+          evict_visit!(existing_visit)
+        end
+
         existing_visit.update_columns(:last_pageload => Time.now) if !@visit_evicted
       rescue ActiveRecord::RecordNotFound
         # this happens if the session table is cleared or if the record in the session
@@ -89,10 +103,17 @@ module UniversalTrackManagerConcern
     return nil if ! UniversalTrackManager.track_utms?
     gen_sha1 = gen_campaign_key(permitted_utm_params)
 
-    # find_or_create_by finding only by sha1 would be nice here, but how to do so with a dynamic set of columns?
-    # we've got a small chance of dups here due to the non-atomic find/create and sha1, but that's ok for this application.
-    c = UniversalTrackManager::Campaign.find_by(sha1: gen_sha1)
-    c ||= UniversalTrackManager::Campaign.create(*(permitted_utm_params.merge({"sha1": gen_sha1})))
+
+    gclid_present = UniversalTrackManager.track_gclid_present? && permitted_utm_params[:gclid].present?
+
+    campaign = UniversalTrackManager::Campaign.find_by(sha1: gen_sha1,
+                                                gclid_present: gclid_present)
+
+    without_glcid = permitted_utm_params.tap{|x| x.delete("gclid")}
+    campaign ||= UniversalTrackManager::Campaign.create(*(without_glcid.merge({
+                                                                              sha1: gen_sha1,
+                                                                              gclid_present: gclid_present
+                                                                              })))
   end
 
   def gen_campaign_key(params)

data/lib/universal_track_manager.rb

@@ -4,9 +4,15 @@ module UniversalTrackManager
   require "railtie.rb" if defined?(Rails)
 
   class Settings
-    attr_accessor :track_ips, :track_utms, :track_user_agent, :track_http_referrer, :campaign_columns
+    attr_accessor :track_ips,
+                  :track_utms,
+                  :track_user_agent,
+                  :track_http_referrer,
+                  :campaign_columns,
+                  :track_gclid_present
   end
 
+
   def self.configure(&block)
     @_settings =  Settings.new
 
@@ -29,6 +35,10 @@ module UniversalTrackManager
     @_settings.track_http_referrer
   end
 
+  def self.track_gclid_present?
+    @_settings.track_gclid_present
+  end
+
   def self.campaign_column_names
     @campaign_column_names ||= @_settings.campaign_columns.split(',')
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module UniversalTrackManager
-  VERSION = "0.7.7"
+  VERSION = "0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universal-track-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: '0.8'
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails