Merge lp:~abreu-alexandre/unity-webapps-qml/automatic-update-of-url-for-webapp into lp:unity-webapps-qml

[Alexandre Abreu]

Automatic update of url to webapp homepage

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-saucy-armhf-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-webapps-qml-ci/6/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'examples/basic-webview/qml/basic-webview/main.qml'
--- examples/basic-webview/qml/basic-webview/main.qml	2013-06-06 17:32:54 +0000
+++ examples/basic-webview/qml/basic-webview/main.qml	2013-07-11 15:24:29 +0000
@@ -34,7 +34,11 @@
         }
 
         function getUnityWebappsProxies() {
-            return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
+            var proxies = UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webView);
+
+            // override the default navigate to request
+            proxies.navigateTo = function(url) {};
+            return proxies;
         }
 
         UnityWebApps {
 
=== modified file 'examples/unity-webapps-example-bbcnews/qml/unity-webapps-example-bbcnews/main.qml'
--- examples/unity-webapps-example-bbcnews/qml/unity-webapps-example-bbcnews/main.qml	2013-06-17 14:46:51 +0000
+++ examples/unity-webapps-example-bbcnews/qml/unity-webapps-example-bbcnews/main.qml	2013-07-11 15:24:29 +0000
@@ -28,8 +28,6 @@
     WebView {
         id: webView
 
-        // test url
-        url: "http://www.bbc.co.uk/news/"
         anchors.fill: parent
         width: parent.width
         height: parent.height
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2013-06-06 17:32:54 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2013-07-11 15:24:29 +0000
@@ -151,7 +151,11 @@
         },
 
         _isValidWebAppsMessage: function(message) {
-            return message != null && message.target && message.target === 'unity-webapps-call' && message.name && message.args;
+            return message != null &&
+                    message.target &&
+                    message.target === 'unity-webapps-call' &&
+                    message.name &&
+                    message.args;
         }
     };
 
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2013-07-09 20:40:53 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2013-07-11 15:24:29 +0000
@@ -162,7 +162,8 @@
         var properties = [{'name': 'sendToPage', 'type': 'function'},
                 {'name': 'loadingStartedConnect', 'type': 'function'},
                 {'name': 'messageReceivedConnect', 'type': 'function'},
-                {'name': 'injectUserScripts', 'type': 'function'}];
+                {'name': 'injectUserScripts', 'type': 'function'},
+                {'name': 'navigateTo', 'type': 'function'}];
 
         var validator = UnityWebAppsJsUtils.makePropertyValidator(properties);
         return validator(proxies);
@@ -189,6 +190,10 @@
         internal.backends = null;
     }
 
+    function __isValidWebAppForModel(webappName) {
+        return model != null && model.exists && model.exists(webappName);
+    }
+
     /*!
       \internal
       Gathers the webapps userscript associated with the webapp whose
@@ -196,9 +201,9 @@
 
       Returns the list of URIs for the associated scripts to be injected
     */
-    function __gatherWebAppUserscripts(webappName) {
+    function __gatherWebAppUserscriptsIfAny(webappName) {
         var userscripts = [];
-        if (model != null && model.exists && model.exists(webappName)) {
+        if (__isValidWebAppForModel(webappName)) {
             var idx = model.getWebappIndex(webappName);
             userscripts = model.data(idx, UbuntuUnityWebApps.UnityWebappsAppModel.Scripts);
 
@@ -208,13 +213,35 @@
         return userscripts;
     }
 
+    /*!
+      \internal
+
+      If the component has been binded to a proper bindee (exposes proper interface)
+      and the webapps bridge has been initialized, this make sure that the bindee
+      is requested to navigate to a given 'homepage' url for the associated
+      webapp.
+    */
+    function __navigateToWebappHomepageInBindee(webappName) {
+        if (__isValidWebAppForModel(webappName) && internal.instance) {
+            var idx = model.getWebappIndex(webappName);
+            var homepage = model.data(idx, UbuntuUnityWebApps.UnityWebappsAppModel.Homepage);
+
+            console.debug('Requesting the bindee to navigate to: ' + homepage);
+
+            var bindeeProxies = bindee.getUnityWebappsProxies();
+            bindeeProxies.navigateTo(homepage);
+        }
+    }
+
     Component.onCompleted: {
         webapps.__unbind();
-        webapps.__bind(bindee, __gatherWebAppUserscripts(name));
+        webapps.__bind(bindee, __gatherWebAppUserscriptsIfAny(name));
 
         if (name != "") {
             UnityBackends.clearAll();
             UnityBackends.createAllWithAsync(webapps, {name: name});
+
+            __navigateToWebappHomepageInBindee(name);
         }
     }
 
@@ -224,7 +251,7 @@
      */
     onBindeeChanged: {
         __unbind();
-        __bind(bindee, __gatherWebAppUserscripts(name));
+        __bind(bindee, __gatherWebAppUserscriptsIfAny(name));
     }
 
     /*!
@@ -253,11 +280,12 @@
 
       TODO lazily create the 'backends' on a getUnityObject
       TODO the backends should prop be on the qml side and provided to here
+      TODO move elsewhere (in js file)
      */
     function __makeBackendProxies () {
         var initialized = false;
         return {
-            init: function (params) {console.debug('calls init')
+            init: function (params) {
                 UnityBackends.signalOnBackendReady("base", function () {
                     initialized = true;
                     // base.init(params);
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2013-06-06 17:32:54 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2013-07-11 15:24:29 +0000
@@ -32,6 +32,9 @@
                 scripts.push(userScriptUrls[i]);
             webViewId.experimental.userScripts = scripts;
         },
+        navigateTo: function(url) {
+            webViewId.url = url;
+        },
         sendToPage: function (message) {
             webViewId.experimental.postMessage(message);
         },
 
=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2013-07-09 19:02:23 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2013-07-11 15:24:29 +0000
@@ -111,6 +111,7 @@
       {
         roles[Name] = "name";
         roles[Domain] = "domain";
+        roles[Homepage] = "homepage";
         roles[Urls] = "urls";
         roles[ScriptsContent] = "content";
         roles[Scripts] = "scripts";
@@ -361,6 +362,9 @@
     case Domain:
         return webapp.data.manifest.domain;
 
+    case Homepage:
+        return webapp.data.manifest.homepage;
+
     case Urls:
         return webapp.data.manifest.includes;
 
 
=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h	2013-07-09 19:02:23 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h	2013-07-11 15:24:29 +0000
@@ -53,6 +53,7 @@
         Name = Qt::UserRole + 1,
         Domain,
         Urls,
+        Homepage,
         Scripts,
         ScriptsContent
     };
 
=== modified file 'tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py'
--- tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2013-07-09 20:33:17 +0000
+++ tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2013-07-11 15:24:29 +0000
@@ -42,7 +42,18 @@
     def test_notificationApiFound(self):
         expression = """
             var unity = window.external.getUnityObject(1.0);
-            return unity.Notification != null && unity.Notification.show != null;
+            return unity.Notification != null && unity.Notification.showNotification != null;
+        """
+        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
+
+    def test_messagingIndicatorApiFound(self):
+        expression = """
+            var unity = window.external.getUnityObject(1.0);
+            return unity.MessagingIndicator != null &&
+                unity.MessagingIndicator.addAction != null &&
+                unity.MessagingIndicator.clearIndicator != null &&
+                unity.MessagingIndicator.clearIndicators != null &&
+                unity.MessagingIndicator.showIndicator != null;
         """
         self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(NotEquals(None)))
 
 
=== modified file 'tests/tests.pro'
--- tests/tests.pro	2013-07-09 20:24:05 +0000
+++ tests/tests.pro	2013-07-11 15:24:29 +0000
@@ -5,5 +5,6 @@
 OTHER_FILES += \
     $$system(ls ./integration/autopilot/qml/*) \
     $$system(ls ./integration/autopilot/html/*) \
+    $$system(ls ./integration/autopilot/data/installed-webapps/*) \
     $$system(ls ./integration/autopilot/unity_webapps_qml/emulators/*.py) \
     $$system(ls ./integration/autopilot/unity_webapps_qml/tests/*.py)
 
=== modified file 'tests/unit/test_plugin/tst_webappsAppModel.cpp'
--- tests/unit/test_plugin/tst_webappsAppModel.cpp	2013-07-09 19:02:23 +0000
+++ tests/unit/test_plugin/tst_webappsAppModel.cpp	2013-07-11 15:24:29 +0000
@@ -50,7 +50,6 @@
     UnityWebappsAppModel
             model;
     model.setSearchPath("./data/no-installed-webapps");
-    qDebug() << model.rowCount();
     QVERIFY(model.rowCount() == 0);
 }
 
 
=== modified file 'tests/unit/test_qml/tst_dispatch.qml'
--- tests/unit/test_qml/tst_dispatch.qml	2013-06-06 17:32:54 +0000
+++ tests/unit/test_qml/tst_dispatch.qml	2013-07-11 15:24:29 +0000
@@ -134,6 +134,8 @@
                 },
                 sendToPage: function (message) {
                 },
+                navigateTo: function (url) {
+                },
                 loadingStartedConnect: function (onLoadingStarted) {
                     mockedWebView.loadingStarted.connect(onLoadingStarted);
                     loadingStartedConnected();
 
=== modified file 'tests/unit/test_qml/tst_init.qml'
--- tests/unit/test_qml/tst_init.qml	2013-06-06 17:32:54 +0000
+++ tests/unit/test_qml/tst_init.qml	2013-07-11 15:24:29 +0000
@@ -93,6 +93,8 @@
                 },
                 sendToPage: function (message) {
                 },
+                navigateTo: function (url) {
+                },
                 loadingStartedConnect: function (onLoadingStarted) {
                     mockedWebView.loadingStarted.connect(onLoadingStarted);
                     loadingStartedConnected();