Merge pull request #1 from tino/master

Allow for floating pixelratios. (Happens when people use browser zoom)

responsive/middleware.py

@@ -28,15 +28,15 @@ def process_request(self, request):
         if value is not None:
             try:
                 width, height, pixelratio = value.split(':')
-                width, height, pixelratio = int(width), int(height), int(pixelratio)
+                width, height, pixelratio = int(width), int(height), float(pixelratio)
             except ValueError:
                 # TODO: Add logging
                 width = None
                 height = None
                 pixelratio = None
         info = {'width': width, 'height': height, 'pixelratio': pixelratio}
         if width is not None:
-            info['type'] =  _get_device_type(width)
+            info['type'] = _get_device_type(width)
         else:
             info['type'] = None
         request.device_info = info

responsive/tests/test_middleware.py

@@ -51,6 +51,19 @@ def test_process_request_valid_cookie(self):
         self.assertEqual(device['type'], 'phone')
         self.assertEqual(device['pixelratio'], 2)
 
+    def test_process_request_float_pixelratio(self):
+        """
+        `pixelratio` can be a float when the user uses in-browser zoom and
+        should give us valid device info.
+        """
+        self.request.COOKIES['resolution'] = '1920:1200:1.100000023841858'  # 110%
+        self.middleware.process_request(request=self.request)
+        device = self.request.device_info
+        self.assertEqual(device['width'], 1920)
+        self.assertEqual(device['height'], 1200)
+        self.assertEqual(device['type'], 'desktop')
+        self.assertEqual(device['pixelratio'], 1.100000023841858)
+
 
 class DeviceInfoScriptTestCase(unittest.TestCase):
     "Middleware for including necessary script tags in HTML responses."