Changeset 3270 in products

Timestamp:

Sep 5, 2011 6:23:32 PM (13 years ago)

Author:

vmaksymiv

Message:

compatibility with plone.app.discussion added

Location:

quintagroup.plonecaptchas/trunk

Files:

• docs/HISTORY.txt (modified) (1 diff)
• quintagroup/plonecaptchas/Extensions/Install.py (modified) (2 diffs)
• quintagroup/plonecaptchas/browser/configure.zcml (modified) (1 diff)
• quintagroup/plonecaptchas/config.py (modified) (1 diff)
• quintagroup/plonecaptchas/configure.zcml (modified) (3 diffs)
• quintagroup/plonecaptchas/interfaces.py (modified) (1 diff)
• quintagroup/plonecaptchas/meta.zcml (added)
• quintagroup/plonecaptchas/profiles/default/metadata.xml (modified) (1 diff)
• quintagroup/plonecaptchas/setuphandlers.py (modified) (2 diffs)
• quintagroup/plonecaptchas/tests/base.py (modified) (1 diff)
• quintagroup/plonecaptchas/tests/discussion.txt (added)
• quintagroup/plonecaptchas/tests/testForms.py (modified) (3 diffs)
• quintagroup/plonecaptchas/validate.py (added)
• setup.py (modified) (2 diffs)

quintagroup.plonecaptchas/trunk/docs/HISTORY.txt

@@ -1 +1 @@
 Changelog
 =========
+
+4.1 (unreleased)
+
+* compatibility with plone.app.discussion added
 
 4.0 - June 9, 2010

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/Extensions/Install.py

@@ -2 +2 @@
 from Products.CMFCore.utils import getToolByName
 REQUIRED = 'quintagroup.captcha.core'
+from quintagroup.plonecaptchas.config import HAS_APP_DISCUSSION
+from quintagroup.plonecaptchas.setuphandlers import registerDiscussionLayer
 
 
@@ -16 +18 @@
     profile = 'profile-quintagroup.plonecaptchas:default'
     gs.runAllImportStepsFromProfile(profile)
+    if HAS_APP_DISCUSSION:
+        # register browser layer
+        registerDiscussionLayer(self)
     transaction.savepoint()
 

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/browser/configure.zcml

@@ -4 +4 @@
     xmlns:five="http://namespaces.zope.org/five"
     i18n_domain="plone">
+
+    <include package="Products.CMFCore" file="permissions.zcml" />
 
     <!-- Join form definition -->

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/config.py

@@ -1 +1 @@
 GLOBALS = globals()
 PRODUCT_NAME = 'quintagroup.plonecaptchas'
+CAPTCHA_NAME = 'plonecaptchas'
+
+HAS_APP_DISCUSSION = True
+try:
+    import plone.app.discussion
+except ImportError:
+    HAS_APP_DISCUSSION = False
 
 #TOOL_ICON = 'tool.gif'

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/configure.zcml

@@ -5 +5 @@
     xmlns:cmf="http://namespaces.zope.org/cmf"
     xmlns:gs="http://namespaces.zope.org/genericsetup"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="quintagroup.plonecaptchas">
 
@@ -10 +11 @@
     <include package="quintagroup.captcha.core" />
     <!-- can't included quintagroup.formlib.captcha
-         because of ConfigurationConflictError. --> 
+        because of ConfigurationConflictError. -->
 
     <five:registerPackage package="." initialize=".initialize" />
@@ -17 +18 @@
     <include package=".browser" />
 
+    <include file="meta.zcml"/>
+
     <!-- File System Directory Views registration -->
     <cmf:registerDirectory name="captchas_discussion" />
     <cmf:registerDirectory name="captchas_sendto_form" />
     <cmf:registerDirectory name="captchas_contact_info" />
+
+    <configure zcml:condition="installed plone.app.discussion">
+
+        <adapter
+            factory=".validate.QGDiscussionCaptchaValidator"
+            provides="z3c.form.interfaces.IValidator"
+            />
+    </configure>
 
     <gs:registerProfile

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/interfaces.py

@@ -1 +1 @@
 from plone.theme.interfaces import IDefaultPloneLayer
+from quintagroup.plonecaptchas.config import HAS_APP_DISCUSSION
+
+if HAS_APP_DISCUSSION:
+    from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+
+    class IQGDiscussionCaptchas(IDefaultBrowserLayer):
+        """quintagroup.plonecaptchas browser layer interface for plone.app.discussion"""
 
 

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/profiles/default/metadata.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>4.0</version>
+  <version>4.1</version>
   <dependencies>
     <dependency>profile-quintagroup.captcha.core:default</dependency>

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/setuphandlers.py

@@ -5 +5 @@
 
 
-def removeBrowserLayer(site):
-    """ Remove browser layer.
+def registerDiscussionLayer(context):
+    """ Register browser layer for extending discussion
+        with quintagroup captcha 
+    """
+    from quintagroup.plonecaptchas.interfaces import IQGDiscussionCaptchas
+    from plone.browserlayer.utils import register_layer
+    name = "QGCaptchaDiscussionLayer"
+    site = getSiteManager(context)
+    register_layer(IQGDiscussionCaptchas, name, site_manager=site)
+
+
+def removeBrowserLayers(site):
+    """ Remove browser layers.
     """
     from plone.browserlayer.utils import unregister_layer
     from plone.browserlayer.interfaces import ILocalBrowserLayerType
 
-    name = "quintagroup.plonecaptchas"
+    layers = ["quintagroup.plonecaptchas", "QGCapchaDiscussionLayer"]
     site = getSiteManager(site)
     registeredLayers = [r.name for r in site.registeredUtilities()
                         if r.provided == ILocalBrowserLayerType]
-    if name in registeredLayers:
-        unregister_layer(name, site_manager=site)
-        logger.log(logging.INFO, "Unregistered \"%s\" browser layer." % name)
+    for name in layers:
+        if name in registeredLayers:
+            unregister_layer(name, site_manager=site)
+            logger.log(logging.INFO, "Unregistered \"%s\" browser layer." % name)
 
 
@@ -26 +38 @@
         return
     site = context.getSite()
-    removeBrowserLayer(site)
+    removeBrowserLayers(site)

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests/base.py

@@ -41 +41 @@
         zcml.load_config('configure.zcml', quintagroup.plonecaptchas)
         fiveconfigure.debug_mode = False
+        ztc.installPackage('quintagroup.captcha.core')
         ztc.installPackage('quintagroup.plonecaptchas')
-        ztc.installPackage('quintagroup.captcha.core')
 
 

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests/testForms.py

@@ -1 +1 @@
 import unittest
+import doctest
 import re
 from urllib import urlencode
@@ -7 +8 @@
 from Products.PloneTestCase.PloneTestCase import default_password
 
-from quintagroup.plonecaptchas.tests.base import FunctionalTestCase
-from quintagroup.plonecaptchas.config import PRODUCT_NAME
+from quintagroup.plonecaptchas.tests.base import FunctionalTestCase, ztc
+from quintagroup.plonecaptchas.config import PRODUCT_NAME, HAS_APP_DISCUSSION
 
 from quintagroup.captcha.core.tests.testWidget import IMAGE_PATT, NOT_VALID
@@ -217 +218 @@
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestDiscussionForm))
+    if HAS_APP_DISCUSSION:
+        suite.addTest(unittest.TestSuite([
+            ztc.FunctionalDocFileSuite(
+                'discussion.txt', package='quintagroup.plonecaptchas.tests',
+                test_class=FunctionalTestCase, globs=globals(),
+                optionflags=doctest.REPORT_ONLY_FIRST_FAILURE |
+                    doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS),
+            ]))
+
+    else:
+        suite.addTest(unittest.makeSuite(TestDiscussionForm))
     suite.addTest(unittest.makeSuite(TestRegisterForm))
     suite.addTest(unittest.makeSuite(TestSendtoForm))

quintagroup.plonecaptchas/trunk/setup.py

@@ -2 +2 @@
 import os
 
-version = '4.0'
+version = '4.1'
 
 setup(name='quintagroup.plonecaptchas',
@@ -30 +30 @@
           'quintagroup.captcha.core>=0.2',
           'quintagroup.formlib.captcha',
+          'quintagroup.z3cform.captcha',
           # -*- Extra requirements: -*-
       ],