Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/sugar/tutorius/uam
diff options
context:
space:
mode:
authorVincent Vinet <vince.vinet@gmail.com>2009-03-27 16:08:14 (GMT)
committer Vincent Vinet <vince.vinet@gmail.com>2009-03-31 14:03:03 (GMT)
commita8b5f4c91b12af9c3a2d84b5da99a71f46c6284d (patch)
treed3140e1671e51fa514a2a41c3bf1dd2c96e1801b /src/sugar/tutorius/uam
parent43ed90ec4003bc540eedde9610e632589df50ab6 (diff)
Add shells for gobject and gtk parsers in UAM, complete tests
Diffstat (limited to 'src/sugar/tutorius/uam')
-rw-r--r--src/sugar/tutorius/uam/Makefile.am2
-rw-r--r--src/sugar/tutorius/uam/__init__.py51
-rw-r--r--src/sugar/tutorius/uam/gobjectparser.py27
-rw-r--r--src/sugar/tutorius/uam/gtkparser.py44
4 files changed, 111 insertions, 13 deletions
diff --git a/src/sugar/tutorius/uam/Makefile.am b/src/sugar/tutorius/uam/Makefile.am
index 83d2119..219291e 100644
--- a/src/sugar/tutorius/uam/Makefile.am
+++ b/src/sugar/tutorius/uam/Makefile.am
@@ -1,3 +1,5 @@
sugardir = $(pythondir)/sugar/tutorius/uam
sugar_PYTHON = \
+ gobjectparser.py \
+ gtkparser.py \
__init__.py
diff --git a/src/sugar/tutorius/uam/__init__.py b/src/sugar/tutorius/uam/__init__.py
index b55ae28..7cf5671 100644
--- a/src/sugar/tutorius/uam/__init__.py
+++ b/src/sugar/tutorius/uam/__init__.py
@@ -15,20 +15,23 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
"""
-Universal addressing module
+Universal Addressing Mechanism module
Allows addressing Events, signals, widgets, etc for supported platforms
"""
from urllib2 import urlparse
-SCHEMA="tap" #Tutorius Adressing Protocol
+import gtkparser
+import gobjectparser
-SUBSCHEMAS = [
- "gtk",
- "pygame",
- "gobject",
-]
+
+SCHEME="tap" #Tutorius Adressing Protocol
+
+__parsers = {
+ gtkparser.SCHEME:gtkparser.parse_gtk,
+ gobjectparser.SCHEME:gobjectparser.parse_gobject,
+}
def __add_to_urlparse(name):
#Add to uses_netloc
@@ -52,12 +55,34 @@ def __add_to_urlparse(name):
urlparse.uses_fragment.append(name)
-#Add schemas to urlparse
-__add_to_urlparse(SCHEMA)
+#Add schemes to urlparse
+__add_to_urlparse(SCHEME)
+
+for subscheme in [".".join([SCHEME,s]) for s in __parsers]:
+ __add_to_urlparse(subscheme)
+
+
+class SchemeError(Exception):
+ def __init__(self, message):
+ Exception.__init__(self, message)
+ self.message = message
+
-for subschema in [".".join([SCHEMA,s]) for s in SUBSCHEMAS]:
- __add_to_urlparse(subschema)
+def parse_uri(uri):
+ res = urlparse.urlparse(uri)
+ scheme = res.scheme.split(".")[0]
+ subscheme = ".".join(res.scheme.split(".")[1:])
+ if not scheme == SCHEME:
+ raise SchemeError("Scheme %s not supported" % scheme)
+
+ if subscheme != "" and not subscheme in __parsers:
+ raise SchemeError("SubScheme %s not supported" % subscheme)
+
+ if subscheme:
+ return __parsers[subscheme](res)
+
+ return res
+
+
-#For now, just export the urlparse urlparse method
-parse_uri = urlparse.urlparse
diff --git a/src/sugar/tutorius/uam/gobjectparser.py b/src/sugar/tutorius/uam/gobjectparser.py
new file mode 100644
index 0000000..c1fba3d
--- /dev/null
+++ b/src/sugar/tutorius/uam/gobjectparser.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2009, Tutorius.org
+# Copyright (C) 2009, Vincent Vinet <vince.vinet@gmail.com>
+#
+# This program 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; either version 2 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+"""
+UAM Parser for gobject subscheme
+
+To be completed
+"""
+
+SCHEME="gobject"
+
+def parse_gobject(parsed_uri):
+ """Do nothing for now"""
+ return parsed_uri
diff --git a/src/sugar/tutorius/uam/gtkparser.py b/src/sugar/tutorius/uam/gtkparser.py
new file mode 100644
index 0000000..ede2f03
--- /dev/null
+++ b/src/sugar/tutorius/uam/gtkparser.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2009, Tutorius.org
+# Copyright (C) 2009, Vincent Vinet <vince.vinet@gmail.com>
+#
+# This program 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; either version 2 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+"""
+UAM Parser for gtk subscheme
+
+Allows addressing Gtk Events, signals, widgets
+
+The gtk subscheme for tutorius is
+
+<scheme>://<activity>/<path>[?<params>#<ptype>]
+
+where:
+
+<scheme> is the uam.SCHEME + "." + SCHEME
+
+<activity> is the activity's dns identifier, such as battleship.tutorius.org
+
+<path> is the Hierarchical path to the widget, where 0 is the activity, such as /0/0/1/0/1/0
+
+<params> can be used to specify additionnal parameters required for an event handler or action, such as event=clicked
+
+<ptype> must be used with params to specify which action or eventfilter to use, such as "DialogMessage"
+
+"""
+
+SCHEME="gtk"
+
+def parse_gtk(parsed_uri):
+ """Do nothing for now"""
+ return parsed_uri