# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1317476694 -10800
# Node ID ed3254ac279bbbde9f1c9440a03273407164b06f
# Parent  b02aa5f2f066a95f989f70c8184be8384c8c9497
Added optional arguments into API

diff -r b02aa5f2f066 -r ed3254ac279b rhodecode/controllers/api/__init__.py
--- a/rhodecode/controllers/api/__init__.py	Fri Sep 30 18:42:35 2011 +0300
+++ b/rhodecode/controllers/api/__init__.py	Sat Oct 01 16:44:54 2011 +0300
@@ -30,6 +30,7 @@
 import logging
 import types
 import urllib
+from itertools import izip_longest
 
 from paste.response import replace_header
 
@@ -132,7 +133,12 @@
 
         # now that we have a method, add self._req_params to
         # self.kargs and dispatch control to WGIController
-        arglist = inspect.getargspec(self._func)[0][1:]
+        argspec = inspect.getargspec(self._func)
+        arglist = argspec[0][1:]
+        defaults = argspec[3]
+        default_empty = types.NotImplementedType
+        kwarglist = list(izip_longest(reversed(arglist),reversed(defaults),
+                                fillvalue=default_empty))
 
         # this is little trick to inject logged in user for 
         # perms decorators to work they expect the controller class to have
@@ -149,14 +155,18 @@
                                  (self._func.__name__, USER_SESSION_ATTR))
 
         # get our arglist and check if we provided them as args
-        for arg in arglist:
+        for arg,default in kwarglist:
             if arg == USER_SESSION_ATTR:
                 # USER_SESSION_ATTR is something translated from api key and 
                 # this is checked before so we don't need validate it
                 continue
-
-            if not self._req_params or arg not in self._req_params:
-                return jsonrpc_error(message='Missing %s arg in JSON DATA' % arg)
+            
+            # skip the required param check if it's default value is 
+            # NotImplementedType (default_empty)
+            if not self._req_params or (type(default) == default_empty
+                                        and arg not in self._req_params):
+                return jsonrpc_error(message=('Missing non optional %s arg '
+                                              'in JSON DATA') % arg)
 
         self._rpc_args = {USER_SESSION_ATTR:u}
         self._rpc_args.update(self._req_params)