[#2003] start separate file for patch actions

ckan/logic/__init__.py

@@ -360,7 +360,7 @@ def get_action(action):
     # Rather than writing them out in full will use __import__
     # to load anything from ckan.logic.action that looks like it might
     # be an action
-    for action_module_name in ['get', 'create', 'update', 'delete']:
+    for action_module_name in ['get', 'create', 'update', 'delete', 'patch']:
         module_path = 'ckan.logic.action.' + action_module_name
         module = __import__(module_path)
         for part in module_path.split('.')[1:]:

ckan/logic/action/patch.py

@@ -0,0 +1,32 @@
+'''API functions for partial updates of existing data in CKAN'''
+
+import ckan.logic.action.update as _update
+from ckan.logic import get_action as _get_action
+
+def package_patch(context, data_dict):
+    '''Patch a dataset (package).
+
+    The difference between the update and patch methods is that the patch will
+    perform an update of the provided parameters, while leaving all other
+    parameters unchanged, whereas the update methods deletes all parameters
+    not explicitly provided in the data_dict
+
+    You must be authorized to edit the dataset and the groups that it belongs
+    to.
+
+    '''
+
+    _check_access('package_patch', context, data_dict)
+
+    name_or_id = data_dict.get("name") or _get_or_bust(data_dict, "id")
+    show_context = {
+        'model': context['model'],
+        'session': context['session'],
+        'user': context['user'],
+        'auth_user_obj': context['auth_user_obj'],
+        }
+
+    package_dict = _get_action('package_show')(show_context, {'id': name_or_id})
+
+    patched = dict(package_dict.items() + data_dict.items())
+    return _update.package_update(context, patched)

ckan/logic/action/update.py

@@ -455,35 +455,6 @@ def package_update(context, data_dict):
 
     return output
 
-def package_patch(context, data_dict):
-    '''Patch a dataset (package).
-
-    The difference between the update and patch methods is that the patch will
-    perform an update of the provided parameters, while leaving all other
-    parameters unchanged, whereas the update methods deletes all parameters
-    not explicitly provided in the data_dict
-
-    You must be authorized to edit the dataset and the groups that it belongs
-    to.
-
-    '''
-
-    _check_access('package_patch', context, data_dict)
-
-    name_or_id = data_dict.get("name") or _get_or_bust(data_dict, "id")
-    show_context = {
-        'model': context['model'],
-        'session': context['session'],
-        'user': context['user'],
-        'auth_user_obj': context['auth_user_obj'],
-        }
-
-    package_dict = _get_action('package_show')(show_context, {'id': name_or_id})
-
-    patched = dict(package_dict.items() + data_dict.items())
-    return package_update(context, patched)
-
-
 def package_resource_reorder(context, data_dict):
     '''Reorder resources against datasets.  If only partial resource ids are
     supplied then these are assumed to be first and the other resources will

ckan/logic/auth/patch.py

@@ -0,0 +1,4 @@
+from ckan import logic
+import ckan.logic.auth.update as _update
+
+package_patch = _update.package_update

ckan/logic/auth/update.py

@@ -48,10 +48,6 @@ def package_update(context, data_dict):
 
     return {'success': True}
 
-@logic.auth_allow_anonymous_access
-def package_patch(context, data_dict):
-    return package_update(context, data_dict)
-
 def package_resource_reorder(context, data_dict):
     ## the action function runs package update so no need to run it twice
     return {'success': True}

ckan/new_authz.py

@@ -44,7 +44,7 @@ def _build(self):
 
         module_root = 'ckan.logic.auth'
 
-        for auth_module_name in ['get', 'create', 'update', 'delete']:
+        for auth_module_name in ['get', 'create', 'update', 'delete', 'patch']:
             module_path = '%s.%s' % (module_root, auth_module_name,)
             try:
                 module = __import__(module_path)