Merge branch 'master' of github.com:okfn/ckan into feature-1515-activ…

…ity-streams
ckan · Jan 20, 2012 · e798eac · e798eac
2 parents 1d40201 + 8cc0dc2
commit e798eac
Show file tree

Hide file tree

Showing 21 changed files with 731 additions and 30 deletions.
diff --git a/ckan/authz.py b/ckan/authz.py
@@ -47,6 +47,7 @@ def is_authorized(cls, username, action, domain_object):
         if isinstance(username, str):
             username = username.decode('utf8')
         assert isinstance(username, unicode), type(username)
+
         for extension in cls.extensions:
             authorized = extension.is_authorized(username,
                                                  action,

diff --git a/ckan/ckan_nose_plugin.py b/ckan/ckan_nose_plugin.py
@@ -47,10 +47,21 @@ def options(self, parser, env):
             '--ckan-migration',
             action='store_true',
             dest='ckan_migration',
-            help='set this when wanting to test migrations')        
+            help='set this when wanting to test migrations')
+        parser.add_option(
+            '--docstrings',
+            action='store_true',
+            dest='docstrings',
+            help='set this to display test docstrings instead of module names')
 
     def configure(self, settings, config):
         CkanNose.settings = settings
         if settings.is_ckan:
             self.enabled = True
             self.is_first_test = True
+
+    def describeTest(self, test):
+        if not CkanNose.settings.docstrings:
+            # display module name instead of docstring
+            return False
+
diff --git a/ckan/config/routing.py b/ckan/config/routing.py
@@ -9,6 +9,7 @@
 from routes import Mapper
 from ckan.plugins import PluginImplementations, IRoutes
 
+
 routing_plugins = PluginImplementations(IRoutes)
 
 def make_map():
@@ -280,6 +281,43 @@ def make_map():
     map.connect('ckanadmin_index', '/ckan-admin', controller='admin', action='index')
     map.connect('ckanadmin', '/ckan-admin/{action}', controller='admin')
 
+    # Storage routes
+    map.connect('storage_api', "/api/storage", 
+                controller='ckan.controllers.storage:StorageAPIController', 
+                action='index')
+    map.connect('storage_api_set_metadata', '/api/storage/metadata/{label:.*}', 
+                controller='ckan.controllers.storage:StorageAPIController', 
+                action='set_metadata',
+                conditions={'method': ['PUT','POST']})
+    map.connect('storage_api_get_metadata', '/api/storage/metadata/{label:.*}', 
+                controller='ckan.controllers.storage:StorageAPIController', 
+                action='get_metadata',
+                conditions={'method': ['GET']})
+    map.connect('storage_api_auth_request',
+                '/api/storage/auth/request/{label:.*}',
+                controller='ckan.controllers.storage:StorageAPIController',
+                action='auth_request')
+    map.connect('storage_api_auth_form',
+                '/api/storage/auth/form/{label:.*}',
+                controller='ckan.controllers.storage:StorageAPIController',
+                action='auth_form')
+    map.connect('storage_upload', '/storage/upload',
+                controller='ckan.controllers.storage:StorageController',
+                action='upload')
+    map.connect('storage_upload_handle', '/storage/upload_handle',
+                controller='ckan.controllers.storage:StorageController',
+                action='upload_handle')
+    map.connect('storage_upload_success', '/storage/upload/success',
+                controller='ckan.controllers.storage:StorageController',
+                action='success')
+    map.connect('storage_upload_success_empty', '/storage/upload/success_empty',
+                controller='ckan.controllers.storage:StorageController',
+                action='success_empty')
+    map.connect('storage_file', '/storage/f/{label:.*}',
+                controller='ckan.controllers.storage:StorageController',
+                action='file')
+
+
     for plugin in routing_plugins:
         map = plugin.after_map(map)