blob: b7bc8231d70211f9babe501f6a6576d205091a4c [file] [log] [blame]
Joe Gregorio48d361f2010-08-18 13:19:21 -04001# Copyright (C) 2010 Google Inc.
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15"""Client for discovery based APIs
16
Joe Gregorio7c22ab22011-02-16 15:32:39 -050017A client library for Google's discovery based APIs.
Joe Gregorio48d361f2010-08-18 13:19:21 -040018"""
19
20__author__ = 'jcgregorio@google.com (Joe Gregorio)'
Joe Gregorioabda96f2011-02-11 20:19:33 -050021__all__ = [
22 'build', 'build_from_document'
23 ]
Joe Gregorio48d361f2010-08-18 13:19:21 -040024
25import httplib2
ade@google.com850cf552010-08-20 23:24:56 +010026import logging
Joe Gregorio6d5e94f2010-08-25 23:49:30 -040027import os
Joe Gregorio48d361f2010-08-18 13:19:21 -040028import re
Joe Gregorio48d361f2010-08-18 13:19:21 -040029import uritemplate
Joe Gregoriofe695fb2010-08-30 12:04:04 -040030import urllib
Joe Gregorio6d5e94f2010-08-25 23:49:30 -040031import urlparse
ade@google.comc5eb46f2010-09-27 23:35:39 +010032try:
33 from urlparse import parse_qsl
34except ImportError:
35 from cgi import parse_qsl
Joe Gregorioaf276d22010-12-09 14:26:58 -050036
Joe Gregoriob843fa22010-12-13 16:26:07 -050037from http import HttpRequest
Joe Gregorio034e7002010-12-15 08:45:03 -050038from anyjson import simplejson
Joe Gregoriob843fa22010-12-13 16:26:07 -050039from model import JsonModel
Joe Gregoriob843fa22010-12-13 16:26:07 -050040from errors import UnknownLinkType
Joe Gregorio48d361f2010-08-18 13:19:21 -040041
Joe Gregoriobc2ff9b2010-11-08 09:20:48 -050042URITEMPLATE = re.compile('{[^}]*}')
43VARNAME = re.compile('[a-zA-Z0-9_-]+')
Joe Gregorioc3fae8a2011-02-18 14:19:50 -050044DISCOVERY_URI = ('https://www.googleapis.com/discovery/v0.3/describe/'
Joe Gregorio2379ecc2010-10-26 10:51:28 -040045 '{api}/{apiVersion}')
Joe Gregorioc3fae8a2011-02-18 14:19:50 -050046DEFAULT_METHOD_DOC = 'A description of how to use this function'
Joe Gregorio48d361f2010-08-18 13:19:21 -040047
48
Joe Gregorio48d361f2010-08-18 13:19:21 -040049def key2param(key):
Joe Gregorio7c22ab22011-02-16 15:32:39 -050050 """Converts key names into parameter names.
51
52 For example, converting "max-results" -> "max_results"
Joe Gregorio48d361f2010-08-18 13:19:21 -040053 """
54 result = []
55 key = list(key)
56 if not key[0].isalpha():
57 result.append('x')
58 for c in key:
59 if c.isalnum():
60 result.append(c)
61 else:
62 result.append('_')
63
64 return ''.join(result)
65
66
Joe Gregorioaf276d22010-12-09 14:26:58 -050067def build(serviceName, version,
Joe Gregorio3fada332011-01-07 17:07:45 -050068 http=None,
69 discoveryServiceUrl=DISCOVERY_URI,
70 developerKey=None,
71 model=JsonModel(),
72 requestBuilder=HttpRequest):
Joe Gregorioabda96f2011-02-11 20:19:33 -050073 """Construct a Resource for interacting with an API.
74
75 Construct a Resource object for interacting with
76 an API. The serviceName and version are the
77 names from the Discovery service.
78
79 Args:
80 serviceName: string, name of the service
81 version: string, the version of the service
82 discoveryServiceUrl: string, a URI Template that points to
83 the location of the discovery service. It should have two
84 parameters {api} and {apiVersion} that when filled in
85 produce an absolute URI to the discovery document for
86 that service.
Joe Gregoriodeeb0202011-02-15 14:49:57 -050087 developerKey: string, key obtained
88 from https://code.google.com/apis/console
Joe Gregorioabda96f2011-02-11 20:19:33 -050089 model: apiclient.Model, converts to and from the wire format
Joe Gregoriodeeb0202011-02-15 14:49:57 -050090 requestBuilder: apiclient.http.HttpRequest, encapsulator for
91 an HTTP request
Joe Gregorioabda96f2011-02-11 20:19:33 -050092
93 Returns:
94 A Resource object with methods for interacting with
95 the service.
96 """
Joe Gregorio48d361f2010-08-18 13:19:21 -040097 params = {
Joe Gregorio6d5e94f2010-08-25 23:49:30 -040098 'api': serviceName,
Joe Gregorio48d361f2010-08-18 13:19:21 -040099 'apiVersion': version
100 }
ade@google.com850cf552010-08-20 23:24:56 +0100101
Joe Gregorioc204b642010-09-21 12:01:23 -0400102 if http is None:
103 http = httplib2.Http()
ade@google.com850cf552010-08-20 23:24:56 +0100104 requested_url = uritemplate.expand(discoveryServiceUrl, params)
105 logging.info('URL being requested: %s' % requested_url)
106 resp, content = http.request(requested_url)
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400107 service = simplejson.loads(content)
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400108
Joe Gregorio7c22ab22011-02-16 15:32:39 -0500109 fn = os.path.join(os.path.dirname(__file__), 'contrib',
110 serviceName, 'future.json')
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400111 try:
Joe Gregorio7c22ab22011-02-16 15:32:39 -0500112 f = file(fn, 'r')
Joe Gregorio292b9b82011-01-12 11:36:11 -0500113 future = f.read()
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400114 f.close()
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400115 except IOError:
Joe Gregorio292b9b82011-01-12 11:36:11 -0500116 future = None
117
118 return build_from_document(content, discoveryServiceUrl, future,
119 http, developerKey, model, requestBuilder)
120
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500121
Joe Gregorio292b9b82011-01-12 11:36:11 -0500122def build_from_document(
123 service,
124 base,
125 future=None,
126 http=None,
127 developerKey=None,
128 model=JsonModel(),
129 requestBuilder=HttpRequest):
Joe Gregorioabda96f2011-02-11 20:19:33 -0500130 """Create a Resource for interacting with an API.
131
132 Same as `build()`, but constructs the Resource object
133 from a discovery document that is it given, as opposed to
134 retrieving one over HTTP.
135
Joe Gregorio292b9b82011-01-12 11:36:11 -0500136 Args:
137 service: string, discovery document
138 base: string, base URI for all HTTP requests, usually the discovery URI
139 future: string, discovery document with future capabilities
140 auth_discovery: dict, information about the authentication the API supports
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500141 http: httplib2.Http, An instance of httplib2.Http or something that acts
142 like it that HTTP requests will be made through.
Joe Gregorio292b9b82011-01-12 11:36:11 -0500143 developerKey: string, Key for controlling API usage, generated
144 from the API Console.
145 model: Model class instance that serializes and
146 de-serializes requests and responses.
147 requestBuilder: Takes an http request and packages it up to be executed.
Joe Gregorioabda96f2011-02-11 20:19:33 -0500148
149 Returns:
150 A Resource object with methods for interacting with
151 the service.
Joe Gregorio292b9b82011-01-12 11:36:11 -0500152 """
153
154 service = simplejson.loads(service)
155 base = urlparse.urljoin(base, service['restBasePath'])
Joe Gregorio292b9b82011-01-12 11:36:11 -0500156 if future:
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500157 future = simplejson.loads(future)
158 auth_discovery = future.get('auth', {})
Joe Gregorio292b9b82011-01-12 11:36:11 -0500159 else:
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400160 future = {}
161 auth_discovery = {}
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400162
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500163 resource = createResource(http, base, model, requestBuilder, developerKey,
164 service, future)
Joe Gregorio48d361f2010-08-18 13:19:21 -0400165
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500166 def auth_method():
167 """Discovery information about the authentication the API uses."""
168 return auth_discovery
Joe Gregorio48d361f2010-08-18 13:19:21 -0400169
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500170 setattr(resource, 'auth_discovery', auth_method)
Joe Gregorioa2f56e72010-09-09 15:15:56 -0400171
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500172 return resource
Joe Gregorio48d361f2010-08-18 13:19:21 -0400173
174
Joe Gregoriobee86832011-02-22 10:00:19 -0500175def _to_string(value, schema_type):
176 """Convert value to a string based on JSON Schema type.
177
178 See http://tools.ietf.org/html/draft-zyp-json-schema-03 for more details on
179 JSON Schema.
180
181 Args:
182 value: any, the value to convert
183 schema_type: string, the type that value should be interpreted as
184
185 Returns:
186 A string representation of 'value' based on the schema_type.
187 """
188 if schema_type == 'string':
189 return str(value)
190 elif schema_type == 'integer':
191 return str(int(value))
192 elif schema_type == 'number':
193 return str(float(value))
194 elif schema_type == 'boolean':
195 return str(bool(value)).lower()
196 else:
197 return str(value)
198
199
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500200def createResource(http, baseUrl, model, requestBuilder,
Joe Gregorioaf276d22010-12-09 14:26:58 -0500201 developerKey, resourceDesc, futureDesc):
Joe Gregorio48d361f2010-08-18 13:19:21 -0400202
203 class Resource(object):
204 """A class for interacting with a resource."""
205
206 def __init__(self):
207 self._http = http
208 self._baseUrl = baseUrl
209 self._model = model
Joe Gregorio00cf1d92010-09-27 09:22:03 -0400210 self._developerKey = developerKey
Joe Gregorioaf276d22010-12-09 14:26:58 -0500211 self._requestBuilder = requestBuilder
Joe Gregorio48d361f2010-08-18 13:19:21 -0400212
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400213 def createMethod(theclass, methodName, methodDesc, futureDesc):
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400214 pathUrl = methodDesc['restPath']
Joe Gregorio48d361f2010-08-18 13:19:21 -0400215 pathUrl = re.sub(r'\{', r'{+', pathUrl)
216 httpMethod = methodDesc['httpMethod']
Joe Gregorioaf276d22010-12-09 14:26:58 -0500217 methodId = methodDesc['rpcMethod']
Joe Gregorio21f11672010-08-18 17:23:17 -0400218
ade@google.com850cf552010-08-20 23:24:56 +0100219 argmap = {}
220 if httpMethod in ['PUT', 'POST']:
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500221 if 'parameters' not in methodDesc:
222 methodDesc['parameters'] = {}
223 methodDesc['parameters']['body'] = {
224 'description': 'The request body.',
Joe Gregorioc2a73932011-02-22 10:17:06 -0500225 'type': 'object',
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500226 }
ade@google.com850cf552010-08-20 23:24:56 +0100227
228 required_params = [] # Required parameters
229 pattern_params = {} # Parameters that must match a regex
230 query_params = [] # Parameters that will be used in the query string
231 path_params = {} # Parameters that will be used in the base URL
Joe Gregoriobee86832011-02-22 10:00:19 -0500232 param_type = {} # The type of the parameter
233 enum_params = {}
Joe Gregorio4292c6e2010-09-09 14:32:43 -0400234 if 'parameters' in methodDesc:
235 for arg, desc in methodDesc['parameters'].iteritems():
236 param = key2param(arg)
237 argmap[param] = arg
Joe Gregorio21f11672010-08-18 17:23:17 -0400238
Joe Gregorio4292c6e2010-09-09 14:32:43 -0400239 if desc.get('pattern', ''):
240 pattern_params[param] = desc['pattern']
Joe Gregoriobee86832011-02-22 10:00:19 -0500241 if desc.get('enum', ''):
242 enum_params[param] = desc['enum']
Joe Gregorio4292c6e2010-09-09 14:32:43 -0400243 if desc.get('required', False):
244 required_params.append(param)
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400245 if desc.get('restParameterType') == 'query':
Joe Gregorio4292c6e2010-09-09 14:32:43 -0400246 query_params.append(param)
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400247 if desc.get('restParameterType') == 'path':
Joe Gregorio4292c6e2010-09-09 14:32:43 -0400248 path_params[param] = param
Joe Gregoriobee86832011-02-22 10:00:19 -0500249 param_type[param] = desc.get('type', 'string')
Joe Gregorio48d361f2010-08-18 13:19:21 -0400250
Joe Gregoriobc2ff9b2010-11-08 09:20:48 -0500251 for match in URITEMPLATE.finditer(pathUrl):
252 for namematch in VARNAME.finditer(match.group(0)):
253 name = key2param(namematch.group(0))
254 path_params[name] = name
255 if name in query_params:
256 query_params.remove(name)
257
Joe Gregorio48d361f2010-08-18 13:19:21 -0400258 def method(self, **kwargs):
259 for name in kwargs.iterkeys():
260 if name not in argmap:
261 raise TypeError('Got an unexpected keyword argument "%s"' % name)
Joe Gregorio21f11672010-08-18 17:23:17 -0400262
ade@google.com850cf552010-08-20 23:24:56 +0100263 for name in required_params:
Joe Gregoriofbf9d0d2010-08-18 16:50:47 -0400264 if name not in kwargs:
265 raise TypeError('Missing required parameter "%s"' % name)
Joe Gregorio21f11672010-08-18 17:23:17 -0400266
ade@google.com850cf552010-08-20 23:24:56 +0100267 for name, regex in pattern_params.iteritems():
Joe Gregorio21f11672010-08-18 17:23:17 -0400268 if name in kwargs:
269 if re.match(regex, kwargs[name]) is None:
Joe Gregorio3bbbf662010-08-30 16:41:53 -0400270 raise TypeError(
271 'Parameter "%s" value "%s" does not match the pattern "%s"' %
272 (name, kwargs[name], regex))
Joe Gregorio21f11672010-08-18 17:23:17 -0400273
Joe Gregoriobee86832011-02-22 10:00:19 -0500274 for name, enums in enum_params.iteritems():
275 if name in kwargs:
276 if kwargs[name] not in enums:
277 raise TypeError(
278 'Parameter "%s" value "%s" is not in the list of allowed values "%s"' %
279 (name, kwargs[name], str(enums)))
280
ade@google.com850cf552010-08-20 23:24:56 +0100281 actual_query_params = {}
282 actual_path_params = {}
Joe Gregorio21f11672010-08-18 17:23:17 -0400283 for key, value in kwargs.iteritems():
ade@google.com850cf552010-08-20 23:24:56 +0100284 if key in query_params:
Joe Gregoriobee86832011-02-22 10:00:19 -0500285 actual_query_params[argmap[key]] = _to_string(value, param_type[key])
ade@google.com850cf552010-08-20 23:24:56 +0100286 if key in path_params:
Joe Gregoriobee86832011-02-22 10:00:19 -0500287 actual_path_params[argmap[key]] = _to_string(value, param_type[key])
ade@google.com850cf552010-08-20 23:24:56 +0100288 body_value = kwargs.get('body', None)
Joe Gregorio21f11672010-08-18 17:23:17 -0400289
Joe Gregorio00cf1d92010-09-27 09:22:03 -0400290 if self._developerKey:
291 actual_query_params['key'] = self._developerKey
292
Joe Gregorio48d361f2010-08-18 13:19:21 -0400293 headers = {}
Joe Gregorio3bbbf662010-08-30 16:41:53 -0400294 headers, params, query, body = self._model.request(headers,
295 actual_path_params, actual_query_params, body_value)
Joe Gregorio48d361f2010-08-18 13:19:21 -0400296
Joe Gregorioaf276d22010-12-09 14:26:58 -0500297 # TODO(ade) This exists to fix a bug in V1 of the Buzz discovery
298 # document. Base URLs should not contain any path elements. If they do
299 # then urlparse.urljoin will strip them out This results in an incorrect
300 # URL which returns a 404
ade@google.com7ebb2ca2010-09-29 16:42:15 +0100301 url_result = urlparse.urlsplit(self._baseUrl)
302 new_base_url = url_result.scheme + '://' + url_result.netloc
303
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400304 expanded_url = uritemplate.expand(pathUrl, params)
Joe Gregorioaf276d22010-12-09 14:26:58 -0500305 url = urlparse.urljoin(new_base_url,
306 url_result.path + expanded_url + query)
Joe Gregoriofbf9d0d2010-08-18 16:50:47 -0400307
ade@google.com850cf552010-08-20 23:24:56 +0100308 logging.info('URL being requested: %s' % url)
Joe Gregorioabda96f2011-02-11 20:19:33 -0500309 return self._requestBuilder(self._http,
310 self._model.response,
311 url,
312 method=httpMethod,
313 body=body,
Joe Gregorioaf276d22010-12-09 14:26:58 -0500314 headers=headers,
Joe Gregorioaf276d22010-12-09 14:26:58 -0500315 methodId=methodId)
Joe Gregorio48d361f2010-08-18 13:19:21 -0400316
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500317 docs = [methodDesc.get('description', DEFAULT_METHOD_DOC), '\n\n']
318 if len(argmap) > 0:
319 docs.append("Args:\n")
Joe Gregorio48d361f2010-08-18 13:19:21 -0400320 for arg in argmap.iterkeys():
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500321 required = ""
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400322 if arg in required_params:
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500323 required = " (required)"
Joe Gregorioc2a73932011-02-22 10:17:06 -0500324 paramdesc = methodDesc['parameters'][argmap[arg]]
325 paramdoc = paramdesc.get('description', 'A parameter')
326 paramtype = paramdesc.get('type', 'string')
327 docs.append(' %s: %s, %s%s\n' % (arg, paramtype, paramdoc, required))
328 enum = paramdesc.get('enum', [])
329 enumDesc = paramdesc.get('enumDescriptions', [])
330 if enum and enumDesc:
331 docs.append(' Allowed values\n')
332 for (name, desc) in zip(enum, enumDesc):
333 docs.append(' %s - %s\n' % (name, desc))
Joe Gregorio48d361f2010-08-18 13:19:21 -0400334
335 setattr(method, '__doc__', ''.join(docs))
336 setattr(theclass, methodName, method)
337
Joe Gregorioaf276d22010-12-09 14:26:58 -0500338 def createNextMethod(theclass, methodName, methodDesc, futureDesc):
339 methodId = methodDesc['rpcMethod'] + '.next'
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400340
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500341 def methodNext(self, previous):
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400342 """
343 Takes a single argument, 'body', which is the results
344 from the last call, and returns the next set of items
345 in the collection.
346
347 Returns None if there are no more items in
348 the collection.
349 """
Joe Gregorioaf276d22010-12-09 14:26:58 -0500350 if futureDesc['type'] != 'uri':
351 raise UnknownLinkType(futureDesc['type'])
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400352
353 try:
354 p = previous
Joe Gregorioaf276d22010-12-09 14:26:58 -0500355 for key in futureDesc['location']:
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400356 p = p[key]
357 url = p
Joe Gregorioc5c5a372010-09-22 11:42:32 -0400358 except (KeyError, TypeError):
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400359 return None
360
Joe Gregorio00cf1d92010-09-27 09:22:03 -0400361 if self._developerKey:
362 parsed = list(urlparse.urlparse(url))
ade@google.comc5eb46f2010-09-27 23:35:39 +0100363 q = parse_qsl(parsed[4])
Joe Gregorio00cf1d92010-09-27 09:22:03 -0400364 q.append(('key', self._developerKey))
365 parsed[4] = urllib.urlencode(q)
366 url = urlparse.urlunparse(parsed)
367
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400368 headers = {}
369 headers, params, query, body = self._model.request(headers, {}, {}, None)
370
371 logging.info('URL being requested: %s' % url)
372 resp, content = self._http.request(url, method='GET', headers=headers)
373
Joe Gregorioabda96f2011-02-11 20:19:33 -0500374 return self._requestBuilder(self._http,
375 self._model.response,
376 url,
377 method='GET',
Joe Gregorioaf276d22010-12-09 14:26:58 -0500378 headers=headers,
Joe Gregorioaf276d22010-12-09 14:26:58 -0500379 methodId=methodId)
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400380
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500381 setattr(theclass, methodName, methodNext)
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400382
383 # Add basic methods to Resource
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400384 if 'methods' in resourceDesc:
385 for methodName, methodDesc in resourceDesc['methods'].iteritems():
386 if futureDesc:
387 future = futureDesc['methods'].get(methodName, {})
388 else:
389 future = None
390 createMethod(Resource, methodName, methodDesc, future)
391
392 # Add in nested resources
393 if 'resources' in resourceDesc:
Joe Gregorioaf276d22010-12-09 14:26:58 -0500394
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500395 def createResourceMethod(theclass, methodName, methodDesc, futureDesc):
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400396
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500397 def methodResource(self):
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400398 return createResource(self._http, self._baseUrl, self._model,
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500399 self._requestBuilder, self._developerKey,
400 methodDesc, futureDesc)
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400401
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500402 setattr(methodResource, '__doc__', 'A collection resource.')
403 setattr(methodResource, '__is_resource__', True)
404 setattr(theclass, methodName, methodResource)
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400405
406 for methodName, methodDesc in resourceDesc['resources'].iteritems():
407 if futureDesc and 'resources' in futureDesc:
408 future = futureDesc['resources'].get(methodName, {})
409 else:
410 future = {}
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500411 createResourceMethod(Resource, methodName, methodDesc, future)
Joe Gregorio6d5e94f2010-08-25 23:49:30 -0400412
413 # Add <m>_next() methods to Resource
Joe Gregorio7a6df3a2011-01-31 21:55:21 -0500414 if futureDesc and 'methods' in futureDesc:
Joe Gregorio2379ecc2010-10-26 10:51:28 -0400415 for methodName, methodDesc in futureDesc['methods'].iteritems():
416 if 'next' in methodDesc and methodName in resourceDesc['methods']:
Joe Gregorioc3fae8a2011-02-18 14:19:50 -0500417 createNextMethod(Resource, methodName + "_next",
Joe Gregorioaf276d22010-12-09 14:26:58 -0500418 resourceDesc['methods'][methodName],
419 methodDesc['next'])
Joe Gregorio48d361f2010-08-18 13:19:21 -0400420
421 return Resource()