<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13033] CalendarServer/branches/users/sagen/move2who-4/txdav/dps/json.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13033">13033</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 14:30:15 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start on expressionFromJSONText()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsjsonpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/json.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsjsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/json.py (13032 => 13033)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/json.py 2014-03-28 20:57:18 UTC (rev 13032)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/json.py 2014-03-28 21:30:15 UTC (rev 13033)
</span><span class="lines">@@ -35,7 +35,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def expressionAsJSONText(expression):
</span><del>- return to_json_text(expressionAsJSON(expression))
</del><ins>+ json = expressionAsJSON(expression)
+ return to_json_text(json)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def expressionAsJSON(expression):
</span><span class="lines">@@ -70,13 +71,71 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def expressionFromJSONText(jsonText):
</span><del>- Operand
- MatchType, MatchFlags
- from_json_text
</del><ins>+ json = from_json_text(jsonText)
+ return expressionFromJSON(json)
+
+
+def expressionFromJSON(json):
+ if not isinstance(json, dict):
+ raise TypeError("JSON expression must be a dict.")
+
+ try:
+ json_type = json["type"]
+ except KeyError as e:
+ raise ValueError("JSON expression must have {!r} key.".format(e[0]))
+
+ if json_type == "CompoundExpression":
+ return compoundExpressionFromJSON(json)
+
+ if json_type == "MatchExpression":
+ return matchExpressionFromJSON(json)
+
+ raise NotImplementedError(
+ "Unknown expression type: {}".format(json_type)
+ )
+
+
+def compoundExpressionFromJSON(json):
+ try:
+ expressions_json = json["expressions"]
+ operand_json = json["operand"]
+ except KeyError as e:
+ raise ValueError(
+ "JSON compound expression must have {!r} key.".format(e[0])
+ )
+
+ expressions = tuple(expressionFromJSON(e) for e in expressions_json)
+ operand = Operand.lookupByName(operand_json)
+
+ return CompoundExpression(expressions, operand)
+
+
+def matchExpressionFromJSON(json):
+ try:
+ field_json = json["field"]
+ value_json = json["value"]
+ match_json = json["match"]
+ flags_json = json["flags"]
+ except KeyError as e:
+ raise ValueError(
+ "JSON match expression must have {!r} key.".format(e[0])
+ )
+
</ins><span class="cx"> raise NotImplementedError()
</span><span class="cx">
</span><ins>+ fieldName = NotImplemented, field_json # Need service...
+ fieldValue = NotImplemented, value_json # Need to cast to correct value
+ matchType = MatchType.lookupByName(match_json)
+ flags = NotImplemented, flags_json # Need to handle composite flags
</ins><span class="cx">
</span><ins>+ MatchFlags # Shh, flakes
</ins><span class="cx">
</span><ins>+ return MatchExpression(
+ fieldName, fieldValue,
+ matchType=matchType, flags=flags,
+ )
+
+
</ins><span class="cx"> def to_json_text(obj):
</span><span class="cx"> """
</span><span class="cx"> Convert an object into JSON text.
</span></span></pre>
</div>
</div>
</body>
</html>