[Zope-Checkins] CVS: Zope/lib/python/ComponentArchitecture - Feature.py:1.1.2.1 Errors.py:1.1.4.2 Presentation.py:1.1.4.6 __init__.py:1.1.4.3

[Shane Hathaway]

Update of /cvs-repository/Zope/lib/python/ComponentArchitecture
In directory cvs.zope.org:/tmp/cvs-serv14942

Modified Files:
      Tag: ComponentArchitecture-branch
	Errors.py Presentation.py __init__.py 
Added Files:
      Tag: ComponentArchitecture-branch
	Feature.py 
Log Message:
Added "features".


=== Added File Zope/lib/python/ComponentArchitecture/Feature.py ===
##############################################################################
# 
# Zope Public License (ZPL) Version 1.0
# -------------------------------------
# 
# Copyright (c) Digital Creations.  All rights reserved.
# 
# This license has been certified as Open Source(tm).
# 
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
# 
# 1. Redistributions in source code must retain the above copyright
#    notice, this list of conditions, and the following disclaimer.
# 
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions, and the following disclaimer in
#    the documentation and/or other materials provided with the
#    distribution.
# 
# 3. Digital Creations requests that attribution be given to Zope
#    in any manner possible. Zope includes a "Powered by Zope"
#    button that is installed by default. While it is not a license
#    violation to remove this button, it is requested that the
#    attribution remain. A significant investment has been put
#    into Zope, and this effort will continue if the Zope community
#    continues to grow. This is one way to assure that growth.
# 
# 4. All advertising materials and documentation mentioning
#    features derived from or use of this software must display
#    the following acknowledgement:
# 
#      "This product includes software developed by Digital Creations
#      for use in the Z Object Publishing Environment
#      (http://www.zope.org/)."
# 
#    In the event that the product being advertised includes an
#    intact Zope distribution (with copyright and license included)
#    then this clause is waived.
# 
# 5. Names associated with Zope or Digital Creations must not be used to
#    endorse or promote products derived from this software without
#    prior written permission from Digital Creations.
# 
# 6. Modified redistributions of any form whatsoever must retain
#    the following acknowledgment:
# 
#      "This product includes software developed by Digital Creations
#      for use in the Z Object Publishing Environment
#      (http://www.zope.org/)."
# 
#    Intact (re-)distributions of any official Zope release do not
#    require an external acknowledgement.
# 
# 7. Modifications are encouraged but must be packaged separately as
#    patches to official Zope releases.  Distributions that do not
#    clearly separate the patches from the original work must be clearly
#    labeled as unofficial distributions.  Modifications which do not
#    carry the name Zope may be packaged in any form, as long as they
#    conform to all of the clauses above.
# 
# 
# Disclaimer
# 
#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
#   SUCH DAMAGE.
# 
# 
# This software consists of contributions made by Digital Creations and
# many individuals on behalf of Digital Creations.  Specific
# attributions are listed in the accompanying credits file.
# 
##############################################################################
"""
Feature component management
"""

from types import StringType

import Interface
from Interface import objectImplements
from Acquisition import ExplicitAcquisitionWrapper, aq_base

import Errors
from Service import Service, findComponent
from IToIRegistry import IToIRegistry


_marker = []  # Create a new marker object.


FEATURE_SERVICE_NAME = 'Features'

class FeatureService (Service):
    """
    """

    def getUnboundComponent(inputs, output):
        """
        Returns a feature component.
        """


_global_reg = IToIRegistry()

def registerFeature(input, output, unbound_comp):
    # assert unbound_comp.allowsBindingTo(input)
    _global_reg.register(input, output, unbound_comp)


def getFeature(object, output, default=_marker):
    """
    Finds a feature for an object by examining what it implements.
    Searches in services then the global registry.
    """
    inputs = objectImplements(object)
    c = findComponent(FEATURE_SERVICE_NAME, object,
                      (inputs, output))
    if c is None:
        reg = _global_reg
        for input in inputs:
            c = reg.get(input, output)
            if c is not None:
                break
    if c is None:
        if default is not _marker:
            return default
        else:
            raise Errors.FeatureNotFound(object, output)
    # Bind the component.
    r = c(object)

    if type(output) is not StringType:
        assert output.isImplementedBy(r), '%s does not implement %s' % (
            `output`, `r`)

##    if not hasattr(r, 'aq_base'):
##        # XXX Add an acquisition wrapper.
##        r = ExplicitAcquisitionWrapper(r, object)
##    if aq_base(r) is not r:
##        # It's a wrapper.
##        r.aq_setData('id', '(p)%s' % name)
    return r



=== Zope/lib/python/ComponentArchitecture/Errors.py 1.1.4.1 => 1.1.4.2 ===
 
 class PresentationNotFound (ObjectAndNameException):
-    """Could not find the necessary presentation for a component"""
+    """Could not find the requested presentation for a component"""
+
+
+class FeatureNotFound (ObjectAndNameException):
+    """Could not find a feature"""
 
 
 class InterfaceNotFound (ObjectAndNameException):


=== Zope/lib/python/ComponentArchitecture/Presentation.py 1.1.4.5 => 1.1.4.6 ===
 import Interface
 from Interface import objectImplements
-from Acquisition import ExplicitAcquisitionWrapper
+from Acquisition import ExplicitAcquisitionWrapper, aq_base
 
 import Errors
 from Service import Service, findComponent
@@ -149,4 +149,7 @@
 ##    if not hasattr(r, 'aq_base'):
 ##        # XXX Add an acquisition wrapper.
 ##        r = ExplicitAcquisitionWrapper(r, object)
+    if aq_base(r) is not r:
+        # It's a wrapper.
+        r.aq_setData('id', '(p)%s' % name)
     return r


=== Zope/lib/python/ComponentArchitecture/__init__.py 1.1.4.2 => 1.1.4.3 ===
 providePresentation = Presentation.registerPresentation
 
+from Feature import getFeature, registerFeature
+provideFeature = registerFeature
+
 ##from Content import Content, ContentContainer
 
 ##import FactoryComponents