Fix asset serialization on empty files (#49)

contentful · Jul 8, 2019 · ae3cb94 · ae3cb94
1 parent 971173a
commit ae3cb94
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # CHANGELOG
 
 ## Unreleased
+### Fixed
+* Assets with empty or missing files no longer error when trying to get it serialized to string. [#48](https://github.com/contentful/contentful.py/issues/48)
 
 ## v1.12.1
 ### Fixed

diff --git a/contentful/asset.py b/contentful/asset.py
@@ -30,6 +30,9 @@ def url(self, **kwargs):
             "//images.contentful.com/spaces/foobar/...?w=120&h=160"
         """
 
+        if not hasattr(self, 'file') or not self.file:
+            return ""
+
         url = self.file['url']
         args = ['{0}={1}'.format(k, v) for k, v in kwargs.items()]
 

diff --git a/tests/asset_test.py b/tests/asset_test.py
@@ -38,3 +38,50 @@ def test_asset(self):
         self.assertEqual(asset.url(), '//images.contentful.com/...')
         self.assertEqual(asset.url(w=123), '//images.contentful.com/...?w=123')
         self.assertEqual(str(asset), "<Asset id='foo' url='//images.contentful.com/...'>")
+
+    def test_asset_with_no_file_can_be_serialized_correctly(self):
+        asset = Asset({
+            'sys': {
+                'type': 'Asset',
+                'id': 'foo',
+                'createdAt': '2016-12-01T11:39:20.257859',
+                'updatedAt': '2016-12-01T11:39:20.257859',
+                'space': {
+                    'sys': {
+                        'type': 'Link',
+                        'linkType': 'Space',
+                        'id': 'foo'
+                    }
+                }
+            },
+            'fields': {
+                'title': 'Awesome Pic',
+                'description': 'A picture of something'
+            }
+        })
+
+        self.assertEqual(str(asset), "<Asset id='foo' url=''>")
+
+    def test_asset_with_empty_file_can_be_serialized_correctly(self):
+        asset = Asset({
+            'sys': {
+                'type': 'Asset',
+                'id': 'foo',
+                'createdAt': '2016-12-01T11:39:20.257859',
+                'updatedAt': '2016-12-01T11:39:20.257859',
+                'space': {
+                    'sys': {
+                        'type': 'Link',
+                        'linkType': 'Space',
+                        'id': 'foo'
+                    }
+                }
+            },
+            'fields': {
+                'title': 'Awesome Pic',
+                'description': 'A picture of something',
+                'file': {}
+            }
+        })
+
+        self.assertEqual(str(asset), "<Asset id='foo' url=''>")