Moved handle_request out of views

src/djanalytics/core/djobject.py

@@ -50,9 +50,9 @@ def http_rpc_helper(baseurl, view_or_query, function, headers = {}):
 def local_call_helper(view_or_query, function):
     ''' Make a call (functionally identical to RPC) to the local djanalytics instance
     '''
-    import djanalytics.core.views
+    import djanalytics.core.registry
     def rpc_call(**kwargs):
-        return djanalytics.core.views.handle_request(view_or_query, function, **kwargs)
+        return djanalytics.core.registry.handle_request(view_or_query, function, **kwargs)
     return rpc_call
 
 class embed():

src/djanalytics/core/registry.py

@@ -98,3 +98,20 @@ def schema_helper():
             endpoints.append({'category' : rh['category'], 'class': cls, 'name' : name, 'doc' : rh['doc']})
     return endpoints
 
+def handle_request(cls, name, **kwargs):
+    ''' Generic code to handle views and requests '''
+    args = dict()
+    categories = request_handlers[cls]
+    if name in categories: 
+        handler_dict = categories[name]
+    else:
+        raise Http404(name+"  is not a valid function")
+    handler = handler_dict['function']
+    if 'args' in handler_dict:
+        arglist = handler_dict['arglist']
+    else:
+        arglist = inspect.getargspec(handler).args
+
+    from util import optional_parameter_call, default_optional_kwargs
+    return optional_parameter_call(handler, default_optional_kwargs, kwargs, arglist)
+

src/djanalytics/core/views.py

@@ -47,23 +47,6 @@ def schema(request):
         return HttpResponse("\n".join(sorted(["<dt><p><b>{class}/{name}</b> <i>{category}</i></dt><dd>{doc}</dd>".format(**rh) for rh in endpoints])))
     return HttpResponse(json.dumps(endpoints))
     
-
-def handle_request(cls, name, **kwargs):
-    ''' Generic code from handle_view and handle_query '''
-    args = dict()
-    categories = request_handlers[cls]
-    if name in categories: 
-        handler_dict = categories[name]
-    else:
-        raise Http404(name+"  is not a valid function")
-    handler = handler_dict['function']
-    if 'args' in handler_dict:
-        arglist = handler_dict['arglist']
-    else:
-        arglist = inspect.getargspec(handler).args
-
-    return optional_parameter_call(handler, default_optional_kwargs, kwargs, arglist)
-
 @auth.auth
 def handle_view(request, name, **kwargs):
     ''' Handles generic view. 
@@ -72,6 +55,7 @@ def handle_view(request, name, **kwargs):
     '''
     kwargs.update(request.POST.items())
     kwargs.update(request.GET.items())
+    from registry import handle_request
     return HttpResponse(handle_request('view', name, **kwargs))
 
 @auth.auth
@@ -82,6 +66,7 @@ def handle_query(request, name, **kwargs):
     '''
     kwargs.update(request.POST.items())
     kwargs.update(request.GET.items())
+    from registry import handle_request
     request_data = handle_request('query', name, **kwargs)
     try:
         request_data = json.dumps(request_data)