From 6c8490f0d02c8433255315733cbd501a7cb39178 Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Sun, 13 Oct 2013 12:06:26 +0200
Subject: [PATCH 01/10] Revrite view helper, fixes, tweaks, autoformat...

---
 Module.php                                    |   8 +-
 .../Analytics/CustomVariable.php              |  33 ++-
 .../Analytics/Ecommerce/Item.php              |  26 +-
 .../Analytics/Ecommerce/Transaction.php       |  62 ++---
 src/SlmGoogleAnalytics/Analytics/Event.php    |  35 +--
 src/SlmGoogleAnalytics/Analytics/Tracker.php  |  58 ++---
 .../View/Helper/GoogleAnalytics.php           | 245 ++++++++++++------
 .../Analytics/CustomeVariableTest.php         |  17 +-
 .../Analytics/Ecommerce/ItemTest.php          |  15 +-
 .../Analytics/Ecommerce/TransactionTest.php   |  13 +-
 .../Analytics/EventTest.php                   |  17 +-
 .../Analytics/TrackerTest.php                 |  14 +-
 .../View/Helper/GoogleAnalyticsTest.php       | 119 ++++-----
 13 files changed, 358 insertions(+), 304 deletions(-)

diff --git a/Module.php b/Module.php
index 2da1c4a..fad0bca 100644
--- a/Module.php
+++ b/Module.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (c) 2012-2013 Jurian Sluiman.
  * All rights reserved.
@@ -37,13 +38,13 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
  * @link        http://juriansluiman.nl
  */
+
 namespace SlmGoogleAnalytics;
 
 use Zend\EventManager\EventInterface;
 use Zend\Http\Request as HttpRequest;
 use Zend\ModuleManager\Feature;
 use Zend\Mvc\MvcEvent;
-
 use SlmGoogleAnalytics\Analytics;
 use SlmGoogleAnalytics\View\Helper;
 
@@ -54,6 +55,7 @@ class Module implements
     Feature\ServiceProviderInterface,
     Feature\BootstrapListenerInterface
 {
+
     public function getAutoloaderConfig()
     {
         return array(
@@ -90,7 +92,7 @@ public function getViewHelperConfig()
     public function getServiceConfig()
     {
         return array(
-            'aliases' => array(
+            'aliases'   => array(
                 'google-analytics' => 'SlmGoogleAnalytics\Analytics\Tracker',
             ),
             'factories' => array(
@@ -107,7 +109,7 @@ public function getServiceConfig()
                     if (isset($config['allow_linker'])) {
                         $tracker->setAllowLinker($config['allow_linker']);
                     }
-                    
+
                     if (true === $config['anonymize_ip']) {
                         $tracker->setAnonymizeIp(true);
                     }
diff --git a/src/SlmGoogleAnalytics/Analytics/CustomVariable.php b/src/SlmGoogleAnalytics/Analytics/CustomVariable.php
index 0fd4609..0f68756 100644
--- a/src/SlmGoogleAnalytics/Analytics/CustomVariable.php
+++ b/src/SlmGoogleAnalytics/Analytics/CustomVariable.php
@@ -40,16 +40,16 @@
 
 class CustomVariable
 {
-    const SCOPE_VISITOR = 1;
-    const SCOPE_SESSION = 2;
+    const SCOPE_VISITOR    = 1;
+    const SCOPE_SESSION    = 2;
     const SCOPE_PAGE_LEVEL = 3;
-    
+
     protected $index;
     protected $name;
     protected $value;
     protected $scope;
 
-    public function __construct ($index, $name, $value, $scope = self::SCOPE_PAGE_LEVEL)
+    public function __construct($index, $name, $value, $scope = self::SCOPE_PAGE_LEVEL)
     {
         $this->setIndex($index);
         $this->setName($name);
@@ -61,16 +61,15 @@ public function setIndex($index)
     {
         if (!is_int($index)) {
             throw new InvalidArgumentException(
-                sprintf(
-                    'Index must be of type integer, %s given',
-                     gettype($index)
-                )
+            sprintf(
+                    'Index must be of type integer, %s given', gettype($index)
+            )
             );
-        }        
-        
+        }
+
         $this->index = $index;
     }
-    
+
     public function getIndex()
     {
         return $this->index;
@@ -103,16 +102,15 @@ public function setScope($scope)
             self::SCOPE_SESSION,
             self::SCOPE_PAGE_LEVEL
         );
-        
+
         if (!in_array($scope, $allowed, true)) {
             throw new InvalidArgumentException(
-                sprintf(
-                    'Invalid value given for scope. Acceptable values are: %s.',
-                    implode(', ', $allowed)
-                )    
+            sprintf(
+                    'Invalid value given for scope. Acceptable values are: %s.', implode(', ', $allowed)
+            )
             );
         }
-        
+
         $this->scope = $scope;
     }
 
@@ -120,5 +118,4 @@ public function getScope()
     {
         return $this->scope;
     }
-
 }
\ No newline at end of file
diff --git a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
index 5485879..5f71494 100644
--- a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
+++ b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
@@ -44,10 +44,10 @@ class Item
     protected $sku;
     protected $price;
     protected $quantity;
-    protected $product;
-    protected $category;
+    protected $product  = '';
+    protected $category = '';
 
-    public function __construct ($sku, $price, $quantity, $product = null, $category = null)
+    public function __construct($sku, $price, $quantity, $product = null, $category = null)
     {
         $this->setSku($sku);
         $this->setPrice($price);
@@ -62,52 +62,52 @@ public function __construct ($sku, $price, $quantity, $product = null, $category
         }
     }
 
-    public function getSku ()
+    public function getSku()
     {
         return $this->sku;
     }
 
-    public function setSku ($sku)
+    public function setSku($sku)
     {
         $this->sku = $sku;
     }
 
-    public function getProduct ()
+    public function getProduct()
     {
         return $this->product;
     }
 
-    public function setProduct ($product)
+    public function setProduct($product)
     {
         $this->product = $product;
     }
 
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
 
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->category = $category;
     }
 
-    public function getPrice ()
+    public function getPrice()
     {
         return $this->price;
     }
 
-    public function setPrice ($price)
+    public function setPrice($price)
     {
         $this->price = $price;
     }
 
-    public function getQuantity ()
+    public function getQuantity()
     {
         return $this->quantity;
     }
 
-    public function setQuantity ($quantity)
+    public function setQuantity($quantity)
     {
         $this->quantity = $quantity;
     }
diff --git a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Transaction.php b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Transaction.php
index 99f595d..830d766 100644
--- a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Transaction.php
+++ b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Transaction.php
@@ -42,117 +42,111 @@
 class Transaction
 {
     protected $id;
-    protected $affiliation;
-    protected $total;
-    protected $tax;
-    protected $shipping;
-    protected $city;
-    protected $state;
-    protected $country;
+    protected $affiliation = '';
+    protected $total       = '';
+    protected $tax         = '';
+    protected $shipping    = '';
+    protected $city        = '';
+    protected $state       = '';
+    protected $country     = '';
+    protected $items       = array();
 
-    protected $items;
-
-    public function __construct ($id, $total)
+    public function __construct($id, $total)
     {
         $this->setId($id);
         $this->setTotal($total);
     }
 
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
-    public function setId ($id)
+    public function setId($id)
     {
         $this->id = $id;
     }
 
-    public function getAffiliation ()
+    public function getAffiliation()
     {
         return $this->affiliation;
     }
 
-    public function setAffiliation ($affiliation)
+    public function setAffiliation($affiliation)
     {
         $this->affiliation = $affiliation;
     }
 
-    public function getTotal ()
+    public function getTotal()
     {
         return $this->total;
     }
 
-    public function setTotal ($total)
+    public function setTotal($total)
     {
         $this->total = $total;
     }
 
-    public function getTax ()
+    public function getTax()
     {
         return $this->tax;
     }
 
-    public function setTax ($tax)
+    public function setTax($tax)
     {
         $this->tax = $tax;
     }
 
-    public function getShipping ()
+    public function getShipping()
     {
         return $this->shipping;
     }
 
-    public function setShipping ($shipping)
+    public function setShipping($shipping)
     {
         $this->shipping = $shipping;
     }
 
-    public function getCity ()
+    public function getCity()
     {
         return $this->city;
     }
 
-    public function setCity ($city)
+    public function setCity($city)
     {
         $this->city = $city;
     }
 
-    public function getState ()
+    public function getState()
     {
         return $this->state;
     }
 
-    public function setState ($state)
+    public function setState($state)
     {
         $this->state = $state;
     }
 
-    public function getCountry ()
+    public function getCountry()
     {
         return $this->country;
     }
 
-    public function setCountry ($country)
+    public function setCountry($country)
     {
         $this->country = $country;
     }
 
-    public function items ()
+    public function getItems()
     {
         return $this->items;
     }
 
-    public function addItem (Item $item)
+    public function addItem(Item $item)
     {
-        if (null === $this->items) {
-            $this->items = array();
-        }
-
         $sku = $item->getSku();
         if (array_key_exists($sku, $this->items)) {
-            $quantity = $this->items[$sku]->getQuantity()
-                      + $item->getQuantity();
+            $quantity = $this->items[$sku]->getQuantity() + $item->getQuantity();
 
             $this->items[$sku]->setQuantity($quantity);
         } else {
diff --git a/src/SlmGoogleAnalytics/Analytics/Event.php b/src/SlmGoogleAnalytics/Analytics/Event.php
index 9ed24f6..6abcf5c 100644
--- a/src/SlmGoogleAnalytics/Analytics/Event.php
+++ b/src/SlmGoogleAnalytics/Analytics/Event.php
@@ -43,53 +43,58 @@ class Event
 {
     protected $category;
     protected $action;
-    protected $label;
-    protected $value;
+    protected $label = '';
+    protected $value = '';
 
-    public function __construct ($category, $action, $label = null, $value = null)
+    public function __construct($category, $action, $label = '', $value = '')
     {
-        $this->category = $category;
-        $this->action   = $action;
-        $this->label    = $label;
-        $this->value    = $value;
+        $this->setCategory($category);
+        $this->setAction($action);
+
+        if ($label !== null) {
+            $this->setLabel($label);
+        }
+        if ($value !== null) {
+            $this->setValue($value);
+        }
     }
 
-    public function getCategory ()
+    public function getCategory()
     {
         return $this->category;
     }
 
-    public function setCategory ($category)
+    public function setCategory($category)
     {
         $this->category = $category;
     }
 
-    public function getAction ()
+    public function getAction()
     {
         return $this->action;
     }
 
-    public function setAction ($action)
+    public function setAction($action)
     {
         $this->action = $action;
     }
 
-    public function getLabel ()
+    public function getLabel()
     {
         return $this->label;
     }
 
-    public function setLabel ($label)
+    public function setLabel($label)
     {
         $this->label = $label;
     }
 
-    public function getValue ()
+    public function getValue()
     {
         return $this->value;
     }
 
-    public function setValue ($value)
+    public function setValue($value)
     {
         $this->value = $value;
     }
diff --git a/src/SlmGoogleAnalytics/Analytics/Tracker.php b/src/SlmGoogleAnalytics/Analytics/Tracker.php
index 22e4566..e78c6e3 100644
--- a/src/SlmGoogleAnalytics/Analytics/Tracker.php
+++ b/src/SlmGoogleAnalytics/Analytics/Tracker.php
@@ -59,49 +59,45 @@ class Tracker
      * @var bool
      */
     protected $enableTracking = true;
-
     protected $enablePageTracking = true;
-
     protected $allowLinker = false;
     protected $domainName;
-
     protected $anonymizeIp = false;
+    protected $customVariables = array();
+    protected $events          = array();
+    protected $transactions    = array();
 
-    protected $customVariables;
-    protected $events;
-    protected $transactions;
-
-    public function __construct ($id)
+    public function __construct($id)
     {
         $this->setId($id);
     }
 
-    public function getId ()
+    public function getId()
     {
         return $this->id;
     }
 
-    public function setId ($id)
+    public function setId($id)
     {
         $this->id = $id;
     }
 
-    public function enabled ()
+    public function enabled()
     {
         return $this->enableTracking;
     }
 
-    public function setEnableTracking ($enable_tracking = true)
+    public function setEnableTracking($enable_tracking = true)
     {
         $this->enableTracking = (bool) $enable_tracking;
     }
 
-    public function enabledPageTracking ()
+    public function enabledPageTracking()
     {
         return $this->enablePageTracking;
     }
 
-    public function setEnablePageTracking ($enable_page_tracking = true)
+    public function setEnablePageTracking($enable_page_tracking = true)
     {
         $this->enablePageTracking = (bool) $enable_page_tracking;
     }
@@ -144,58 +140,44 @@ public function setAnonymizeIp($flag)
         $this->anonymizeIp = (bool) $flag;
     }
 
-    public function customVariables()
+    public function getCustomVariables()
     {
         return $this->customVariables;
     }
-    
+
     public function addCustomVariable(CustomVariable $variable)
     {
-        if (null === $this->customVariables) {
-            $this->customVariables = array();
-        }
-
         $index = $variable->getIndex();
         if (array_key_exists($index, $this->customVariables)) {
             throw new InvalidArgumentException(
-                'Cannot add custom variable with index %d, it already exists',
-                $index
+            'Cannot add custom variable with index %d, it already exists', $index
             );
         }
-        
+
         $this->customVariables[$index] = $variable;
     }
-    
-    public function events ()
+
+    public function getEvents()
     {
         return $this->events;
     }
 
-    public function addEvent (Event $event)
+    public function addEvent(Event $event)
     {
-        if (null === $this->events) {
-            $this->events = array();
-        }
-
         $this->events[] = $event;
     }
 
-    public function transactions ()
+    public function getTransactions()
     {
         return $this->transactions;
     }
 
-    public function addTransaction (Transaction $transaction)
+    public function addTransaction(Transaction $transaction)
     {
-        if (null === $this->transactions) {
-            $this->transactions = array();
-        }
-
         $id = $transaction->getId();
         if (array_key_exists($id, $this->transactions)) {
             throw new InvalidArgumentException(sprintf(
-                'Cannot add transaction with id %s, it already exists',
-                $id
+                    'Cannot add transaction with id %s, it already exists', $id
             ));
         }
 
diff --git a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
index 59009f3..0a823b7 100644
--- a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
+++ b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
@@ -41,8 +41,9 @@
 
 use Zend\View\Helper\AbstractHelper;
 use Zend\View\Helper\HeadScript;
+use Zend\Json\Encoder;
 use SlmGoogleAnalytics\Analytics\Tracker;
-
+use SlmGoogleAnalytics\Analytics\Ecommerce\Transaction;
 use SlmGoogleAnalytics\Exception\RuntimeException;
 
 class GoogleAnalytics extends AbstractHelper
@@ -62,124 +63,200 @@ class GoogleAnalytics extends AbstractHelper
      */
     protected $rendered = false;
 
-    public function __construct (Tracker $tracker)
+    public function __construct(Tracker $tracker)
     {
         $this->tracker = $tracker;
     }
 
-    public function getContainer ()
+    public function getContainerName()
     {
         return $this->container;
     }
 
-    public function setContainer ($container)
+    public function setContainer($container)
     {
         $this->container = $container;
     }
 
-    public function __invoke ()
+    public function __invoke()
     {
-        // Do not render the GA twice
-        if  ($this->rendered) {
-            return;
-        }
-
-        // Do not render when tracker is disabled
-        $tracker = $this->tracker;
-        if (!$tracker->enabled()) {
-            return;
-        }
-
         // We need to be sure $container->appendScript() can be called
-        $container = $this->view->plugin($this->getContainer());
+        $container = $this->view->plugin($this->getContainerName());
         if (!$container instanceof HeadScript) {
             throw new RuntimeException(sprintf(
-                'Container %s does not extend HeadScript view helper',
-                 $this->getContainer()
+                    'Container %s does not extend HeadScript view helper', $this->getContainerName()
             ));
         }
 
-        $script  = "var _gaq = _gaq || [];\n";
-        $script .= sprintf("_gaq.push(['_setAccount', '%s']);\n",
-                           $tracker->getId());
+        $script = $this->getScript();
 
-        if ($tracker->getDomainName()) {
-            $script .= sprintf("_gaq.push(['_setDomainName', '%s']);\n",
-                               $tracker->getDomainName());;
+        if (empty($script)) {
+            return;
         }
 
-        if ($tracker->getAllowLinker()) {
-            $script .= "_gaq.push(['_setAllowLinker', true]);\n";
-        }
+        $container->appendScript($script);
 
-        if ($tracker->getAnonymizeIp()) {
-            $script .= "_gaq.push(['_gat._anonymizeIp']);\n";
-        }
+        // Mark this GA as rendered
+        $this->rendered = true;
+    }
 
-        if (null !== ($customVariables = $tracker->customVariables())) {
-            foreach ($customVariables as $variable) {
-                $script .= sprintf("_gaq.push(['_setCustomVar', %d, '%s', '%s', %d]);\n",
-                        $variable->getIndex(),
-                        $variable->getName(),
-                        $variable->getValue(),
-                        $variable->getScope());
-            }
-        }
-        
-        if ($tracker->enabledPageTracking()) {
-            $script .= "_gaq.push(['_trackPageview']);\n";
-        }
-        
-
-        if (null !== ($events = $tracker->events())) {
-            foreach ($events as $event) {
-                $script .= sprintf("_gaq.push(['_trackEvent', '%s', '%s', '%s', '%s']);\n",
-                                   $event->getCategory(),
-                                   $event->getAction(),
-                                   $event->getLabel() ?: '',
-                                   $event->getValue() ?: '');
-            }
+    public function getScript()
+    {
+        // Do not render the GA twice
+        if ($this->rendered) {
+            return '';
         }
 
-        if (null !== ($transactions = $tracker->transactions())) {
-            foreach ($transactions as $transaction) {
-                $script .= sprintf("_gaq.push(['_addTrans', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s']);\n",
-                                   $transaction->getId(),
-                                   $transaction->getAffiliation() ?: '',
-                                   $transaction->getTotal(),
-                                   $transaction->getTax() ?: '',
-                                   $transaction->getShipping() ?: '',
-                                   $transaction->getCity() ?: '',
-                                   $transaction->getState() ?: '',
-                                   $transaction->getCountry() ?: '');
-
-                if (null !== ($items = $transaction->items())) {
-                    foreach ($items as $item) {
-                        $script .= sprintf("_gaq.push(['_addItem', '%s', '%s', '%s', '%s', '%s', '%s']);\n",
-                                           $transaction->getId(),
-                                           $item->getSku() ?: '',
-                                           $item->getProduct() ?: '',
-                                           $item->getCategory() ?: '',
-                                           $item->getPrice(),
-                                           $item->getQuantity());
-                    }
-                }
-            }
-
-            $script .= "_gaq.push(['_trackTrans']);";
+        // Do not render when tracker is disabled
+        if (!$this->tracker->enabled()) {
+            return '';
         }
 
-        $script .= <<<SCRIPT
+        $script = "var _gaq = _gaq || [];\n";
+
+        $script .= $this->prepareSetAccount();
+        $script .= $this->prepareSetDomain();
+        $script .= $this->prepareSetAllowLinker();
+        $script .= $this->prepareAnonymizeIp();
+        $script .= $this->prepareCustomVariables();
+        $script .= $this->prepareEnabledPageTracking();
+        $script .= $this->prepareTrackEvents();
+        $script .= $this->prepareTransactions();
+
+        $script .= $this->getLoadScript();
+
+        return $script;
+    }
+
+    protected function getLoadScript()
+    {
+        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;
+    }
 
-        $container->appendScript($script);
+    protected function push($methodName, array $params = array())
+    {
+        array_unshift($params, '_'. $methodName);
+        $jsArray = Encoder::encode($params);
+        $output  = sprintf('_gaq.push(%s);' . "\n", $jsArray);
 
-        // Mark this GA as rendered
-        $this->rendered = true;
+        return $output;
+    }
+
+    protected function prepareSetAccount()
+    {
+        return $this->push('setAccount', array($this->tracker->getId()));
+    }
+
+    protected function prepareSetDomain()
+    {
+        $domainName = $this->tracker->getDomainName();
+
+        if ($domainName) {
+            return $this->push('setDomainName', array($domainName));
+        }
+        return '';
+    }
+
+    protected function prepareSetAllowLinker()
+    {
+        if ($this->tracker->getAllowLinker()) {
+            return $this->push('setAllowLinker', array(true));
+        }
+        return '';
+    }
+
+    protected function prepareAnonymizeIp()
+    {
+        if ($this->tracker->getAnonymizeIp()) {
+            return $this->push('gat._anonymizeIp');
+        }
+    }
+
+    protected function prepareCustomVariables()
+    {
+        $customVariables = $this->tracker->getCustomVariables();
+        $output          = '';
+
+        foreach ($customVariables as $variable) {
+            $output .= $this->push('setCustomVar', array(
+                $variable->getIndex(),
+                $variable->getName(),
+                $variable->getValue(),
+                $variable->getScope(),
+            ));
+        }
+        return $output;
+    }
+
+    protected function prepareEnabledPageTracking()
+    {
+        if ($this->tracker->enabledPageTracking()) {
+            return $this->push('trackPageview');
+        }
+        return '';
+    }
+
+    protected function prepareTrackEvents()
+    {
+        $events = $this->tracker->getEvents();
+        $output = '';
+
+        foreach ($events as $event) {
+            $output .= $this->push('trackEvent', array(
+                $event->getCategory(),
+                $event->getAction(),
+                $event->getLabel(),
+                $event->getValue(),
+            ));
+        }
+        return $output;
+    }
+
+    protected function prepareTransactions()
+    {
+        $transactions = $this->tracker->getTransactions();
+        $output       = '';
+
+        foreach ($transactions as $transaction) {
+            $output .= $this->push('addTrans', array(
+                $transaction->getId(),
+                $transaction->getAffiliation(),
+                $transaction->getTotal(),
+                $transaction->getTax(),
+                $transaction->getShipping(),
+                $transaction->getCity(),
+                $transaction->getState(),
+                $transaction->getCountry(),
+            ));
+
+            $output .= $this->prepareTransactionItems($transaction);
+        }
+        $output .= $this->push('trackTrans');
+
+        return $output;
+    }
+
+    protected function prepareTransactionItems(Transaction $transaction)
+    {
+        $output = '';
+        $items  = $transaction->getItems();
+
+        foreach ($items as $item) {
+            $output .= $this->push('addItem', array(
+                $transaction->getId(),
+                $item->getSku(),
+                $item->getProduct(),
+                $item->getCategory(),
+                $item->getPrice(),
+                $item->getQuantity(),
+            ));
+        }
+        return $output;
     }
 }
diff --git a/tests/SlmGoogleAnalyticsTest/Analytics/CustomeVariableTest.php b/tests/SlmGoogleAnalyticsTest/Analytics/CustomeVariableTest.php
index 30bdc5e..ba23827 100644
--- a/tests/SlmGoogleAnalyticsTest/Analytics/CustomeVariableTest.php
+++ b/tests/SlmGoogleAnalyticsTest/Analytics/CustomeVariableTest.php
@@ -42,10 +42,11 @@
 
 class CustomeVariableTest extends TestCase
 {
+
     public function testCanInstantiateCustomeVariable()
     {
         $variable = new CustomVariable(1, 'var1', 'value1');
-        
+
         $this->assertEquals(1, $variable->getIndex());
         $this->assertEquals('var1', $variable->getName());
         $this->assertEquals('value1', $variable->getValue());
@@ -54,31 +55,31 @@ public function testCanInstantiateCustomeVariable()
 
     public function testCanAddCustomeVariableToTrack()
     {
-        $tracker = new Tracker(123);
+        $tracker  = new Tracker(123);
         $variable = new CustomVariable(1, 'var1', 'value1');
         $tracker->addCustomVariable($variable);
 
-        $this->assertCount(1, $tracker->customVariables());
+        $this->assertCount(1, $tracker->getCustomVariables());
     }
 
     public function testCanAddMultipleCustomVariablesToTracker()
     {
-        $tracker = new Tracker(123);
+        $tracker   = new Tracker(123);
         $variable1 = new CustomVariable(1, 'var1', 'value1');
         $variable2 = new CustomVariable(2, 'var2', 'value2');
         $tracker->addCustomVariable($variable1);
         $tracker->addCustomVariable($variable2);
 
-        $this->assertCount(2, $tracker->customVariables());
+        $this->assertCount(2, $tracker->getCustomVariables());
     }
 
     public function testAddCustomVariablesWithSameId()
     {
-        $tracker = new Tracker(123);
+        $tracker   = new Tracker(123);
         $variable1 = new CustomVariable(1, 'var1', 'value1');
         $variable2 = new CustomVariable(1, 'var2', 'value2');
         $tracker->addCustomVariable($variable1);
-        
+
         $this->setExpectedException('SlmGoogleAnalytics\Exception\InvalidArgumentException');
         $tracker->addCustomVariable($variable2);
     }
@@ -88,7 +89,7 @@ public function testInvalidIndex()
         $this->setExpectedException('SlmGoogleAnalytics\Exception\InvalidArgumentException');
         $variable = new CustomVariable('index', 'var1', 'value1');
     }
-    
+
     public function testInvalidScope()
     {
         $this->setExpectedException('SlmGoogleAnalytics\Exception\InvalidArgumentException');
diff --git a/tests/SlmGoogleAnalyticsTest/Analytics/Ecommerce/ItemTest.php b/tests/SlmGoogleAnalyticsTest/Analytics/Ecommerce/ItemTest.php
index 46f16ac..a504944 100644
--- a/tests/SlmGoogleAnalyticsTest/Analytics/Ecommerce/ItemTest.php
+++ b/tests/SlmGoogleAnalyticsTest/Analytics/Ecommerce/ItemTest.php
@@ -45,7 +45,8 @@
 
 class ItemTest extends TestCase
 {
-    public function testCanInstantiateItem ()
+
+    public function testCanInstantiateItem()
     {
         $item = new Item(123, 12.50, 1);
 
@@ -54,17 +55,17 @@ public function testCanInstantiateItem ()
         $this->assertEquals(1, $item->getQuantity());
     }
 
-    public function testCanAddItemToTransaction ()
+    public function testCanAddItemToTransaction()
     {
         $item        = new Item(123, 12.50, 1);
         $transaction = new Transaction(1, 12.50);
         $transaction->addItem($item);
 
-        $items = count($transaction->items());
+        $items = count($transaction->getItems());
         $this->assertEquals(1, $items);
     }
 
-    public function testCanAddItemsToTransaction ()
+    public function testCanAddItemsToTransaction()
     {
         $item1       = new Item(123, 12.50, 1);
         $item2       = new Item(456, 22.80, 1);
@@ -72,11 +73,11 @@ public function testCanAddItemsToTransaction ()
         $transaction->addItem($item1);
         $transaction->addItem($item2);
 
-        $items = count($transaction->items());
+        $items = count($transaction->getItems());
         $this->assertEquals(2, $items);
     }
 
-    public function testCanAddSameSkuMoreThanOnce ()
+    public function testCanAddSameSkuMoreThanOnce()
     {
         $item1       = new Item(123, 12.50, 1);
         $item2       = new Item(123, 22.80, 1);
@@ -84,7 +85,7 @@ public function testCanAddSameSkuMoreThanOnce ()
         $transaction->addItem($item1);
         $transaction->addItem($item2);
 
-        $items = $transaction->items();
+        $items = $transaction->getItems();
         $this->assertEquals(1, count($items));
 
         $item = reset($items);
diff --git a/tests/SlmGoogleAnalyticsTest/Analytics/Ecommerce/TransactionTest.php b/tests/SlmGoogleAnalyticsTest/Analytics/Ecommerce/TransactionTest.php
index 63527e0..2f68ff0 100644
--- a/tests/SlmGoogleAnalyticsTest/Analytics/Ecommerce/TransactionTest.php
+++ b/tests/SlmGoogleAnalyticsTest/Analytics/Ecommerce/TransactionTest.php
@@ -45,7 +45,8 @@
 
 class TransactionTest extends TestCase
 {
-    public function testCanInstantiateTransaction ()
+
+    public function testCanInstantiateTransaction()
     {
         $transaction = new Transaction(123, 12.50);
 
@@ -53,17 +54,17 @@ public function testCanInstantiateTransaction ()
         $this->assertEquals(12.50, $transaction->getTotal());
     }
 
-    public function testCanAddTransactionToTracker ()
+    public function testCanAddTransactionToTracker()
     {
         $tracker     = new Tracker(123);
         $transaction = new Transaction(123, 12.50);
         $tracker->addTransaction($transaction);
 
-        $transactions = count($tracker->transactions());
+        $transactions = count($tracker->getTransactions());
         $this->assertEquals(1, $transactions);
     }
 
-    public function testCanAddMultipleTransactionsToTracker ()
+    public function testCanAddMultipleTransactionsToTracker()
     {
         $tracker      = new Tracker(123);
         $transaction1 = new Transaction(123, 12.50);
@@ -71,11 +72,11 @@ public function testCanAddMultipleTransactionsToTracker ()
         $tracker->addTransaction($transaction1);
         $tracker->addTransaction($transaction2);
 
-        $transactions = count($tracker->transactions());
+        $transactions = count($tracker->getTransactions());
         $this->assertEquals(2, $transactions);
     }
 
-    public function testCannotAddTransactionsWithSameId ()
+    public function testCannotAddTransactionsWithSameId()
     {
         $this->setExpectedException('SlmGoogleAnalytics\Exception\InvalidArgumentException');
 
diff --git a/tests/SlmGoogleAnalyticsTest/Analytics/EventTest.php b/tests/SlmGoogleAnalyticsTest/Analytics/EventTest.php
index 6f9645a..95ea16a 100644
--- a/tests/SlmGoogleAnalyticsTest/Analytics/EventTest.php
+++ b/tests/SlmGoogleAnalyticsTest/Analytics/EventTest.php
@@ -45,7 +45,8 @@
 
 class EventTest extends TestCase
 {
-    public function testCanInstantiateEvent ()
+
+    public function testCanInstantiateEvent()
     {
         $event = new Event('Category', 'Action');
 
@@ -53,17 +54,17 @@ public function testCanInstantiateEvent ()
         $this->assertEquals('Action', $event->getAction());
     }
 
-    public function testCanAddEventToTracker ()
+    public function testCanAddEventToTracker()
     {
         $tracker = new Tracker(123);
         $event   = new Event('Category', 'Action');
         $tracker->addEvent($event);
 
-        $events = count($tracker->events());
+        $events = count($tracker->getEvents());
         $this->assertEquals(1, $events);
     }
 
-    public function testCanAddMultipleEventsToTracker ()
+    public function testCanAddMultipleEventsToTracker()
     {
         $tracker = new Tracker(123);
         $event1  = new Event('Category', 'Action');
@@ -71,25 +72,25 @@ public function testCanAddMultipleEventsToTracker ()
         $tracker->addEvent($event1);
         $tracker->addEvent($event2);
 
-        $events = count($tracker->events());
+        $events = count($tracker->getEvents());
         $this->assertEquals(2, $events);
     }
 
-    public function testCanHaveEventLabel ()
+    public function testCanHaveEventLabel()
     {
         $event = new Event('Category', 'Action', 'Label');
 
         $this->assertEquals('Label', $event->getLabel());
     }
 
-    public function testCanHaveEventValue ()
+    public function testCanHaveEventValue()
     {
         $event = new Event('Category', 'Action', null, 123);
 
         $this->assertEquals(123, $event->getValue());
     }
 
-    public function testCanHaveEventLabelAndValue ()
+    public function testCanHaveEventLabelAndValue()
     {
         $event = new Event('Category', 'Action', 'Label', 123);
 
diff --git a/tests/SlmGoogleAnalyticsTest/Analytics/TrackerTest.php b/tests/SlmGoogleAnalyticsTest/Analytics/TrackerTest.php
index 9eedcca..89959c2 100644
--- a/tests/SlmGoogleAnalyticsTest/Analytics/TrackerTest.php
+++ b/tests/SlmGoogleAnalyticsTest/Analytics/TrackerTest.php
@@ -44,31 +44,32 @@
 
 class TrackerTest extends TestCase
 {
-    public function testCanInstantiateTracker ()
+
+    public function testCanInstantiateTracker()
     {
         $tracker = new Tracker(123);
         $this->assertEquals(123, $tracker->getId());
     }
 
-    public function testIsEnabledByDefault ()
+    public function testIsEnabledByDefault()
     {
         $tracker = new Tracker(123);
         $this->assertTrue($tracker->enabled());
     }
 
-    public function testHasPageTrackingEnabledByDefault ()
+    public function testHasPageTrackingEnabledByDefault()
     {
         $tracker = new Tracker(123);
         $this->assertTrue($tracker->enabledPageTracking());
     }
 
-    public function testDomainNameDefaultsToFalse ()
+    public function testDomainNameDefaultsToFalse()
     {
         $tracker = new Tracker(123);
         $this->assertNull($tracker->getDomainName());
     }
 
-    public function testDomainName ()
+    public function testDomainName()
     {
         $tracker = new Tracker(123);
         $tracker->setDomainName('foobar');
@@ -83,7 +84,7 @@ public function testClearDomainNameReturnsNull()
         $this->assertNull($tracker->getDomainName());
     }
 
-    public function testAllowLinkerDefaultsToFalse ()
+    public function testAllowLinkerDefaultsToFalse()
     {
         $tracker = new Tracker(123);
         $tracker->setAllowLinker(true);
@@ -103,4 +104,3 @@ public function testAnonymizeIp()
         $this->assertTrue($tracker->getAnonymizeIp());
     }
 }
-
diff --git a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
index 251e0c8..cfde3aa 100644
--- a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
+++ b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
@@ -39,14 +39,10 @@
  */
 namespace SlmGoogleAnalyticsTest\View\Helper;
 
-use StdClass;
 use PHPUnit_Framework_TestCase as TestCase;
-
 use Zend\View\Renderer\PhpRenderer;
-use Zend\View\Helper\Placeholder\Registry as PlaceholderRegistry;
 use SlmGoogleAnalytics\Analytics\Tracker;
 use SlmGoogleAnalytics\View\Helper\GoogleAnalytics as Helper;
-
 use SlmGoogleAnalyticsTest\View\Helper\TestAsset\CustomViewHelper;
 use SlmGoogleAnalytics\Analytics\CustomVariable;
 use SlmGoogleAnalytics\Analytics\Event;
@@ -65,7 +61,7 @@ class GoogleAnalyticsTest extends TestCase
      */
     protected $helper;
 
-    public function setUp ()
+    public function setUp()
     {
         $this->tracker = new Tracker(123);
         $this->tracker->setAllowLinker(true);
@@ -75,31 +71,31 @@ public function setUp ()
         $this->helper->setView($view);
     }
 
-    public function tearDown ()
+    public function tearDown()
     {
         unset($this->tracker);
         unset($this->helper);
     }
 
-    public function testHelperRendersAccountId ()
+    public function testHelperRendersAccountId()
     {
         $helper = $this->helper;
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_setAccount', '123'])", $output);
+        $this->assertContains('_gaq.push(["_setAccount",123])', $output);
     }
 
-    public function testHelperTracksPagesByDefault ()
+    public function testHelperTracksPagesByDefault()
     {
         $helper = $this->helper;
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_trackPageview'])", $output);
+        $this->assertContains('_gaq.push(["_trackPageview"])', $output);
     }
 
-    public function testHelperReturnsNullWithDisabledTracker ()
+    public function testHelperReturnsNullWithDisabledTracker()
     {
         $this->tracker->setEnableTracking(false);
         $helper = $this->helper;
@@ -108,7 +104,7 @@ public function testHelperReturnsNullWithDisabledTracker ()
         $this->assertEquals(null, $return);
     }
 
-    public function testHelperThrowsExceptionWithNonExistingContainer ()
+    public function testHelperThrowsExceptionWithNonExistingContainer()
     {
         $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
 
@@ -117,7 +113,7 @@ public function testHelperThrowsExceptionWithNonExistingContainer ()
         $helper();
     }
 
-    public function testHelperThrowsExceptionWithContainerNotInheritedFromHeadscript ()
+    public function testHelperThrowsExceptionWithContainerNotInheritedFromHeadscript()
     {
         $this->setExpectedException('SlmGoogleAnalytics\Exception\RuntimeException');
 
@@ -133,7 +129,7 @@ public function testHelperThrowsExceptionWithContainerNotInheritedFromHeadscript
         $helper();
     }
 
-    public function testHelperRendersNoPagesWithPageTrackingOff ()
+    public function testHelperRendersNoPagesWithPageTrackingOff()
     {
         $this->tracker->setEnablePageTracking(false);
         $helper = $this->helper;
@@ -141,10 +137,10 @@ public function testHelperRendersNoPagesWithPageTrackingOff ()
 
         $output = $this->getOutput($this->helper);
         $this->assertGreaterThan(0, strlen($output));
-        $this->assertFalse(strpos($output, "_gaq.push(['_trackPageview'])"));
+        $this->assertFalse(strpos($output, '_gaq.push(["_trackPageview"])'));
     }
 
-    public function testHelperLoadsFileFromGoogle ()
+    public function testHelperLoadsFileFromGoogle()
     {
         $helper = $this->helper;
         $helper();
@@ -161,9 +157,9 @@ public function testHelperLoadsFileFromGoogle ()
         $this->assertContains($script, $output);
     }
 
-    public function testHelperDoesNotRenderTwice ()
+    public function testHelperDoesNotRenderTwice()
     {
-        $helper = $this->helper;
+        $helper  = $this->helper;
         $helper();
         $output1 = $this->getOutput($this->helper);
         $helper();
@@ -172,24 +168,24 @@ public function testHelperDoesNotRenderTwice ()
         $this->assertEquals($output1, $output2);
     }
 
-    public function testHelperRendersDomainName ()
+    public function testHelperRendersDomainName()
     {
         $this->tracker->setDomainName('foobar');
         $helper = $this->helper;
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_setDomainName', 'foobar'])", $output);
+        $this->assertContains('_gaq.push(["_setDomainName","foobar"])', $output);
     }
 
-    public function testHelperRendersAllowLinker ()
+    public function testHelperRendersAllowLinker()
     {
         $this->tracker->setAllowLinker(true);
         $helper = $this->helper;
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_setAllowLinker', true])", $output);
+        $this->assertContains('_gaq.push(["_setAllowLinker",true])', $output);
     }
 
     public function testHelperRendersAnonymizeIp()
@@ -199,30 +195,27 @@ public function testHelperRendersAnonymizeIp()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_gat._anonymizeIp'])", $output);
+        $this->assertContains('_gaq.push(["_gat._anonymizeIp"])', $output);
     }
 
     public function testHelperOmitsAnonymipzeIpOnFalse()
     {
-        // Anonymizing IP addresses is false on default
-        $helper = $this->helper;
-
         $output = $this->getOutput($this->helper);
-        $this->assertNotContains("_gaq.push(['_gat._anonymizeIp'])", $output);
+        $this->assertNotContains('_gaq.push(["_gat._anonymizeIp"])', $output);
     }
 
     public function testHelperRendersCustomVariables()
     {
         $variable = new CustomVariable(1, 'var1', 'value1');
         $this->tracker->addCustomVariable($variable);
-        
+
         $helper = $this->helper;
         $helper();
-        
+
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_setCustomVar', 1, 'var1', 'value1', 3])", $output);
+        $this->assertContains('_gaq.push(["_setCustomVar",1,"var1","value1",3])', $output);
     }
-    
+
     public function testHelperRendersMultipleCustomVariables()
     {
         $variable1 = new CustomVariable(1, 'var1', 'value1');
@@ -230,16 +223,16 @@ public function testHelperRendersMultipleCustomVariables()
 
         $this->tracker->addCustomVariable($variable1);
         $this->tracker->addCustomVariable($variable2);
-    
+
         $helper = $this->helper;
         $helper();
-    
+
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_setCustomVar', 1, 'var1', 'value1', 3])", $output);
-        $this->assertContains("_gaq.push(['_setCustomVar', 2, 'var2', 'value2', 3])", $output);
+        $this->assertContains('_gaq.push(["_setCustomVar",1,"var1","value1",3])', $output);
+        $this->assertContains('_gaq.push(["_setCustomVar",2,"var2","value2",3])', $output);
     }
-    
-    public function testHelperRendersEvent ()
+
+    public function testHelperRendersEvent()
     {
         $event = new Event('Category', 'Action', 'Label', 'Value');
 
@@ -248,10 +241,10 @@ public function testHelperRendersEvent ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_trackEvent', 'Category', 'Action', 'Label', 'Value'])", $output);
+        $this->assertContains('_gaq.push(["_trackEvent","Category","Action","Label","Value"])', $output);
     }
 
-    public function testHelperRendersMultipleEvents ()
+    public function testHelperRendersMultipleEvents()
     {
         $fooEvent = new Event('CategoryFoo', 'ActionFoo', 'LabelFoo', 'ValueFoo');
         $barEvent = new Event('CategoryBar', 'ActionBar', 'LabelBar', 'ValueBar');
@@ -262,11 +255,11 @@ public function testHelperRendersMultipleEvents ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_trackEvent', 'CategoryFoo', 'ActionFoo', 'LabelFoo', 'ValueFoo'])", $output);
-        $this->assertContains("_gaq.push(['_trackEvent', 'CategoryBar', 'ActionBar', 'LabelBar', 'ValueBar'])", $output);
+        $this->assertContains('_gaq.push(["_trackEvent","CategoryFoo","ActionFoo","LabelFoo","ValueFoo"])', $output);
+        $this->assertContains('_gaq.push(["_trackEvent","CategoryBar","ActionBar","LabelBar","ValueBar"])', $output);
     }
 
-    public function testHelperRendersEmptyLabelAsEmptyString ()
+    public function testHelperRendersEmptyLabelAsEmptyString()
     {
         $event = new Event('Category', 'Action', null, 'Value');
 
@@ -275,10 +268,10 @@ public function testHelperRendersEmptyLabelAsEmptyString ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_trackEvent', 'Category', 'Action', '', 'Value'])", $output);
+        $this->assertContains('_gaq.push(["_trackEvent","Category","Action","","Value"])', $output);
     }
 
-    public function testHelperRendersEmptyValueAsEmptyString ()
+    public function testHelperRendersEmptyValueAsEmptyString()
     {
         $event = new Event('Category', 'Action', 'Label');
 
@@ -287,10 +280,10 @@ public function testHelperRendersEmptyValueAsEmptyString ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_trackEvent', 'Category', 'Action', 'Label', ''])", $output);
+        $this->assertContains('_gaq.push(["_trackEvent","Category","Action","Label",""])', $output);
     }
 
-    public function testHelperRendersEmptyValueAndLabelAsEmptyStrings ()
+    public function testHelperRendersEmptyValueAndLabelAsEmptyStrings()
     {
         $event = new Event('Category', 'Action');
 
@@ -299,10 +292,10 @@ public function testHelperRendersEmptyValueAndLabelAsEmptyStrings ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_trackEvent', 'Category', 'Action', '', ''])", $output);
+        $this->assertContains('_gaq.push(["_trackEvent","Category","Action","",""])', $output);
     }
 
-    public function testHelperRendersTransaction ()
+    public function testHelperRendersTransaction()
     {
         $transaction = new Transaction(123, 12.55);
 
@@ -319,10 +312,10 @@ public function testHelperRendersTransaction ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_addTrans', '123', 'Affiliation', '12.55', '9.66', '3.22', 'City', 'State', 'Country'])", $output);
+        $this->assertContains('_gaq.push(["_addTrans",123,"Affiliation",12.55,9.66,3.22,"City","State","Country"])', $output);
     }
 
-    public function testHelperRendersTransactionTracking ()
+    public function testHelperRendersTransactionTracking()
     {
         $transaction = new Transaction(123, 12.55);
 
@@ -331,10 +324,10 @@ public function testHelperRendersTransactionTracking ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_trackTrans'])", $output);
+        $this->assertContains('_gaq.push(["_trackTrans"])', $output);
     }
 
-    public function testHelperRendersTransactionWithOptionalValuesEmpty ()
+    public function testHelperRendersTransactionWithOptionalValuesEmpty()
     {
         $transaction = new Transaction(123, 12.55);
 
@@ -343,10 +336,10 @@ public function testHelperRendersTransactionWithOptionalValuesEmpty ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_addTrans', '123', '', '12.55', '', '', '', '', ''])", $output);
+        $this->assertContains('_gaq.push(["_addTrans",123,"",12.55,"","","","",""])', $output);
     }
 
-    public function testHelperRendersTransactionItem ()
+    public function testHelperRendersTransactionItem()
     {
         $transaction = new Transaction(123, 12.55);
         $item        = new Item(456, 9.66, 1, 'Product', 'Category');
@@ -357,10 +350,10 @@ public function testHelperRendersTransactionItem ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_addItem', '123', '456', 'Product', 'Category', '9.66', '1'])", $output);
+        $this->assertContains('_gaq.push(["_addItem",123,456,"Product","Category",9.66,1])', $output);
     }
 
-    public function testHelperRendersTransactionWithMultipleItems ()
+    public function testHelperRendersTransactionWithMultipleItems()
     {
         $transaction = new Transaction(123, 12.55);
         $item1       = new Item(456, 9.66, 1, 'Product1', 'Category1');
@@ -373,11 +366,11 @@ public function testHelperRendersTransactionWithMultipleItems ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_addItem', '123', '456', 'Product1', 'Category1', '9.66', '1'])", $output);
-        $this->assertContains("_gaq.push(['_addItem', '123', '789', 'Product2', 'Category2', '15.33', '2'])", $output);
+        $this->assertContains('_gaq.push(["_addItem",123,456,"Product1","Category1",9.66,1])', $output);
+        $this->assertContains('_gaq.push(["_addItem",123,789,"Product2","Category2",15.33,2])', $output);
     }
 
-    public function testHelperRendersItemWithOptionalValuesEmpty ()
+    public function testHelperRendersItemWithOptionalValuesEmpty()
     {
         $transaction = new Transaction(123, 12.55);
         $item        = new Item(456, 9.66, 1);
@@ -388,13 +381,13 @@ public function testHelperRendersItemWithOptionalValuesEmpty ()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains("_gaq.push(['_addItem', '123', '456', '', '', '9.66', '1'])", $output);
+        $this->assertContains('_gaq.push(["_addItem",123,456,"","",9.66,1])', $output);
     }
 
-    protected function getOutput (Helper $helper)
+    protected function getOutput(Helper $helper)
     {
-        $container = $helper->getContainer();
-        $container = $helper->getView()->plugin($container);
+        $containerName = $helper->getContainerName();
+        $container = $helper->getView()->plugin($containerName);
 
         return $container->toString();
     }

From 81c8cbeaca50ad4d8744e1f6693e73d422fb7766 Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Sun, 13 Oct 2013 12:28:22 +0200
Subject: [PATCH 02/10] Fix transaction push and small tweaks

---
 .../View/Helper/GoogleAnalytics.php              | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
index 0a823b7..825b88c 100644
--- a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
+++ b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
@@ -48,6 +48,8 @@
 
 class GoogleAnalytics extends AbstractHelper
 {
+    const METHOD_PREFIX = '_';
+
     /**
      * @var Tracker
      */
@@ -112,7 +114,7 @@ public function getScript()
             return '';
         }
 
-        $script = "var _gaq = _gaq || [];\n";
+        $script = $this->getVarCreate();
 
         $script .= $this->prepareSetAccount();
         $script .= $this->prepareSetDomain();
@@ -139,9 +141,14 @@ protected function getLoadScript()
 SCRIPT;
     }
 
+    protected function getVarCreate()
+    {
+        return 'var _gaq = _gaq || [];'."\n";
+    }
+
     protected function push($methodName, array $params = array())
     {
-        array_unshift($params, '_'. $methodName);
+        array_unshift($params, self::METHOD_PREFIX . $methodName);
         $jsArray = Encoder::encode($params);
         $output  = sprintf('_gaq.push(%s);' . "\n", $jsArray);
 
@@ -237,8 +244,9 @@ protected function prepareTransactions()
 
             $output .= $this->prepareTransactionItems($transaction);
         }
-        $output .= $this->push('trackTrans');
-
+        if ($output !== '') {
+            $output .= $this->push('trackTrans');
+        }
         return $output;
     }
 

From 6e0213cf76a9d875083aeaf0cb4517c5b9f67641 Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Sun, 13 Oct 2013 12:34:44 +0200
Subject: [PATCH 03/10] Deafult quantity in trans item

---
 src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
index 5f71494..e9e4133 100644
--- a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
+++ b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
@@ -41,17 +41,22 @@
 
 class Item
 {
+    const DEFAULT_QUANTITY = 1;
+
     protected $sku;
     protected $price;
-    protected $quantity;
+    protected $quantity = self::DEFAULT_QUANTITY;
     protected $product  = '';
     protected $category = '';
 
-    public function __construct($sku, $price, $quantity, $product = null, $category = null)
+    public function __construct($sku, $price, $quantity = self::DEFAULT_QUANTITY, $product = null, $category = null)
     {
         $this->setSku($sku);
         $this->setPrice($price);
-        $this->setQuantity($quantity);
+
+        if (self::DEFAULT_QUANTITY !== $quantity) {
+            $this->setQuantity($quantity);
+        }
 
         if (null !== $product) {
             $this->setProduct($product);

From be150659487c8047a9506d52e05e888e343fa2f4 Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Sun, 13 Oct 2013 15:41:56 +0200
Subject: [PATCH 04/10] Base for support custom scripts

---
 Module.php                                    |  33 ++-
 config/module.config.php                      |   1 +
 .../View/Helper/GoogleAnalytics.php           | 188 +--------------
 .../View/Helper/Script/Analyticsjs.php        |  56 +++++
 .../View/Helper/Script/Gajs.php               | 225 ++++++++++++++++++
 .../View/Helper/Script/ScriptInterface.php    |  48 ++++
 .../View/Helper/GoogleAnalyticsTest.php       |   7 +-
 7 files changed, 370 insertions(+), 188 deletions(-)
 create mode 100644 src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
 create mode 100644 src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
 create mode 100644 src/SlmGoogleAnalytics/View/Helper/Script/ScriptInterface.php

diff --git a/Module.php b/Module.php
index fad0bca..bc3f4e0 100644
--- a/Module.php
+++ b/Module.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright (c) 2012-2013 Jurian Sluiman.
  * All rights reserved.
@@ -38,7 +37,6 @@
  * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
  * @link        http://juriansluiman.nl
  */
-
 namespace SlmGoogleAnalytics;
 
 use Zend\EventManager\EventInterface;
@@ -80,8 +78,8 @@ public function getViewHelperConfig()
         return array(
             'factories' => array(
                 'googleAnalytics' => function($sm) {
-                    $tracker = $sm->getServiceLocator()->get('google-analytics');
-                    $helper  = new Helper\GoogleAnalytics($tracker);
+                    $script = $sm->getServiceLocator()->get('google-analytics-script');
+                    $helper = new Helper\GoogleAnalytics($script);
 
                     return $helper;
                 },
@@ -92,10 +90,14 @@ public function getViewHelperConfig()
     public function getServiceConfig()
     {
         return array(
-            'aliases'   => array(
+            'aliases'    => array(
                 'google-analytics' => 'SlmGoogleAnalytics\Analytics\Tracker',
             ),
-            'factories' => array(
+            'invokables' => array(
+                'google-analytics-script-analytics-js' => 'SlmGoogleAnalytics\View\Helper\Script\Analyticsjs',
+                'google-analytics-script-ga-js'        => 'SlmGoogleAnalytics\View\Helper\Script\Gajs',
+            ),
+            'factories'  => array(
                 'SlmGoogleAnalytics\Analytics\Tracker' => function($sm) {
                     $config = $sm->get('config');
                     $config = $config['google_analytics'];
@@ -120,6 +122,17 @@ public function getServiceConfig()
 
                     return $tracker;
                 },
+                'google-analytics-script' => function($sm) {
+                    $config     = $sm->get('config');
+                    $scriptName = $config['google_analytics']['script'];
+
+                    $script = $sm->get($scriptName);
+                    $ga     = $sm->get('google-analytics');
+
+                    $script->setTracker($ga);
+
+                    return $script;
+                },
             ),
         );
     }
@@ -141,9 +154,9 @@ public function onBootstrap(EventInterface $e)
         }
 
         $em->attach(MvcEvent::EVENT_RENDER, function(MvcEvent $e) use ($sm) {
-            $view   = $sm->get('ViewHelperManager');
-            $plugin = $view->get('googleAnalytics');
-            $plugin();
-        });
+                    $view   = $sm->get('ViewHelperManager');
+                    $plugin = $view->get('googleAnalytics');
+                    $plugin();
+                });
     }
 }
diff --git a/config/module.config.php b/config/module.config.php
index 80b58cf..7001952 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -45,5 +45,6 @@
         'domain_name'  => '',
         'allow_linker' => false,
         'anonymize_ip' => false,
+        'script'       => 'google-analytics-script-ga-js',
     ),
 );
diff --git a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
index 825b88c..aedb861 100644
--- a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
+++ b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
@@ -41,20 +41,10 @@
 
 use Zend\View\Helper\AbstractHelper;
 use Zend\View\Helper\HeadScript;
-use Zend\Json\Encoder;
-use SlmGoogleAnalytics\Analytics\Tracker;
-use SlmGoogleAnalytics\Analytics\Ecommerce\Transaction;
 use SlmGoogleAnalytics\Exception\RuntimeException;
 
 class GoogleAnalytics extends AbstractHelper
 {
-    const METHOD_PREFIX = '_';
-
-    /**
-     * @var Tracker
-     */
-    protected $tracker;
-
     /**
      * @var string
      */
@@ -65,9 +55,14 @@ class GoogleAnalytics extends AbstractHelper
      */
     protected $rendered = false;
 
-    public function __construct(Tracker $tracker)
+    /**
+     * @var Script\ScriptInterface
+     */
+    protected $script;
+
+    public function __construct(Script\ScriptInterface $script)
     {
-        $this->tracker = $tracker;
+        $this->script = $script;
     }
 
     public function getContainerName()
@@ -82,6 +77,9 @@ public function setContainer($container)
 
     public function __invoke()
     {
+        if ($this->rendered) {
+            return;
+        }
         // We need to be sure $container->appendScript() can be called
         $container = $this->view->plugin($this->getContainerName());
         if (!$container instanceof HeadScript) {
@@ -90,7 +88,7 @@ public function __invoke()
             ));
         }
 
-        $script = $this->getScript();
+        $script = $this->script->getScript();
 
         if (empty($script)) {
             return;
@@ -102,169 +100,5 @@ public function __invoke()
         $this->rendered = true;
     }
 
-    public function getScript()
-    {
-        // Do not render the GA twice
-        if ($this->rendered) {
-            return '';
-        }
-
-        // Do not render when tracker is disabled
-        if (!$this->tracker->enabled()) {
-            return '';
-        }
-
-        $script = $this->getVarCreate();
-
-        $script .= $this->prepareSetAccount();
-        $script .= $this->prepareSetDomain();
-        $script .= $this->prepareSetAllowLinker();
-        $script .= $this->prepareAnonymizeIp();
-        $script .= $this->prepareCustomVariables();
-        $script .= $this->prepareEnabledPageTracking();
-        $script .= $this->prepareTrackEvents();
-        $script .= $this->prepareTransactions();
-
-        $script .= $this->getLoadScript();
-
-        return $script;
-    }
-
-    protected function getLoadScript()
-    {
-        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;
-    }
-
-    protected function getVarCreate()
-    {
-        return 'var _gaq = _gaq || [];'."\n";
-    }
-
-    protected function push($methodName, array $params = array())
-    {
-        array_unshift($params, self::METHOD_PREFIX . $methodName);
-        $jsArray = Encoder::encode($params);
-        $output  = sprintf('_gaq.push(%s);' . "\n", $jsArray);
-
-        return $output;
-    }
-
-    protected function prepareSetAccount()
-    {
-        return $this->push('setAccount', array($this->tracker->getId()));
-    }
-
-    protected function prepareSetDomain()
-    {
-        $domainName = $this->tracker->getDomainName();
-
-        if ($domainName) {
-            return $this->push('setDomainName', array($domainName));
-        }
-        return '';
-    }
 
-    protected function prepareSetAllowLinker()
-    {
-        if ($this->tracker->getAllowLinker()) {
-            return $this->push('setAllowLinker', array(true));
-        }
-        return '';
-    }
-
-    protected function prepareAnonymizeIp()
-    {
-        if ($this->tracker->getAnonymizeIp()) {
-            return $this->push('gat._anonymizeIp');
-        }
-    }
-
-    protected function prepareCustomVariables()
-    {
-        $customVariables = $this->tracker->getCustomVariables();
-        $output          = '';
-
-        foreach ($customVariables as $variable) {
-            $output .= $this->push('setCustomVar', array(
-                $variable->getIndex(),
-                $variable->getName(),
-                $variable->getValue(),
-                $variable->getScope(),
-            ));
-        }
-        return $output;
-    }
-
-    protected function prepareEnabledPageTracking()
-    {
-        if ($this->tracker->enabledPageTracking()) {
-            return $this->push('trackPageview');
-        }
-        return '';
-    }
-
-    protected function prepareTrackEvents()
-    {
-        $events = $this->tracker->getEvents();
-        $output = '';
-
-        foreach ($events as $event) {
-            $output .= $this->push('trackEvent', array(
-                $event->getCategory(),
-                $event->getAction(),
-                $event->getLabel(),
-                $event->getValue(),
-            ));
-        }
-        return $output;
-    }
-
-    protected function prepareTransactions()
-    {
-        $transactions = $this->tracker->getTransactions();
-        $output       = '';
-
-        foreach ($transactions as $transaction) {
-            $output .= $this->push('addTrans', array(
-                $transaction->getId(),
-                $transaction->getAffiliation(),
-                $transaction->getTotal(),
-                $transaction->getTax(),
-                $transaction->getShipping(),
-                $transaction->getCity(),
-                $transaction->getState(),
-                $transaction->getCountry(),
-            ));
-
-            $output .= $this->prepareTransactionItems($transaction);
-        }
-        if ($output !== '') {
-            $output .= $this->push('trackTrans');
-        }
-        return $output;
-    }
-
-    protected function prepareTransactionItems(Transaction $transaction)
-    {
-        $output = '';
-        $items  = $transaction->getItems();
-
-        foreach ($items as $item) {
-            $output .= $this->push('addItem', array(
-                $transaction->getId(),
-                $item->getSku(),
-                $item->getProduct(),
-                $item->getCategory(),
-                $item->getPrice(),
-                $item->getQuantity(),
-            ));
-        }
-        return $output;
-    }
 }
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
new file mode 100644
index 0000000..88ff3db
--- /dev/null
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright (c) 2012-2013 Jurian Sluiman.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the names of the copyright holders nor the names of the
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author      Witold Wasiczko <witold@wasiczko.pl>
+ * @copyright   2012-2013 Jurian Sluiman.
+ * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
+ * @link        http://www.psd2html.pl
+ */
+namespace SlmGoogleAnalytics\View\Helper\Script;
+
+use SlmGoogleAnalytics\Analytics\Tracker;
+class Analyticsjs implements ScriptInterface
+{
+    protected $tracker;
+
+    public function getScript()
+    {
+
+    }
+
+    public function setTracker(Tracker $tracker)
+    {
+        $this->tracker = $tracker;
+    }
+}
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
new file mode 100644
index 0000000..7ded333
--- /dev/null
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Copyright (c) 2012-2013 Jurian Sluiman.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the names of the copyright holders nor the names of the
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author      Witold Wasiczko <witold@wasiczko.pl>
+ * @copyright   2012-2013 Jurian Sluiman.
+ * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
+ * @link        http://www.psd2html.pl
+ */
+namespace SlmGoogleAnalytics\View\Helper\Script;
+
+use Zend\Json\Encoder;
+use SlmGoogleAnalytics\Analytics\Tracker;
+use SlmGoogleAnalytics\Analytics\CustomVariable;
+use SlmGoogleAnalytics\Analytics\Ecommerce\Transaction;
+
+class Gajs implements ScriptInterface
+{
+    const METHOD_PREFIX = '_';
+
+    protected $tracker;
+
+    public function setTracker(Tracker $tracker)
+    {
+        $this->tracker = $tracker;
+    }
+
+    public function getScript()
+    {
+        // Do not render when tracker is disabled
+        if (!$this->tracker->enabled()) {
+            return '';
+        }
+
+        $script = $this->getVarCreate();
+
+        $script .= $this->prepareSetAccount();
+        $script .= $this->prepareSetDomain();
+        $script .= $this->prepareSetAllowLinker();
+        $script .= $this->prepareAnonymizeIp();
+        $script .= $this->prepareCustomVariables();
+        $script .= $this->prepareEnabledPageTracking();
+        $script .= $this->prepareTrackEvents();
+        $script .= $this->prepareTransactions();
+
+        $script .= $this->getLoadScript();
+
+        return $script;
+    }
+
+    protected function getLoadScript()
+    {
+        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;
+    }
+
+    protected function getVarCreate()
+    {
+        return 'var _gaq = _gaq || [];'."\n";
+    }
+
+    protected function push($methodName, array $params = array())
+    {
+        array_unshift($params, self::METHOD_PREFIX . $methodName);
+        $jsArray = Encoder::encode($params);
+        $output  = sprintf('_gaq.push(%s);' . "\n", $jsArray);
+
+        return $output;
+    }
+
+    protected function prepareSetAccount()
+    {
+        return $this->push('setAccount', array($this->tracker->getId()));
+    }
+
+    protected function prepareSetDomain()
+    {
+        $domainName = $this->tracker->getDomainName();
+
+        if ($domainName) {
+            return $this->push('setDomainName', array($domainName));
+        }
+        return '';
+    }
+
+    protected function prepareSetAllowLinker()
+    {
+        if ($this->tracker->getAllowLinker()) {
+            return $this->push('setAllowLinker', array(true));
+        }
+        return '';
+    }
+
+    protected function prepareAnonymizeIp()
+    {
+        if ($this->tracker->getAnonymizeIp()) {
+            return $this->push('gat._anonymizeIp');
+        }
+    }
+
+    protected function prepareCustomVariables()
+    {
+        $customVariables = $this->tracker->getCustomVariables();
+        $output          = '';
+
+        foreach ($customVariables as $variable) {
+            $output .= $this->prepareCustomVariable($variable);
+        }
+        return $output;
+    }
+
+    protected function prepareCustomVariable(CustomVariable $customVariable)
+    {
+        $data = array(
+            $customVariable->getIndex(),
+            $customVariable->getName(),
+            $customVariable->getValue(),
+            $customVariable->getScope(),
+        );
+
+        return $this->push('setCustomVar', $data);
+    }
+
+    protected function prepareEnabledPageTracking()
+    {
+        if ($this->tracker->enabledPageTracking()) {
+            return $this->push('trackPageview');
+        }
+        return '';
+    }
+
+    protected function prepareTrackEvents()
+    {
+        $events = $this->tracker->getEvents();
+        $output = '';
+
+        foreach ($events as $event) {
+            $output .= $this->push('trackEvent', array(
+                $event->getCategory(),
+                $event->getAction(),
+                $event->getLabel(),
+                $event->getValue(),
+            ));
+        }
+        return $output;
+    }
+
+    protected function prepareTransactions()
+    {
+        $transactions = $this->tracker->getTransactions();
+        $output       = '';
+
+        foreach ($transactions as $transaction) {
+            $output .= $this->push('addTrans', array(
+                $transaction->getId(),
+                $transaction->getAffiliation(),
+                $transaction->getTotal(),
+                $transaction->getTax(),
+                $transaction->getShipping(),
+                $transaction->getCity(),
+                $transaction->getState(),
+                $transaction->getCountry(),
+            ));
+
+            $output .= $this->prepareTransactionItems($transaction);
+        }
+        if ($output !== '') {
+            $output .= $this->push('trackTrans');
+        }
+        return $output;
+    }
+
+    protected function prepareTransactionItems(Transaction $transaction)
+    {
+        $output = '';
+        $items  = $transaction->getItems();
+
+        foreach ($items as $item) {
+            $output .= $this->push('addItem', array(
+                $transaction->getId(),
+                $item->getSku(),
+                $item->getProduct(),
+                $item->getCategory(),
+                $item->getPrice(),
+                $item->getQuantity(),
+            ));
+        }
+        return $output;
+    }
+}
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/ScriptInterface.php b/src/SlmGoogleAnalytics/View/Helper/Script/ScriptInterface.php
new file mode 100644
index 0000000..4c19a48
--- /dev/null
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/ScriptInterface.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright (c) 2012-2013 Jurian Sluiman.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the names of the copyright holders nor the names of the
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author      Witold Wasiczko <witold@wasiczko.pl>
+ * @copyright   2012-2013 Jurian Sluiman.
+ * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
+ * @link        http://www.psd2html.pl
+ */
+namespace SlmGoogleAnalytics\View\Helper\Script;
+
+use SlmGoogleAnalytics\Analytics\Tracker;
+
+interface ScriptInterface
+{
+    public function setTracker(Tracker $tracker);
+    public function getScript();
+}
diff --git a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
index cfde3aa..9aae7cb 100644
--- a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
+++ b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
@@ -43,6 +43,7 @@
 use Zend\View\Renderer\PhpRenderer;
 use SlmGoogleAnalytics\Analytics\Tracker;
 use SlmGoogleAnalytics\View\Helper\GoogleAnalytics as Helper;
+use SlmGoogleAnalytics\View\Helper\Script;
 use SlmGoogleAnalyticsTest\View\Helper\TestAsset\CustomViewHelper;
 use SlmGoogleAnalytics\Analytics\CustomVariable;
 use SlmGoogleAnalytics\Analytics\Event;
@@ -65,7 +66,11 @@ public function setUp()
     {
         $this->tracker = new Tracker(123);
         $this->tracker->setAllowLinker(true);
-        $this->helper  = new Helper($this->tracker);
+
+        $script = new Script\Gajs();
+        $script->setTracker($this->tracker);
+
+        $this->helper  = new Helper($script);
 
         $view = new PhpRenderer;
         $this->helper->setView($view);

From b33e167db11bc9c89e4847a13ed144b2b0bec7ba Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Sun, 13 Oct 2013 21:16:16 +0200
Subject: [PATCH 05/10] Analytics.js script

---
 Module.php                                    |  19 +-
 .../View/Helper/GoogleAnalytics.php           |  16 +-
 .../View/Helper/Script/Analyticsjs.php        | 239 +++++++++++++++++-
 3 files changed, 260 insertions(+), 14 deletions(-)

diff --git a/Module.php b/Module.php
index bc3f4e0..9bd7995 100644
--- a/Module.php
+++ b/Module.php
@@ -47,11 +47,7 @@
 use SlmGoogleAnalytics\View\Helper;
 
 class Module implements
-    Feature\AutoloaderProviderInterface,
-    Feature\ConfigProviderInterface,
-    Feature\ViewHelperProviderInterface,
-    Feature\ServiceProviderInterface,
-    Feature\BootstrapListenerInterface
+Feature\AutoloaderProviderInterface, Feature\ConfigProviderInterface, Feature\ViewHelperProviderInterface, Feature\ServiceProviderInterface, Feature\BootstrapListenerInterface
 {
 
     public function getAutoloaderConfig()
@@ -146,17 +142,18 @@ public function getServiceConfig()
     public function onBootstrap(EventInterface $e)
     {
         $app = $e->getParam('application');
-        $sm  = $app->getServiceManager();
-        $em  = $app->getEventManager();
 
         if (!$app->getRequest() instanceof HttpRequest) {
             return;
         }
 
+        $sm = $app->getServiceManager();
+        $em = $app->getEventManager();
+
         $em->attach(MvcEvent::EVENT_RENDER, function(MvcEvent $e) use ($sm) {
-                    $view   = $sm->get('ViewHelperManager');
-                    $plugin = $view->get('googleAnalytics');
-                    $plugin();
-                });
+            $view   = $sm->get('ViewHelperManager');
+            $plugin = $view->get('googleAnalytics');
+            $plugin->appendScript();
+        });
     }
 }
diff --git a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
index aedb861..d09b61d 100644
--- a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
+++ b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
@@ -76,12 +76,18 @@ public function setContainer($container)
     }
 
     public function __invoke()
+    {
+        return $this;
+    }
+
+    public function appendScript()
     {
         if ($this->rendered) {
             return;
         }
+
         // We need to be sure $container->appendScript() can be called
-        $container = $this->view->plugin($this->getContainerName());
+        $container = $this->getContainer();
         if (!$container instanceof HeadScript) {
             throw new RuntimeException(sprintf(
                     'Container %s does not extend HeadScript view helper', $this->getContainerName()
@@ -98,7 +104,15 @@ public function __invoke()
 
         // Mark this GA as rendered
         $this->rendered = true;
+
+        return $this;
     }
 
+    protected function getContainer()
+    {
+        $containerName = $this->getContainerName();
+        $container     = $this->view->plugin($containerName);
 
+        return $container;
+    }
 }
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
index 88ff3db..eb5029b 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
@@ -39,18 +39,253 @@
  */
 namespace SlmGoogleAnalytics\View\Helper\Script;
 
+use Zend\Json\Json;
 use SlmGoogleAnalytics\Analytics\Tracker;
+use SlmGoogleAnalytics\Analytics\Ecommerce\Item;
+use SlmGoogleAnalytics\Analytics\Ecommerce\Transaction;
+
 class Analyticsjs implements ScriptInterface
 {
+    const DEFAULT_FUNCTION_NAME = 'ga';
+
     protected $tracker;
+    protected $function      = self::DEFAULT_FUNCTION_NAME;
+    protected $loadedPlugins = array();
+
+    public function setTracker(Tracker $tracker)
+    {
+        $this->tracker = $tracker;
+    }
+
+    protected function callGa(array $params)
+    {
+        $jsArray         = Json::encode($params);
+        $jsArrayAsParams = substr($jsArray, 1, -1);
+        $output          = sprintf("\n" . '%s(%s);', $this->getFunctionName(), $jsArrayAsParams);
+
+        return $output;
+    }
 
     public function getScript()
     {
+        // Do not render when tracker is disabled
+        if (!$this->tracker->enabled()) {
+            return '';
+        }
+
+        $script = $this->getLoadScript();
+
+        $script .= $this->prepareCreate();
+        $script .= $this->prepareLinker();
+        $script .= $this->prepareTrackEvents();
+        $script .= $this->prepareTransactions();
+        $script .= $this->prepareSend();
 
+        return $script;
     }
 
-    public function setTracker(Tracker $tracker)
+    public function setFunctionName($name)
     {
-        $this->tracker = $tracker;
+        $this->function = $name;
+    }
+
+    public function getFunctionName()
+    {
+        return $this->function;
+    }
+
+    protected function getLoadScript()
+    {
+        $script = <<<SCRIPT
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','%s');
+SCRIPT;
+
+        return sprintf($script, $this->getFunctionName());
+    }
+
+    protected function requirePlugin($name, $scriptName = null)
+    {
+        $output = '';
+
+        if (array_search($name, $this->loadedPlugins) === false) {
+            $params = array(
+                'require',
+                $name,
+            );
+
+            if ($scriptName !== null) {
+                $params[] = $scriptName;
+            }
+
+            $output = $this->callGa($params);
+        }
+        return $output;
+    }
+
+    protected function prepareCreate()
+    {
+        $parameters = array();
+        $params     = array(
+            'create',
+            $this->tracker->getId(),
+        );
+
+
+        if ($this->tracker->getAllowLinker()) {
+            $parameters['allowLinker'] = true;
+        }
+
+        if ($this->tracker->getAnonymizeIp()) {
+            $parameters['anonymizeIp'] = true;
+        }
+
+        if (count($parameters) > 0) {
+            $params[] = $parameters;
+        }
+
+        return $this->callGa($params);
+    }
+
+    protected function prepareSend()
+    {
+        if (!$this->tracker->enabledPageTracking()) {
+            return '';
+        }
+
+        $parameters = array();
+        $params     = array(
+            'send',
+            'pageview',
+        );
+
+        $customVariables = $this->tracker->getCustomVariables();
+
+        if (count($customVariables) > 0) {
+            foreach ($customVariables as $customVariable) {
+                $index = $customVariable->getIndex();
+                $key   = 'dimension' . $index;
+                $value = $customVariable->getValue();
+
+                $parameters[$key] = $value;
+            }
+        }
+
+        if (count($parameters) > 0) {
+            $params[] = $parameters;
+        }
+
+        return $this->callGa($params);
+    }
+
+    protected function prepareLinker()
+    {
+        $domainName = $this->tracker->getDomainName();
+        $output     = '';
+
+        if ($domainName) {
+            $output .= $this->requirePlugin('linker');
+
+            $params = array(
+                'linker:autoLink',
+                array($domainName),
+            );
+
+            $output .= $this->callGa($params);
+        }
+        return $output;
+    }
+
+    protected function prepareTrackEvents()
+    {
+        $events = $this->tracker->getEvents();
+        $output = '';
+
+        foreach ($events as $event) {
+            $output .= $this->prepareTrackEvent($event);
+        }
+        return $output;
+    }
+
+    protected function prepareTrackEvent(\SlmGoogleAnalytics\Analytics\Event $event)
+    {
+        $params = array(
+            'send',
+            'event',
+            $event->getCategory(),
+            $event->getAction(),
+            $event->getLabel(),
+            $event->getValue(),
+        );
+
+        return $this->callGa($params);
+    }
+
+    protected function prepareTransactions()
+    {
+        $transactions = $this->tracker->getTransactions();
+        $output       = '';
+
+        $hasTransactions = count($transactions) > 0;
+
+        if ($hasTransactions) {
+            $output .= $this->requirePlugin('ecommerce', 'ecommerce.js');
+        }
+
+        foreach ($transactions as $transaction) {
+            $output .= $this->prepareTransaction($transaction);
+            $output .= $this->prepareTransactionItems($transaction);
+        }
+
+        if ($hasTransactions) {
+            $output .= $this->callGa(array('ecommerce:send'));
+        }
+        return $output;
+    }
+
+    protected function prepareTransaction(Transaction $transaction)
+    {
+        $params = array(
+            'ecommerce:addTransaction',
+            array(
+                'id'          => $transaction->getId(),
+                'affiliation' => $transaction->getAffiliation(),
+                'revenue'     => $transaction->getTotal(),
+                'shipping'    => $transaction->getItems(),
+                'tax'         => $transaction->getTax(),
+            ),
+        );
+
+        return $this->callGa($params);
+    }
+
+    protected function prepareTransactionItems(Transaction $transaction)
+    {
+        $output = '';
+        $items  = $transaction->getItems();
+
+        foreach ($items as $item) {
+            $output .= $this->prepareTransactionItem($transaction, $item);
+        }
+        return $output;
+    }
+
+    protected function prepareTransactionItem(Transaction $transaction, Item $item)
+    {
+        $params = array(
+            'ecommerce:addItem',
+            array(
+                'id'       => $transaction->getId(),
+                'name'     => $item->getProduct(),
+                'sku'      => $item->getSku(),
+                'category' => $item->getCategory(),
+                'price'    => $item->getPrice(),
+                'quantity' => $item->getQuantity(),
+            ),
+        );
+
+        return $this->callGa($params);
     }
 }

From 7a361ece7404d654ca2901860379966555837842 Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Sun, 13 Oct 2013 22:10:37 +0200
Subject: [PATCH 06/10] Factories and bring config from module.php to
 module.config.php

---
 Module.php                                    | 70 +-----------------
 config/module.config.php                      | 18 +++++
 .../Service/GoogleAnalyticsFactory.php        | 56 ++++++++++++++
 .../Service/ScriptFactory.php                 | 62 ++++++++++++++++
 .../Service/TrackerFactory.php                | 74 +++++++++++++++++++
 5 files changed, 213 insertions(+), 67 deletions(-)
 create mode 100644 src/SlmGoogleAnalytics/Service/GoogleAnalyticsFactory.php
 create mode 100644 src/SlmGoogleAnalytics/Service/ScriptFactory.php
 create mode 100644 src/SlmGoogleAnalytics/Service/TrackerFactory.php

diff --git a/Module.php b/Module.php
index 9bd7995..ac8616d 100644
--- a/Module.php
+++ b/Module.php
@@ -43,11 +43,11 @@
 use Zend\Http\Request as HttpRequest;
 use Zend\ModuleManager\Feature;
 use Zend\Mvc\MvcEvent;
-use SlmGoogleAnalytics\Analytics;
-use SlmGoogleAnalytics\View\Helper;
 
 class Module implements
-Feature\AutoloaderProviderInterface, Feature\ConfigProviderInterface, Feature\ViewHelperProviderInterface, Feature\ServiceProviderInterface, Feature\BootstrapListenerInterface
+    Feature\AutoloaderProviderInterface,
+    Feature\ConfigProviderInterface,
+    Feature\BootstrapListenerInterface
 {
 
     public function getAutoloaderConfig()
@@ -69,70 +69,6 @@ public function getConfig()
         return include __DIR__ . '/config/module.config.php';
     }
 
-    public function getViewHelperConfig()
-    {
-        return array(
-            'factories' => array(
-                'googleAnalytics' => function($sm) {
-                    $script = $sm->getServiceLocator()->get('google-analytics-script');
-                    $helper = new Helper\GoogleAnalytics($script);
-
-                    return $helper;
-                },
-            ),
-        );
-    }
-
-    public function getServiceConfig()
-    {
-        return array(
-            'aliases'    => array(
-                'google-analytics' => 'SlmGoogleAnalytics\Analytics\Tracker',
-            ),
-            'invokables' => array(
-                'google-analytics-script-analytics-js' => 'SlmGoogleAnalytics\View\Helper\Script\Analyticsjs',
-                'google-analytics-script-ga-js'        => 'SlmGoogleAnalytics\View\Helper\Script\Gajs',
-            ),
-            'factories'  => array(
-                'SlmGoogleAnalytics\Analytics\Tracker' => function($sm) {
-                    $config = $sm->get('config');
-                    $config = $config['google_analytics'];
-
-                    $tracker = new Analytics\Tracker($config['id']);
-
-                    if (isset($config['domain_name'])) {
-                        $tracker->setDomainName($config['domain_name']);
-                    }
-
-                    if (isset($config['allow_linker'])) {
-                        $tracker->setAllowLinker($config['allow_linker']);
-                    }
-
-                    if (true === $config['anonymize_ip']) {
-                        $tracker->setAnonymizeIp(true);
-                    }
-
-                    if (false === $config['enable']) {
-                        $tracker->setEnableTracking(false);
-                    }
-
-                    return $tracker;
-                },
-                'google-analytics-script' => function($sm) {
-                    $config     = $sm->get('config');
-                    $scriptName = $config['google_analytics']['script'];
-
-                    $script = $sm->get($scriptName);
-                    $ga     = $sm->get('google-analytics');
-
-                    $script->setTracker($ga);
-
-                    return $script;
-                },
-            ),
-        );
-    }
-
     /**
      * When the render event is triggered, we invoke the view helper to
      * render the javascript code.
diff --git a/config/module.config.php b/config/module.config.php
index 7001952..d8c1c4c 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -47,4 +47,22 @@
         'anonymize_ip' => false,
         'script'       => 'google-analytics-script-ga-js',
     ),
+    'service_manager'  => array(
+        'aliases'    => array(
+            'google-analytics' => 'SlmGoogleAnalytics\Analytics\Tracker',
+        ),
+        'invokables' => array(
+            'google-analytics-script-analytics-js' => 'SlmGoogleAnalytics\View\Helper\Script\Analyticsjs',
+            'google-analytics-script-ga-js'        => 'SlmGoogleAnalytics\View\Helper\Script\Gajs',
+        ),
+        'factories'  => array(
+            'SlmGoogleAnalytics\Analytics\Tracker' => 'SlmGoogleAnalytics\Service\TrackerFactory',
+            'google-analytics-script'              => 'SlmGoogleAnalytics\Service\ScriptFactory',
+        ),
+    ),
+    'view_helpers'     => array(
+        'factories' => array(
+            'googleAnalytics' => 'SlmGoogleAnalytics\Service\GoogleAnalyticsFactory',
+        ),
+    )
 );
diff --git a/src/SlmGoogleAnalytics/Service/GoogleAnalyticsFactory.php b/src/SlmGoogleAnalytics/Service/GoogleAnalyticsFactory.php
new file mode 100644
index 0000000..9d4c9a6
--- /dev/null
+++ b/src/SlmGoogleAnalytics/Service/GoogleAnalyticsFactory.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright (c) 2012-2013 Jurian Sluiman.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the names of the copyright holders nor the names of the
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author      Witold Wasiczko <witold@wasiczko.pl>
+ * @copyright   2012-2013 Jurian Sluiman.
+ * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
+ * @link        http://www.psd2html.pl
+ */
+namespace SlmGoogleAnalytics\Service;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use SlmGoogleAnalytics\View\Helper\GoogleAnalytics;
+
+class GoogleAnalyticsFactory implements FactoryInterface
+{
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        $sm = $serviceLocator->getServiceLocator();
+        $script = $sm->get('google-analytics-script');
+        $helper = new GoogleAnalytics($script);
+
+        return $helper;
+    }
+}
diff --git a/src/SlmGoogleAnalytics/Service/ScriptFactory.php b/src/SlmGoogleAnalytics/Service/ScriptFactory.php
new file mode 100644
index 0000000..c51d4a5
--- /dev/null
+++ b/src/SlmGoogleAnalytics/Service/ScriptFactory.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright (c) 2012-2013 Jurian Sluiman.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the names of the copyright holders nor the names of the
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author      Witold Wasiczko <witold@wasiczko.pl>
+ * @copyright   2012-2013 Jurian Sluiman.
+ * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
+ * @link        http://www.psd2html.pl
+ */
+namespace SlmGoogleAnalytics\Service;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class ScriptFactory implements FactoryInterface
+{
+
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        $config     = $serviceLocator->get('config');
+        $scriptName = $config['google_analytics']['script'];
+
+
+        $script = $serviceLocator->get($scriptName);
+        /* @var $script \SlmGoogleAnalytics\View\Helper\Script\ScriptInterface */
+        $ga     = $serviceLocator->get('google-analytics');
+
+        $script->setTracker($ga);
+
+        return $script;
+    }
+}
diff --git a/src/SlmGoogleAnalytics/Service/TrackerFactory.php b/src/SlmGoogleAnalytics/Service/TrackerFactory.php
new file mode 100644
index 0000000..543211b
--- /dev/null
+++ b/src/SlmGoogleAnalytics/Service/TrackerFactory.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (c) 2012-2013 Jurian Sluiman.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the names of the copyright holders nor the names of the
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author      Witold Wasiczko <witold@wasiczko.pl>
+ * @copyright   2012-2013 Jurian Sluiman.
+ * @license     http://www.opensource.org/licenses/bsd-license.php  BSD License
+ * @link        http://www.psd2html.pl
+ */
+namespace SlmGoogleAnalytics\Service;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use SlmGoogleAnalytics\Analytics\Tracker;
+
+class TrackerFactory implements FactoryInterface
+{
+
+    public function createService(ServiceLocatorInterface $serviceLocator)
+    {
+        $config = $serviceLocator->get('config');
+        $gaConfig = $config['google_analytics'];
+
+        $tracker = new Tracker($gaConfig['id']);
+
+        if (isset($gaConfig['domain_name'])) {
+            $tracker->setDomainName($gaConfig['domain_name']);
+        }
+
+        if (isset($gaConfig['allow_linker'])) {
+            $tracker->setAllowLinker($gaConfig['allow_linker']);
+        }
+
+        if (true === $gaConfig['anonymize_ip']) {
+            $tracker->setAnonymizeIp(true);
+        }
+
+        if (false === $gaConfig['enable']) {
+            $tracker->setEnableTracking(false);
+        }
+
+        return $tracker;
+    }
+}

From 752dda5c6fc25c2a1856354838e4cb816a8622ee Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Mon, 21 Oct 2013 13:50:36 +0200
Subject: [PATCH 07/10] Fix tests

---
 .../View/Helper/GoogleAnalytics.php           |  8 ++++----
 .../View/Helper/GoogleAnalyticsTest.php       | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
index d09b61d..8de1631 100644
--- a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
+++ b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
@@ -48,7 +48,7 @@ class GoogleAnalytics extends AbstractHelper
     /**
      * @var string
      */
-    protected $container = 'InlineScript';
+    protected $containerName = 'InlineScript';
 
     /**
      * @var bool
@@ -67,12 +67,12 @@ public function __construct(Script\ScriptInterface $script)
 
     public function getContainerName()
     {
-        return $this->container;
+        return $this->containerName;
     }
 
-    public function setContainer($container)
+    public function setContainerName($container)
     {
-        $this->container = $container;
+        $this->containerName = $container;
     }
 
     public function __invoke()
diff --git a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
index 9aae7cb..18e6a77 100644
--- a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
+++ b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
@@ -41,14 +41,14 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\View\Renderer\PhpRenderer;
+use SlmGoogleAnalytics\Analytics\CustomVariable;
+use SlmGoogleAnalytics\Analytics\Ecommerce\Transaction;
+use SlmGoogleAnalytics\Analytics\Ecommerce\Item;
+use SlmGoogleAnalytics\Analytics\Event;
 use SlmGoogleAnalytics\Analytics\Tracker;
 use SlmGoogleAnalytics\View\Helper\GoogleAnalytics as Helper;
 use SlmGoogleAnalytics\View\Helper\Script;
 use SlmGoogleAnalyticsTest\View\Helper\TestAsset\CustomViewHelper;
-use SlmGoogleAnalytics\Analytics\CustomVariable;
-use SlmGoogleAnalytics\Analytics\Event;
-use SlmGoogleAnalytics\Analytics\Ecommerce\Transaction;
-use SlmGoogleAnalytics\Analytics\Ecommerce\Item;
 
 class GoogleAnalyticsTest extends TestCase
 {
@@ -104,7 +104,7 @@ public function testHelperReturnsNullWithDisabledTracker()
     {
         $this->tracker->setEnableTracking(false);
         $helper = $this->helper;
-        $return = $helper();
+        $return = $helper()->appendScript();
 
         $this->assertEquals(null, $return);
     }
@@ -113,9 +113,9 @@ public function testHelperThrowsExceptionWithNonExistingContainer()
     {
         $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
 
-        $this->helper->setContainer('NonExistingViewHelper');
+        $this->helper->setContainerName('NonExistingViewHelper');
         $helper = $this->helper;
-        $helper();
+        $helper()->appendScript();
     }
 
     public function testHelperThrowsExceptionWithContainerNotInheritedFromHeadscript()
@@ -129,9 +129,9 @@ public function testHelperThrowsExceptionWithContainerNotInheritedFromHeadscript
         $broker = $view->getHelperPluginManager();
         $broker->setService('CustomViewHelper', $plugin);
 
-        $this->helper->setContainer('CustomViewHelper');
+        $this->helper->setContainerName('CustomViewHelper');
         $helper = $this->helper;
-        $helper();
+        $helper()->appendScript();
     }
 
     public function testHelperRendersNoPagesWithPageTrackingOff()
@@ -391,6 +391,7 @@ public function testHelperRendersItemWithOptionalValuesEmpty()
 
     protected function getOutput(Helper $helper)
     {
+        $helper->appendScript();
         $containerName = $helper->getContainerName();
         $container = $helper->getView()->plugin($containerName);
 

From d75fb6cf38f7478db23ec26ffe93dffc8214cb4b Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Mon, 21 Oct 2013 14:57:13 +0200
Subject: [PATCH 08/10] Fixes

---
 config/module.config.php                      | 14 ++--
 .../Analytics/CustomVariable.php              | 18 +++--
 .../Analytics/Ecommerce/Item.php              | 25 ++-----
 .../Analytics/Ecommerce/Transaction.php       | 16 ++---
 src/SlmGoogleAnalytics/Analytics/Event.php    | 15 ++--
 src/SlmGoogleAnalytics/Analytics/Tracker.php  | 18 +++--
 .../Service/GoogleAnalyticsFactory.php        |  2 +-
 .../Service/ScriptFactory.php                 |  2 -
 .../Service/TrackerFactory.php                |  6 +-
 .../View/Helper/GoogleAnalytics.php           | 26 +++----
 .../View/Helper/Script/Analyticsjs.php        | 68 +++++++++++++-----
 .../View/Helper/Script/Gajs.php               | 70 ++++++++++++-------
 .../View/Helper/Script/ScriptInterface.php    |  2 +-
 .../View/Helper/GoogleAnalyticsTest.php       | 12 ++--
 14 files changed, 163 insertions(+), 131 deletions(-)

diff --git a/config/module.config.php b/config/module.config.php
index d8c1c4c..7595718 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -45,19 +45,21 @@
         'domain_name'  => '',
         'allow_linker' => false,
         'anonymize_ip' => false,
-        'script'       => 'google-analytics-script-ga-js',
+        'script'       => 'google-analytics-ga',
     ),
     'service_manager'  => array(
         'aliases'    => array(
-            'google-analytics' => 'SlmGoogleAnalytics\Analytics\Tracker',
+            'google-analytics'           => 'SlmGoogleAnalytics\Analytics\Tracker',
+            'google-analytics-universal' => 'SlmGoogleAnalytics\View\Helper\Script\Analyticsjs',
+            'google-analytics-ga'        => 'SlmGoogleAnalytics\View\Helper\Script\Gajs',
         ),
         'invokables' => array(
-            'google-analytics-script-analytics-js' => 'SlmGoogleAnalytics\View\Helper\Script\Analyticsjs',
-            'google-analytics-script-ga-js'        => 'SlmGoogleAnalytics\View\Helper\Script\Gajs',
+            'SlmGoogleAnalytics\View\Helper\Script\Analyticsjs' => 'SlmGoogleAnalytics\View\Helper\Script\Analyticsjs',
+            'SlmGoogleAnalytics\View\Helper\Script\Gajs'        => 'SlmGoogleAnalytics\View\Helper\Script\Gajs',
         ),
         'factories'  => array(
-            'SlmGoogleAnalytics\Analytics\Tracker' => 'SlmGoogleAnalytics\Service\TrackerFactory',
-            'google-analytics-script'              => 'SlmGoogleAnalytics\Service\ScriptFactory',
+            'SlmGoogleAnalytics\Analytics\Tracker'     => 'SlmGoogleAnalytics\Service\TrackerFactory',
+            'SlmGoogleAnalytics\Service\ScriptFactory' => 'SlmGoogleAnalytics\Service\ScriptFactory',
         ),
     ),
     'view_helpers'     => array(
diff --git a/src/SlmGoogleAnalytics/Analytics/CustomVariable.php b/src/SlmGoogleAnalytics/Analytics/CustomVariable.php
index 0f68756..6d621ea 100644
--- a/src/SlmGoogleAnalytics/Analytics/CustomVariable.php
+++ b/src/SlmGoogleAnalytics/Analytics/CustomVariable.php
@@ -60,11 +60,10 @@ public function __construct($index, $name, $value, $scope = self::SCOPE_PAGE_LEV
     public function setIndex($index)
     {
         if (!is_int($index)) {
-            throw new InvalidArgumentException(
-            sprintf(
-                    'Index must be of type integer, %s given', gettype($index)
-            )
-            );
+            throw new InvalidArgumentException(sprintf(
+                'Index must be of type integer, %s given',
+                gettype($index)
+            ));
         }
 
         $this->index = $index;
@@ -104,11 +103,10 @@ public function setScope($scope)
         );
 
         if (!in_array($scope, $allowed, true)) {
-            throw new InvalidArgumentException(
-            sprintf(
-                    'Invalid value given for scope. Acceptable values are: %s.', implode(', ', $allowed)
-            )
-            );
+            throw new InvalidArgumentException(sprintf(
+                'Invalid value given for scope. Acceptable values are: %s.',
+                implode(', ', $allowed)
+            ));
         }
 
         $this->scope = $scope;
diff --git a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
index e9e4133..18a13e8 100644
--- a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
+++ b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Item.php
@@ -41,30 +41,19 @@
 
 class Item
 {
-    const DEFAULT_QUANTITY = 1;
-
     protected $sku;
     protected $price;
-    protected $quantity = self::DEFAULT_QUANTITY;
-    protected $product  = '';
-    protected $category = '';
+    protected $quantity;
+    protected $product;
+    protected $category;
 
-    public function __construct($sku, $price, $quantity = self::DEFAULT_QUANTITY, $product = null, $category = null)
+    public function __construct($sku, $price, $quantity = null, $product = null, $category = null)
     {
         $this->setSku($sku);
         $this->setPrice($price);
-
-        if (self::DEFAULT_QUANTITY !== $quantity) {
-            $this->setQuantity($quantity);
-        }
-
-        if (null !== $product) {
-            $this->setProduct($product);
-        }
-
-        if (null !== $category) {
-            $this->setCategory($category);
-        }
+        $this->setQuantity($quantity);
+        $this->setProduct($product);
+        $this->setCategory($category);
     }
 
     public function getSku()
diff --git a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Transaction.php b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Transaction.php
index 830d766..48a180a 100644
--- a/src/SlmGoogleAnalytics/Analytics/Ecommerce/Transaction.php
+++ b/src/SlmGoogleAnalytics/Analytics/Ecommerce/Transaction.php
@@ -42,14 +42,14 @@
 class Transaction
 {
     protected $id;
-    protected $affiliation = '';
-    protected $total       = '';
-    protected $tax         = '';
-    protected $shipping    = '';
-    protected $city        = '';
-    protected $state       = '';
-    protected $country     = '';
-    protected $items       = array();
+    protected $affiliation;
+    protected $total;
+    protected $tax;
+    protected $shipping;
+    protected $city;
+    protected $state;
+    protected $country;
+    protected $items = array();
 
     public function __construct($id, $total)
     {
diff --git a/src/SlmGoogleAnalytics/Analytics/Event.php b/src/SlmGoogleAnalytics/Analytics/Event.php
index 6abcf5c..b66553d 100644
--- a/src/SlmGoogleAnalytics/Analytics/Event.php
+++ b/src/SlmGoogleAnalytics/Analytics/Event.php
@@ -43,20 +43,15 @@ class Event
 {
     protected $category;
     protected $action;
-    protected $label = '';
-    protected $value = '';
+    protected $label;
+    protected $value;
 
-    public function __construct($category, $action, $label = '', $value = '')
+    public function __construct($category, $action, $label = null, $value = null)
     {
         $this->setCategory($category);
         $this->setAction($action);
-
-        if ($label !== null) {
-            $this->setLabel($label);
-        }
-        if ($value !== null) {
-            $this->setValue($value);
-        }
+        $this->setLabel($label);
+        $this->setValue($value);
     }
 
     public function getCategory()
diff --git a/src/SlmGoogleAnalytics/Analytics/Tracker.php b/src/SlmGoogleAnalytics/Analytics/Tracker.php
index e78c6e3..2df88e7 100644
--- a/src/SlmGoogleAnalytics/Analytics/Tracker.php
+++ b/src/SlmGoogleAnalytics/Analytics/Tracker.php
@@ -79,7 +79,7 @@ public function getId()
 
     public function setId($id)
     {
-        $this->id = $id;
+        $this->id = (string) $id;
     }
 
     public function enabled()
@@ -114,10 +114,7 @@ public function getAllowLinker()
 
     public function setDomainName($domain_name)
     {
-        if (!is_string($domain_name))
-            throw new InvalidArgumentException('$domain_name is not a string');
-
-        $this->domainName = $domain_name;
+        $this->domainName = (string) $domain_name;
     }
 
     public function getDomainName()
@@ -149,9 +146,10 @@ public function addCustomVariable(CustomVariable $variable)
     {
         $index = $variable->getIndex();
         if (array_key_exists($index, $this->customVariables)) {
-            throw new InvalidArgumentException(
-            'Cannot add custom variable with index %d, it already exists', $index
-            );
+            throw new InvalidArgumentException(sprintf(
+                'Cannot add custom variable with index %d, it already exists',
+                $index
+            ));
         }
 
         $this->customVariables[$index] = $variable;
@@ -177,10 +175,10 @@ public function addTransaction(Transaction $transaction)
         $id = $transaction->getId();
         if (array_key_exists($id, $this->transactions)) {
             throw new InvalidArgumentException(sprintf(
-                    'Cannot add transaction with id %s, it already exists', $id
+                'Cannot add transaction with id %s, it already exists',
+                $id
             ));
         }
-
         $this->transactions[$id] = $transaction;
     }
 }
diff --git a/src/SlmGoogleAnalytics/Service/GoogleAnalyticsFactory.php b/src/SlmGoogleAnalytics/Service/GoogleAnalyticsFactory.php
index 9d4c9a6..9577aa1 100644
--- a/src/SlmGoogleAnalytics/Service/GoogleAnalyticsFactory.php
+++ b/src/SlmGoogleAnalytics/Service/GoogleAnalyticsFactory.php
@@ -48,7 +48,7 @@ class GoogleAnalyticsFactory implements FactoryInterface
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $sm = $serviceLocator->getServiceLocator();
-        $script = $sm->get('google-analytics-script');
+        $script = $sm->get('SlmGoogleAnalytics\Service\ScriptFactory');
         $helper = new GoogleAnalytics($script);
 
         return $helper;
diff --git a/src/SlmGoogleAnalytics/Service/ScriptFactory.php b/src/SlmGoogleAnalytics/Service/ScriptFactory.php
index c51d4a5..79ce683 100644
--- a/src/SlmGoogleAnalytics/Service/ScriptFactory.php
+++ b/src/SlmGoogleAnalytics/Service/ScriptFactory.php
@@ -44,13 +44,11 @@
 
 class ScriptFactory implements FactoryInterface
 {
-
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $config     = $serviceLocator->get('config');
         $scriptName = $config['google_analytics']['script'];
 
-
         $script = $serviceLocator->get($scriptName);
         /* @var $script \SlmGoogleAnalytics\View\Helper\Script\ScriptInterface */
         $ga     = $serviceLocator->get('google-analytics');
diff --git a/src/SlmGoogleAnalytics/Service/TrackerFactory.php b/src/SlmGoogleAnalytics/Service/TrackerFactory.php
index 543211b..fcf4030 100644
--- a/src/SlmGoogleAnalytics/Service/TrackerFactory.php
+++ b/src/SlmGoogleAnalytics/Service/TrackerFactory.php
@@ -45,10 +45,9 @@
 
 class TrackerFactory implements FactoryInterface
 {
-
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $config = $serviceLocator->get('config');
+        $config   = $serviceLocator->get('config');
         $gaConfig = $config['google_analytics'];
 
         $tracker = new Tracker($gaConfig['id']);
@@ -68,7 +67,6 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         if (false === $gaConfig['enable']) {
             $tracker->setEnableTracking(false);
         }
-
         return $tracker;
     }
-}
+}
\ No newline at end of file
diff --git a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
index 8de1631..df3f750 100644
--- a/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
+++ b/src/SlmGoogleAnalytics/View/Helper/GoogleAnalytics.php
@@ -75,6 +75,14 @@ public function setContainerName($container)
         $this->containerName = $container;
     }
 
+    protected function getContainer()
+    {
+        $containerName = $this->getContainerName();
+        $container     = $this->view->plugin($containerName);
+
+        return $container;
+    }
+
     public function __invoke()
     {
         return $this;
@@ -82,6 +90,7 @@ public function __invoke()
 
     public function appendScript()
     {
+        // Do not render the GA twice
         if ($this->rendered) {
             return;
         }
@@ -90,29 +99,22 @@ public function appendScript()
         $container = $this->getContainer();
         if (!$container instanceof HeadScript) {
             throw new RuntimeException(sprintf(
-                    'Container %s does not extend HeadScript view helper', $this->getContainerName()
+                'Container %s does not extend HeadScript view helper',
+                $this->getContainerName()
             ));
         }
 
-        $script = $this->script->getScript();
+        $code = $this->script->getCode();
 
-        if (empty($script)) {
+        if (empty($code)) {
             return;
         }
 
-        $container->appendScript($script);
+        $container->appendScript($code);
 
         // Mark this GA as rendered
         $this->rendered = true;
 
         return $this;
     }
-
-    protected function getContainer()
-    {
-        $containerName = $this->getContainerName();
-        $container     = $this->view->plugin($containerName);
-
-        return $container;
-    }
 }
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
index eb5029b..69d263c 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
@@ -66,7 +66,7 @@ protected function callGa(array $params)
         return $output;
     }
 
-    public function getScript()
+    public function getCode()
     {
         // Do not render when tracker is disabled
         if (!$this->tracker->enabled()) {
@@ -247,15 +247,33 @@ protected function prepareTransactions()
 
     protected function prepareTransaction(Transaction $transaction)
     {
+        $transactionParams = array(
+            'id' => $transaction->getId(),
+        );
+
+        $affiliation = $transaction->getAffiliation();
+        if ($affiliation !== null) {
+            $transactionParams['affiliation'] = $affiliation;
+        }
+
+        $revenue = $transaction->getTotal();
+        if ($revenue !== null) {
+            $transactionParams['revenue'] = $revenue;
+        }
+
+        $shipping = $transaction->getItems();
+        if ($shipping !== null) {
+            $transactionParams['shipping'] = $shipping;
+        }
+
+        $tax = $transaction->getTax();
+        if ($tax !== null) {
+            $transactionParams['tax'] = $tax;
+        }
+
         $params = array(
             'ecommerce:addTransaction',
-            array(
-                'id'          => $transaction->getId(),
-                'affiliation' => $transaction->getAffiliation(),
-                'revenue'     => $transaction->getTotal(),
-                'shipping'    => $transaction->getItems(),
-                'tax'         => $transaction->getTax(),
-            ),
+            $transactionParams,
         );
 
         return $this->callGa($params);
@@ -274,16 +292,34 @@ protected function prepareTransactionItems(Transaction $transaction)
 
     protected function prepareTransactionItem(Transaction $transaction, Item $item)
     {
+        $itemParams = array(
+            'id'   => $transaction->getId(),
+            'name' => $item->getProduct(),
+        );
+
+        $sku = $item->getSku();
+        if ($sku !== null) {
+            $itemParams['sku'] = $sku;
+        }
+
+        $category = $item->getCategory();
+        if ($category !== null) {
+            $itemParams['category'] = $category;
+        }
+
+        $price = $item->getPrice();
+        if ($price !== null) {
+            $itemParams['price'] = $price;
+        }
+
+        $quantity = $item->getQuantity();
+        if ($quantity !== null) {
+            $itemParams['quantity'] = $quantity;
+        }
+
         $params = array(
             'ecommerce:addItem',
-            array(
-                'id'       => $transaction->getId(),
-                'name'     => $item->getProduct(),
-                'sku'      => $item->getSku(),
-                'category' => $item->getCategory(),
-                'price'    => $item->getPrice(),
-                'quantity' => $item->getQuantity(),
-            ),
+            $itemParams,
         );
 
         return $this->callGa($params);
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
index 7ded333..3e27225 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Gajs.php
@@ -43,6 +43,8 @@
 use SlmGoogleAnalytics\Analytics\Tracker;
 use SlmGoogleAnalytics\Analytics\CustomVariable;
 use SlmGoogleAnalytics\Analytics\Ecommerce\Transaction;
+use SlmGoogleAnalytics\Analytics\Ecommerce\Item;
+use SlmGoogleAnalytics\Analytics\Event;
 
 class Gajs implements ScriptInterface
 {
@@ -55,7 +57,7 @@ public function setTracker(Tracker $tracker)
         $this->tracker = $tracker;
     }
 
-    public function getScript()
+    public function getCode()
     {
         // Do not render when tracker is disabled
         if (!$this->tracker->enabled()) {
@@ -131,6 +133,7 @@ protected function prepareAnonymizeIp()
         if ($this->tracker->getAnonymizeIp()) {
             return $this->push('gat._anonymizeIp');
         }
+        return '';
     }
 
     protected function prepareCustomVariables()
@@ -170,34 +173,28 @@ protected function prepareTrackEvents()
         $output = '';
 
         foreach ($events as $event) {
-            $output .= $this->push('trackEvent', array(
-                $event->getCategory(),
-                $event->getAction(),
-                $event->getLabel(),
-                $event->getValue(),
-            ));
+            $output .= $this->prepareTrackEvent($event);
         }
         return $output;
     }
 
+    protected function prepareTrackEvent(Event $event)
+    {
+        return $this->push('trackEvent', array(
+            $event->getCategory(),
+            $event->getAction(),
+            $event->getLabel(),
+            $event->getValue(),
+        ));
+    }
+
     protected function prepareTransactions()
     {
         $transactions = $this->tracker->getTransactions();
         $output       = '';
 
         foreach ($transactions as $transaction) {
-            $output .= $this->push('addTrans', array(
-                $transaction->getId(),
-                $transaction->getAffiliation(),
-                $transaction->getTotal(),
-                $transaction->getTax(),
-                $transaction->getShipping(),
-                $transaction->getCity(),
-                $transaction->getState(),
-                $transaction->getCountry(),
-            ));
-
-            $output .= $this->prepareTransactionItems($transaction);
+            $output .= $this->prepareTransaction($transaction);
         }
         if ($output !== '') {
             $output .= $this->push('trackTrans');
@@ -205,21 +202,40 @@ protected function prepareTransactions()
         return $output;
     }
 
+    protected function prepareTransaction(Transaction $transaction)
+    {
+        return $this->push('addTrans', array(
+            $transaction->getId(),
+            $transaction->getAffiliation(),
+            $transaction->getTotal(),
+            $transaction->getTax(),
+            $transaction->getShipping(),
+            $transaction->getCity(),
+            $transaction->getState(),
+            $transaction->getCountry(),
+        )) . $this->prepareTransactionItems($transaction);
+    }
+
     protected function prepareTransactionItems(Transaction $transaction)
     {
         $output = '';
         $items  = $transaction->getItems();
 
         foreach ($items as $item) {
-            $output .= $this->push('addItem', array(
-                $transaction->getId(),
-                $item->getSku(),
-                $item->getProduct(),
-                $item->getCategory(),
-                $item->getPrice(),
-                $item->getQuantity(),
-            ));
+            $output .= $this->prepareTransactionItem($transaction, $item);
         }
         return $output;
     }
+
+    protected function prepareTransactionItem(Transaction $transaction, Item $item)
+    {
+        return $this->push('addItem', array(
+            $transaction->getId(),
+            $item->getSku(),
+            $item->getProduct(),
+            $item->getCategory(),
+            $item->getPrice(),
+            $item->getQuantity(),
+        ));
+    }
 }
diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/ScriptInterface.php b/src/SlmGoogleAnalytics/View/Helper/Script/ScriptInterface.php
index 4c19a48..a068e40 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/ScriptInterface.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/ScriptInterface.php
@@ -44,5 +44,5 @@
 interface ScriptInterface
 {
     public function setTracker(Tracker $tracker);
-    public function getScript();
+    public function getCode();
 }
diff --git a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
index 18e6a77..1c6b070 100644
--- a/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
+++ b/tests/SlmGoogleAnalyticsTest/View/Helper/GoogleAnalyticsTest.php
@@ -88,7 +88,7 @@ public function testHelperRendersAccountId()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains('_gaq.push(["_setAccount",123])', $output);
+        $this->assertContains('_gaq.push(["_setAccount","123"])', $output);
     }
 
     public function testHelperTracksPagesByDefault()
@@ -273,7 +273,7 @@ public function testHelperRendersEmptyLabelAsEmptyString()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains('_gaq.push(["_trackEvent","Category","Action","","Value"])', $output);
+        $this->assertContains('_gaq.push(["_trackEvent","Category","Action",null,"Value"])', $output);
     }
 
     public function testHelperRendersEmptyValueAsEmptyString()
@@ -285,7 +285,7 @@ public function testHelperRendersEmptyValueAsEmptyString()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains('_gaq.push(["_trackEvent","Category","Action","Label",""])', $output);
+        $this->assertContains('_gaq.push(["_trackEvent","Category","Action","Label",null])', $output);
     }
 
     public function testHelperRendersEmptyValueAndLabelAsEmptyStrings()
@@ -297,7 +297,7 @@ public function testHelperRendersEmptyValueAndLabelAsEmptyStrings()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains('_gaq.push(["_trackEvent","Category","Action","",""])', $output);
+        $this->assertContains('_gaq.push(["_trackEvent","Category","Action",null,null])', $output);
     }
 
     public function testHelperRendersTransaction()
@@ -341,7 +341,7 @@ public function testHelperRendersTransactionWithOptionalValuesEmpty()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains('_gaq.push(["_addTrans",123,"",12.55,"","","","",""])', $output);
+        $this->assertContains('_gaq.push(["_addTrans",123,null,12.55,null,null,null,null,null])', $output);
     }
 
     public function testHelperRendersTransactionItem()
@@ -386,7 +386,7 @@ public function testHelperRendersItemWithOptionalValuesEmpty()
         $helper();
 
         $output = $this->getOutput($this->helper);
-        $this->assertContains('_gaq.push(["_addItem",123,456,"","",9.66,1])', $output);
+        $this->assertContains('_gaq.push(["_addItem",123,456,null,null,9.66,1])', $output);
     }
 
     protected function getOutput(Helper $helper)

From 525bdca900affd3989c35bb34f4d3335b134b03d Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Wed, 30 Oct 2013 23:11:05 +0100
Subject: [PATCH 09/10] Ommit params in Event

---
 .../View/Helper/Script/Analyticsjs.php          | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
index 69d263c..ecc2de9 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
@@ -40,6 +40,7 @@
 namespace SlmGoogleAnalytics\View\Helper\Script;
 
 use Zend\Json\Json;
+use SlmGoogleAnalytics\Analytics\Event;
 use SlmGoogleAnalytics\Analytics\Tracker;
 use SlmGoogleAnalytics\Analytics\Ecommerce\Item;
 use SlmGoogleAnalytics\Analytics\Ecommerce\Transaction;
@@ -209,17 +210,27 @@ protected function prepareTrackEvents()
         return $output;
     }
 
-    protected function prepareTrackEvent(\SlmGoogleAnalytics\Analytics\Event $event)
+    protected function prepareTrackEvent(Event $event)
     {
         $params = array(
             'send',
             'event',
             $event->getCategory(),
             $event->getAction(),
-            $event->getLabel(),
-            $event->getValue(),
         );
 
+        $label = $event->getLabel();
+
+        if ($label !== null) {
+            $params[] = $label;
+            $value = $event->getValue();
+
+            if ($value !== null) {
+                $params[] = $value;
+            }
+        }
+
+
         return $this->callGa($params);
     }
 

From 1b4844f2bc6ce3adbd659070424fe6ee32d7c125 Mon Sep 17 00:00:00 2001
From: snapshotpl <witold@wasiczko.pl>
Date: Wed, 30 Oct 2013 23:15:24 +0100
Subject: [PATCH 10/10] Check plugin loader

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

diff --git a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
index ecc2de9..cccc3c8 100644
--- a/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
+++ b/src/SlmGoogleAnalytics/View/Helper/Script/Analyticsjs.php
@@ -111,7 +111,7 @@ protected function requirePlugin($name, $scriptName = null)
     {
         $output = '';
 
-        if (array_search($name, $this->loadedPlugins) === false) {
+        if (isset($this->loadedPlugins[$name]) === false) {
             $params = array(
                 'require',
                 $name,
@@ -122,6 +122,7 @@ protected function requirePlugin($name, $scriptName = null)
             }
 
             $output = $this->callGa($params);
+            $this->loadedPlugins[$name] = true;
         }
         return $output;
     }