Docserver: Display enum value descriptions in API docs.

tools/json_schema_compiler/model.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os.path
 
 from json_parse import OrderedDict
 from memoize import memoize
 
 class ParseException(Exception):
@@ skipping 123 matching lines @@
     json_type = json.get('type', None)
     if json_type == 'array':
       self.property_type = PropertyType.ARRAY
       self.item_type = Type(
           self, '%sType' % name, json['items'], namespace, origin)
     elif '$ref' in json:
       self.property_type = PropertyType.REF
       self.ref_type = json['$ref']
     elif 'enum' in json and json_type == 'string':
       self.property_type = PropertyType.ENUM
-      self.enum_values = [value for value in json['enum']]
+      self.enum_values = []
+      for enum_value in json['enum']:
+        if not isinstance(enum_value, dict):
+          enum_value = {'name': enum_value}
+        self.enum_values.append(enum_value)

[not at google - send to devlin, 2013/10/28 18:00:25]

Rather than users of Model have to access enum['name'] and presumably
enum['description'] I'd rather there be an Enum class. IDL doesn't deal in
dict-style properties; it deals with well-defined structures.

Unfortunately there's already an enum (_Enum) class for something entirely
different, but you can rename that easily enough. Or, call this EnumValue.

[Sam McNally, 2013/10/29 00:39:02]

Done.

     elif json_type == 'any':
       self.property_type = PropertyType.ANY
     elif json_type == 'binary':
       self.property_type = PropertyType.BINARY
     elif json_type == 'boolean':
       self.property_type = PropertyType.BOOLEAN
     elif json_type == 'integer':
       self.property_type = PropertyType.INTEGER
     elif (json_type == 'double' or
           json_type == 'number'):
@@ skipping 333 matching lines @@
 def _GetPlatforms(json):
   if 'platforms' not in json:
     return None
   platforms = []
   for platform_name in json['platforms']:
     for platform_enum in _Enum.GetAll(Platforms):
       if platform_name == platform_enum.name:
         platforms.append(platform_enum)
         break
   return platforms