Changeset 818

Timestamp:

05/30/07 19:22:35 (2 years ago)

Author:

sgillies

Message:

Add Persons and subject and responsibility relationships

Files:

• Bibliomane/trunk/bibliomane/configure.zcml (modified) (1 diff)
• Bibliomane/trunk/bibliomane/interfaces.py (modified) (5 diffs)
• Bibliomane/trunk/bibliomane/principals.py (added)
• Bibliomane/trunk/bibliomane/tests/test_doctests.py (modified) (2 diffs)
• Bibliomane/trunk/bibliomane/tests/works.txt (modified) (2 diffs)
• Bibliomane/trunk/bibliomane/works.py (modified) (2 diffs)

Bibliomane/trunk/bibliomane/configure.zcml

@@ -92 +92 @@
-  </class>
-
+  <interface
+    interface=".interfaces.IPerson"
+    type="zope.app.content.interfaces.IContentType"
+    />
+
+  <class class=".principals.Person">
+    <require
+      permission="zope.View"
+      interface=".interfaces.IPerson"
+      />
+    <require
+      permission="zope.ManageContent"
+      set_schema=".interfaces.IPerson"
+      />
+  </class>
+
+  <interface
+    interface=".interfaces.ICorporateBody"
+    type="zope.app.content.interfaces.IContentType"
+    />
+
+  <class class=".principals.CorporateBody">
+    <require
+      permission="zope.View"
+      interface=".interfaces.ICorporateBody"
+      />
+    <require
+      permission="zope.ManageContent"
+      set_schema=".interfaces.ICorporateBody"
+      />
+  </class>
+
-</configure>

Bibliomane/trunk/bibliomane/interfaces.py

@@ -2 +2 @@
-from zope.app.container.interfaces import IContainer, IContained
-from zope.app.container.constraints import contains, containers
-
-
+
+
+
-
-class IWork(IContained, IContainer):
+
+    """A Work "is realized through" an Expression and "is created by" a Person
+    or Corporate Body. It "has as subject" another Work, Expression, 
+    Manifestation, Item, Person, object, or concept.
+    """
-    contains('bibliomane.interfaces.IExpression')
-
@@ -45 +51 @@
-        )
-
+    subjects = Iterable(
+        title=u"Subjects",
+        description=u"Subjects of this work also found in the database",
+        required=False,
+        )
+
+    works = Iterable(
+        title=u"Works",
+        description=u"Other works treating this one as a subject",
+        required=False,
+        )
+
+    creators = Iterable(
+        title=u"Creators",
+        description=u"Creators of this work",
+        required=False,
+        )
+
-
-class IExpression(IWork):
+    
+    """An Expression "is embodied in" a Manifestation and "is realized by" a
+    Person or Corporate Body.
+    """
-    containers('bibliomane.interfaces.IWork')
-
@@ -57 +85 @@
-
-class IManifestation(IContained, IContainer):
+
+    """A Manifestation "is exemplified by" an Item and "is produced by" a 
+    Person or Corporate Body.
+    """
-    containers('bibliomane.interfaces.IExpression')
-    contains('bibliomane.interfaces.IItem')
@@ -86 +118 @@
-
-class IItem(IContained):
+
+    """An Item "is owned by" a Person or Corporate Body.
+    """
-    containers('bibliomane.interfaces.IManifestation')
-
@@ -95 +130 @@
-
-
+class IPerson(Interface):
+    
+    name = TextLine(
+        title=u"Name",
+        description=u"The person's name",
+        required=True,
+        )
+
+    name_language = TextLine(
+        title=u"Title Language",
+        description=u"The language and/or script of the person's name",
+        required=False,
+        )
+
+    link = URI(
+        title=u"URI",
+        description=u"A link to more authoritative information",
+        required=False,
+        )
+
+    creations = Iterable(
+        title=u"Creations",
+        description=u"Works that the person has created",
+        required=False,
+        )
+
+
+class ICorporateBody(Interface):
+    
+    name = TextLine(
+        title=u"Name",
+        description=u"The corporate body's name",
+        required=True,
+        )
+
+    name_language = TextLine(
+        title=u"Title Language",
+        description=u"The language and/or script of the name",
+        required=False,
+        )
+
+    place = TextLine(
+        title=u"Place",
+        description=u"The location of the corporate body",
+        required=False,
+        )
+    
+
+# Marker interfaces
+
+class IFrbrRelationshipContainer(Interface):
+    pass
+
+# Relationship markers
+
+class IHasSubject(Interface):
+    pass
+
+class ICreatedBy(Interface):
+    pass
+
+class IRealizedBy(Interface):
+    pass
+
+class IProducedBy(Interface):
+    pass
+
+class IOwnedBy(Interface):
+    pass
+
+

Bibliomane/trunk/bibliomane/tests/test_doctests.py

@@ -4 +4 @@
-from zope.testing import doctestunit
-from zope.component import testing
+
+from zc.relationship.tests import intidSetUp as setUp
+from zc.relationship.tests import tearDown
-
-OPTIONFLAGS = (doctest.REPORT_ONLY_FIRST_FAILURE |
@@ -19 +22 @@
-        doctestunit.DocFileSuite(
-            'works.txt', optionflags=OPTIONFLAGS, package='bibliomane.tests',
-testing.setUp, tearDown=testing.
+setUp, tearDown=
-
-        #doctestunit.DocTestSuite(

Bibliomane/trunk/bibliomane/tests/works.txt

@@ -22 +22 @@
-  >>> from zope.app.folder import Folder
-
+  >>> root = app.getSiteManager()
-  >>> works = Folder()
+  >>> root['works'] = works
+
-  >>> works[u'1'] = work
-  >>> IContained.providedBy(work)
@@ -76 +79 @@
-  True
-
+Test subject relationships
+--------------------------
-
+  Create a subject relationship container
+
+  >>> from zc.relationship import Container
+  >>> container = Container()
+  >>> works['frbr_relationships'] = container
+  >>> from zope.component import provideUtility
+  >>> from bibliomane.interfaces import IFrbrRelationshipContainer
+  >>> provideUtility(container, IFrbrRelationshipContainer)
+
+  Relate two works
+
+  >>> another_work = Work()
+  >>> another_work.title = u'Herodotus and religion in the Persian Wars'
+  >>> works[u'2'] = another_work
+
+  >>> from bibliomane.relationships import relate
+  >>> from bibliomane.interfaces import IHasSubject
+  >>> relate(another_work, work, IHasSubject)
+  >>> [w.title for w in another_work.subjects]
+  [u'The Histories']
+  >>> [w.title for w in work.works]
+  [u'Herodotus and religion in the Persian Wars']
+
+  Remove relationship
+
+  >>> from bibliomane.relationships import unrelate 
+  >>> unrelate(another_work, work, IHasSubject)
+  >>> list(another_work.subjects)
+  []
+  >>> list(work.works)
+  []
+
+Test responsibility relationships
+---------------------------------
+
+  Relate work to creator
+
+  >>> from bibliomane.principals import Person
+  >>> herodotus = Person(name=u'Herodotus')
+  >>> herodotus
+  <bibliomane.principals.Person object at ...>
+  >>> principals = Folder()
+  >>> root['principals'] = principals
+  >>> principals[u'herodotus'] = herodotus
+  >>> import transaction
+  >>> transaction.commit()
+
+  >>> from bibliomane.interfaces import ICreatedBy
+  >>> relate(work, herodotus, ICreatedBy)
+  >>> [w.title for w in herodotus.creations]
+  [u'The Histories']
+  >>> [c.name for c in work.creators]
+  [u'Herodotus']
+
+

Bibliomane/trunk/bibliomane/works.py

@@ -1 +1 @@
-from persistent import Persistent
-from zope.interface import implements
+from zope.component import getUtility
-from zope.app.container.btree import BTreeContainer
-from zope.app.container.contained import Contained
-
-
+
+
+
+
+
+
-
-
@@ -23 +29 @@
-        self.title = title
-
+    @property
+    def subjects(self):
+        return find_targets(self, IHasSubject)
+
+    @property
+    def works(self):
+        return find_sources(self, IHasSubject)
+
+    @property
+    def creators(self):
+        return find_targets(self, ICreatedBy)
+
-        
-Work
+BTreeContainer, Contained
-    implements(IExpression)
-
+    __name__ = __parent__ = None
+
+    title = u""
+    title_language = u""
+    form = u""
+    date = None
+    context = u""
-    language = u""
-