<!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>[12500] CalendarServer/trunk/txdav/who</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/12500">12500</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 19:47:48 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at who extensions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavwhoidirectorypy">CalendarServer/trunk/txdav/who/idirectory.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoxmlpy">CalendarServer/trunk/txdav/who/xml.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalendarServer/trunk/txdav/who/test/</li>
<li><a href="#CalendarServertrunktxdavwhotest__init__py">CalendarServer/trunk/txdav/who/test/__init__.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_xmlpy">CalendarServer/trunk/txdav/who/test/test_xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavwhoidirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/idirectory.py (12499 => 12500)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/idirectory.py 2014-01-31 03:47:26 UTC (rev 12499)
+++ CalendarServer/trunk/txdav/who/idirectory.py 2014-01-31 03:47:48 UTC (rev 12500)
</span><span class="lines">@@ -15,6 +15,9 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+from __future__ import print_function
+from __future__ import absolute_import
+
</ins><span class="cx"> """
</span><span class="cx"> Calendar and contacts directory extentions to L{twext.who.idirectory}.
</span><span class="cx"> """
</span><span class="lines">@@ -115,21 +118,26 @@
</span><span class="cx"> """
</span><span class="cx"> Constants for automatic scheduling modes.
</span><span class="cx">
</span><ins>+ @cvar none: Invitations are not automatically handled.
+
</ins><span class="cx"> @cvar accept: Accept all invitations.
</span><span class="cx">
</span><span class="cx"> @cvar decline: Decline all invitations.
</span><span class="cx">
</span><span class="cx"> @cvar acceptIfFree: Accept invitations that do not conflict with a busy
</span><del>- time slot. Other invitations are left to be handled manually.
</del><ins>+ time slot. Other invitations are not automatically handled.
</ins><span class="cx">
</span><span class="cx"> @cvar declineIfBusy: Decline invitations that conflict with a busy time
</span><del>- slot. Other invitations are left to be handled manually.
</del><ins>+ slot. Other invitations are not automatically handled.
+
+ @cvar acceptIfFreeDeclineIfBusy: Accept invitations that do not conflict
+ with a busy time slot. Decline invitations that conflict with a busy
+ time slot. Other invitations are not automatically handled.
</ins><span class="cx"> """
</span><span class="cx">
</span><del>- # default -> ?
</del><ins>+ none = NamedConstant()
+ none.description = u"no action"
</ins><span class="cx">
</span><del>- # none -> ?
-
</del><span class="cx"> accept = NamedConstant()
</span><span class="cx"> accept.description = u"accept"
</span><span class="cx">
</span><span class="lines">@@ -142,4 +150,5 @@
</span><span class="cx"> declineIfBusy = NamedConstant()
</span><span class="cx"> declineIfBusy.description = u"decline if busy"
</span><span class="cx">
</span><del>- # automatic -> ?
</del><ins>+ acceptIfFreeDeclineIfBusy = NamedConstant()
+ acceptIfFreeDeclineIfBusy.description = u"accept if free, decline if busy"
</ins></span></pre></div>
<a id="CalendarServertrunktxdavwhotest__init__py"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/who/test/__init__.py (0 => 12500)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/__init__.py (rev 0)
+++ CalendarServer/trunk/txdav/who/test/__init__.py 2014-01-31 03:47:48 UTC (rev 12500)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Tests for L{txdav.who}.
+"""
</ins></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_xmlpy"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/who/test/test_xml.py (0 => 12500)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_xml.py (rev 0)
+++ CalendarServer/trunk/txdav/who/test/test_xml.py 2014-01-31 03:47:48 UTC (rev 12500)
</span><span class="lines">@@ -0,0 +1,121 @@
</span><ins>+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from __future__ import print_function
+from __future__ import absolute_import
+
+"""
+Tests for L{txdav.who.xml}.
+"""
+
+from textwrap import dedent
+
+from twisted.internet.defer import inlineCallbacks
+from twisted.trial import unittest
+
+from twext.who.test.test_xml import xmlService
+
+from ..idirectory import (
+ RecordType, FieldName, AutoScheduleMode
+)
+from ..xml import DirectoryService
+
+
+
+class ExtendedSchemaTest(unittest.TestCase):
+ """
+ Tests for calendar and contacts schema extensions.
+ """
+
+ def makeRecord(self, fieldName, elementName, value):
+ uid = u"THE ONLY RECORD"
+
+ xmlData = dedent(
+ b"""
+ <?xml version="1.0" encoding="utf-8"?>
+
+ <directory realm="Test Realm">
+ <record type="user">
+ <uid>{uid}</uid>
+ <short-name>wsanchez</short-name>
+ <{element}>{value}</{element}>
+ </record>
+ </directory>
+ """[1:]
+ .format(
+ uid=uid.encode("utf-8"),
+ element=elementName.encode("utf-8"),
+ value=value.encode("utf-8"),
+ )
+ )
+
+ service = xmlService(
+ self.mktemp(), xmlData=xmlData, serviceClass=DirectoryService
+ )
+
+ # print("Unknown record types:", service.unknownRecordTypes)
+ # print("Unknown fields:", service.unknownFieldElements)
+
+ return service.recordWithUID(uid)
+
+
+ @inlineCallbacks
+ def test_unicodeElements(self):
+ for field, element in (
+ (FieldName.serviceNodeUID, u"service-node"),
+ (FieldName.autoAcceptGroup, u"auto-accept-group"),
+ ):
+ record = yield self.makeRecord(field, element, u"xyzzy")
+ self.assertEquals(record.fields[field], u"xyzzy")
+
+
+ @inlineCallbacks
+ def test_booleanElements(self):
+ for field, element in (
+ (FieldName.loginAllowed, u"login-allowed"),
+ (FieldName.hasCalendars, u"has-calendars"),
+ (FieldName.hasContacts, u"has-contacts"),
+ ):
+ record = yield self.makeRecord(field, element, u"<true />")
+ self.assertIdentical(record.fields[field], True, field)
+
+ test_booleanElements.todo = "WTF?"
+
+
+ @inlineCallbacks
+ def test_autoScheduleMode(self):
+ for mode, value in (
+ (AutoScheduleMode.none, u"none"),
+ (AutoScheduleMode.accept, u"accept"),
+ (AutoScheduleMode.decline, u"decline"),
+ (AutoScheduleMode.acceptIfFree, u"accept-if-free"),
+ (AutoScheduleMode.declineIfBusy, u"decline-if-busy"),
+ (
+ AutoScheduleMode.acceptIfFreeDeclineIfBusy,
+ u"accept-if-free-decline-if-busy"
+ ),
+ ):
+ field = FieldName.autoScheduleMode
+ record = yield self.makeRecord(field, u"auto-schedule-mode", value)
+ self.assertIdentical(record.fields[field], mode)
+
+ test_autoScheduleMode.todo = "constants unhandled"
+
+
+ def test_recordTypes(self):
+ raise NotImplementedError(RecordType)
+
+ test_recordTypes.todo = "unimplemented"
</ins></span></pre></div>
<a id="CalendarServertrunktxdavwhoxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/xml.py (12499 => 12500)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/xml.py 2014-01-31 03:47:26 UTC (rev 12499)
+++ CalendarServer/trunk/txdav/who/xml.py 2014-01-31 03:47:48 UTC (rev 12500)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# -*- test-case-name: txdav.who -*-
</del><ins>+# -*- test-case-name: txdav.who.test.test_xml -*-
</ins><span class="cx"> ##
</span><span class="cx"> # Copyright (c) 2014 Apple Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -31,30 +31,11 @@
</span><span class="cx"> from twext.who.xml import DirectoryService as BaseDirectoryService
</span><span class="cx"> from twext.who.util import ConstantsContainer
</span><span class="cx">
</span><del>-from .idirectory import RecordType, FieldName
</del><ins>+from .idirectory import RecordType, FieldName, AutoScheduleMode
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span><del>-# Directory Service
-#
-
-class DirectoryService(BaseDirectoryService):
- """
- XML directory service with calendar and contacts attributes.
- """
-
- recordType = ConstantsContainer(
- (BaseDirectoryService.recordType, RecordType)
- )
-
- fieldName = ConstantsContainer(
- (BaseDirectoryService.fieldName, FieldName)
- )
-
-
-
-#
</del><span class="cx"> # XML constants
</span><span class="cx"> #
</span><span class="cx">
</span><span class="lines">@@ -98,30 +79,70 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> location = ValueConstant(u"location")
</span><del>- location.fieldName = FieldName.location
</del><ins>+ location.recordType = RecordType.location
</ins><span class="cx">
</span><span class="cx"> resource = ValueConstant(u"resource")
</span><del>- resource.fieldName = FieldName.resource
</del><ins>+ resource.recordType = RecordType.resource
</ins><span class="cx">
</span><span class="cx"> address = ValueConstant(u"address")
</span><del>- address.fieldName = FieldName.address
</del><ins>+ address.recordType = RecordType.address
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class AutoScheduleValue(Values):
</span><span class="cx"> """
</span><del>- XML attribute values for auto-schedule modes.
</del><ins>+ XML element values for auto-schedule modes.
</ins><span class="cx"> """
</span><del>- # default -> ?
</del><span class="cx">
</span><del>- # none -> ?
</del><ins>+ none = ValueConstant(u"none")
+ none.mode = AutoScheduleMode.none
</ins><span class="cx">
</span><span class="cx"> accept = ValueConstant(u"accept")
</span><ins>+ accept.mode = AutoScheduleMode.accept
</ins><span class="cx">
</span><span class="cx"> decline = ValueConstant(u"decline")
</span><ins>+ decline.mode = AutoScheduleMode.decline
</ins><span class="cx">
</span><span class="cx"> acceptIfFree = ValueConstant(u"accept-if-free")
</span><ins>+ acceptIfFree.mode = AutoScheduleMode.acceptIfFree
</ins><span class="cx">
</span><span class="cx"> declineIfBusy = ValueConstant(u"decline-if-busy")
</span><ins>+ declineIfBusy.mode = AutoScheduleMode.declineIfBusy
</ins><span class="cx">
</span><del>- # automatic -> ?
</del><ins>+ acceptIfFreeDeclineIfBusy = ValueConstant(
+ u"accept-if-free-decline-if-busy"
+ )
+ acceptIfFreeDeclineIfBusy.mode = AutoScheduleMode.acceptIfFreeDeclineIfBusy
+
+
+
+#
+# Directory Service
+#
+
+class DirectoryService(BaseDirectoryService):
+ """
+ XML directory service with calendar and contacts data.
+ """
+
+ recordType = ConstantsContainer(
+ (BaseDirectoryService.recordType, RecordType)
+ )
+
+ fieldName = ConstantsContainer(
+ (BaseDirectoryService.fieldName, FieldName)
+ )
+
+ # XML schema constants
+
+ element = ConstantsContainer(
+ (BaseDirectoryService.element, Element)
+ )
+
+ attribute = ConstantsContainer(
+ (BaseDirectoryService.attribute, Attribute)
+ )
+
+ recordTypeValue = ConstantsContainer(
+ (BaseDirectoryService.recordTypeValue, RecordTypeValue)
+ )
</ins></span></pre>
</div>
</div>
</body>
</html>