universal-track-manager 0.8 → 0.8.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3502ff3b3d704f5b5dfeb4c13e58ce428440cbadcc919e4520ff52b984c48d67
4
- data.tar.gz: 9bea1196733eb210f5a6f13d6cf9ea6d611ef2a4e4adf026632f1d96a917994d
3
+ metadata.gz: e81a6831078252018eea9ade50cf2b86b81e7dec73a0adcdbf9029a4ce064e7d
4
+ data.tar.gz: cc68915256827e2f0488d21eaa883d89ad729858ef6f7367571c586c57fd6e85
5
5
  SHA512:
6
- metadata.gz: 7366b077ae76ae1d634281dec71e89dfbecb126d2e025f98339f933db911067d17e3a9c1b1274c2c035d482c37cf458e463561733521987f4fb952ee3a5f6ed6
7
- data.tar.gz: 84d7cdfa15d0fd2a7e2b6fb7480352e9573707c6170c32a3ea58baba35f930d74ef1f2dee4317c677bc9891eedfbe1375351d147940515e4bee02ee4216c7125
6
+ metadata.gz: 0714b3fac4f8c7263a46a93965926b60f58f270641dd08227e30be36724f893609d263d20f3d16de3d9d1c9fd6391c0a424156fb2c3e8005d325b98d547a32c0
7
+ data.tar.gz: 3c0ae40db19e2b223ed449b15f9ac6eb382dd2d97c2b582c768cd88e4274bacd673fdadf45ff55994b96855776eec61f123feddf8dd5a44cb0d7703804fb3d30
@@ -41,7 +41,9 @@ module UniversalTrackManagerConcern
41
41
  ip_v4_address: ip_address,
42
42
  campaign: find_or_create_campaign_by_current
43
43
  }
44
- params[:referer] = request.referer if UniversalTrackManager.track_http_referrer?
44
+ if request.referrer && !request.referrer.include?(request.host)
45
+ params[:referer] = request.referer if UniversalTrackManager.track_http_referrer?
46
+ end
45
47
  params[:browser] = find_or_create_browser_by_current if request.user_agent
46
48
  visit = UniversalTrackManager::Visit.create!(params)
47
49
  session[:visit_id] = visit.id
@@ -68,15 +70,16 @@ module UniversalTrackManagerConcern
68
70
  existing_visit.browser.name != user_agent
69
71
  evict_visit!(existing_visit)
70
72
  end
73
+
74
+ if (UniversalTrackManager.track_http_referrer?)
75
+ if existing_visit.referer == request.referer
71
76
 
72
-
73
- if (UniversalTrackManager.track_http_referrer? &&
74
- (request.referrer &&
75
- !request.referrer.include?(request.host) &&
76
- existing_visit.referer != request.referer))
77
- evict_visit!(existing_visit)
77
+ elsif request.referrer && !request.referrer.include?(request.host)
78
+ evict_visit!(existing_visit)
79
+ end
78
80
  end
79
81
 
82
+
80
83
  existing_visit.update_columns(:last_pageload => Time.now) if !@visit_evicted
81
84
  rescue ActiveRecord::RecordNotFound
82
85
  # this happens if the session table is cleared or if the record in the session
@@ -101,16 +104,16 @@ module UniversalTrackManagerConcern
101
104
 
102
105
  def find_or_create_campaign_by_current
103
106
  return nil if ! UniversalTrackManager.track_utms?
104
- gen_sha1 = gen_campaign_key(permitted_utm_params)
107
+ params_without_glcid = permitted_utm_params.tap{|x| x.delete("gclid")}
105
108
 
109
+ gen_sha1 = gen_campaign_key(params_without_glcid)
106
110
 
107
111
  gclid_present = UniversalTrackManager.track_gclid_present? && permitted_utm_params[:gclid].present?
108
112
 
109
113
  campaign = UniversalTrackManager::Campaign.find_by(sha1: gen_sha1,
110
- gclid_present: gclid_present)
114
+ gclid_present: gclid_present)
111
115
 
112
- without_glcid = permitted_utm_params.tap{|x| x.delete("gclid")}
113
- campaign ||= UniversalTrackManager::Campaign.create(*(without_glcid.merge({
116
+ campaign ||= UniversalTrackManager::Campaign.create(*(params_without_glcid.merge({
114
117
  sha1: gen_sha1,
115
118
  gclid_present: gclid_present
116
119
  })))
data/lib/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module UniversalTrackManager
2
- VERSION = "0.8"
2
+ VERSION = "0.8.0.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: universal-track-manager
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.8'
4
+ version: 0.8.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jason Fleetwood-Boldt