Added support for catch all symbols in unions.

braincore · braincore · commit bb59f88aa1ca · 2014-11-16T16:43:49.000-08:00
diff --git a/babelapi/babel/tower.py b/babelapi/babel/tower.py
@@ -120,25 +120,30 @@ def _create_alias(self, env, item):
     def _create_type(self, env, item):
         super_type = None
         if item.composite_type == 'struct':
-            composite_type_obj = Struct
             if item.extends:
                 if item.extends not in env:
                     raise Exception('Data type %r is undefined' % item.extends)
                 else:
                     super_type = env.get(item.extends)
+            api_type_fields = []
+            for babel_field in item.fields:
+                api_type_field = self._create_field(env, babel_field)
+                api_type_fields.append(api_type_field)
+            api_type = Struct(item.name, item.doc, api_type_fields, super_type)
         elif item.composite_type == 'union':
-            composite_type_obj = Union
+            catch_all_field = None
+            api_type_fields = []
+            for babel_field in item.fields:
+                if isinstance(babel_field, BabelCatchAllSymbol):
+                    catch_all_field = babel_field.name
+                else:
+                    api_type_field = self._create_field(env, babel_field)
+                    api_type_fields.append(api_type_field)
+            api_type = Union(item.name, item.doc, api_type_fields, super_type,
+                             catch_all_field)
         else:
             raise ValueError('Unknown composite_type %r'
                              % item.composite_type)
-        api_type_fields = []
-        for babel_field in item.fields:
-            if isinstance(babel_field, BabelCatchAllSymbol):
-                pass
-            else:
-                api_type_field = self._create_field(env, babel_field)
-                api_type_fields.append(api_type_field)
-        api_type = composite_type_obj(item.name, item.doc, api_type_fields, super_type)
         for example_label, (example_text, example) in item.examples.items():
             api_type.add_example(example_label, example_text, dict(example))
         env[item.name] = api_type
diff --git a/babelapi/data_type.py b/babelapi/data_type.py
@@ -505,9 +505,9 @@ class Union(CompositeType):
 
     composite_type = 'union'
 
-    def __init__(self, name, doc, fields, super_type=None, open_field=None):
-        super(CompositeType, self).__init__(name, doc, fields, super_type=super_type)
-        self.open_field = open_field
+    def __init__(self, name, doc, fields, super_type=None, catch_all_field=None):
+        super(Union, self).__init__(name, doc, fields, super_type=super_type)
+        self.catch_all_field = catch_all_field
 
     def check(self, val):
         if isinstance(val, dict):
diff --git a/example/api/dbx-core/files.babel b/example/api/dbx-core/files.babel
@@ -17,6 +17,7 @@ struct SubError
 union DownloadError
     disallowed SubError
     no_file SubError
+    *unknown
 
 route Download (FileTarget, FileInfo, DownloadError)
     "Download a file in a user's Dropbox."
@@ -98,7 +99,6 @@ union ConflictReason
         "Conflict with a file."
     autorename_failed
         "Could not autorename."
-    *unknown
 
 struct ConflictError
     reason ConflictReason
diff --git a/example/generator/dropbox-python-sdk/base_files.py b/example/generator/dropbox-python-sdk/base_files.py
@@ -492,31 +492,26 @@ class ConflictReason(object):
     Folder = object()
     File = object()
     AutorenameFailed = object()
-    Unknown = object()
 
     def __init__(self,
                  folder=None,
                  file=None,
                  autorename_failed=None,
-                 unknown=None,
                  **kwargs):
         """
         Only one argument can be set.
 
         :param bool folder: Conflict with a folder.
         :param bool file: Conflict with a file.
         :param bool autorename_failed: Could not autorename.
-        :type unknown: bool
         """
         assert_only_one(folder=folder,
                         file=file,
                         autorename_failed=autorename_failed,
-                        unknown=unknown,
                         **kwargs)
         self.folder = None
         self.file = None
         self.autorename_failed = None
-        self.unknown = None
 
         if folder is not None:
             assert isinstance(folder, bool), 'folder must be of type bool'
@@ -533,11 +528,6 @@ def __init__(self,
             self.autorename_failed = autorename_failed
             self._tag = 'autorename_failed'
 
-        if unknown is not None:
-            assert isinstance(unknown, bool), 'unknown must be of type bool'
-            self.unknown = unknown
-            self._tag = 'unknown'
-
     def is_folder(self):
         return self._tag == 'folder'
 
@@ -547,9 +537,6 @@ def is_file(self):
     def is_autorename_failed(self):
         return self._tag == 'autorename_failed'
 
-    def is_unknown(self):
-        return self._tag == 'unknown'
-
     @classmethod
     def from_json(self, obj):
         obj = copy.copy(obj)
@@ -560,8 +547,6 @@ def from_json(self, obj):
             return obj
         if obj == 'autorename_failed':
             return obj
-        if obj == 'unknown':
-            return obj
         return ConflictReason(**obj)
 
     def to_json(self):
@@ -571,8 +556,6 @@ def to_json(self):
             return self._tag
         if self._tag == 'autorename_failed':
             return self._tag
-        if self._tag == 'unknown':
-            return self._tag
 
     def __repr__(self):
         return 'ConflictReason(%r)' % self._tag
@@ -591,8 +574,6 @@ def __init__(self,
             self.reason = ConflictReason(file=True)
         if reason == ConflictReason.AutorenameFailed:
             self.reason = ConflictReason(autorename_failed=True)
-        if reason == ConflictReason.Unknown:
-            self.reason = ConflictReason(unknown=True)
 
     @classmethod
     def from_json(cls, obj):
diff --git a/test/test_babel.py b/test/test_babel.py
@@ -5,6 +5,7 @@
     BabelAlias,
     BabelField,
     BabelParser,
+    BabelCatchAllSymbol,
     BabelSymbol,
     BabelTypeDef,
 )
@@ -165,6 +166,19 @@ def test_union_decl(self):
 
         # TODO: Test a union that includes a struct.
 
+        text = """
+namespace files
+
+union Error
+    A
+        "Variant A"
+    B
+        "Variant B"
+    *UNK
+"""
+        out = self.parser.parse(text)
+        self.assertTrue(isinstance(out[1].fields[2], BabelCatchAllSymbol))
+
     def test_route_decl(self):
         text = """
 namespace users
