Merge lp:~ted/url-dispatcher/regex-domain-fix into lp:url-dispatcher/rtm-14.09

[Ted Gould]

Fix domain handling in generic regular expression

[Charles Kerr (charlesk)]

LGTM.

review: Approve

=== modified file 'service/dispatcher.c'
--- service/dispatcher.c	2014-10-23 21:57:11 +0000
+++ service/dispatcher.c	2014-12-11 19:02:27 +0000
@@ -449,7 +449,7 @@
 
 	applicationre = g_regex_new("^application:///([a-zA-Z0-9_\\.-]*)\\.desktop$", 0, 0, NULL);
 	appidre = g_regex_new("^appid://([a-z0-9\\.-]*)/([a-zA-Z0-9-]*)/([a-zA-Z0-9\\.-]*)$", 0, 0, NULL);
-	genericre = g_regex_new("^([a-z][a-z0-9]*):(?://(?:.*@)(a-z0-9\\.-]*)(?::[0-9])/)?(.*)?$", 0, 0, NULL);
+	genericre = g_regex_new("^([a-z][a-z0-9]*):(?://(?:.*@)?([a-zA-Z0-9\\.-]*)(?::[0-9]*)?/?)?(.*)?$", 0, 0, NULL);
 
 	g_bus_get(G_BUS_TYPE_SESSION, cancellable, bus_got, mainloop);
 

=== modified file 'tests/dispatcher-test.cc'
--- tests/dispatcher-test.cc	2014-10-29 14:48:02 +0000
+++ tests/dispatcher-test.cc	2014-12-11 19:02:27 +0000
@@ -49,6 +49,12 @@
 			url_db_set_file_motification_time(db, "/testdir/magnet-test.url-dispatcher", &timestamp);
 			url_db_insert_url(db, "/testdir/magnet-test.url-dispatcher", "magnet", NULL);
 
+			url_db_set_file_motification_time(db, "/testdir/browser.url-dispatcher", &timestamp);
+			url_db_insert_url(db, "/testdir/browser.url-dispatcher", "http", NULL);
+
+			url_db_set_file_motification_time(db, "/testdir/webapp.url-dispatcher", &timestamp);
+			url_db_insert_url(db, "/testdir/webapp.url-dispatcher", "http", "foo.com");
+
 			sqlite3_close(db);
 
 			testbus = g_test_dbus_new(G_TEST_DBUS_NONE);
@@ -193,3 +199,26 @@
 
 	return;
 }
+
+TEST_F(DispatcherTest, WebappTest)
+{
+	gchar * out_appid = NULL;
+	const gchar * out_url = NULL;
+
+	/* Browser test */
+	EXPECT_TRUE(dispatcher_url_to_appid("http://ubuntu.com", &out_appid, &out_url));
+	EXPECT_STREQ("browser", out_appid);
+	g_free(out_appid);
+
+	/* Webapp test */
+	EXPECT_TRUE(dispatcher_url_to_appid("http://foo.com", &out_appid, &out_url));
+	EXPECT_STREQ("webapp", out_appid);
+	g_free(out_appid);
+
+	EXPECT_TRUE(dispatcher_url_to_appid("http://m.foo.com", &out_appid, &out_url));
+	EXPECT_STREQ("webapp", out_appid);
+	g_free(out_appid);
+
+	return;
+}
+