Merge lp:~elachuni/ubuntu-webcatalog/more-analytics into lp:ubuntu-webcatalog

[Anthony Lenton]

Added a secondary Google Analytics ID

Overview
========
This branch adds a secondary Google Analytics ID, to aggregate information with the general Ubuntu.com stats

Details
=======
A pretty straight forward change, via a setting and a context processor like the original google analytics id was added.

While I was there, I sorted out the bootstrap fab task on Oneiric.

[Michael Nelson (michael.nelson)]

14:43 < achuni> noodles: if you have a while, could you have a look? https://code.launchpad.net/~elachuni/ubuntu-webcatalog/more-analytics/+merge/87758
14:44 < noodles> Sure thing
14:46 < noodles> achuni: is that a real ga-id on line 9? Does that mean our dev servers will be contributing to analytics? (not something you changed, but just worth asking :-)
14:47 < achuni> noodles: -36 is the staging id, so yep. Before, -24 meant that yes our dev server was contributing to analytics
14:48 < achuni> noodles: it should be ok to leave -36 in for dev, as we use the same id for all staging services nobody really takes those seriously
14:49 < noodles> achuni: sweet
14:50 < noodles> achuni: have you tested the bootstrap on lucid? (I can do so on my canonistack lucid instance, if not)
14:50 < achuni> noodles: not with the latest changes, nope, if you could that would be great
14:54 < noodles> achuni: bootstrapped fine on lucid with all tests passing.
14:54 < achuni> neat
14:54 < achuni> txs noodles
14:56 < noodles> achuni: the code+test look great - I assume it doesn't add significantly to the page load time? Might be worth a quick test using any web-dev tools. Anyway, approving.
14:57 < achuni> noodles: it doesn't add a noticeable wait to the page load, and we've got that code in place on sca/devportal already
14:57 < noodles> Great.

review: Approve

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2011-09-15 11:25:35 +0000
+++ django_project/config/main.cfg	2012-01-06 14:43:36 +0000
@@ -95,7 +95,7 @@
 default_distro = natty
 
 [google]
-google_analytics_id = UA-1018242-24
+google_analytics_id = UA-1018242-36
 
 [rnr]
 rnr_service_root = http://reviews.ubuntu.com/reviews/api/1.0
 
=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py	2011-11-17 15:58:00 +0000
+++ fabtasks/bootstrap.py	2012-01-06 14:43:36 +0000
@@ -58,18 +58,31 @@
             _symlink(filename, 'virtualenv/lib/python2.%s/site-packages/%s' %
                 (minor, basename))
 
-    _symlink_libs([
-        '/usr/lib/pymodules/python2.%s/gtk-2.0' % minor,
-        '/usr/lib/pymodules/python2.%s/cairo' % minor,
-        ])
+    gtk_dir_preoneiric = '/usr/lib/pymodules/python2.%s/gtk-2.0' % minor
+    gtk_dir_oneiric = '/usr/lib/python2.%s/dist-packages/gtk-2.0' % minor
+    if os.path.exists(gtk_dir_preoneiric):
+        # Ubuntu Lucid / Maverick / Natty setup
+        _symlink_libs([
+            gtk_dir_preoneiric,
+            '/usr/lib/pymodules/python2.%s/cairo' % minor,
+            ])
+    else:
+        # Ubuntu Oneiric setup
+        _symlink_libs([
+            gtk_dir_oneiric,
+            '/usr/lib/python2.%s/dist-packages/cairo' % minor,
+            ])
+
     pth_file_prenatty = '/usr/lib/pymodules/python2.%s/pygtk.pth' % minor
     pth_file_natty = '/usr/share/pyshared/pygtk.pth'
     if os.path.exists(pth_file_prenatty):
+        # Ubuntu Lucid / Maveric setup
         _symlink_libs([
             pth_file_prenatty,
             '/usr/lib/pymodules/python2.%s/pygtk.py' % minor,
         ])
     elif os.path.exists(pth_file_natty):
+        # Ubuntu Natty / Oneiric setup
         _symlink_libs([
             pth_file_natty,
             '/usr/lib/pymodules/python2.%s/cairo' % minor,
 
=== modified file 'src/webcatalog/context_processors.py'
--- src/webcatalog/context_processors.py	2011-09-12 13:37:24 +0000
+++ src/webcatalog/context_processors.py	2012-01-06 14:43:36 +0000
@@ -23,6 +23,8 @@
     """Adds the google analytics id to the context if it's present."""
     return {
         'google_analytics_id': getattr(settings, 'GOOGLE_ANALYTICS_ID', None),
+        'secondary_google_analytics_id':
+            getattr(settings, 'SECONDARY_GOOGLE_ANALYTICS_ID', None),
         }
 
 
 
=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2011-09-15 11:25:35 +0000
+++ src/webcatalog/schema.py	2012-01-06 14:43:36 +0000
@@ -63,6 +63,7 @@
 
     google = ConfigSection()
     google.google_analytics_id = StringConfigOption()
+    google.secondary_google_analytics_id = StringConfigOption()
 
     logging = ConfigSection()
     logging.webapp_logging_config = StringConfigOption()
 
=== modified file 'src/webcatalog/templates/light/index.1col.html'
--- src/webcatalog/templates/light/index.1col.html	2011-04-12 13:16:43 +0000
+++ src/webcatalog/templates/light/index.1col.html	2012-01-06 14:43:36 +0000
@@ -141,12 +141,20 @@
                 <p>&copy; 2010, 2011 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
             </div>
         </div>
+
         {% if google_analytics_id %}
         <script type="text/javascript">
 
           var _gaq = _gaq || [];
           _gaq.push(['_setAccount', '{{ google_analytics_id }}']);
+          _gaq.push(['_setDomainName', '.ubuntu.com']);
           _gaq.push(['_trackPageview']);
+        {% if secondary_google_analytics_id %}
+            /* save to www.ubuntu.com (http://www.ubuntu.com) profile */
+          _gaq.push(['b._setAccount', '{{ secondary_google_analytics_id }}']);
+          _gaq.push(['b._setDomainName', '.ubuntu.com (http://ubuntu.com)']);
+          _gaq.push(['b._trackPageview']);
+        {% endif %}
 
           (function() {
           var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 
=== modified file 'src/webcatalog/tests/__init__.py'
--- src/webcatalog/tests/__init__.py	2011-09-12 13:37:24 +0000
+++ src/webcatalog/tests/__init__.py	2012-01-06 14:43:36 +0000
@@ -18,6 +18,7 @@
 """Import various view, model and other tests for django's default runner."""
 from .test_api import *
 from .test_commands import *
+from .test_context_processors import *
 from .test_department_filters import *
 from .test_forms import *
 from .test_handlers import *
 
=== added file 'src/webcatalog/tests/test_context_processors.py'
--- src/webcatalog/tests/test_context_processors.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_context_processors.py	2012-01-06 14:43:36 +0000
@@ -0,0 +1,41 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Apps Directory
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Apps Directory context processor tests."""
+
+from __future__ import absolute_import
+
+__metaclass__ = type
+__all__ = [
+    'GoogleAnalyticsTestCase',
+    ]
+
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+
+from webcatalog.tests.helpers import patch_settings
+
+
+class GoogleAnalyticsTestCase(TestCase):
+    def test_configured_analytics_ids_show_up(self):
+        with patch_settings(GOOGLE_ANALYTICS_ID='foo',
+                            SECONDARY_GOOGLE_ANALYTICS_ID='bar'):
+            response = self.client.get(reverse('wc-index'))
+        snippets = ["_gaq.push(['_setAccount', 'foo'])",
+                    "_gaq.push(['b._setAccount', 'bar'])"]
+        for snippet in snippets:
+            self.assertContains(response, snippet)