Changeset 2609 in products

Timestamp:

Jul 2, 2010 1:46:49 PM (14 years ago)

Author:

mylan

Message:

Register IGAuthUtility to LocalSiteManager? on installation and bound to configlet; some refactoring and updates

Location:

quintagroup.gauth/trunk/quintagroup/gauth

Files:

• configure.zcml (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• profiles/default/import_steps.xml (added)
• profiles/default/quintagrouop_gauth.txt (added)
• setuphandlers.py (added)
• tests.py (modified) (5 diffs)
• utility.py (modified) (4 diffs)

quintagroup.gauth/trunk/quintagroup/gauth/configure.zcml

@@ -7 +7 @@
 
   <include package=".browser" />
-
-  <utility
-      factory=".utility.GAuthUtility" />
 
   <genericsetup:registerProfile

quintagroup.gauth/trunk/quintagroup/gauth/interfaces.py

@@ -1 +1 @@
 from zope.interface import Interface, Attribute
 
-class IGAuthInterface(Interface):
+class IGAuthUtility(Interface):
     """ Utility, which operate with authentication data,
         stored in Google Data configlet.

quintagroup.gauth/trunk/quintagroup/gauth/tests.py

@@ -4 +4 @@
 #from zope.testing import doctestunit
 #from zope.component import testing
+from zope.component import queryUtility
+from zope.component import getSiteManager
 from Testing import ZopeTestCase as ztc
 
@@ -15 +17 @@
 
 import quintagroup.gauth
+from quintagroup.gauth.interfaces import IGAuthUtility
 
 class GauthLayer(PloneSite):
@@ -48 +51 @@
 
 class TestInstall(TestCase):
+
     def afterSetUp(self):
         self.loginAsPortalOwner()
@@ -63 +67 @@
         self.assert_("quintagroup.gauth" in aifs, aifs)
 
+    def testUtility(self):
+        lsm = getSiteManager(self.portal)
+        gauth = lsm.queryUtility(IGAuthUtility)
+        self.assert_(gauth is not None)
+        self.assert_(gauth.gconf is not None)
 
 class TestConfiglet(FunctionalTestCase):
@@ -84 +93 @@
     def test_update(self):
         temail, tpass = "tester@test.com", "secret"
-        from quintagroup.gauth.interfaces import IGAuthInterface
-        from zope.component import queryUtility
-        gauth_util = queryUtility(IGAuthInterface)
-        gauth_util.gconf_init(self.portal, self.portal.REQUEST)
+        gauth_util = queryUtility(IGAuthUtility)
         url = self.save_url + '&form.gauth_email='+temail + '&form.gauth_pass='+tpass
         self.publish(url, self.basic_auth)
         self.assert_(gauth_util.email == temail)
         self.assert_(gauth_util.password == tpass)
-        
+
 
 def test_suite():

quintagroup.gauth/trunk/quintagroup/gauth/utility.py

@@ -8 +8 @@
 from plone.memoize.view import memoize_contextless
 
-from quintagroup.gauth.interfaces import IGAuthInterface
+from quintagroup.gauth.interfaces import IGAuthUtility
 from quintagroup.gauth.browser.configlet import IGAuthConfigletSchema
 
@@ -20 +20 @@
 
 class GAuthUtility(object):
-    implements(IGAuthInterface)
+    implements(IGAuthUtility)
 
     gconf = None
-
-    def gconf_init(self, context, request):
-        pps = queryMultiAdapter((context, request), name="plone_portal_state")
+    
+    def __init__(self, context):
+        # Bind utility to the context
+        pps = queryMultiAdapter((context, context.REQUEST), name="plone_portal_state")
         self.gconf = queryAdapter(pps.portal(), IGAuthConfigletSchema)
 
@@ -31 +32 @@
     def email(self):
         """ Get the email."""
-        if not self.gconf:
-            return None
-        return self.gconf.gauth_email
+        return getattr(self.gconf, 'gauth_email', '')
 
     @property
     def password(self):
         """ Get the password."""
-        if not self.gconf:
-            return None
-        return self.gconf.gauth_pass
+        return getattr(self.gconf, 'gauth_pass', '')
 
 
@@ -55 +52 @@
 
             def __init__(self):
-                gauth_util = queryUtility(IGAuthInterface)
+                gauth_util = queryUtility(IGAuthUtility)
                 self.service = gdata.spreadsheet.service.SpreadsheetService(
                                    gauth_util.email, gauth_util.password)