[KSS-checkins] r53921 - in kukit/kss.concatresource/trunk: docs kss/concatresource/compression

[reebalazs at codespeak.net]

Author: reebalazs
Date: Sun Apr 20 19:31:01 2008
New Revision: 53921

Removed:
   kukit/kss.concatresource/trunk/kss/concatresource/compression/css.py
Modified:
   kukit/kss.concatresource/trunk/docs/HISTORY.txt
   kukit/kss.concatresource/trunk/kss/concatresource/compression/__init__.py
Log:
Port forward from 1.4 branch -r53918:53920: Change concatresource to accept resources with "application/x-javascript" content type only

Modified: kukit/kss.concatresource/trunk/docs/HISTORY.txt
==============================================================================
--- kukit/kss.concatresource/trunk/docs/HISTORY.txt	(original)
+++ kukit/kss.concatresource/trunk/docs/HISTORY.txt	Sun Apr 20 19:31:01 2008
@@ -2,10 +2,24 @@
 
     (name of developer listed in brackets)
 
-kss.concatresource - 1.4dev Unreleased
+kss.concatresource - 1.5dev Unreleased
 
     - ...
 
+    - Change concatresource to accept resources with
+      "application/x-javascript" content type only
+      [ree]
+
+kss.concatresource - 1.4-rc1 Released 2008-03-25
+
+    - Prepare for release
+      [ree]
+
+kss.concatresource - 1.4-alpha1 Released 2008-03-09
+
+    - Prepare for release
+      [ree]
+
 kss.concatresource - 1.2 Released 2007-08-17
 
     - Change ;;; rendering in devel mode

Modified: kukit/kss.concatresource/trunk/kss/concatresource/compression/__init__.py
==============================================================================
--- kukit/kss.concatresource/trunk/kss/concatresource/compression/__init__.py	(original)
+++ kukit/kss.concatresource/trunk/kss/concatresource/compression/__init__.py	Sun Apr 20 19:31:01 2008
@@ -5,16 +5,9 @@
 __all__ = ('compress', )
 
 from javascript import compress as compress_javascript
-from css import compress as compress_css
-
-compress_methods = {    
-    'application/x-javascript': compress_javascript,
-    'text/css': compress_css,
-    }
-
-default_compress_method = lambda text: text
 
 def compress(data, content_type, compress_level):
     'Returns compressed text for a given content type'
-    method = compress_methods.get(content_type, default_compress_method)
-    return method(data, compress_level)
+    assert content_type == 'application/x-javascript', \
+        'Only application/x-javascript content types are supported.'
+    return compress_javascript(data, compress_level)

Deleted: /kukit/kss.concatresource/trunk/kss/concatresource/compression/css.py
==============================================================================
--- /kukit/kss.concatresource/trunk/kss/concatresource/compression/css.py	Sun Apr 20 19:31:01 2008
+++ (empty file)
@@ -1,18 +0,0 @@
-'''\
-The css compressor uses the 3rdparty packer module
-that is taken from Plone's ResourceRegistries.
-'''
-
-from thirdparty.packer import CSSPacker
-# Packer needs to be created for each packing
-
-def compress(data, compress_level):
-    if compress_level == "safe":
-        csspacker_safe = CSSPacker('safe')
-        return csspacker_safe.pack(data)
-    elif compress_level == "full":
-        csspacker_full = CSSPacker('full')
-        return csspacker_full.pack(data)
-    else:
-        # none
-        return data