[KSS-checkins] r49244 - in kukit/kss.zope/trunk/kss/zope/concatresource: . compression

[reebalazs at codespeak.net]

Author: reebalazs
Date: Sat Dec  1 13:28:03 2007
New Revision: 49244

Removed:
   kukit/kss.zope/trunk/kss/zope/concatresource/compression/
Modified:
   kukit/kss.zope/trunk/kss/zope/concatresource/concatfileresource.py
Log:
Reuse a little bit more from kss.base.

Modified: kukit/kss.zope/trunk/kss/zope/concatresource/concatfileresource.py
==============================================================================
--- kukit/kss.zope/trunk/kss/zope/concatresource/concatfileresource.py	(original)
+++ kukit/kss.zope/trunk/kss/zope/concatresource/concatfileresource.py	Sat Dec  1 13:28:03 2007
@@ -9,7 +9,7 @@
 from zope.interface import implements
 from interfaces import IContextFile
 from fileresource import File
-from compression import compress
+from kss.base.compression.javascript import compress
 import time
 import zope.component as capi
 from kss.zope.interfaces import IKSSPluginRegistry
@@ -53,17 +53,17 @@
 
     def getContents(self):
         fileslist = self.getFilesList()
-        assert fileslist, 'Must contain at least one resource.'
-        result = fileslist[0].getContents()
-        content_type = result['content_type']
-        data = [result['data']]
-        for subres in fileslist[1:]:
+        # concatenate the data
+        data = []
+        # We only handle javascript now.
+        content_type =  'application/x-javascript'
+        for subres in fileslist:
             d = subres.getContents()
-            # all elements must have the same content type.
             assert d['content_type'] == content_type
             data.append(d['data'])
-        result['data'] = '\n'.join(data)
-        result['compress_level'] = self.compress_level
-        # Do compression on the result
-        result['data'] = compress(**result)
+        # Do javascript compression on the result.
+        result = dict(
+            data = compress( '\n'.join(data), self.compress_level),
+            content_type = content_type,
+            )
         return result