universal-track-manager 0.0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d4ccaab6ae451754dd8f55acb8f428196a614ab75bc30272e7a85f08a08555b
-  data.tar.gz: 53ebc16ec88d2ec50ede34e375f4007d4c4e99c2624a46e5012891f69502dc1c
+  metadata.gz: d48794e98ac66bd550a5f0bc89582f60b5bb82c439c45f6e3d0a8390826ccf2b
+  data.tar.gz: d7d09b5ac92ece9105755d45bb96a122ce3c1c7e71b3f784bc8ee63fbe25d1fe
 SHA512:
-  metadata.gz: 982f15f14f329af1fd81095ce5e9d6ce3bd5da1e066c39416f990ba35e5a5f9fd891e07cf039ba1279842347e76e51029a9b32c589643e236156d6c9fcadb38d
-  data.tar.gz: 74da13c9637440c0aba42968a6778f16683aa0b2b4fc09e26d876a68380e9203b3f15aae0e3ad47d4f1b0f7e486e99c299c0df7cc5293a2cf0788dbf2ef6db3d
+  metadata.gz: 4605e21f5e796428900637174281783678d29fa178fb6d328bb66f052669de39a37deffad718fdcbc3331f04656e9d09e26384c7ba4d86feedfba693afc15e51
+  data.tar.gz: 12d8bbca72e630abf4753fa8fe5f5bf736db2b0cf2fad35187a4b53a2a272fc5d7aaae06db2f27d840ded2a375824b46aa1abc9b4d10d5849b38a713e28476bf

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

@@ -59,6 +59,12 @@ module UniversalTrackManagerConcern
       # existing visit, maybe
       existing_visit = UniversalTrackManager::Visit.find(session['visit_id'])
 
+      evict_visit!(existing_visit) if any_utm_params? && !existing_visit.matches_all_utms?({utm_campaign: utm_campaign,
+                                                                      utm_source: utm_source,
+                                                                      utm_term: utm_term,
+                                                                      utm_content: utm_content,
+                                                                      utm_medium: utm_medium})
+
       evict_visit!(existing_visit) if existing_visit.ip_v4_address != ip_address
       evict_visit!(existing_visit) if existing_visit.browser.name != user_agent
 
@@ -67,6 +73,13 @@ module UniversalTrackManagerConcern
     end
   end
 
+
+  def any_utm_params?
+    [:utm_campaign, :utm_source, :utm_medium, :utm_term, :utm_content].any? do |key|
+      params[key].present?
+    end
+  end
+
   def find_or_create_browser_by_current
     browser = UniversalTrackManager::Browser.find_or_create_by(name: user_agent)
   end

data/lib/universal_track_manager/models/visit.rb

@@ -3,4 +3,22 @@ class UniversalTrackManager::Visit < ActiveRecord::Base
 
   belongs_to :campaign, class_name: "UniversalTrackManager::Campaign"
   belongs_to :browser, class_name: "UniversalTrackManager::Browser"
+
+
+  def matches_all_utms?(params)
+    if !campaign
+      # this visit has no campaign, which means all UTMs = null
+      # if any of the UTMs are present, return false (they don't match null)
+      return ! [:utm_campaign, :utm_source, :utm_medium, :utm_term, :utm_content].any? do |key|
+        params[key].present?
+      end
+    end
+
+    # note params are allowed to be missing
+    return campaign.utm_campaign == params[:utm_campaign] &&
+      campaign.utm_source == params[:utm_source] &&
+      campaign.utm_medium == params[:utm_medium] &&
+      campaign.utm_term == params[:utm_term] &&
+      campaign.utm_content == params[:utm_content]
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module UniversalTrackManager
-  VERSION = "0.0.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universal-track-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: '0.4'
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,7 +52,8 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '2.2'
-description: See https://github.com/jasonfb/universal_track_manager
+description: Simple, plug & play visitor tracking by user agent (browser), IP address,
+  referrer, and UTM parameters.
 email: jason.fb@datatravels.com
 executables: []
 extensions: []
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A gem to track visitors to your website.