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 70d52e71e580439a69b160a420dfbc4e5e0566eb..7954b9f0a960cd2856766e56f1f003c933eec722 100644 |
--- a/chrome/common/extensions/docs/server2/api_data_source.py |
+++ b/chrome/common/extensions/docs/server2/api_data_source.py |
@@ -50,9 +50,14 @@ 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): |
+ def __init__(self, |
+ json, |
+ ref_resolver, |
+ disable_refs, |
+ availability_data_source): |
self._ref_resolver = ref_resolver |
self._disable_refs = disable_refs |
+ self._availability_data_source = availability_data_source |
clean_json = copy.deepcopy(json) |
if _RemoveNoDocs(clean_json): |
self._namespace = None |
@@ -76,12 +81,31 @@ class _JSCModel(object): |
return {} |
return { |
'name': self._namespace.name, |
+ 'description': self._namespace.description, |
+ 'availability': self._GetAvailability(), |
'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 _GetAvailability(self): |
+ """Finds the earliest version of chrome where an API was available using |
+ AvailabilityDataSource. Also [temporarily] creates a string describing the |
+ availability depending on its original format. |
+ """ |
+ availability_string = 'Not Currently Available' |
+ availability = self._availability_data_source.FindEarliestAvailability( |
+ self._namespace.name) |
+ |
+ if availability is not None: |
+ if availability.isdigit(): |
+ availability_string = 'Chrome %s' % availability |
+ else: |
+ availability_string = ('Chrome %s Channel Only' % |
+ availability.capitalize()) |
+ return availability_string |
+ |
def _GenerateTypes(self, types): |
return [self._GenerateType(t) for t in types] |
@@ -268,7 +292,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_data_source_factory): |
def create_compiled_fs(fn, category): |
return compiled_fs_factory.Create( |
fn, APIDataSource, category=category, version=_VERSION) |
@@ -297,7 +324,7 @@ class APIDataSource(object): |
self._names_cache = create_compiled_fs(self._GetAllNames, 'names') |
self._base_path = base_path |
- |
+ self._availability_data_source = availability_data_source_factory.Create() |
# These must be set later via the SetFooDataSourceFactory methods. |
self._ref_resolver_factory = None |
self._samples_data_source_factory = None |
@@ -343,14 +370,16 @@ 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_data_source).ToDict() |
def _LoadIdlAPI(self, api, disable_refs): |
idl = idl_parser.IDLParser().ParseData(api) |
return _JSCModel( |
idl_schema.IDLSchema(idl).process()[0], |
self._ref_resolver_factory.Create() if not disable_refs else None, |
- disable_refs).ToDict() |
+ disable_refs, |
+ self._availability_data_source).ToDict() |
def _GetIDLNames(self, base_dir, apis): |
return self._GetExtNames(apis, ['idl']) |
@@ -430,21 +459,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: |
+ 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 |
@@ -452,6 +486,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) |
return self._GenerateHandlebarContext( |
cache.GetFromFile('%s/%s%s' % (self._base_path, unix_name, ext)), |
path) |