[google-sgnodemapper] r219 committed - more tests and fix a warning.

1 view
Skip to first unread message

codesite...@google.com

unread,
Mar 7, 2010, 9:09:55 PM3/7/10
to sgnodemapp...@googlegroups.com
Revision: 219
Author: br...@danga.com
Date: Sun Mar 7 18:08:58 2010
Log: more tests and fix a warning.
http://code.google.com/p/google-sgnodemapper/source/detail?r=219

Modified:
/trunk/autogen/nodemapper.js
/trunk/autogen/nodemapper_debug.js
/trunk/autogen/nodemapper_tests.js
/trunk/sites/google.js
/trunk/sites/simple.js

=======================================
--- /trunk/autogen/nodemapper.js Wed Mar 3 14:15:19 2010
+++ /trunk/autogen/nodemapper.js Sun Mar 7 18:08:58 2010
@@ -628,11 +628,11 @@
var READER_RE = /^\/reader\/(?:shared|
public\/atom\/user)\/(\d{7,})(?:\/state\/com.google\/broadcast)?/;
var googleIdentProfileHandler = nodemapper.createPathRegexpHandler(
"profiles.google.com", // fake domain
- /^(?:\/s2)?\/(?:profiles\/|sharing\/stuff\?user=)([\w+\.]+)/,
+ /^(?:\/s2)?\/(?:profiles\/|buzz\/|sharing\/stuff\?user=)([\w+\.]+)/,
{keyName: "ident"});
var googleProfileHandler = nodemapper.createPathRegexpHandler(
"profiles.google.com", // fake domain
- /^(?:\/s2)?\/(?:profiles\/|sharing\/stuff\?user=)(\d+)/,
+ /^(?:\/s2)?\/(?:profiles\/|buzz\/|sharing\/stuff\?user=)(\d+)/,
{keyName: "pk", fallbackHandler: googleIdentProfileHandler });
var readerHandler = nodemapper.createPathRegexpHandler(
"reader.google.com", // fake domain
@@ -640,8 +640,12 @@
{keyName: "pk"});
var profilesDomainIdentHandler = nodemapper.createPathRegexpHandler(
"profiles.google.com", // fake domain
- /^\/([\w+\.]+)(?:\?|$)/,
+ /^\/([\w+\.]+)(?:\?|\/|$)/,
{keyName: "ident"});
+var profilesDomainHandler = nodemapper.createPathRegexpHandler(
+ "profiles.google.com", // fake domain
+ /^\/(\d+)(?:\?|\/|$)/,
+ {keyName: "pk", fallbackHandler: profilesDomainIdentHandler });
var sidewikiIdentHandler = nodemapper.createPathRegexpHandler(
"sidewiki.google.com", // fake domain
/^\/sidewiki\/feeds\/entries\/author\/([\w+\.]+)\/default/,
@@ -662,6 +666,8 @@
var handler = null;
if (path.indexOf("/reader") == 0) {
handler = readerHandler;
+ } else if (path.indexOf("/buzz/") == 0) {
+ handler = googleProfileHandler;
} else if (path.indexOf("/s2/") == 0) {
handler = googleProfileHandler;
} else if (path.indexOf("/profiles/") == 0) {
@@ -767,7 +773,7 @@
nodemapper.addSimpleHandler("orkut.com", "pk_to_profile",
"http://www.orkut.com/Profile.aspx?uid=");
nodemapper.registerDomain("profiles.google.com", {
- urlToGraphNode: profilesDomainIdentHandler,
+ urlToGraphNode: profilesDomainHandler,
name: "Google Profile",
pkRegexp: /^\d{7,}$/,
identRegexp: /^[\w\.]{1,40}$/
@@ -776,6 +782,10 @@
"http://www.google.com/profiles/");
nodemapper.addSimpleHandler("profiles.google.com", "ident_to_profile",
"http://www.google.com/profiles/");
+nodemapper.registerDomain("buzz.google.com", {
+ urlToGraphNode: profilesDomainHandler,
+ name: "Google Buzz"
+ });
nodemapper.registerDomain("sidewiki.google.com", {
name: "Google Sidewiki",

favIconUrl: "http://www.google.com/sidewiki/intl/en/images/icon_yellowbubble.png",
@@ -1222,8 +1232,9 @@
["del.icio.us", "delicious.com"],
{name: "del.icio.us",
primaryDomain: "del.icio.us",
+ identRegexp: /^[\w\.]+$/,
urlToGraphNode: nodemapper.createPathRegexpHandler(
- "del.icio.us", /^\/(?:rss\/)?(\w+)/,
+ "del.icio.us", /^\/(?:rss\/)?([\w+\.]+)/,
{ notUsernames: { "rss": 1 }, slashAnything: 1})});
nodemapper.addSimpleHandler("del.icio.us", "ident_to_profile",
"http://delicious.com/");
=======================================
--- /trunk/autogen/nodemapper_debug.js Wed Mar 3 14:15:19 2010
+++ /trunk/autogen/nodemapper_debug.js Sun Mar 7 18:08:58 2010
@@ -1040,12 +1040,12 @@

var googleIdentProfileHandler = nodemapper.createPathRegexpHandler(
"profiles.google.com", // fake domain
- /^(?:\/s2)?\/(?:profiles\/|sharing\/stuff\?user=)([\w+\.]+)/,
+ /^(?:\/s2)?\/(?:profiles\/|buzz\/|sharing\/stuff\?user=)([\w+\.]+)/,
{keyName: "ident"});

var googleProfileHandler = nodemapper.createPathRegexpHandler(
"profiles.google.com", // fake domain
- /^(?:\/s2)?\/(?:profiles\/|sharing\/stuff\?user=)(\d+)/,
+ /^(?:\/s2)?\/(?:profiles\/|buzz\/|sharing\/stuff\?user=)(\d+)/,
{keyName: "pk", fallbackHandler: googleIdentProfileHandler });

var readerHandler = nodemapper.createPathRegexpHandler(
@@ -1055,9 +1055,14 @@

var profilesDomainIdentHandler = nodemapper.createPathRegexpHandler(
"profiles.google.com", // fake domain
- /^\/([\w+\.]+)(?:\?|$)/,
+ /^\/([\w+\.]+)(?:\?|\/|$)/,
{keyName: "ident"});

+var profilesDomainHandler = nodemapper.createPathRegexpHandler(
+ "profiles.google.com", // fake domain
+ /^\/(\d+)(?:\?|\/|$)/,
+ {keyName: "pk", fallbackHandler: profilesDomainIdentHandler });
+
var sidewikiIdentHandler = nodemapper.createPathRegexpHandler(
"sidewiki.google.com", // fake domain
/^\/sidewiki\/feeds\/entries\/author\/([\w+\.]+)\/default/,
@@ -1083,6 +1088,8 @@
var handler = null;
if (path.indexOf("/reader") == 0) {
handler = readerHandler;
+ } else if (path.indexOf("/buzz/") == 0) {
+ handler = googleProfileHandler;
} else if (path.indexOf("/s2/") == 0) {
handler = googleProfileHandler;
} else if (path.indexOf("/profiles/") == 0) {
@@ -1205,7 +1212,7 @@
"http://www.orkut.com/Profile.aspx?uid=");

nodemapper.registerDomain("profiles.google.com", {
- urlToGraphNode: profilesDomainIdentHandler,
+ urlToGraphNode: profilesDomainHandler,
name: "Google Profile",
pkRegexp: /^\d{7,}$/,
identRegexp: /^[\w\.]{1,40}$/
@@ -1215,6 +1222,15 @@
nodemapper.addSimpleHandler("profiles.google.com", "ident_to_profile",
"http://www.google.com/profiles/");

+// Note that we never actually create sgn://buzz.google.com nodes, but
+// register the domain in order to have the urlToGraphNode handler
+// setup to map http://buzz.google.com URLs into
+// sgn://profiles.google.com nodes
+nodemapper.registerDomain("buzz.google.com", {
+ urlToGraphNode: profilesDomainHandler,
+ name: "Google Buzz"
+ });
+
nodemapper.registerDomain("sidewiki.google.com", {
name: "Google Sidewiki",

favIconUrl: "http://www.google.com/sidewiki/intl/en/images/icon_yellowbubble.png",
@@ -1895,8 +1911,9 @@
["del.icio.us", "delicious.com"],
{name: "del.icio.us",
primaryDomain: "del.icio.us",
+ identRegexp: /^[\w\.]+$/,
urlToGraphNode: nodemapper.createPathRegexpHandler(
- "del.icio.us", /^\/(?:rss\/)?(\w+)/,
+ "del.icio.us", /^\/(?:rss\/)?([\w+\.]+)/,
{ notUsernames: { "rss": 1 }, slashAnything: 1})});

nodemapper.addSimpleHandler("del.icio.us", "ident_to_profile",
=======================================
--- /trunk/autogen/nodemapper_tests.js Wed Mar 3 14:15:19 2010
+++ /trunk/autogen/nodemapper_tests.js Sun Mar 7 18:08:58 2010
@@ -175,12 +175,24 @@

["urlToGraphNode", "http://picasaweb.google.hu/abcdef", "sgn://picasaweb.google.com/?ident=abcdef"],

["urlToGraphNode", "http://www.picasaweb.google.hu/abcdef", "sgn://picasaweb.google.com/?ident=abcdef"],

["urlToGraphNode", "http://www.google.com/s2/profiles/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],
-
["urlToGraphNode", "http://www.google.com/profiles/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],

["urlToGraphNode", "http://www.google.co.uk/s2/profiles/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],

["urlToGraphNode", "http://www.google.de/s2/profiles/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],

["urlToGraphNode", "http://www.google.com/profiles/bradfitz", "sgn://profiles.google.com/?ident=bradfitz"],

["urlToGraphNode", "http://profiles.google.com/bradfitz", "sgn://profiles.google.com/?ident=bradfitz"],

["urlToGraphNode", "http://profiles.google.com/bradfitz?foo", "sgn://profiles.google.com/?ident=bradfitz"],
+
["urlToGraphNode", "http://profiles.google.com/bradfitz/foo", "sgn://profiles.google.com/?ident=bradfitz"],
+
["urlToGraphNode", "http://www.google.com/profiles/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],
+
["urlToGraphNode", "http://profiles.google.com/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],
+
["urlToGraphNode", "http://profiles.google.com/115863474911002159675?foo", "sgn://profiles.google.com/?pk=115863474911002159675"],
+
["urlToGraphNode", "http://profiles.google.com/115863474911002159675/foo", "sgn://profiles.google.com/?pk=115863474911002159675"],
+
["urlToGraphNode", "http://www.google.com/buzz/bradfitz", "sgn://profiles.google.com/?ident=bradfitz"],
+
["urlToGraphNode", "http://buzz.google.com/bradfitz", "sgn://profiles.google.com/?ident=bradfitz"],
+
["urlToGraphNode", "http://buzz.google.com/bradfitz?foo", "sgn://profiles.google.com/?ident=bradfitz"],
+
["urlToGraphNode", "http://buzz.google.com/bradfitz/foo", "sgn://profiles.google.com/?ident=bradfitz"],
+
["urlToGraphNode", "http://www.google.com/buzz/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],
+
["urlToGraphNode", "http://buzz.google.com/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],
+
["urlToGraphNode", "http://buzz.google.com/115863474911002159675?foo", "sgn://profiles.google.com/?pk=115863474911002159675"],
+
["urlToGraphNode", "http://buzz.google.com/115863474911002159675/foo", "sgn://profiles.google.com/?pk=115863474911002159675"],

["urlToGraphNode", "http://www.google.com/s2/sharing/stuff?user=123", "sgn://profiles.google.com/?pk=123"],

["urlFromGraphNode", "sgn://profiles.google.com/?pk=115863474911002159675", "profile", "http://www.google.com/profiles/115863474911002159675"],

["urlToGraphNode", "http://www.google.com/profiles/115863474911002159675", "sgn://profiles.google.com/?pk=115863474911002159675"],
@@ -199,6 +211,8 @@

["urlFromGraphNode", "sgn://code.google.com/?ident=adewale", "atom", "http://code.google.com/feeds/u/adewale/updates/user/basic"],

["urlToGraphNode", "http://code.google.com/feeds/u/adewale/updates/user/basic", "sgn://code.google.com/?ident=adewale"],

["urlToGraphNode", "http://code.google.com/feeds/u/adewale/updates/user/basic", "sgn://code.google.com/?ident=adewale"],
+
["urlFromGraphNode", "sgn://code.google.com/?ident=adewale", "profile", "http://code.google.com/u/adewale/"],
+
["urlToGraphNode", "http://code.google.com/u/adewale/", "sgn://code.google.com/?ident=adewale"],

["urlToGraphNode", "http://api.hi5.com/rest/profile/foaf/87628233", "sgn://hi5.com/?pk=87628233"],

["urlToGraphNode", "http://lindner.hi5.com/", "sgn://hi5.com/?ident=lindner"],
["urlToGraphNode", "http://123455.hi5.com/", "sgn://hi5.com/?pk=123455"],
@@ -446,6 +460,15 @@

["urlToGraphNode", "http://delicious.com/jsmarr", "sgn://del.icio.us/?ident=jsmarr"],

["urlFromGraphNode", "sgn://del.icio.us/?ident=jsmarr", "rss", "http://feeds.delicious.com/rss/jsmarr"],

["urlToGraphNode", "http://feeds.delicious.com/rss/jsmarr", "sgn://del.icio.us/?ident=jsmarr"],
+
["urlToGraphNode", "http://del.icio.us/antoine.bertier", "sgn://del.icio.us/?ident=antoine.bertier"],
+
["urlToGraphNode", "http://del.icio.us/rss/antoine.bertier", "sgn://del.icio.us/?ident=antoine.bertier"],
+
["urlToGraphNode", "http://delicious.com/antoine.bertier", "sgn://del.icio.us/?ident=antoine.bertier"],
+
["urlToGraphNode", "http://delicious.com/rss/antoine.bertier", "sgn://del.icio.us/?ident=antoine.bertier"],
+
["urlToGraphNode", "http://feeds.delicious.com/rss/antoine.bertier", "sgn://del.icio.us/?ident=antoine.bertier"],
+
["urlFromGraphNode", "sgn://del.icio.us/?ident=antoine.bertier", "profile", "http://delicious.com/antoine.bertier"],
+
["urlToGraphNode", "http://delicious.com/antoine.bertier", "sgn://del.icio.us/?ident=antoine.bertier"],
+
["urlFromGraphNode", "sgn://del.icio.us/?ident=antoine.bertier", "rss", "http://feeds.delicious.com/rss/antoine.bertier"],
+
["urlToGraphNode", "http://feeds.delicious.com/rss/antoine.bertier", "sgn://del.icio.us/?ident=antoine.bertier"],

["urlToGraphNode", "http://community.webshots.com/user/bob", "sgn://webshots.com/?ident=bob"],

["urlFromGraphNode", "sgn://webshots.com/?ident=bob", "profile", "http://community.webshots.com/user/bob"],

["urlToGraphNode", "http://community.webshots.com/user/bob", "sgn://webshots.com/?ident=bob"],
=======================================
--- /trunk/sites/google.js Sat Mar 6 12:02:24 2010
+++ /trunk/sites/google.js Sun Mar 7 18:08:58 2010
@@ -308,3 +308,4 @@
http://code.google.com/u/adewale/updates
sgn://code.google.com/?ident=adewale
atom(sgn://code.google.com/?ident=adewale)
http://code.google.com/feeds/u/adewale/updates/user/basic
http://code.google.com/feeds/u/adewale/updates/user/basic
sgn://code.google.com/?ident=adewale
+profile(sgn://code.google.com/?ident=adewale)
http://code.google.com/u/adewale/
=======================================
--- /trunk/sites/simple.js Wed Mar 3 16:28:45 2010
+++ /trunk/sites/simple.js Sun Mar 7 18:08:58 2010
@@ -96,6 +96,7 @@
["del.icio.us", "delicious.com"],
{name: "del.icio.us",
primaryDomain: "del.icio.us",
+ identRegexp: /^[\w\.]+$/,
urlToGraphNode: nodemapper.createPathRegexpHandler(
"del.icio.us", /^\/(?:rss\/)?([\w+\.]+)/,
{ notUsernames: { "rss": 1 }, slashAnything: 1})});

Reply all
Reply to author
Forward
0 new messages