- corrected json import bug added in previous commit

- added automatic handling of 501 NotImplemented error in case a url
exists but the specific requested method does not .
For simplicity, this is done via an added dict called "urlMethods" in
RequestRouter, that maps urls to lists of implemented http methods , and
is filled in_registerRouters

corepost/convert.py

@@ -8,6 +8,7 @@ for JSON/XML/YAML output
 
 import collections
 import logging
+import json
 from UserDict import DictMixin
 from twisted.python import log
 
@@ -15,8 +16,8 @@ advanced_json = False
 try:
     import jsonpickle
     advanced_json = True
-except ImportError:
-    import json
+except ImportError: pass
+
 
 primitives = (int, long, float, bool, str,unicode)
 

corepost/routing.py

@@ -15,15 +15,14 @@ from enums import MediaType
 from twisted.internet import defer
 from twisted.web.http import parse_qs
 from twisted.python import log
-import re, copy, exceptions, yaml, logging
+import re, copy, exceptions, yaml,json, logging
 from xml.etree import ElementTree
 
 advanced_json = False
 try:
     import jsonpickle
     advanced_json = True
-except ImportError:
-    import json
+except ImportError: pass
 
 
 class UrlRouter:
@@ -152,12 +151,12 @@ class RequestRouter:
         self.__cachedUrls = {Http.GET: defaultdict(dict),Http.POST: defaultdict(dict),Http.PUT: defaultdict(dict),Http.DELETE: defaultdict(dict),Http.OPTIONS: defaultdict(dict),Http.PATCH: defaultdict(dict),Http.HEAD: defaultdict(dict)}
         self.__urlRouterInstances = {}
         self.__schema = schema
+        self.__urlsMehods = {}
         self.__registerRouters(restServiceContainer)
         self.__urlContainer = restServiceContainer
         self.__requestFilters = []
         self.__responseFilters = []
 
-        #filters
         if filters != None:
             for webFilter in filters:
                 valid = False
@@ -187,7 +186,6 @@ class RequestRouter:
                 func = service.__class__.__dict__[key]
                 # handle REST resources directly on the CorePost resource
                 if type(func) == FunctionType and hasattr(func,'corepostRequestRouter'):
-                    
                     # if specified, add class path to each function's path
                     rq = func.corepostRequestRouter
                     #workaround for multiple passes of __registerRouters (for unit tests etc)
@@ -206,7 +204,9 @@ class RequestRouter:
                             urlRouterInstance = UrlRouterInstance(service,rq)
                             self.__urls[method][rq.url][accepts] = urlRouterInstance
                             self.__urlRouterInstances[func] = urlRouterInstance # needed so that we can lookup the urlRouterInstance for a specific function
-                            
+                            if self.__urlsMehods.get(rq.url, None) is None:
+                                self.__urlsMehods[rq.url] = []
+                            self.__urlsMehods[rq.url].append(method)
 
     def getResponse(self,request):
         """Finds the appropriate instance and dispatches the request to the registered function. Returns the appropriate Response object"""
@@ -246,11 +246,11 @@ class RequestRouter:
                         # see if the path arguments match up against any function @route definition
                         args = instance.urlRouter.getArguments(path)
                         if args != None:
+                           
                             if instance.urlRouter.cache:
                                 self.__cachedUrls[request.method][path][contentType] = CachedUrl(instance, args)
                             urlRouterInstance,pathargs = instance,args
                             break
-        
             #actual call
             if urlRouterInstance != None and pathargs != None:
                 allargs = copy.deepcopy(pathargs)
@@ -297,7 +297,8 @@ class RequestRouter:
                     response =  self.__createErrorResponse(request,500,"Unexpected server error: %s\n%s" % (type(ex),ex))
                     
             #if a url is defined, but not the requested method
-            elif self.__urls[request.method].get(path, {}) == {}:
+            elif not request.method in self.__urlsMehods.get(path, []) and self.__urlsMehods.get(path, []) != []:
+                
                 response = self.__createErrorResponse(request,501, "")
             else:
                 log.msg("URL %s not found" % path,logLevel=logging.WARN)