Files generated by the JSON schema compiler are named incorrectly

tools/json_schema_compiler/compiler.py

 #!/usr/bin/env python
 # 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.
 """Generator for C++ structs from api json files.
 
 The purpose of this tool is to remove the need for hand-written code that
 converts to and from base::Value types when receiving javascript api calls.
 Originally written for generating code for extension apis. Reference schemas
 are in chrome/common/extensions/api.
 
 Usage example:
   compiler.py --root /home/Work/src --namespace extensions windows.json
     tabs.json
   compiler.py --destdir gen --root /home/Work/src
     --namespace extensions windows.json tabs.json
 """
 
 import cc_generator
 import cpp_type_generator
 import h_generator
 import idl_schema
 import json_schema
 import model
 import schema_bundle_generator
 
 import optparse
 import os.path
+import re
 import sys
 
 def load_schema(schema):
-  schema_filename, schema_extension = os.path.splitext(schema)
+  schema_path, schema_extension = os.path.splitext(schema)
+  schema_path, schema_filename = os.path.split(schema_path)
+
+  if (schema_filename.find('.') != -1 or
+      re.search('[A-Z]', schema_filename) != None):
+    sys.exit("Filename %s%s is illegal. Name files using unix_hacker style." %
+             (schema_filename, schema_extension))

[not at google - send to devlin, 2012/05/10 02:36:02]

Instead of doing this can we load the Namespace then assert that name ==
unix_name?

[cduvall, 2012/05/10 03:09:01]

I did it for single schemas, but I'm not quite sure what the best way is for
bundle schemas.

[not at google - send to devlin, 2012/05/10 03:26:52]

Oh, that is a really good point. In fact none of this will even work if there's
more than one schema; that's an existing bug with json_schema_compiler.

I think we'll need to add another check that a file only contains a single
schema :\ and only return that one schema from here.

(trivia: once upon a time I tried to make it so that schema files only contain a
single schema rather than a list, but it turned into too much of a yak shave and
I gave up).

And do that ==namespace.unix_name after namespace is created below, perhaps.

 
   if schema_extension == '.json':
     api_defs = json_schema.Load(schema)
   elif schema_extension == '.idl':
     api_defs = idl_schema.Load(schema)
   else:
     sys.exit("Did not recognize file extension %s for schema %s" %
              (schema_extension, schema))
 
   return api_defs
@@ skipping 20 matching lines @@
 
     # Gets the relative path from opts.root to the schema to correctly determine
     # the include path.
     relpath = os.path.relpath(schema, opts.root)
     namespace = api_model.AddNamespace(target_namespace, relpath)
     if not namespace:
       continue
 
     # The output filename must match the input filename for gyp to deal with it
     # properly.
-    out_file = namespace.name
+    out_file = namespace.unix_name
     type_generator = cpp_type_generator.CppTypeGenerator(
         root_namespace, namespace, namespace.unix_name)
     for referenced_namespace in api_model.namespaces.values():
       if referenced_namespace == namespace:
         continue
       type_generator.AddNamespace(
           referenced_namespace,
-          referenced_namespace.name)
+          referenced_namespace.unix_name)
 
     h_code = (h_generator.HGenerator(namespace, type_generator)
         .Generate().Render())
     cc_code = (cc_generator.CCGenerator(namespace, type_generator)
         .Generate().Render())
 
     if dest_dir:
       with open(
           os.path.join(dest_dir, namespace.source_file_dir, out_file + '.cc'),
           'w') as cc_file:
@@ skipping 21 matching lines @@
 
   api_model = model.Model()
   relpath = os.path.relpath(os.path.normpath(filenames[0]), root)
   for target_namespace in api_defs:
     api_model.AddNamespace(target_namespace, relpath)
 
   type_generator = cpp_type_generator.CppTypeGenerator(root_namespace)
   for referenced_namespace in api_model.namespaces.values():
     type_generator.AddNamespace(
         referenced_namespace,
-        referenced_namespace.name)
+        referenced_namespace.unix_name)
 
   generator = schema_bundle_generator.SchemaBundleGenerator(
       api_model, api_defs, type_generator)
   api_h_code = generator.GenerateAPIHeader().Render()
   schemas_h_code = generator.GenerateSchemasHeader().Render()
   schemas_cc_code = generator.GenerateSchemasCC().Render()
 
   if dest_dir:
     basedir = os.path.join(dest_dir, 'chrome/common/extensions/api')
     with open(os.path.join(basedir, 'generated_api.h'), 'w') as h_file:
@@ skipping 30 matching lines @@
 '''if supplied, causes compiler to generate bundle files for the given set of
 source files.''')
 
   (opts, args) = parser.parse_args()
 
   if not args:
     sys.exit(0) # This is OK as a no-op
   dest_dir = opts.destdir
   root_namespace = opts.namespace
 
+  # TODO(cduvall) error on bad filename

[not at google - send to devlin, 2012/05/10 02:36:02]

might as well do it now. sys.exit(...) (somewhere above there's an error)

[cduvall, 2012/05/10 03:09:01]

Oops forgot to delete this.

+
   if opts.bundle:
     handle_bundle_schema(args, dest_dir, opts.root, root_namespace)
   else:
     handle_single_schema(args[0], dest_dir, opts.root, root_namespace)