Merge pull request asdf-format#832 from eslavich/eslavich-flexible-extension-metadata

Prevent errors when extra properties are present in extension metadata

Author: eslavich

CHANGES.rst

@@ -66,6 +66,9 @@
 - Add option to disable validation of schema default values
   in the pytest plugin. [#831]
 
+- Prevent errors when extension metadata contains additional
+  properties. [#832]
+
 2.6.0 (2020-04-22)
 ------------------
 

asdf/asdf.py

@@ -252,7 +252,7 @@ def _update_extension_history(self):
             ext_meta = ExtensionMetadata(extension_class=ext_name)
             metadata = self._extension_metadata.get(ext_name)
             if metadata is not None:
-                ext_meta.software = Software(name=metadata[0], version=metadata[1])
+                ext_meta['software'] = Software(name=metadata[0], version=metadata[1])
 
             for i, entry in enumerate(self.tree['history']['extensions']):
                 # Update metadata about this extension if it already exists

asdf/tags/core/__init__.py

@@ -41,25 +41,17 @@ class HistoryEntry(dict, AsdfType):
     version = '1.0.0'
 
 
-class ExtensionMetadata(AsdfType):
+class ExtensionMetadata(dict, AsdfType):
     name = 'core/extension_metadata'
     version = '1.0.0'
 
-    def __init__(self, extension_class=None, software={}):
-        self.extension_class = extension_class
-        self.software = software
+    @property
+    def extension_class(self):
+        return self['extension_class']
 
-    @classmethod
-    def from_tree(cls, node, ctx):
-        return cls(**node)
-
-    @classmethod
-    def to_tree(cls, node, ctx):
-        tree = {}
-        tree['extension_class'] = node.extension_class
-        tree['software'] = node.software
-
-        return tree
+    @property
+    def software(self):
+        return self.get('software')
 
 
 class SubclassMetadata(dict, AsdfType):

asdf/tags/core/tests/test_extension_metadata.py

@@ -0,0 +1,21 @@
+import asdf
+
+from asdf.tests import helpers
+
+def test_extra_properties():
+    yaml = """
+metadata: !core/extension_metadata-1.0.0
+  extension_class: foo.extension.FooExtension
+  software: !core/software-1.0.0
+    name: FooSoft
+    version: "1.5"
+  extension_uri: http://foo.biz/extensions/foo-1.0.0
+    """
+
+    buff = helpers.yaml_to_asdf(yaml)
+
+    with asdf.open(buff) as af:
+        af["metadata"].extension_class == "foo.extension.FooExtension"
+        af["metadata"].software["name"] == "FooSoft"
+        af["metadata"].software["version"] == "1.5"
+        af["metadata"]["extension_uri"] == "http://foo.biz/extensions/foo-1.0.0"

asdf/tests/test_api.py

@@ -308,8 +308,8 @@ def test_extension_version_check(installed, extension, warns):
     tree = {
         'history': {
             'extensions': [
-                asdf.tags.core.ExtensionMetadata('foo.extension.FooExtension',
-                    asdf.tags.core.Software(name='foo', version=extension)),
+                asdf.tags.core.ExtensionMetadata(extension_class='foo.extension.FooExtension',
+                    software=asdf.tags.core.Software(name='foo', version=extension)),
             ]
         }
     }