dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1566 from BrenBarn/flexserve

Browse Source 
Add FlexibleService, which allows @service-style methods with varargs
This commit is contained in:
mdipierro
2017-03-21 12:18:09 -05:00
committed by GitHub
parent 868d6f6369 86a2c529b9
commit b2f221bbaa
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+19 -10
View File
@@ -5386,7 +5386,9 @@ def universal_caller(f, *a, **b):
class Service(object): class Service(object):
def __init__(self, environment=None): def __init__(self, environment=None, check_args=False):
self.check_args = check_args
self.run_procedures = {} self.run_procedures = {}
self.csv_procedures = {} self.csv_procedures = {}
self.xml_procedures = {} self.xml_procedures = {}
@@ -5436,7 +5438,7 @@ class Service(object):
wget http://..../app/default/call/csv/myfunction?a=3&b=4 wget http://..../app/default/call/csv/myfunction?a=3&b=4
""" """
self.run_procedures[f.__name__] = f self.csv_procedures[f.__name__] = f
return f return f
def xml(self, f): def xml(self, f):
@@ -5456,7 +5458,7 @@ class Service(object):
wget http://..../app/default/call/xml/myfunction?a=3&b=4 wget http://..../app/default/call/xml/myfunction?a=3&b=4
""" """
self.run_procedures[f.__name__] = f self.xml_procedures[f.__name__] = f
return f return f
def rss(self, f): def rss(self, f):
@@ -5643,7 +5645,7 @@ class Service(object):
if not args: if not args:
args = request.args args = request.args
if args and args[0] in self.run_procedures: if args and args[0] in self.run_procedures:
return str(universal_caller(self.run_procedures[args[0]], return str(self.call_service_function(self.run_procedures[args[0]],
*args[1:], **dict(request.vars))) *args[1:], **dict(request.vars)))
self.error() self.error()
@@ -5662,9 +5664,9 @@ class Service(object):
if value is None: if value is None:
return '<NULL>' return '<NULL>'
return value return value
if args and args[0] in self.run_procedures: if args and args[0] in self.csv_procedures:
import types import types
r = universal_caller(self.run_procedures[args[0]], r = self.call_service_function(self.csv_procedures[args[0]],
*args[1:], **dict(request.vars)) *args[1:], **dict(request.vars))
s = StringIO() s = StringIO()
if hasattr(r, 'export_to_csv_file'): if hasattr(r, 'export_to_csv_file'):
@@ -5690,8 +5692,8 @@ class Service(object):
response.headers['Content-Type'] = 'text/xml' response.headers['Content-Type'] = 'text/xml'
if not args: if not args:
args = request.args args = request.args
if args and args[0] in self.run_procedures: if args and args[0] in self.xml_procedures:
s = universal_caller(self.run_procedures[args[0]], s = self.call_service_function(self.xml_procedures[args[0]],
*args[1:], **dict(request.vars)) *args[1:], **dict(request.vars))
if hasattr(s, 'as_list'): if hasattr(s, 'as_list'):
s = s.as_list() s = s.as_list()
@@ -5704,7 +5706,7 @@ class Service(object):
if not args: if not args:
args = request.args args = request.args
if args and args[0] in self.rss_procedures: if args and args[0] in self.rss_procedures:
feed = universal_caller(self.rss_procedures[args[0]], feed = self.call_service_function(self.rss_procedures[args[0]],
*args[1:], **dict(request.vars)) *args[1:], **dict(request.vars))
else: else:
self.error() self.error()
@@ -5719,7 +5721,7 @@ class Service(object):
args = request.args args = request.args
d = dict(request.vars) d = dict(request.vars)
if args and args[0] in self.json_procedures: if args and args[0] in self.json_procedures:
s = universal_caller(self.json_procedures[args[0]], *args[1:], **d) s = self.call_service_function(self.json_procedures[args[0]], *args[1:], **d)
if hasattr(s, 'as_list'): if hasattr(s, 'as_list'):
s = s.as_list() s = s.as_list()
return response.json(s) return response.json(s)
@@ -6053,6 +6055,13 @@ class Service(object):
def error(self): def error(self):
raise HTTP(404, "Object does not exist") raise HTTP(404, "Object does not exist")
# we make this a method so that subclasses can override it if they want to do more specific argument-checking
# but the default implmentation is the simplest: just pass the arguments we got, with no checking
def call_service_function(self, f, *a, **b):
if self.check_args:
return universal_caller(f, *a, **b)
else:
return f(*a, **b)
def completion(callback): def completion(callback):
""" """