[Checkins] SVN: z3c.resourceinclude/trunk/ - Refactor some parts to be able to make a version in Zope 2 more easly.

[Sylvain Viollon]

Log message for revision 90173:
  
  - Refactor some parts to be able to make a version in Zope 2 more easly.
  
  

Changed:
  U   z3c.resourceinclude/trunk/setup.py
  U   z3c.resourceinclude/trunk/z3c/resourceinclude/collector.py
  U   z3c.resourceinclude/trunk/z3c/resourceinclude/configure.zcml
  U   z3c.resourceinclude/trunk/z3c/resourceinclude/manager.py
  U   z3c.resourceinclude/trunk/z3c/resourceinclude/meta.zcml
  U   z3c.resourceinclude/trunk/z3c/resourceinclude/zcml.py

-=-
Modified: z3c.resourceinclude/trunk/setup.py
===================================================================
--- z3c.resourceinclude/trunk/setup.py	2008-08-24 12:30:44 UTC (rev 90172)
+++ z3c.resourceinclude/trunk/setup.py	2008-08-24 14:41:59 UTC (rev 90173)
@@ -31,7 +31,7 @@
           'zope.app.cache',
           'zope.contentprovider',
           'plone.memoize',
-          'z3c.pt',
+          'z3c.pt [lxml]',
           # -*- Extra requirements: -*-
       ],
       entry_points="""

Modified: z3c.resourceinclude/trunk/z3c/resourceinclude/collector.py
===================================================================
--- z3c.resourceinclude/trunk/z3c/resourceinclude/collector.py	2008-08-24 12:30:44 UTC (rev 90172)
+++ z3c.resourceinclude/trunk/z3c/resourceinclude/collector.py	2008-08-24 14:41:59 UTC (rev 90173)
@@ -114,7 +114,7 @@
         resources = []
         names = []
 
-        request = TemporaryRequest(self.request)
+        request = self._get_request()
         
         for name, manager in self._get_managers():
             items = manager.getResources(request)
@@ -138,6 +138,9 @@
 
     def merge(self, resources):
         pass
+
+    def _get_request(self):
+        return TemporaryRequest(self.request)
     
     def _get_managers(self):
         managers = [(name, manager) for name, manager in \

Modified: z3c.resourceinclude/trunk/z3c/resourceinclude/configure.zcml
===================================================================
--- z3c.resourceinclude/trunk/z3c/resourceinclude/configure.zcml	2008-08-24 12:30:44 UTC (rev 90172)
+++ z3c.resourceinclude/trunk/z3c/resourceinclude/configure.zcml	2008-08-24 14:41:59 UTC (rev 90173)
@@ -10,5 +10,5 @@
   <adapter
      zcml:condition="not-have devmode"
      factory=".collector.DigestResourceCollector" />
-
+     
 </configure>

Modified: z3c.resourceinclude/trunk/z3c/resourceinclude/manager.py
===================================================================
--- z3c.resourceinclude/trunk/z3c/resourceinclude/manager.py	2008-08-24 12:30:44 UTC (rev 90172)
+++ z3c.resourceinclude/trunk/z3c/resourceinclude/manager.py	2008-08-24 14:41:59 UTC (rev 90173)
@@ -19,6 +19,10 @@
         if name not in self.names:
             self.names.append(name)
 
+    def searchResource(self, request, name):
+        return component.queryAdapter(
+                request, name=name)
+
     def getResources(self, request):
         resources = []
         
@@ -28,8 +32,7 @@
             else:
                 path = None
 
-            resource = component.queryAdapter(
-                request, name=name)
+            resource = self.searchResource(request, name)
 
             if path is not None:
                 resource = resource[path]
@@ -39,3 +42,17 @@
 
         return resources
 
+
+class ResourceManagerFactory(object):
+
+    interface.implements(component.IFactory)
+
+    title = "z3c.resourceinclude.ResourceManager"
+    descript = "Build a resource manager"
+
+    def getInterfaces(self):
+        return [IResourceManager,]
+
+    def __call__(self):
+        return ResourceManager()
+

Modified: z3c.resourceinclude/trunk/z3c/resourceinclude/meta.zcml
===================================================================
--- z3c.resourceinclude/trunk/z3c/resourceinclude/meta.zcml	2008-08-24 12:30:44 UTC (rev 90172)
+++ z3c.resourceinclude/trunk/z3c/resourceinclude/meta.zcml	2008-08-24 14:41:59 UTC (rev 90173)
@@ -12,4 +12,10 @@
     
   </meta:directives>
 
+  <utility
+     factory=".manager.ResourceManagerFactory"
+     provides="zope.component.IFactory"
+     name="z3c.resourceinclude.ResourceManager"
+     />
+
 </configure>

Modified: z3c.resourceinclude/trunk/z3c/resourceinclude/zcml.py
===================================================================
--- z3c.resourceinclude/trunk/z3c/resourceinclude/zcml.py	2008-08-24 12:30:44 UTC (rev 90172)
+++ z3c.resourceinclude/trunk/z3c/resourceinclude/zcml.py	2008-08-24 14:41:59 UTC (rev 90173)
@@ -65,7 +65,8 @@
 
         if manager is None:
             # create new resource manager
-            managers[key] = manager = ResourceManager()
+            managers[key] = manager = component.createObject(
+                'z3c.resourceinclude.ResourceManager')
 
             # maintain order by creating a name that corresponds to
             # the current number of resource managers