Expand tests to ensure same behaviour as other clients.

Author: rolftimmermans

test/tinify_result_meta_test.py

@@ -23,3 +23,16 @@ def test_height_should_return_image_height(self):
 
     def test_location_should_return_stored_location(self):
         self.assertEqual('https://bucket.s3-region.amazonaws.com/some/location', self.result.location)
+
+class TinifyResultMetaWithoutMetaTest(TestHelper):
+    def setUp(self):
+        self.result = ResultMeta({})
+
+    def test_width_should_return_none(self):
+        self.assertEqual(None, self.result.width)
+
+    def test_height_should_return_none(self):
+        self.assertEqual(None, self.result.height)
+
+    def test_location_should_return_none(self):
+        self.assertEqual(None, self.result.location)

test/tinify_result_test.py

@@ -34,3 +34,28 @@ def test_content_type_should_return_mime_type(self):
 
     def test_to_buffer_should_return_image_data(self):
         self.assertEqual(b'image data', self.result.to_buffer())
+
+class TinifyResultWithoutMetaAndDataTest(TestHelper):
+    def setUp(self):
+        self.result = Result({}, None)
+
+    def test_width_should_return_none(self):
+        self.assertEqual(None, self.result.width)
+
+    def test_height_should_return_none(self):
+        self.assertEqual(None, self.result.height)
+
+    def test_location_should_return_none(self):
+        self.assertEqual(None, self.result.location)
+
+    def test_size_should_return_none(self):
+        self.assertEqual(None, self.result.size)
+
+    def test_len_builtin_should_return_zero(self):
+        self.assertEqual(0, len(self.result))
+
+    def test_content_type_should_return_none(self):
+        self.assertEqual(None, self.result.content_type)
+
+    def test_to_buffer_should_return_none(self):
+        self.assertEqual(None, self.result.to_buffer())

tinify/result.py

@@ -20,11 +20,12 @@ def to_buffer(self):
 
     @property
     def size(self):
-        return int(self._meta['Content-Length'])
+        value = self._meta.get('Content-Length')
+        return value and int(value)
 
     @property
     def media_type(self):
-        return self._meta['Content-Type']
+        return self._meta.get('Content-Type')
 
     @property
     def content_type(self):

tinify/result_meta.py

@@ -7,15 +7,17 @@ def __init__(self, meta):
 
     @property
     def width(self):
-        return int(self._meta['Image-Width'])
+        value = self._meta.get('Image-Width')
+        return value and int(value)
 
     @property
     def height(self):
-        return int(self._meta['Image-Height'])
+        value = self._meta.get('Image-Height')
+        return value and int(value)
 
     @property
     def location(self):
-        return self._meta['Location']
+        return self._meta.get('Location')
 
     def __len__(self):
-        return self.size
+        return self.size or 0