[Checkins] SVN: Sandbox/luciano/kirbi/src/kirbi/ renamed user_folder attr to userFolder

[Luciano Ramalho]

Log message for revision 78970:
  renamed user_folder attr to userFolder
  

Changed:
  U   Sandbox/luciano/kirbi/src/kirbi/app.py
  U   Sandbox/luciano/kirbi/src/kirbi/ftests/user.txt

-=-
Modified: Sandbox/luciano/kirbi/src/kirbi/app.py
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/app.py	2007-08-18 19:21:08 UTC (rev 78969)
+++ Sandbox/luciano/kirbi/src/kirbi/app.py	2007-08-18 19:46:00 UTC (rev 78970)
@@ -48,10 +48,9 @@
                        name='kirbi.Owner',
                        name_in_container='kirbi.Owner')
     def __init__(self):
-        global sitePac, siteUsers, siteUsersURL
         super(Kirbi, self).__init__()
         self.pac = self[PAC_NAME] = Pac()
-        self.user_folder = self[USER_FOLDER_NAME] = UserFolder()
+        self.userFolder = self[USER_FOLDER_NAME] = UserFolder()
 
 @grok.subscribe(Kirbi, grok.IObjectAddedEvent)
 def grant_permissions(app, event):
@@ -65,7 +64,7 @@
         return self.url(self.context.pac)
 
     def login_url(self):
-        return self.url(self.context.user_folder,'login')
+        return self.url(self.context.userFolder,'login')
 
 class BookIndexes(grok.Indexes):
     grok.site(Kirbi)

Modified: Sandbox/luciano/kirbi/src/kirbi/ftests/user.txt
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/ftests/user.txt	2007-08-18 19:21:08 UTC (rev 78969)
+++ Sandbox/luciano/kirbi/src/kirbi/ftests/user.txt	2007-08-18 19:46:00 UTC (rev 78970)
@@ -28,34 +28,34 @@
     >>> from kirbi.app import Kirbi
     >>> root = getRootFolder()
     >>> kirbi_app = root['kirbi'] = Kirbi()
-    >>> kirbi_app.user_folder
+    >>> kirbi_app.userFolder
     <kirbi.user.UserFolder object ...>
     
     >>> from zope.app.authentication.interfaces import IAuthenticatorPlugin
-    >>> IAuthenticatorPlugin.providedBy(kirbi_app.user_folder)
+    >>> IAuthenticatorPlugin.providedBy(kirbi_app.userFolder)
     True
     
-Now we put the ``alice`` user created before in the ``user_folder``, and
+Now we put the ``alice`` user created before in the ``userFolder``, and
 exercise the ``IAuthenticatorPlugin`` methods::
     
-    >>> kirbi_app.user_folder[u'alice'] = alice
-    >>> principal = kirbi_app.user_folder.principalInfo(u'alice')
+    >>> kirbi_app.userFolder[u'alice'] = alice
+    >>> principal = kirbi_app.userFolder.principalInfo(u'alice')
     >>> principal.description
     u'Alice Cooper (alice)'
     
-    >>> kirbi_app.user_folder.principalInfo('nonexistent-user') is None
+    >>> kirbi_app.userFolder.principalInfo('nonexistent-user') is None
     True
     
     >>> good_credentials = {'login':u'alice','password':u'1234'}
     >>> bad_login_cred = {'login':u'bob','password':u'1234'}
     >>> bad_passwd_cred = {'login':u'alice','password':u'9999'}
-    >>> principal = kirbi_app.user_folder.authenticateCredentials(good_credentials)
+    >>> principal = kirbi_app.userFolder.authenticateCredentials(good_credentials)
     >>> principal.description
     u'Alice Cooper (alice)'
 
-    >>> kirbi_app.user_folder.authenticateCredentials(bad_login_cred) is None
+    >>> kirbi_app.userFolder.authenticateCredentials(bad_login_cred) is None
     True
-    >>> kirbi_app.user_folder.authenticateCredentials(bad_passwd_cred) is None
+    >>> kirbi_app.userFolder.authenticateCredentials(bad_passwd_cred) is None
     True