From 408571cd996d9077e89a6f34358b6216ffb9df57 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Fri, 16 Aug 2019 00:23:13 +0200
Subject: [PATCH 1/8] google global: better empty tracker handling

---
 lib/rack/tracker/google_global/google_global.rb     |  2 +-
 .../google_global/template/google_global.erb        |  2 +-
 spec/integration/google_global_integration_spec.rb  | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/rack/tracker/google_global/google_global.rb b/lib/rack/tracker/google_global/google_global.rb
index 0631794..7433809 100644
--- a/lib/rack/tracker/google_global/google_global.rb
+++ b/lib/rack/tracker/google_global/google_global.rb
@@ -37,7 +37,7 @@ def events
   def trackers
     options[:trackers].map { |tracker|
       tracker[:id].respond_to?(:call) ? tracker.merge(id: tracker[:id].call(env)) : tracker
-    }.reject { |tracker| tracker[:id].nil? }
+    }.reject { |tracker| tracker[:id].nil? || "" == tracker[:id].to_s.strip }
   end
 
   def set_options
diff --git a/lib/rack/tracker/google_global/template/google_global.erb b/lib/rack/tracker/google_global/template/google_global.erb
index b6141a8..9103419 100644
--- a/lib/rack/tracker/google_global/template/google_global.erb
+++ b/lib/rack/tracker/google_global/template/google_global.erb
@@ -1,4 +1,4 @@
-<% if trackers %>
+<% if trackers.any? %>
 <script async src='https://www.googletagmanager.com/gtag/js?id=<%= trackers[0][:id] %>'></script>
 <script>
   window.dataLayer = window.dataLayer || [];
diff --git a/spec/integration/google_global_integration_spec.rb b/spec/integration/google_global_integration_spec.rb
index 7079036..c6ab8dd 100644
--- a/spec/integration/google_global_integration_spec.rb
+++ b/spec/integration/google_global_integration_spec.rb
@@ -27,4 +27,17 @@
      expect(page.find("body")).to have_content('U-XXX-Y')
     end
   end
+
+  describe "handles empty tracker id" do
+    before do
+      setup_app(action: :google_global) do |tracker|
+        tracker.handler :google_global, trackers: [{ id: nil }, { id: "" }, { id: "  " }]
+      end
+      visit '/'
+    end
+
+    it "does not inject scripts" do
+      expect(page.find("head")).not_to have_content("<script async src='https://www.googletagmanager.com/gtag/js?id=")
+    end
+  end
 end

From 149cfea48aaffd3b667e876e85866f42874e9b80 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Fri, 16 Aug 2019 00:32:38 +0200
Subject: [PATCH 2/8] google global: improve integration test

---
 .../google_global_integration_spec.rb         | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/spec/integration/google_global_integration_spec.rb b/spec/integration/google_global_integration_spec.rb
index c6ab8dd..e64d557 100644
--- a/spec/integration/google_global_integration_spec.rb
+++ b/spec/integration/google_global_integration_spec.rb
@@ -3,24 +3,19 @@
 RSpec.describe "Google Global Integration Integration" do
   before do
     setup_app(action: :google_global) do |tracker|
-      tracker.handler :google_global, trackers: [{ id: 'U-XXX-Y' }]
+      tracker.handler :google_global, tracker_options
     end
     visit '/'
   end
 
-  subject { page }
+  let(:tracker_options) { { trackers: [{ id: 'U-XXX-Y' }] } }
 
   it "embeds the script tag with tracking event from the controller action" do
     expect(page.find("head")).to have_content('U-XXX-Y')
   end
 
   describe 'adjust tracker position via options' do
-    before do
-      setup_app(action: :google_global) do |tracker|
-        tracker.handler :google_global, trackers: [{ id: 'U-XXX-Y' }], position: :body
-      end
-      visit '/'
-    end
+    let(:tracker_options) { { trackers: [{ id: 'U-XXX-Y' }], position: :body } }
 
     it "will be placed in the specified tag" do
      expect(page.find("head")).to_not have_content('U-XXX-Y')
@@ -29,15 +24,10 @@
   end
 
   describe "handles empty tracker id" do
-    before do
-      setup_app(action: :google_global) do |tracker|
-        tracker.handler :google_global, trackers: [{ id: nil }, { id: "" }, { id: "  " }]
-      end
-      visit '/'
-    end
+    let(:tracker_options) { { trackers: [{ id: nil }, { id: "" }, { id: "  " }] } }
 
     it "does not inject scripts" do
-      expect(page.find("head")).not_to have_content("<script async src='https://www.googletagmanager.com/gtag/js?id=")
+      expect(page.find("head")).to_not have_content("<script async src='https://www.googletagmanager.com/gtag/js?id=")
     end
   end
 end

From 3f0fb4ee2d4542c3e8518ecaca18a3a4fbb0ee29 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Fri, 16 Aug 2019 00:35:53 +0200
Subject: [PATCH 3/8] google global: collect trackers only once

---
 lib/rack/tracker/google_global/google_global.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rack/tracker/google_global/google_global.rb b/lib/rack/tracker/google_global/google_global.rb
index 7433809..5cfdca4 100644
--- a/lib/rack/tracker/google_global/google_global.rb
+++ b/lib/rack/tracker/google_global/google_global.rb
@@ -35,7 +35,7 @@ def events
   end
 
   def trackers
-    options[:trackers].map { |tracker|
+    @_trackers ||= options[:trackers].map { |tracker|
       tracker[:id].respond_to?(:call) ? tracker.merge(id: tracker[:id].call(env)) : tracker
     }.reject { |tracker| tracker[:id].nil? || "" == tracker[:id].to_s.strip }
   end

From baea37765050b7997b3f504ece2a046299b62718 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Fri, 16 Aug 2019 00:42:07 +0200
Subject: [PATCH 4/8] google global: improve tracker option validation and
 collection logic

---
 .../tracker/google_global/google_global.rb    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/rack/tracker/google_global/google_global.rb b/lib/rack/tracker/google_global/google_global.rb
index 5cfdca4..b7517d7 100644
--- a/lib/rack/tracker/google_global/google_global.rb
+++ b/lib/rack/tracker/google_global/google_global.rb
@@ -35,9 +35,7 @@ def events
   end
 
   def trackers
-    @_trackers ||= options[:trackers].map { |tracker|
-      tracker[:id].respond_to?(:call) ? tracker.merge(id: tracker[:id].call(env)) : tracker
-    }.reject { |tracker| tracker[:id].nil? || "" == tracker[:id].to_s.strip }
+    @_trackers ||= build_trackers
   end
 
   def set_options
@@ -46,6 +44,22 @@ def set_options
 
   private
 
+  def build_trackers
+    options[:trackers].map(&method(:call_tracker)).reject(&method(:invalid_tracker?))
+  end
+
+  def call_tracker tracker
+    if tracker[:id].respond_to?(:call)
+      tracker.merge(id: tracker[:id].call(env))
+    else
+      tracker
+    end
+  end
+
+  def invalid_tracker? tracker
+    tracker[:id].nil? || "" == tracker[:id].to_s.strip
+  end
+
   def build_set_options
     value = options[:set]
     value.respond_to?(:call) ? value.call(env) : value

From 236e849d1f9b5c5e1bab25d9577d5f65ab13a046 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Fri, 16 Aug 2019 01:36:45 +0200
Subject: [PATCH 5/8] google global: test if callable gets called

---
 spec/integration/google_global_integration_spec.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/integration/google_global_integration_spec.rb b/spec/integration/google_global_integration_spec.rb
index e64d557..14df465 100644
--- a/spec/integration/google_global_integration_spec.rb
+++ b/spec/integration/google_global_integration_spec.rb
@@ -30,4 +30,12 @@
       expect(page.find("head")).to_not have_content("<script async src='https://www.googletagmanager.com/gtag/js?id=")
     end
   end
+
+  describe "callable tracker id" do
+    let(:tracker_options) { { trackers: [{ id: proc { "U-XXX-Y" } }] } }
+
+    it "is injected into head with id from proc" do
+      expect(page.find("head")).to have_content('U-XXX-Y')
+    end
+  end
 end

From c784524b9bee4ab7d8547b7efbe687c893bef077 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Sat, 17 Aug 2019 13:46:57 +0200
Subject: [PATCH 6/8] code style

---
 lib/rack/tracker/google_global/google_global.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rack/tracker/google_global/google_global.rb b/lib/rack/tracker/google_global/google_global.rb
index b7517d7..0c81c62 100644
--- a/lib/rack/tracker/google_global/google_global.rb
+++ b/lib/rack/tracker/google_global/google_global.rb
@@ -48,7 +48,7 @@ def build_trackers
     options[:trackers].map(&method(:call_tracker)).reject(&method(:invalid_tracker?))
   end
 
-  def call_tracker tracker
+  def call_tracker(tracker)
     if tracker[:id].respond_to?(:call)
       tracker.merge(id: tracker[:id].call(env))
     else
@@ -56,7 +56,7 @@ def call_tracker tracker
     end
   end
 
-  def invalid_tracker? tracker
+  def invalid_tracker?(tracker)
     tracker[:id].nil? || "" == tracker[:id].to_s.strip
   end
 

From b604e7d719c1b2ec5ebaf9a4eee020e408de0266 Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Sun, 18 Aug 2019 19:40:08 +0200
Subject: [PATCH 7/8] google global: simplified invalid tracker check

---
 lib/rack/tracker/google_global/google_global.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rack/tracker/google_global/google_global.rb b/lib/rack/tracker/google_global/google_global.rb
index 0c81c62..bca14b1 100644
--- a/lib/rack/tracker/google_global/google_global.rb
+++ b/lib/rack/tracker/google_global/google_global.rb
@@ -57,7 +57,7 @@ def call_tracker(tracker)
   end
 
   def invalid_tracker?(tracker)
-    tracker[:id].nil? || "" == tracker[:id].to_s.strip
+    tracker[:id].to_s.strip == ''
   end
 
   def build_set_options

From 8412a7ea1a80dea4e2d492e97d3a41d3456b53eb Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Fri, 8 Nov 2019 10:36:35 +0100
Subject: [PATCH 8/8] warn about empty google global tracker

---
 lib/rack/tracker/google_global/google_global.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/rack/tracker/google_global/google_global.rb b/lib/rack/tracker/google_global/google_global.rb
index bca14b1..5ccb817 100644
--- a/lib/rack/tracker/google_global/google_global.rb
+++ b/lib/rack/tracker/google_global/google_global.rb
@@ -57,7 +57,16 @@ def call_tracker(tracker)
   end
 
   def invalid_tracker?(tracker)
-    tracker[:id].to_s.strip == ''
+    if tracker[:id].to_s.strip == ''
+      $stdout.puts <<~WARN
+      WARNING: One of the trackers specified for Rack::Tracker handler 'google_global' is empty.
+               Trackers: #{options[:trackers]}
+      WARN
+
+      true
+    else
+      false
+    end
   end
 
   def build_set_options