Merge branch 'master' into 2549-merge-organizations

CHANGELOG.txt

@@ -1,6 +1,26 @@
 CKAN CHANGELOG
 ++++++++++++++
 
+v1.8
+====
+
+* [#2592,#2428] Ubuntu 12.04 Precise is now supported with CKAN source install.
+  The source install instructions have been updated and simplified.
+  Some of CKAN's dependencies have been updated and some removed.
+* Requirements have been updated see doc/install-from-source.rst
+  users will need to do a new pip install (#2592)
+* [#2304,#2305] New 'follow' feature. You'll now see a 'Followers' tab on user
+  and dataset pages, where you can see how many users are following that user
+  or dataset.  If you're logged in, you'll see a 'Follow' button on the pages
+  of datasets and other users that you can click to follow them. Also when
+  logged in, if you go to your own user page you'll see a new 'Dashboard' tab
+  where you can see an activity stream from of all the users and datasets that
+  you're following. There are also API calls for the follow features, see the
+  Action API reference documentation.
+* [#2345] New action API reference docs. The documentation for CKAN's Action
+  API has been rewritten, with each function and its arguments and return
+  values now individually documented.
+
 v1.7.1 2012-06-20
 =================
 

ckan/config/routing.py

@@ -252,6 +252,7 @@ def make_map():
         m.connect('/user/edit', action='edit')
         # Note: openid users have slashes in their ids, so need the wildcard
         # in the route.
+        m.connect('/user/dashboard', action='dashboard')
         m.connect('/user/followers/{id:.*}', action='followers')
         m.connect('/user/edit/{id:.*}', action='edit')
         m.connect('/user/reset/{id:.*}', action='perform_reset')

ckan/config/solr/CHANGELOG.txt

@@ -8,6 +8,8 @@ v1.4 - (ckan>=1.7)
 * Add title_string so you can sort alphabetically on title.
 * Fields related to analytics, access and view counts.
 * Add data_dict field for the whole package_dict.
+* Add vocab_* dynamic field so it is possible to facet by vocabulary tags
+* Add copyField for text with source vocab_*
 
 v1.3 - (ckan>=1.5.1)
 --------------------

ckan/config/solr/schema-1.4.xml

@@ -153,6 +153,7 @@
     <field name="data_dict" type="string" indexed="false" stored="true" />
 
     <dynamicField name="extras_*" type="text" indexed="true" stored="true" multiValued="false"/>
+    <dynamicField name="vocab_*" type="string" indexed="true" stored="true" multiValued="true"/>
     <dynamicField name="*" type="string" indexed="true"  stored="false"/>
 </fields>
 
@@ -165,6 +166,7 @@
 <copyField source="download_url" dest="urls"/>
 <copyField source="res_url" dest="urls"/>
 <copyField source="extras_*" dest="text"/>
+<copyField source="vocab_*" dest="text"/>
 <copyField source="urls" dest="text"/>
 <copyField source="name" dest="text"/>
 <copyField source="title" dest="text"/>

ckan/controllers/api.py

@@ -251,6 +251,7 @@ def list(self, ver=None, register=None, subregister=None, id=None):
             ('dataset', 'activity'): 'package_activity_list',
             ('group', 'activity'): 'group_activity_list',
             ('user', 'activity'): 'user_activity_list',
+            ('user', 'dashboard_activity'): 'dashboard_activity_list',
             ('activity', 'details'): 'activity_detail_list',
         }
 

ckan/controllers/package.py

@@ -594,8 +594,7 @@ def _save_new(self, context, package_type=None):
         except DataError:
             abort(400, _(u'Integrity Error'))
         except SearchIndexError, e:
-            abort(500, _(u'Unable to add package to search index.') +
-                  repr(e.args))
+            abort(500, _(u'Unable to add package to search index.'))
         except ValidationError, e:
             errors = e.error_dict
             error_summary = e.error_summary
@@ -627,7 +626,7 @@ def _save_edit(self, name_or_id, context):
         except DataError:
             abort(400, _(u'Integrity Error'))
         except SearchIndexError, e:
-            abort(500, _(u'Unable to update search index.') + repr(e.args))
+            abort(500, _(u'Unable to update search index.'))
         except ValidationError, e:
             errors = e.error_dict
             error_summary = e.error_summary

ckan/controllers/related.py

@@ -34,5 +34,5 @@ def list(self, id):
             base.abort(401, base._('Unauthorized to read package %s') % id)
 
         c.related_count = len(c.pkg.related)
-
+        c.action = 'related'
         return base.render("package/related_list.html")

ckan/controllers/user.py

@@ -117,8 +117,8 @@ def me(self, locale=None):
             h.redirect_to(locale=locale, controller='user',
                           action='login', id=None)
         user_ref = c.userobj.get_reference_preferred_for_uri()
-        h.redirect_to(locale=locale, controller='user',
-                      action='read', id=user_ref)
+        h.redirect_to(locale=locale, controller='user', action='dashboard',
+                      id=user_ref)
 
     def register(self, data=None, errors=None, error_summary=None):
         return self.new(data, errors, error_summary)
@@ -445,3 +445,10 @@ def followers(self, id=None):
         f = get_action('user_follower_list')
         c.followers = f(context, {'id': c.user_dict['id']})
         return render('user/followers.html')
+
+    def dashboard(self, id=None):
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user or c.author, 'for_view': True}
+        data_dict = {'id': id, 'user_obj': c.userobj}
+        self._setup_template_variables(context, data_dict)
+        return render('user/dashboard.html')

ckan/lib/helpers.py

@@ -506,7 +506,7 @@ def format_icon(_format):
 
 def linked_gravatar(email_hash, size=100, default=None):
     return literal(
-        '<a href="https://gravatar.com/" target="_blank"' +
+        '<a href="https://gravatar.com/" target="_blank" ' +
         'title="%s">' % _('Update your avatar at gravatar.com') +
         '%s</a>' % gravatar(email_hash,size,default)
         )
@@ -871,6 +871,20 @@ def follow_count(obj_type, obj_id):
     context = {'model' : model, 'session':model.Session, 'user':c.user}
     return logic.get_action(action)(context, {'id': obj_id})
 
+def dashboard_activity_stream(user_id):
+    '''Return the dashboard activity stream of the given user.
+
+    :param user_id: the id of the user
+    :type user_id: string
+
+    :returns: an activity stream as an HTML snippet
+    :rtype: string
+
+    '''
+    import ckan.logic as logic
+    context = {'model' : model, 'session':model.Session, 'user':c.user}
+    return logic.get_action('dashboard_activity_list_html')(context, {'id': user_id})
+
 
 # these are the functions that will end up in `h` template helpers
 # if config option restrict_template_vars is true
@@ -927,6 +941,7 @@ def follow_count(obj_type, obj_id):
            'unselected_facet_items',
            'follow_button',
            'follow_count',
+           'dashboard_activity_stream',
     # imported into ckan.lib.helpers
            'literal',
            'link_to',

ckan/lib/search/index.py

@@ -1,7 +1,6 @@
 import socket
 import string
 import logging
-import itertools
 import collections
 import json
 
@@ -14,6 +13,7 @@
 import ckan.model as model
 from ckan.plugins import (PluginImplementations,
                           IPackageController)
+import ckan.logic as logic
 
 log = logging.getLogger(__name__)
 
@@ -122,10 +122,27 @@ def index_package(self, pkg_dict):
                 pkg_dict[key] = value
         pkg_dict.pop('extras', None)
 
-        #Add tags and groups
+        # add tags, removing vocab tags from 'tags' list and adding them as
+        # vocab_<tag name> so that they can be used in facets
+        non_vocab_tag_names = []
         tags = pkg_dict.pop('tags', [])
-        pkg_dict['tags'] = [tag['name'] for tag in tags]
-
+        context = {'model': model}
+
+        for tag in tags:
+            if tag.get('vocabulary_id'):
+                data = {'id': tag['vocabulary_id']}
+                vocab = logic.get_action('vocabulary_show')(context, data)
+                key = u'vocab_%s' % vocab['name']
+                if key in pkg_dict:
+                    pkg_dict[key].append(tag['name'])
+                else:
+                    pkg_dict[key] = [tag['name']]
+            else:
+                non_vocab_tag_names.append(tag['name'])
+
+        pkg_dict['tags'] = non_vocab_tag_names
+
+        # add groups
         groups = pkg_dict.pop('groups', [])
 
         # Capacity is different to the default only if using organizations
@@ -197,7 +214,6 @@ def index_package(self, pkg_dict):
         import hashlib
         pkg_dict['index_id'] = hashlib.md5('%s%s' % (pkg_dict['id'],config.get('ckan.site_id'))).hexdigest()
 
-
         for item in PluginImplementations(IPackageController):
             pkg_dict = item.before_index(pkg_dict)
 

ckan/logic/action/create.py

@@ -534,7 +534,8 @@ def group_create(context, data_dict):
         'defer_commit':True,
         'session': session
     }
-    activity_create(activity_create_context, activity_dict, ignore_auth=True)
+    logic.get_action('activity_create')(activity_create_context,
+            activity_dict, ignore_auth=True)
 
     if not context.get('defer_commit'):
         model.repo.commit()
@@ -648,7 +649,8 @@ def user_create(context, data_dict):
             'object_id': user.id,
             'activity_type': 'new user',
             }
-    activity_create(activity_create_context, activity_dict, ignore_auth=True)
+    logic.get_action('activity_create')(activity_create_context,
+            activity_dict, ignore_auth=True)
 
     if not context.get('defer_commit'):
         model.repo.commit()
@@ -842,6 +844,7 @@ def follow_user(context, data_dict):
         raise logic.NotAuthorized
 
     model = context['model']
+    session = context['session']
 
     userobj = model.User.get(context['user'])
     if not userobj:
@@ -869,6 +872,24 @@ def follow_user(context, data_dict):
 
     follower = model_save.user_following_user_dict_save(data_dict, context)
 
+    activity_dict = {
+            'user_id': userobj.id,
+            'object_id': data_dict['id'],
+            'activity_type': 'follow user',
+            }
+    activity_dict['data'] = {
+            'user': ckan.lib.dictization.table_dictize(
+                model.User.get(data_dict['id']), context),
+            }
+    activity_create_context = {
+        'model': model,
+        'user': userobj,
+        'defer_commit':True,
+        'session': session
+    }
+    logic.get_action('activity_create')(activity_create_context,
+            activity_dict, ignore_auth=True)
+
     if not context.get('defer_commit'):
         model.repo.commit()
 
@@ -895,6 +916,7 @@ def follow_dataset(context, data_dict):
         raise logic.NotAuthorized
 
     model = context['model']
+    session = context['session']
 
     userobj = model.User.get(context['user'])
     if not userobj:
@@ -918,6 +940,24 @@ def follow_dataset(context, data_dict):
 
     follower = model_save.user_following_dataset_dict_save(data_dict, context)
 
+    activity_dict = {
+            'user_id': userobj.id,
+            'object_id': data_dict['id'],
+            'activity_type': 'follow dataset',
+            }
+    activity_dict['data'] = {
+            'dataset': ckan.lib.dictization.table_dictize(
+                model.Package.get(data_dict['id']), context),
+            }
+    activity_create_context = {
+        'model': model,
+        'user': userobj,
+        'defer_commit':True,
+        'session': session
+    }
+    logic.get_action('activity_create')(activity_create_context,
+            activity_dict, ignore_auth=True)
+
     if not context.get('defer_commit'):
         model.repo.commit()