From 607c51c4461f6e75e3e1dbcc68e8bbc8e844dd5f Mon Sep 17 00:00:00 2001
From: Bas Kamer <bas@bushbaby.nl>
Date: Tue, 20 May 2014 14:28:15 +0200
Subject: [PATCH 1/7] Adds support to enable display advertising features

---
 src/SlmGoogleAnalytics/Analytics/Tracker.php         | 11 +++++++++++
 .../View/Helper/Script/Analyticsjs.php               | 12 ++++++++++++
 src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php   | 12 +++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/SlmGoogleAnalytics/Analytics/Tracker.php b/src/SlmGoogleAnalytics/Analytics/Tracker.php
index d16aa96..674ec6c 100644
--- a/src/SlmGoogleAnalytics/Analytics/Tracker.php
+++ b/src/SlmGoogleAnalytics/Analytics/Tracker.php
@@ -61,6 +61,7 @@ class Tracker
     protected $enableTracking = true;
     protected $enablePageTracking = true;
     protected $allowLinker = false;
+    protected $enableDisplayAdvertising = false;
     protected $domainName;
     protected $anonymizeIp = false;
     protected $customVariables = array();
@@ -113,6 +114,16 @@ public function getAllowLinker()
         return $this->allowLinker;
     }
 
+    public function setEnableDisplayAdvertising($enableDisplayAdvertising)
+    {
+        $this->enableDisplayAdvertising = $enableDisplayAdvertising;
+    }
+
+    public function getEnableDisplayAdvertising()
+    {
+        return $this->enableDisplayAdvertising;
+    }
+
     public function setDomainName($domain_name)
     {
         $this->domainName = (string) $domain_name;
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
index 5feb086..2116f89 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
@@ -78,6 +78,7 @@ public function getCode()
 
         $script .= $this->prepareCreate();
         $script .= $this->prepareLinker();
+        $script .= $this->prepareDisplayAdvertising();
         $script .= $this->prepareTrackEvents();
         $script .= $this->prepareTransactions();
         $script .= $this->prepareSend();
@@ -206,6 +207,17 @@ protected function prepareLinker()
         return $output;
     }
 
+    protected function prepareDisplayAdvertising()
+    {
+        $output          = '';
+
+        if ($this->tracker->getEnableDisplayAdvertising()) {
+            $output .= $this->requirePlugin('displayfeatures');
+        }
+
+        return $output;
+    }
+
     protected function prepareTrackEvents()
     {
         $events = $this->tracker->getEvents();
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
index 85c3a52..2bd3b85 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
@@ -82,13 +82,23 @@ public function getCode()
 
     protected function getLoadScript()
     {
-        return <<<SCRIPT
+        if (!$this->tracker->getEnableDisplayAdvertising()) {
+            return <<<SCRIPT
 (function() {
   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
   ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 })();\n
 SCRIPT;
+        } else {
+            return <<<SCRIPT
+(function() {
+  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+  ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
+  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();\n
+SCRIPT;
+        }
     }
 
     protected function getVarCreate()

From 6b3571c85f4b886b7cbe9deeac2924829a94cd54 Mon Sep 17 00:00:00 2001
From: Bas Kamer <bas@bushbaby.nl>
Date: Tue, 20 May 2014 14:28:59 +0200
Subject: [PATCH 2/7] make feature configurable

---
 config/module.config.php                          | 13 +++++++------
 config/slmgoogleanalytics.global.php.dist         |  9 +++++++++
 src/SlmGoogleAnalytics/Service/TrackerFactory.php |  4 ++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/config/module.config.php b/config/module.config.php
index 7595718..ced931c 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -40,12 +40,13 @@
 
 return array(
     'google_analytics' => array(
-        'enable'       => true,
-        'id'           => '',
-        'domain_name'  => '',
-        'allow_linker' => false,
-        'anonymize_ip' => false,
-        'script'       => 'google-analytics-ga',
+        'enable'                     => true,
+        'id'                         => '',
+        'domain_name'                => '',
+        'allow_linker'               => false,
+        'enable_display_advertising' => false,
+        'anonymize_ip'               => false,
+        'script'                     => 'google-analytics-ga',
     ),
     'service_manager'  => array(
         'aliases'    => array(
diff --git a/config/slmgoogleanalytics.global.php.dist b/config/slmgoogleanalytics.global.php.dist
index 76aa67f..c110d83 100644
--- a/config/slmgoogleanalytics.global.php.dist
+++ b/config/slmgoogleanalytics.global.php.dist
@@ -18,6 +18,15 @@ $googleAnalytics = array(
     'domain_name' 	=> '',
     'allow_linker' => false,
 
+    /**
+     * Enable Google's Analytics Display Advertising features which include the following:
+     *
+     * - Demographics and Interests reporting
+     * - Remarketing with Google Analytics
+     * - DoubleClick Campaign Manager integration (for Google Analytics Premium)
+     */
+    // 'enable_display_advertising' => true,
+
     /**
      * Disable/enable page tracking
      *
diff --git a/src/SlmGoogleAnalytics/Service/TrackerFactory.php b/src/SlmGoogleAnalytics/Service/TrackerFactory.php
index fcf4030..82d319f 100644
--- a/src/SlmGoogleAnalytics/Service/TrackerFactory.php
+++ b/src/SlmGoogleAnalytics/Service/TrackerFactory.php
@@ -60,6 +60,10 @@ public function createService(ServiceLocatorInterface $serviceLocator)
             $tracker->setAllowLinker($gaConfig['allow_linker']);
         }
 
+        if (true === $gaConfig['enable_display_advertising']) {
+            $tracker->setEnableDisplayAdvertising(true);
+        }
+
         if (true === $gaConfig['anonymize_ip']) {
             $tracker->setAnonymizeIp(true);
         }

From 085718ad9cdcda55b39220f97027cc5933b3360c Mon Sep 17 00:00:00 2001
From: Bas Kamer <bas@bushbaby.nl>
Date: Tue, 20 May 2014 14:29:25 +0200
Subject: [PATCH 3/7] adds a few unittests

---
 .../Analytics/TrackerTest.php                 |  6 +++++
 .../View/Helper/GoogleAnalyticsTest.php       | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/tests/SlmGoogleAnalyticsTest/Analytics/TrackerTest.php b/tests/SlmGoogleAnalyticsTest/Analytics/TrackerTest.php
index 89959c2..29fd713 100644
--- a/tests/SlmGoogleAnalyticsTest/Analytics/TrackerTest.php
+++ b/tests/SlmGoogleAnalyticsTest/Analytics/TrackerTest.php
@@ -91,6 +91,12 @@ public function testAllowLinkerDefaultsToFalse()
         $this->assertTrue($tracker->getAllowLinker());
     }
 
+    public function testEnableDisplayAdvertisingDefaultsToFalse()
+    {
+        $tracker = new Tracker(123);
+        $this->assertFalse($tracker->getEnableDisplayAdvertising());
+    }
+
     public function testAnonymizeIpDefaultsToFalse()
     {
         $tracker = new Tracker(123);
diff --git a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
index cf6787e..6c9dfe1 100644
--- a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
+++ b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
@@ -162,6 +162,28 @@ public function testHelperLoadsFileFromGoogle()
         $this->assertContains($script, $output);
     }
 
+    public function testEnableDisplayFeaturesLoadDifferentFileFromGoogle()
+    {
+        $this->tracker->setEnableDisplayAdvertising(true);
+
+        $script = new Script\Gajs();
+        $script->setTracker($this->tracker);
+
+        $helper = new Helper($script);
+        $helper();
+
+        $script = <<<SCRIPT
+(function() {
+  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+  ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
+  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();\n
+SCRIPT;
+
+        $output = $this->getOutput($this->helper);
+        $this->assertContains($script, $output);
+    }
+
     public function testHelperDoesNotRenderTwice()
     {
         $helper  = $this->helper;

From 8e2655aced1274e17491d6938a05554c782eb5c4 Mon Sep 17 00:00:00 2001
From: Bas Kamer <bas@bushbaby.nl>
Date: Tue, 20 May 2014 14:29:36 +0200
Subject: [PATCH 4/7] documentation

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index 6559da1..240d4e8 100644
--- a/README.md
+++ b/README.md
@@ -166,3 +166,25 @@ $var   = new SlmGoogleAnalytics\Analytics\CustomVariable($index, $name, $value,
 ```
 
 The scope can be `SCOPE_VISITOR`, `SCOPE_SESSION` or (the default) `SCOPE_PAGE_LEVEL`.
+
+### Display Advertising
+To enable Google Analytics [Display Advertising](https://support.google.com/analytics/answer/3450482) features simply call the appropiate method on the tracker. 
+
+```php
+$ga->setEnableDisplayAdvertising(true);
+```
+
+Or, alternatively, you can set these variables inside the configuration:
+
+```php
+'google_analytics' => array(
+    'enable_display_advertising' => true,
+),
+```
+
+
+The Google Analytics Display Advertising features include the following:
+
+- [Demographics and Interests reporting](https://support.google.com/analytics/answer/2799357)
+- [Remarketing with Google Analytics](https://support.google.com/analytics/answer/2611268)
+- DoubleClick Campaign Manager integration (for [Google Analytics Premium](https://www.google.com/intl/en_ALL/analytics/premium/index.html))

From bf7392671014e60ff54f366d447f884fe2f820a7 Mon Sep 17 00:00:00 2001
From: Bas Kamer <bas@bushbaby.nl>
Date: Mon, 26 May 2014 14:20:52 +0200
Subject: [PATCH 5/7] use heredoc variable

---
 .../View/Helper/Script/Gajs.php               | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
index 2bd3b85..be71ae3 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
@@ -82,23 +82,18 @@ public function getCode()
 
     protected function getLoadScript()
     {
-        if (!$this->tracker->getEnableDisplayAdvertising()) {
-            return <<<SCRIPT
-(function() {
-  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();\n
-SCRIPT;
-        } else {
-            return <<<SCRIPT
+        $script = 'google-analytics.com/ga.js';
+        if (true === $this->tracker->getEnableDisplayAdvertising()) {
+            $script = 'stats.g.doubleclick.net/dc.js';
+        }
+
+        return <<<SCRIPT
 (function() {
   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
+  ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + '$script';
   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 })();\n
 SCRIPT;
-        }
     }
 
     protected function getVarCreate()

From fd289042c581fccae40b820d557c265b09796e9e Mon Sep 17 00:00:00 2001
From: Bas Kamer <bas@bushbaby.nl>
Date: Mon, 26 May 2014 14:21:12 +0200
Subject: [PATCH 6/7] remove spaces

---
 src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
index 2116f89..fbeaa95 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
@@ -209,7 +209,7 @@ protected function prepareLinker()
 
     protected function prepareDisplayAdvertising()
     {
-        $output          = '';
+        $output = '';
 
         if ($this->tracker->getEnableDisplayAdvertising()) {
             $output .= $this->requirePlugin('displayfeatures');

From a3a2ab60f00889f76cce2d198019579405941300 Mon Sep 17 00:00:00 2001
From: Bas Kamer <bas@bushbaby.nl>
Date: Mon, 26 May 2014 15:18:29 +0200
Subject: [PATCH 7/7] update test

---
 .../SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
index 6c9dfe1..2e8f488 100644
--- a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
+++ b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
@@ -153,7 +153,7 @@ public function testHelperLoadsFileFromGoogle()
         $script = <<<SCRIPT
 (function() {
   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+  ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'google-analytics.com/ga.js';
   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
 })();\n
 SCRIPT;