Better names for activity logic functions

ckan/controllers/api.py

@@ -232,7 +232,7 @@ def show(self, ver=None, register=None, subregister=None, id=None, id2=None):
             'tag': get_action('tag_show_rest'),
             'dataset': get_action('package_show_rest'),
             'package': get_action('package_show_rest'),
-            'activity': get_action('activity_show'),
+            'activity': get_action('user_activity_list'),
             ('dataset', 'relationships'): get_action('package_relationships_list'),
             ('package', 'relationships'): get_action('package_relationships_list'),
         }

ckan/logic/action/get.py

@@ -868,15 +868,15 @@ def status_show(context, data_dict):
         'extensions': config.get('ckan.plugins').split(),
         }
 
-def activity_show(context, data_dict):
+def user_activity_list(context, data_dict):
     '''Return a user's public activity stream as a list of dicts.'''
     model = context['model']
     user_id = data_dict['id']
     activity_objects = model.Session.query(
             model.activity.Activity).filter_by(user_id=user_id).all()
     return activity_list_dictize(activity_objects, context)
 
-def activity_detail_show(context, data_dict):
+def activity_detail_list(context, data_dict):
     '''Return an activity's list of activity detail items, as a list of dicts.
     
     '''

ckan/tests/models/test_activity.py

@@ -8,7 +8,7 @@
 from ckan.logic.action.update import package_update, resource_update
 from ckan.logic.action.delete import package_delete
 from ckan.lib.dictization.model_dictize import resource_list_dictize
-from ckan.logic.action.get import activity_show, activity_detail_show
+from ckan.logic.action.get import user_activity_list, activity_detail_list
 
 def datetime_from_string(s):
     '''Return a standard datetime.datetime object initialised from a string in
@@ -64,13 +64,13 @@ def get_user_activity_stream(user_id):
     '''Return the public activity stream for the given user.'''
     context = {'model':model}
     data_dict = {'id':user_id}
-    return activity_show(context, data_dict)
+    return user_activity_list(context, data_dict)
 
 def get_activity_details(activity):
     '''Return the list of activity details for the given activity.'''
     context = {'model': model}
     data_dict = {'id': activity['id']}
-    return activity_detail_show(context, data_dict)
+    return activity_detail_list(context, data_dict)
 
 def record_details(user_id):
     details = {}