From d25e88bfd72ffc060110878c9480ae5925896876 Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Thu, 24 Jun 2021 14:24:38 -0300 Subject: [PATCH 01/11] add eventID param to facebook pixel --- .vscode/settings.json | 13 +++++++++ .../tracker/facebook_pixel/facebook_pixel.rb | 4 +++ .../template/facebook_pixel.erb | 2 +- spec/handler/facebook_pixel_spec.rb | 27 +++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c939738 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,13 @@ +{ + "workbench.colorCustomizations": { + "statusBar.background": "#652e45", + "statusBar.foreground": "#e7e7e7", + "statusBarItem.hoverBackground": "#883e5d", + "tab.activeBorder": "#883e5d", + "titleBar.activeBackground": "#652e45", + "titleBar.activeForeground": "#e7e7e7", + "titleBar.inactiveBackground": "#652e4599", + "titleBar.inactiveForeground": "#e7e7e799" + }, + "peacock.color": "#652e45" +} \ No newline at end of file diff --git a/lib/rack/tracker/facebook_pixel/facebook_pixel.rb b/lib/rack/tracker/facebook_pixel/facebook_pixel.rb index f6015dd..81c6206 100644 --- a/lib/rack/tracker/facebook_pixel/facebook_pixel.rb +++ b/lib/rack/tracker/facebook_pixel/facebook_pixel.rb @@ -7,6 +7,10 @@ def write options.present? ? type_to_json << options_to_json : type_to_json end + def with_event_id + ", eventID: #{event_id}" if event_id.present? + end + private def type_to_json diff --git a/lib/rack/tracker/facebook_pixel/template/facebook_pixel.erb b/lib/rack/tracker/facebook_pixel/template/facebook_pixel.erb index 2901c52..fd755d5 100644 --- a/lib/rack/tracker/facebook_pixel/template/facebook_pixel.erb +++ b/lib/rack/tracker/facebook_pixel/template/facebook_pixel.erb @@ -18,7 +18,7 @@ <% if events.any? %> <% end %> diff --git a/spec/handler/facebook_pixel_spec.rb b/spec/handler/facebook_pixel_spec.rb index 9716529..2423be1 100644 --- a/spec/handler/facebook_pixel_spec.rb +++ b/spec/handler/facebook_pixel_spec.rb @@ -70,4 +70,31 @@ def env expect(subject).to match(%r{https://www.facebook.com/tr\?id=&ev=PageView&noscript=1}) end end + + describe 'with event_id' do + def env + { + 'tracker' => { + 'facebook_pixel' => + [ + { + 'type' => 'Purchase', + 'class_name' => 'Track', + 'options' => + { + 'value' => '23', + 'currency' => 'EUR' + }, + 'event_id' => '42' + } + ] + } + } + end + subject { described_class.new(env).render } + + it 'will push the tracking event with the eventID param' do + expect(subject).to match(%r{"track", "Purchase", \{"value":"23","currency":"EUR"\}, eventID: 42}) + end + end end From 3e686074bdba41a6bd424b6b9119c43e196cb662 Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Thu, 24 Jun 2021 14:25:47 -0300 Subject: [PATCH 02/11] ignore vscode folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a955cfa..554a6d2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ test/tmp test/version_tmp tmp .DS_Store +.vscode From cbab740d3dddc98f7d73f308cea1a42dfa302297 Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Thu, 24 Jun 2021 14:26:30 -0300 Subject: [PATCH 03/11] remove vscode folder --- .vscode/settings.json | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c939738..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "workbench.colorCustomizations": { - "statusBar.background": "#652e45", - "statusBar.foreground": "#e7e7e7", - "statusBarItem.hoverBackground": "#883e5d", - "tab.activeBorder": "#883e5d", - "titleBar.activeBackground": "#652e45", - "titleBar.activeForeground": "#e7e7e7", - "titleBar.inactiveBackground": "#652e4599", - "titleBar.inactiveForeground": "#e7e7e799" - }, - "peacock.color": "#652e45" -} \ No newline at end of file From ac26498912277cf9b1d51816fe8c6a19582eb2cb Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Thu, 24 Jun 2021 14:50:45 -0300 Subject: [PATCH 04/11] send eventid as json --- lib/rack/tracker/facebook_pixel/facebook_pixel.rb | 2 +- spec/handler/facebook_pixel_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rack/tracker/facebook_pixel/facebook_pixel.rb b/lib/rack/tracker/facebook_pixel/facebook_pixel.rb index 81c6206..671653a 100644 --- a/lib/rack/tracker/facebook_pixel/facebook_pixel.rb +++ b/lib/rack/tracker/facebook_pixel/facebook_pixel.rb @@ -8,7 +8,7 @@ def write end def with_event_id - ", eventID: #{event_id}" if event_id.present? + ", {\"eventID\":\"#{event_id}\"}" if event_id.present? end private diff --git a/spec/handler/facebook_pixel_spec.rb b/spec/handler/facebook_pixel_spec.rb index 2423be1..2be26e9 100644 --- a/spec/handler/facebook_pixel_spec.rb +++ b/spec/handler/facebook_pixel_spec.rb @@ -94,7 +94,7 @@ def env subject { described_class.new(env).render } it 'will push the tracking event with the eventID param' do - expect(subject).to match(%r{"track", "Purchase", \{"value":"23","currency":"EUR"\}, eventID: 42}) + expect(subject).to match(%r{"track", "Purchase", \{"value":"23","currency":"EUR"\}, \{"eventID":"42"\}}) end end end From beb47864b03a07133dbef5c606eefe6066897f06 Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Tue, 6 Jul 2021 11:44:42 -0300 Subject: [PATCH 05/11] tag manager can be self hosted --- lib/rack/tracker/google_global/template/google_global.erb | 2 +- .../google_tag_manager/template/google_tag_manager_body.erb | 2 +- .../google_tag_manager/template/google_tag_manager_head.erb | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/rack/tracker/google_global/template/google_global.erb b/lib/rack/tracker/google_global/template/google_global.erb index 9103419..495e144 100644 --- a/lib/rack/tracker/google_global/template/google_global.erb +++ b/lib/rack/tracker/google_global/template/google_global.erb @@ -1,5 +1,5 @@ <% if trackers.any? %> - + <% end %> - - From 6758f6ebbe3e1f7073ad64fa9b9e12ae1b5819eb Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Tue, 6 Jul 2021 12:13:25 -0300 Subject: [PATCH 06/11] version up --- lib/rack/tracker/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rack/tracker/version.rb b/lib/rack/tracker/version.rb index 7d12101..51122c1 100644 --- a/lib/rack/tracker/version.rb +++ b/lib/rack/tracker/version.rb @@ -1,5 +1,5 @@ module Rack class Tracker - VERSION = '1.12.1' + VERSION = '1.12.2' end end From 2e04e2cd6e4e7c41d4438b95680d2017360f2ed3 Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Tue, 6 Jul 2021 14:08:00 -0300 Subject: [PATCH 07/11] force tag --- .../google_global/template/google_global.erb | 2 +- .../google_tag_manager/google_tag_manager.rb | 13 ++++++------- .../template/google_tag_manager_body.erb | 2 +- .../template/google_tag_manager_head.erb | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/rack/tracker/google_global/template/google_global.erb b/lib/rack/tracker/google_global/template/google_global.erb index 495e144..fa08df9 100644 --- a/lib/rack/tracker/google_global/template/google_global.erb +++ b/lib/rack/tracker/google_global/template/google_global.erb @@ -1,5 +1,5 @@ <% if trackers.any? %> - + <% end %> From d62aee523da04373966cc8d4050fd06ea5ee8718 Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Tue, 6 Jul 2021 14:27:54 -0300 Subject: [PATCH 08/11] static --- lib/rack/tracker/google_global/template/google_global.erb | 2 +- .../google_tag_manager/template/google_tag_manager_body.erb | 2 +- .../google_tag_manager/template/google_tag_manager_head.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/rack/tracker/google_global/template/google_global.erb b/lib/rack/tracker/google_global/template/google_global.erb index fa08df9..6935523 100644 --- a/lib/rack/tracker/google_global/template/google_global.erb +++ b/lib/rack/tracker/google_global/template/google_global.erb @@ -1,5 +1,5 @@ <% if trackers.any? %> - + <% end %> From 675c359f36fd9e77570b4f6432107c9dbe21714e Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Tue, 6 Jul 2021 14:55:01 -0300 Subject: [PATCH 09/11] use options --- lib/rack/tracker/google_global/template/google_global.erb | 2 +- .../google_tag_manager/template/google_tag_manager_body.erb | 2 +- .../google_tag_manager/template/google_tag_manager_head.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/rack/tracker/google_global/template/google_global.erb b/lib/rack/tracker/google_global/template/google_global.erb index 6935523..fa08df9 100644 --- a/lib/rack/tracker/google_global/template/google_global.erb +++ b/lib/rack/tracker/google_global/template/google_global.erb @@ -1,5 +1,5 @@ <% if trackers.any? %> - + <% end %> From 660af361cc00ed2d5bcaf34b8d5b92b0f6cfdd57 Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Wed, 7 Jul 2021 08:10:12 -0300 Subject: [PATCH 10/11] fully replaceable host --- lib/rack/tracker/google_global/template/google_global.erb | 2 +- .../google_tag_manager/template/google_tag_manager_body.erb | 2 +- .../google_tag_manager/template/google_tag_manager_head.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/rack/tracker/google_global/template/google_global.erb b/lib/rack/tracker/google_global/template/google_global.erb index fa08df9..9b74b21 100644 --- a/lib/rack/tracker/google_global/template/google_global.erb +++ b/lib/rack/tracker/google_global/template/google_global.erb @@ -1,5 +1,5 @@ <% if trackers.any? %> - + <% end %> From b3da5d68e851caa62f5ebdfd56ef067be620a8cc Mon Sep 17 00:00:00 2001 From: Alex Takitani Date: Tue, 19 Mar 2024 11:09:48 -0300 Subject: [PATCH 11/11] fix noscript tag for google --- .../google_tag_manager/template/google_tag_manager_body.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb index af24613..d739a79 100644 --- a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb +++ b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb @@ -1,4 +1,4 @@ <% if container %> - <% end %>