falcon-compression 0.2.0__tar.gz → 0.2.2__tar.gz

{falcon-compression-0.2.0 → falcon_compression-0.2.2}/PKG-INFO

@@ -1,17 +1,23 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: falcon-compression
-Version: 0.2.0
+Version: 0.2.2
 Summary: Compression middleware for Falcon
-Home-page: https://github.com/willnewton/falcon-compression
-License: Apache
+License: Apache-2.0
+License-File: LICENSE
 Author: Will Newton
 Author-email: will.newton@gmail.com
 Requires-Python: >=3.9,<4.0
-Classifier: License :: Other/Proprietary License
+Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: Brotli (>=1.0.9,<2.0.0)
+Project-URL: Homepage, https://github.com/willnewton/falcon-compression
 Project-URL: Repository, https://github.com/willnewton/falcon-compression
 Description-Content-Type: text/markdown
 

{falcon-compression-0.2.0 → falcon_compression-0.2.2}/falcon_compression/brotli.py

@@ -5,6 +5,7 @@ from .util import wrap_file
 
 class BrotliCompressor:
     encoding = "br"
+    priority = 1
     compression_level = 4
 
     def compress(self, data):

{falcon-compression-0.2.0 → falcon_compression-0.2.2}/falcon_compression/gzip.py

@@ -5,6 +5,7 @@ from .util import StreamingBuffer, wrap_file
 
 class GzipCompressor:
     encoding = "gzip"
+    priority = 2
     compression_level = 6
 
     def compress(self, data):

{falcon-compression-0.2.0 → falcon_compression-0.2.2}/falcon_compression/middleware.py

@@ -4,7 +4,7 @@ from .gzip import GzipCompressor
 MIN_SIZE = 200
 
 
-def parse_q_list(s):
+def parse_q_list(s, priorities):
     values = []
     for name in s.split(","):
         q = 1.0
@@ -16,22 +16,27 @@ def parse_q_list(s):
                 q = 0.0
             if q == 0.0:
                 continue
-        values.append((name.strip().lower(), q))
-    values.sort(key=lambda v: v[1], reverse=True)
+        encoding = name.strip().lower()
+        if encoding in priorities:
+            values.append((encoding, priorities[encoding], q))
+    values.sort(key=lambda v: v[1])
+    values.sort(key=lambda v: v[2], reverse=True)
     return [v[0] for v in values]
 
 
 class CompressionMiddleware:
     def __init__(self):
         self._compressors = {}
+        self._priorities = {}
         self._add_compressor(GzipCompressor())
         self._add_compressor(BrotliCompressor())
 
     def _add_compressor(self, compressor):
+        self._priorities[compressor.encoding] = compressor.priority
         self._compressors[compressor.encoding] = compressor
 
     def _get_compressor(self, accept_encoding):
-        for encoding in parse_q_list(accept_encoding):
+        for encoding in parse_q_list(accept_encoding, self._priorities):
             compressor = self._compressors.get(encoding)
             if compressor:
                 return compressor

{falcon-compression-0.2.0 → falcon_compression-0.2.2}/pyproject.toml

@@ -1,10 +1,10 @@
 [tool.poetry]
 name = "falcon-compression"
-version = "0.2.0"
+version = "0.2.2"
 description = "Compression middleware for Falcon"
 authors = ["Will Newton <will.newton@gmail.com>"]
 readme = "README.md"
-license = "Apache"
+license = "Apache-2.0"
 homepage = "https://github.com/willnewton/falcon-compression"
 repository = "https://github.com/willnewton/falcon-compression"
 include = [
@@ -15,10 +15,10 @@ include = [
 python = "^3.9"
 Brotli = "^1.0.9"
 
-[tool.poetry.dev-dependencies]
-pytest = ">=6.2.5"
-falcon = "^3.1.0"
-pytest-benchmark = "^3.4.1"
+[tool.poetry.group.test.dependencies]
+pytest = "^8.0"
+falcon = "^4.4.0"
+pytest-benchmark = "^5.2.0"
 pytest-cov = "^3.0.0"
 
 [build-system]

falcon-compression-0.2.0/setup.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['falcon_compression']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['Brotli>=1.0.9,<2.0.0']
-
-setup_kwargs = {
-    'name': 'falcon-compression',
-    'version': '0.2.0',
-    'description': 'Compression middleware for Falcon',
-    'long_description': '\n# Falcon Compression Middleware\n\nMiddleware to apply content compression to Falcon responses.\n',
-    'author': 'Will Newton',
-    'author_email': 'will.newton@gmail.com',
-    'maintainer': None,
-    'maintainer_email': None,
-    'url': 'https://github.com/willnewton/falcon-compression',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'python_requires': '>=3.9,<4.0',
-}
-
-
-setup(**setup_kwargs)