Chromium Code Reviews| Index: chrome/common/extensions/docs/server2/api_data_source.py |
| diff --git a/chrome/common/extensions/docs/server2/api_data_source.py b/chrome/common/extensions/docs/server2/api_data_source.py |
| index c1e9b65af41b6d227a7602dd1d81fd2b9b5bbe79..4b4a6af2ca90dbfe72763e92d6700b83398df384 100644 |
| --- a/chrome/common/extensions/docs/server2/api_data_source.py |
| +++ b/chrome/common/extensions/docs/server2/api_data_source.py |
| @@ -2,11 +2,14 @@ |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| +import collections |
| import copy |
| +import json as json_library |
| import logging |
| import os |
| from collections import defaultdict, Mapping |
| +import svn_constants |
| import third_party.json_schema_compiler.json_parse as json_parse |
| import third_party.json_schema_compiler.model as model |
| import third_party.json_schema_compiler.idl_schema as idl_schema |
| @@ -103,9 +106,18 @@ class _JSCModel(object): |
| """Uses a Model from the JSON Schema Compiler and generates a dict that |
| a Handlebar template can use for a data source. |
| """ |
| - def __init__(self, json, ref_resolver, disable_refs, idl=False): |
| + def __init__(self, |
| + json, |
| + ref_resolver, |
| + disable_refs, |
| + availability_finder, |
| + intro_cache, |
| + idl=False): |
| self._ref_resolver = ref_resolver |
| self._disable_refs = disable_refs |
| + self._availability_finder = availability_finder |
| + self._intro_tables = intro_cache.GetFromFile( |
| + '%s/intro_tables.json' % svn_constants.JSON_PATH) |
| clean_json = copy.deepcopy(json) |
| if _RemoveNoDocs(clean_json): |
| self._namespace = None |
| @@ -132,12 +144,52 @@ class _JSCModel(object): |
| return {} |
| return { |
| 'name': self._namespace.name, |
| + 'description': self._namespace.description, |
| + 'availability': self._GetApiAvailability(), |
| + 'experimental': self._CheckExperimental(), |
| + 'api_permissions': self._GetPermissions(), |
| + 'learn_more': self._GetMoreLearning(), |
| 'types': self._GenerateTypes(self._namespace.types.values()), |
| 'functions': self._GenerateFunctions(self._namespace.functions), |
| 'events': self._GenerateEvents(self._namespace.events), |
| 'properties': self._GenerateProperties(self._namespace.properties) |
| } |
| + def _GetApiAvailability(self): |
| + """Finds the earliest stable version of chrome where an API was available |
| + using AvailabilityFinder. If an API hasn't been released to stable yet, |
| + then the development channel that the API is currently available on will |
| + be returned instead. |
| + """ |
| + if not self._CheckExperimental(): |
| + availability = self._availability_finder.GetApiAvailability( |
| + self._namespace.name) |
| + if availability: |
| + if availability.channel == 'stable': |
| + return availability.version |
| + return availability.channel |
| + # A special message for experimental APIs' availability will be displayed. |
| + return None |
| + |
| + def _CheckExperimental(self): |
| + return self._namespace.name.startswith('experimental') |
| + |
| + def _GetPermissions(self): |
| + """This is a temporary fix for generating API intro tables automatically. |
| + Information on an API's permissions is pulled from a json file so that it |
| + can be sent to the templates along with other relevant intro data. |
| + """ |
| + table_info = self._intro_tables.get(self._namespace.name) |
| + return table_info.get('Permissions') if table_info else None |
| + |
| + def _GetMoreLearning(self): |
| + """We can't automatically generate the "Learn more" field in an API's. |
| + intro table; instead, we pull it from a json file so that it can be sent to |
| + the templates along with other relevant intro data. |
| + """ |
| + table_info = self._intro_tables.get(self._namespace.name) |
| + return table_info.get('LearnMore') if table_info else None |
| + |
| def _GenerateTypes(self, types): |
| return [self._GenerateType(t) for t in types] |
| @@ -324,7 +376,10 @@ class APIDataSource(object): |
| |compiled_fs_factory|, so the APIs can be plugged into templates. |
| """ |
| class Factory(object): |
| - def __init__(self, compiled_fs_factory, base_path): |
| + def __init__(self, |
| + compiled_fs_factory, |
| + base_path, |
| + availability_finder_factory): |
| def create_compiled_fs(fn, category): |
| return compiled_fs_factory.Create(fn, APIDataSource, category=category) |
| @@ -352,7 +407,10 @@ class APIDataSource(object): |
| self._names_cache = create_compiled_fs(self._GetAllNames, 'names') |
| self._base_path = base_path |
| - |
| + self._availability_finder = availability_finder_factory.Create() |
| + def compiled_fs_parse(path, json): |
| + return json_parse.Parse(json) |
| + self._intro_cache = create_compiled_fs(compiled_fs_parse, 'intro-cache') |
|
not at google - send to devlin
2013/06/05 00:24:09
ah right. yeah, using a lambda here would be bette
epeterson
2013/06/17 20:05:49
Done.
|
| # These must be set later via the SetFooDataSourceFactory methods. |
| self._ref_resolver_factory = None |
| self._samples_data_source_factory = None |
| @@ -398,7 +456,9 @@ class APIDataSource(object): |
| return _JSCModel( |
| json_parse.Parse(api)[0], |
| self._ref_resolver_factory.Create() if not disable_refs else None, |
| - disable_refs).ToDict() |
| + disable_refs, |
| + self._availability_finder, |
| + self._intro_cache).ToDict() |
| def _LoadIdlAPI(self, api, disable_refs): |
| idl = idl_parser.IDLParser().ParseData(api) |
| @@ -406,6 +466,8 @@ class APIDataSource(object): |
| idl_schema.IDLSchema(idl).process()[0], |
| self._ref_resolver_factory.Create() if not disable_refs else None, |
| disable_refs, |
| + self._availability_finder, |
| + self._intro_cache, |
| idl=True).ToDict() |
| def _GetIDLNames(self, base_dir, apis): |
| @@ -483,21 +545,26 @@ class APIDataSource(object): |
| def _GetAsSubdirectory(self, name): |
| if name.startswith('experimental_'): |
| parts = name[len('experimental_'):].split('_', 1) |
| - parts[1] = 'experimental_%s' % parts[1] |
| - return '/'.join(parts) |
| + if len(parts) > 1: |
| + parts[1] = 'experimental_%s' % parts[1] |
| + return '/'.join(parts) |
| + else: |
|
not at google - send to devlin
2013/06/05 00:24:09
no else after a return statement
epeterson
2013/06/17 20:05:49
Done.
|
| + return '%s/%s' % (parts[0], name) |
| return name.replace('_', '/', 1) |
| - def get(self, key): |
| + def _DetermineNamesForGet(self, key): |
| if key.endswith('.html') or key.endswith('.json') or key.endswith('.idl'): |
| path, ext = os.path.splitext(key) |
| else: |
| path = key |
| unix_name = model.UnixName(path) |
| - idl_names = self._idl_names_cache.GetFromFileListing(self._base_path) |
| names = self._names_cache.GetFromFileListing(self._base_path) |
| if unix_name not in names and self._GetAsSubdirectory(unix_name) in names: |
| unix_name = self._GetAsSubdirectory(unix_name) |
| + return (path, unix_name) |
| + def _DetermineCacheForGet(self, unix_name): |
| + idl_names = self._idl_names_cache.GetFromFileListing(self._base_path) |
| if self._disable_refs: |
| cache, ext = ( |
| (self._idl_cache_no_refs, '.idl') if (unix_name in idl_names) else |
| @@ -505,6 +572,11 @@ class APIDataSource(object): |
| else: |
| cache, ext = ((self._idl_cache, '.idl') if (unix_name in idl_names) else |
| (self._json_cache, '.json')) |
| + return (cache, ext) |
| + |
| + def get(self, key): |
| + path, unix_name = self._DetermineNamesForGet(key) |
| + cache, ext = self._DetermineCacheForGet(unix_name) |
|
not at google - send to devlin
2013/06/05 00:24:09
any particular reason why you split this out?
epeterson
2013/06/17 20:05:49
When I was using that old "get2" method here, the
|
| return self._GenerateHandlebarContext( |
| cache.GetFromFile('%s/%s%s' % (self._base_path, unix_name, ext)), |
| path) |