universal-track-manager 0.7.7.1 → 0.8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 238c76e4d3f9f6e21f15142ae4c8d983db140aa2095ad77270e16556fa574193
-  data.tar.gz: 16299e6c14303ca631c2b31cbf0f28518e1bbdd5ec2661edee399d8a9bdd0d51
+  metadata.gz: e81a6831078252018eea9ade50cf2b86b81e7dec73a0adcdbf9029a4ce064e7d
+  data.tar.gz: cc68915256827e2f0488d21eaa883d89ad729858ef6f7367571c586c57fd6e85
 SHA512:
-  metadata.gz: 8a0fc3bda7897348becab7b7c99e1952a57024bfec130cd91d7a039823baf5d8bca8580123c5dd69e6b649dc007734c5911e31625239b925e151a9626e925271
-  data.tar.gz: bf5c71059981fef0acc32bd65c8bad5acefafbdac200ea8c1c2e01c97621da23afbb5f3cdea134f6536968e2af1d4a00a54155fc32f2ba610b1b3a95108efb22
+  metadata.gz: 0714b3fac4f8c7263a46a93965926b60f58f270641dd08227e30be36724f893609d263d20f3d16de3d9d1c9fd6391c0a424156fb2c3e8005d325b98d547a32c0
+  data.tar.gz: 3c0ae40db19e2b223ed449b15f9ac6eb382dd2d97c2b582c768cd88e4274bacd673fdadf45ff55994b96855776eec61f123feddf8dd5a44cb0d7703804fb3d30

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

@@ -41,7 +41,9 @@ module UniversalTrackManagerConcern
       ip_v4_address: ip_address,
       campaign: find_or_create_campaign_by_current
     }
-    params[:referer] = request.referer if UniversalTrackManager.track_http_referrer?
+    if request.referrer && !request.referrer.include?(request.host)
+      params[:referer] = request.referer if UniversalTrackManager.track_http_referrer?
+    end
     params[:browser] =  find_or_create_browser_by_current if request.user_agent
     visit = UniversalTrackManager::Visit.create!(params)
     session[:visit_id] = visit.id
@@ -68,15 +70,16 @@ module UniversalTrackManagerConcern
           existing_visit.browser.name != user_agent
           evict_visit!(existing_visit)
         end
+        
+        if (UniversalTrackManager.track_http_referrer?)
+          if existing_visit.referer == request.referer
 
-
-        if (UniversalTrackManager.track_http_referrer? &&
-          (request.referrer &&
-            !request.referrer.include?(request.host) &&
-          existing_visit.referer != request.referer))
-          evict_visit!(existing_visit)
+          elsif request.referrer && !request.referrer.include?(request.host)
+            evict_visit!(existing_visit)
+          end
         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
@@ -101,12 +104,19 @@ module UniversalTrackManagerConcern
 
   def find_or_create_campaign_by_current
     return nil if ! UniversalTrackManager.track_utms?
-    gen_sha1 = gen_campaign_key(permitted_utm_params)
+    params_without_glcid = permitted_utm_params.tap{|x| x.delete("gclid")}
+
+    gen_sha1 = gen_campaign_key(params_without_glcid)
+
+    gclid_present = UniversalTrackManager.track_gclid_present? && permitted_utm_params[:gclid].present?
+
+    campaign = UniversalTrackManager::Campaign.find_by(sha1: gen_sha1,
+                                                       gclid_present: gclid_present)
 
-    # 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})))
+    campaign ||= UniversalTrackManager::Campaign.create(*(params_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.1"
+  VERSION = "0.8.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universal-track-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.7.1
+  version: 0.8.0.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-22 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: A gem to track visitors and their UTMs to your website.