Merge lp:~uriboni/webbrowser-app/merge-url-functions into lp:webbrowser-app

[Ugo Riboni]

Merge two url utility files into one, since they had no reason for being separate. Add unit tests for some of the functions that had none.

Merge two url utility files into one, since they had no reason for being separate. Add unit tests for some of the functions that had none.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:987
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1700/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2494/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/457
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/457
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2163/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2492
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2492/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19980

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1700/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Note: this MR will likely conflict with https://code.launchpad.net/~rpadovani/webbrowser-app/data-address/+merge/256367, which will probably go first, so this one will need updating afterwards.

One minor comment (thus approving, but please fix anyway): the copyright notice for UrlUtils.js should be updated to include 2015.

review: Approve

[Olivier Tilloy (osomon)]

Riccardo’s branch has now been merged into trunk, and there is indeed a conflict when merging this one. Please resolve, and address the minor comment above, and this will be good to merge.

review: Needs Fixing

[lp:~uriboni/webbrowser-app/merge-url-functions]

988. By Ugo Riboni on 2015-06-16

Merge changes from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:988
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1895/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3213/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3211/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1895/rebuild

review: Needs Fixing (continuous-integration)

[lp:~uriboni/webbrowser-app/merge-url-functions]

989. By Ugo Riboni on 2015-06-16

Pull back the changes to urlManagement.js that were done in trunk after the merge. Thank you unit tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:989
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1896/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3214/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/653
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/653/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/653
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3212/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1896/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Please revert the changes to po/webbrowser-app.pot, they conflicts when merging this branch into trunk.

review: Needs Fixing

[lp:~uriboni/webbrowser-app/merge-url-functions]

990. By Ugo Riboni on 2015-08-18

Revert mistaken commits to pot file

991. By Ugo Riboni on 2015-08-18

Merge changes from trunk

[Olivier Tilloy (osomon)]

LGTM, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:991
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2116/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/870
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/870
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/870
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3775
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3775/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22638

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2116/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/UrlUtils.js'
--- src/app/UrlUtils.js	2014-11-11 16:20:47 +0000
+++ src/app/UrlUtils.js	2015-08-18 08:49:36 +0000
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+'use strict';
+
 function extractAuthority(url) {
     var authority = url.toString()
     var indexOfScheme = authority.indexOf("://")
@@ -41,3 +43,45 @@
     }
     return host
 }
+
+function fixUrl(address) {
+    var url = address
+    if (address.toLowerCase() == "about:blank") {
+        return address.toLowerCase()
+    } else if (address.match(/^data:/i)) {
+        return "data:" + address.substr(5)
+    } else if (address.substr(0, 1) == "/") {
+        url = "file://" + address
+    } else if (address.indexOf("://") == -1) {
+        url = "http://" + address
+    }
+    return url
+}
+
+function looksLikeAUrl(address) {
+    if (address.match(/^data:/i)) {
+        return true;
+    }
+    var terms = address.split(/\s/)
+    if (terms.length > 1) {
+        return false
+    }
+    if (address.toLowerCase() == "about:blank") {
+        return true
+    }
+    if (address.substr(0, 1) == "/") {
+        return true
+    }
+    if (address.match(/^https?:\/\//i) ||
+        address.match(/^file:\/\//i) ||
+        address.match(/^[a-z]+:\/\//i)) {
+        return true
+    }
+    if (address.split('/', 1)[0].match(/\.[a-zA-Z]{2,}$/)) {
+        return true
+    }
+    if (address.split('/', 1)[0].match(/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}/)) {
+        return true
+    }
+    return false
+}

=== modified file 'src/app/webbrowser/AddressBar.qml'
--- src/app/webbrowser/AddressBar.qml	2015-08-11 10:37:56 +0000
+++ src/app/webbrowser/AddressBar.qml	2015-08-18 08:49:36 +0000
@@ -21,7 +21,7 @@
 import Ubuntu.Components.Popups 1.3
 import com.canonical.Oxide 1.8 as Oxide
 import ".."
-import "urlManagement.js" as UrlManagement
+import "../UrlUtils.js" as UrlUtils
 
 FocusScope {
     id: addressbar
@@ -109,7 +109,7 @@
 
                     readonly property bool reload: addressbar.activeFocus && addressbar.text &&
                                                    (addressbar.text == addressbar.actualUrl)
-                    readonly property bool looksLikeAUrl: UrlManagement.looksLikeAUrl(addressbar.text.trim())
+                    readonly property bool looksLikeAUrl: UrlUtils.looksLikeAUrl(addressbar.text.trim())
 
                     name: addressbar.loading ? "stop" :
                           reload ? "reload" :
@@ -302,8 +302,8 @@
 
         function validate() {
             var query = text.trim()
-            if (UrlManagement.looksLikeAUrl(query)) {
-                requestedUrl = UrlManagement.fixUrl(query)
+            if (UrlUtils.looksLikeAUrl(query)) {
+                requestedUrl = UrlUtils.fixUrl(query)
             } else {
                 requestedUrl = internal.buildSearchUrl(query)
             }

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-08-16 01:37:08 +0000
+++ src/app/webbrowser/Browser.qml	2015-08-18 08:49:36 +0000
@@ -27,7 +27,6 @@
 import "../actions" as Actions
 import ".."
 import "../UrlUtils.js" as UrlUtils
-import "urlManagement.js" as UrlManagement
 
 BrowserView {
     id: browser
@@ -496,7 +495,7 @@
                 searchEngine: currentSearchEngine
                 active: (chrome.activeFocus || suggestionsList.activeFocus) &&
                          !browser.incognito && !chrome.findInPageMode &&
-                         !UrlManagement.looksLikeAUrl(chrome.text.replace(/ /g, "+"))
+                         !UrlUtils.looksLikeAUrl(chrome.text.replace(/ /g, "+"))
 
                 function limit(number) {
                     var slice = results.slice(0, number)
@@ -788,7 +787,7 @@
 
                 FocusScope {
                     id: expandedHistoryViewContainer
-    
+
                     visible: children.length > 0
                     anchors.fill: parent
 

=== modified file 'src/app/webbrowser/SettingsPage.qml'
--- src/app/webbrowser/SettingsPage.qml	2015-08-10 15:22:00 +0000
+++ src/app/webbrowser/SettingsPage.qml	2015-08-18 08:49:36 +0000
@@ -24,7 +24,7 @@
 import Ubuntu.Web 0.2
 import webbrowserapp.private 0.1
 
-import "urlManagement.js" as UrlManagement
+import "../UrlUtils.js" as UrlUtils
 
 Item {
     id: settingsItem
@@ -327,8 +327,8 @@
                 text: settingsObject.homepage
                 inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText | Qt.ImhUrlCharactersOnly
                 onAccepted: {
-                    if (UrlManagement.looksLikeAUrl(text)) {
-                        settingsObject.homepage = UrlManagement.fixUrl(text)
+                    if (UrlUtils.looksLikeAUrl(text)) {
+                        settingsObject.homepage = UrlUtils.fixUrl(text)
                         PopupUtils.close(dialogue)
                     }
                 }
@@ -351,10 +351,10 @@
                     right: parent.right
                 }
                 text: i18n.tr("Save")
-                enabled: UrlManagement.looksLikeAUrl(homepageTextField.text.trim())
+                enabled: UrlUtils.looksLikeAUrl(homepageTextField.text.trim())
                 color: "#3fb24f"
                 onClicked: {
-                    settingsObject.homepage = UrlManagement.fixUrl(homepageTextField.text)
+                    settingsObject.homepage = UrlUtils.fixUrl(homepageTextField.text)
                     PopupUtils.close(dialogue)
                 }
             }

=== removed file 'src/app/webbrowser/urlManagement.js'
--- src/app/webbrowser/urlManagement.js	2015-04-27 08:23:06 +0000
+++ src/app/webbrowser/urlManagement.js	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-'use strict';
-
-function fixUrl(address) {
-    var url = address
-    if (address.toLowerCase() == "about:blank") {
-        return address.toLowerCase()
-    } else if (address.match(/^data:/i)) {
-        return "data:" + address.substr(5)
-    } else if (address.substr(0, 1) == "/") {
-        url = "file://" + address
-    } else if (address.indexOf("://") == -1) {
-        url = "http://" + address
-    }
-    return url
-}
-
-function looksLikeAUrl(address) {
-    if (address.match(/^data:/i)) {
-        return true;
-    }
-    var terms = address.split(/\s/)
-    if (terms.length > 1) {
-        return false
-    }
-    if (address.toLowerCase() == "about:blank") {
-        return true
-    }
-    if (address.substr(0, 1) == "/") {
-        return true
-    }
-    if (address.match(/^https?:\/\//i) ||
-        address.match(/^file:\/\//i) ||
-        address.match(/^[a-z]+:\/\//i)) {
-        return true
-    }
-    if (address.split('/', 1)[0].match(/\.[a-zA-Z]{2,}$/)) {
-        return true
-    }
-    if (address.split('/', 1)[0].match(/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}/)) {
-        return true
-    }
-    return false
-}

=== modified file 'tests/unittests/qml/tst_UrlUtils.qml'
--- tests/unittests/qml/tst_UrlUtils.qml	2014-11-13 14:43:16 +0000
+++ tests/unittests/qml/tst_UrlUtils.qml	2015-08-18 08:49:36 +0000
@@ -54,4 +54,33 @@
     function test_extractHost(data) {
         compare(UrlUtils.extractHost(data.url), data.host)
     }
+
+    function test_looksLikeAUrl_data() {
+        return [
+            {url: "", looksLike: false},
+            {url: "http://example.org/", looksLike: true},
+            {url: "example.org", looksLike: true},
+            {url: "http://www.example.org?q=foo bar", looksLike: false},
+            {url: "about:blank", looksLike: true},
+            {url: "file:///usr/foo/bar", looksLike: true},
+            {url: "hello://my/name/is/", looksLike: true},
+            {url: "192.168.1.0", looksLike: true}
+        ]
+    }
+
+    function test_looksLikeAUrl(data) {
+        compare(UrlUtils.looksLikeAUrl(data.url), data.looksLike)
+    }
+
+    function test_fixUrl_data() {
+        return [
+            {url: "About:BLANK", fixed: "about:blank"},
+            {url: "/usr/bin/", fixed: "file:///usr/bin/"},
+            {url: "example.org", fixed: "http://example.org"}
+        ]
+    }
+
+    function test_fixUrl(data) {
+        compare(UrlUtils.fixUrl(data.url), data.fixed)
+    }
 }