universal-track-manager 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3502ff3b3d704f5b5dfeb4c13e58ce428440cbadcc919e4520ff52b984c48d67
-  data.tar.gz: 9bea1196733eb210f5a6f13d6cf9ea6d611ef2a4e4adf026632f1d96a917994d
+  metadata.gz: 74a4a72e51d99c98b5b16b49ca2845d022849567444342f4950243a708b47e86
+  data.tar.gz: edcc46786f0ac9590f4b1a8301d419d61336b6bf78b2ec9535f99c50311ce980
 SHA512:
-  metadata.gz: 7366b077ae76ae1d634281dec71e89dfbecb126d2e025f98339f933db911067d17e3a9c1b1274c2c035d482c37cf458e463561733521987f4fb952ee3a5f6ed6
-  data.tar.gz: 84d7cdfa15d0fd2a7e2b6fb7480352e9573707c6170c32a3ea58baba35f930d74ef1f2dee4317c677bc9891eedfbe1375351d147940515e4bee02ee4216c7125
+  metadata.gz: b5f2e6d1ac6690b475b19e39578b818609f6e83fd6eb7b7822eebfc8fc438c9798610da4c8a5b32f6849056f1a1ae2721ed3b3d45938dfb0eedccc63505faa08
+  data.tar.gz: bb9501a4f90fce92057c71a9c19ab522636c172d812c39e295a9af85b59eb127dc281553d751b6059eac0f885649c7e4f4bfd4847d6da82dbc590000532e7312

data/lib/generators/templates/create_universal_track_manager_tables.rb

@@ -1,16 +1,17 @@
 class CreateUniversalTrackManagerTables < ActiveRecord::Migration<%= migration_version %>
   def self.up
     ActiveRecord::Base.transaction do
+      prefix = "<%= @table_prefix %>"
 
-      create_table :browsers do |t|
+      create_table :"#{prefix}browsers" do |t|
         # this table gets automatically populated by inbound traffic
         t.string :name, limit: 255
         t.timestamps
       end
 
-      add_index :browsers, :name
+      add_index :"#{prefix}browsers", :name
 
-      create_table :campaigns do |t|
+      create_table :"#{prefix}campaigns" do |t|
         # this table gets automatically populated by inbound traffic
 #GENERATOR INSERTS CAMPAIGN COLUMNS HERE
         t.string :sha1, limit: 40
@@ -18,9 +19,9 @@ class CreateUniversalTrackManagerTables < ActiveRecord::Migration<%= migration_v
         t.timestamps
       end
 
-      add_index :campaigns, :sha1
+      add_index :"#{prefix}campaigns", :sha1
 
-      create_table :visits do |t|
+      create_table :"#{prefix}visits" do |t|
         t.datetime :first_pageload
         t.datetime :last_pageload
         t.integer :original_visit_id
@@ -38,9 +39,11 @@ class CreateUniversalTrackManagerTables < ActiveRecord::Migration<%= migration_v
 
   def self.down
     ActiveRecord::Base.transaction do
-      drop_table :browsers
-      drop_table :visits
-      drop_table :campaigns
+      prefix = "<%= @table_prefix %>"
+
+      drop_table :"#{prefix}browsers"
+      drop_table :"#{prefix}visits"
+      drop_table :"#{prefix}campaigns"
     end
   end
 end

data/lib/generators/templates/universal_track_manager.rb

@@ -5,6 +5,7 @@ UniversalTrackManager.configure do |config|
   #GENERATOR INSERTS CAMPAIGN COLUMN CONFIG HERE
 
   config.campaign_columns = 'utm_source,utm_medium,utm_campaign,utm_term,utm_content'
+  # config.table_prefix = 'utm'  # prefix all UTM tables (e.g., utm_campaigns, utm_browsers, utm_visits)
   # config.track_referrer = true
   # config.track_gclid_present = true # be sure to add gclid to campaign_columns
 end

data/lib/generators/universal_track_manager/install_generator.rb

@@ -17,6 +17,7 @@ module UniversalTrackManager
 
     class_option :add, type: :string, default: nil
     class_option :only, type: :string, default: nil
+    class_option :table_prefix, type: :string, default: ""
 
 
     def self.next_migration_number(path)
@@ -55,21 +56,28 @@ module UniversalTrackManager
         end
       end
 
+      @table_prefix = options['table_prefix'].present? ? "#{options['table_prefix']}_" : ""
+
       column_defs = ""
       @default_params.each  do |p|
         column_defs += "          t.string :#{p}, limit:256\n"
       end
       copy_file "create_universal_track_manager_tables.rb", "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged"
       gsub_file "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged", "#GENERATOR INSERTS CAMPAIGN COLUMNS HERE", column_defs
+      gsub_file "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged", "<%= @table_prefix %>", @table_prefix
+      gsub_file "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged", "<%= migration_version %>", migration_version.to_s
       migration_template "create_universal_track_manager_tables.rb-staged",  "db/migrate/create_universal_track_manager_tables.rb"
 
       remove_file "#{self.class.source_root}/create_universal_track_manager_tables.rb-staged"
     end
 
     def create_universal_track_manager_initializer
-      column_config = "config.campaign_columns = '#{options.param_list}'"
+      @table_prefix_value = options['table_prefix']
+      column_config = "config.campaign_columns = '#{@default_params.join(',')}'"
+      table_prefix_config = options['table_prefix'].present? ? "\n  config.table_prefix = '#{options['table_prefix']}'" : ""
+
       copy_file "universal_track_manager.rb", "#{self.class.source_root}/universal_track_manager.rb-staged"
-      gsub_file "#{self.class.source_root}/universal_track_manager.rb-staged", "#GENERATOR INSERTS CAMPAIGN COLUMN CONFIG HERE", column_config
+      gsub_file "#{self.class.source_root}/universal_track_manager.rb-staged", "#GENERATOR INSERTS CAMPAIGN COLUMN CONFIG HERE", "#{column_config}#{table_prefix_config}"
       copy_file 'universal_track_manager.rb-staged', 'config/initializers/universal_track_manager.rb'
       remove_file "#{self.class.source_root}/universal_track_manager.rb-staged"
     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,16 +104,16 @@ 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)
+                                                       gclid_present: gclid_present)
 
-    without_glcid = permitted_utm_params.tap{|x| x.delete("gclid")}
-    campaign ||= UniversalTrackManager::Campaign.create(*(without_glcid.merge({
+    campaign ||= UniversalTrackManager::Campaign.create(*(params_without_glcid.merge({
                                                                               sha1: gen_sha1,
                                                                               gclid_present: gclid_present
                                                                               })))

data/lib/universal_track_manager/models/browser.rb

@@ -1,4 +1,6 @@
 class UniversalTrackManager::Browser < ActiveRecord::Base
-  self.table_name = "browsers"
-  
+  def self.table_name
+    UniversalTrackManager.prefixed_table_name("browsers")
+  end
+
 end

data/lib/universal_track_manager/models/campaign.rb

@@ -1,4 +1,6 @@
 class UniversalTrackManager::Campaign < ActiveRecord::Base
-  self.table_name = "campaigns"
+  def self.table_name
+    UniversalTrackManager.prefixed_table_name("campaigns")
+  end
 
-end
+end

data/lib/universal_track_manager/models/visit.rb

@@ -1,5 +1,7 @@
 class UniversalTrackManager::Visit < ActiveRecord::Base
-  self.table_name = "visits"
+  def self.table_name
+    UniversalTrackManager.prefixed_table_name("visits")
+  end
 
   belongs_to :campaign, class_name: "UniversalTrackManager::Campaign"
   belongs_to :browser, class_name: "UniversalTrackManager::Browser"

data/lib/universal_track_manager.rb

@@ -9,12 +9,14 @@ module UniversalTrackManager
                   :track_user_agent,
                   :track_http_referrer,
                   :campaign_columns,
-                  :track_gclid_present
+                  :track_gclid_present,
+                  :table_prefix
   end
 
 
   def self.configure(&block)
     @_settings =  Settings.new
+    @_settings.table_prefix = "" # default: no prefix (backward compatible)
 
     block.call(@_settings)
   end
@@ -39,6 +41,15 @@ module UniversalTrackManager
     @_settings.track_gclid_present
   end
 
+  def self.table_prefix
+    @_settings&.table_prefix || ""
+  end
+
+  def self.prefixed_table_name(base_name)
+    prefix = table_prefix
+    prefix.present? ? "#{prefix}_#{base_name}" : base_name
+  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.8"
+  VERSION = "0.9"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: universal-track-manager
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2026-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 7.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 7.0.8
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A gem to track visitors and their UTMs to your website.