Merge branch 'master' into 3196-common-requests-code

ckan/config/deployment.ini_tmpl

@@ -106,6 +106,13 @@ ckan.plugins = stats text_view image_view recline_view
 # (plugins must be loaded in ckan.plugins)
 ckan.views.default_views = image_view text_view recline_view
 
+# Customize which text formats the text_view plugin will show
+#ckan.preview.json_formats = json
+#ckan.preview.xml_formats = xml rdf rdf+xml owl+xml atom rss
+#ckan.preview.text_formats = text plain text/plain
+
+# Customize which image formats the image_view plugin will show
+#ckan.preview.image_formats = png jpeg jpg gif
 
 ## Front-End Settings
 ckan.site_title = CKAN

ckan/lib/i18n.py

@@ -36,6 +36,7 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 '''
 
+import collections
 import json
 import logging
 import os
@@ -362,7 +363,7 @@ def build_js_translations():
     # Collect all language codes (an extension might add support for a
     # language that isn't supported by CKAN core, yet).
     langs = set()
-    i18n_dirs = {ckan_i18n_dir: u'ckan'}
+    i18n_dirs = collections.OrderedDict([(ckan_i18n_dir, u'ckan')])
     for item in os.listdir(ckan_i18n_dir):
         if os.path.isdir(os.path.join(ckan_i18n_dir, item)):
             langs.add(item)

ckan/logic/action/update.py

@@ -994,7 +994,7 @@ def dashboard_mark_activities_old(context, data_dict):
     model = context['model']
     user_id = model.User.get(context['user']).id
     model.Dashboard.get(user_id).activity_stream_last_viewed = (
-            datetime.datetime.now())
+            datetime.datetime.utcnow())
     if not context.get('defer_commit'):
         model.repo.commit()
 

ckan/model/dashboard.py

@@ -21,8 +21,8 @@ class Dashboard(object):
 
     def __init__(self, user_id):
         self.user_id = user_id
-        self.activity_stream_last_viewed = datetime.datetime.now()
-        self.email_last_sent = datetime.datetime.now()
+        self.activity_stream_last_viewed = datetime.datetime.utcnow()
+        self.email_last_sent = datetime.datetime.utcnow()
 
     @classmethod
     def get(cls, user_id):

ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po

@@ -12,6 +12,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.1.1\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 # Overriding a JS translation from CKAN core
 msgid "Loading..."

ckan/tests/lib/test_base.py

@@ -3,7 +3,9 @@
 from nose import tools as nose_tools
 
 import ckan.tests.helpers as helpers
+
 import ckan.plugins as p
+import ckan.tests.factories as factories
 
 
 class TestRenderSnippet(helpers.FunctionalTestBase):
@@ -21,6 +23,38 @@ def test_comment_absent_if_debug_false(self):
         assert '<!-- Snippet ' not in response
 
 
+class TestGetUserForApikey(helpers.FunctionalTestBase):
+
+    def test_apikey_missing(self):
+        app = self._get_test_app()
+        request_headers = {}
+
+        app.get('/dataset/new', headers=request_headers, status=403)
+
+    def test_apikey_in_authorization_header(self):
+        user = factories.Sysadmin()
+        app = self._get_test_app()
+        request_headers = {'Authorization': str(user['apikey'])}
+
+        app.get('/dataset/new', headers=request_headers)
+
+    def test_apikey_in_x_ckan_header(self):
+        user = factories.Sysadmin()
+        app = self._get_test_app()
+        # non-standard header name is defined in test-core.ini
+        request_headers = {'X-Non-Standard-CKAN-API-Key': str(user['apikey'])}
+
+        app.get('/dataset/new', headers=request_headers)
+
+    def test_apikey_contains_unicode(self):
+        # there is no valid apikey containing unicode, but we should fail
+        # nicely if unicode is supplied
+        app = self._get_test_app()
+        request_headers = {'Authorization': '\xc2\xb7'}
+
+        app.get('/dataset/new', headers=request_headers, status=403)
+
+
 class TestCORS(helpers.FunctionalTestBase):
 
     def test_options(self):

ckan/views/__init__.py

@@ -174,7 +174,7 @@ def _get_user_for_apikey():
     if not apikey:
         return None
     log.debug(u'Received API Key: %s' % apikey)
-    apikey = unicode(apikey)
+    apikey = apikey.decode('utf8', 'ignore')
     query = model.Session.query(model.User)
     user = query.filter_by(apikey=apikey).first()
     return user

ckanext/imageview/plugin.py

@@ -6,7 +6,7 @@
 log = logging.getLogger(__name__)
 ignore_empty = p.toolkit.get_validator('ignore_empty')
 
-DEFAULT_IMAGE_FORMATS = ['png', 'jpeg', 'jpg', 'gif']
+DEFAULT_IMAGE_FORMATS = 'png jpeg jpg gif'
 
 
 class ImageView(p.SingletonPlugin):
@@ -17,6 +17,9 @@ class ImageView(p.SingletonPlugin):
 
     def update_config(self, config):
         p.toolkit.add_template_directory(config, 'theme/templates')
+        self.formats = config.get(
+                'ckan.preview.image_formats',
+                DEFAULT_IMAGE_FORMATS).split()
 
     def info(self):
         return {'name': 'image_view',
@@ -30,7 +33,7 @@ def info(self):
 
     def can_view(self, data_dict):
         return (data_dict['resource'].get('format', '').lower()
-                in DEFAULT_IMAGE_FORMATS)
+                in self.formats)
 
     def view_template(self, context, data_dict):
         return 'image_view.html'

doc/maintaining/configuration.rst

@@ -1186,7 +1186,7 @@ Example::
 
 Default value: ``json``
 
-JSON based resource formats that will be rendered by the Text view plugin (``text_view``)
+Space-delimited list of JSON based resource formats that will be rendered by the Text view plugin (``text_view``)
 
 .. _ckan.preview.xml_formats:
 
@@ -1199,7 +1199,7 @@ Example::
 
 Default value: ``xml rdf rdf+xml owl+xml atom rss``
 
-XML based resource formats that will be rendered by the Text view plugin (``text_view``)
+Space-delimited list of XML based resource formats that will be rendered by the Text view plugin (``text_view``)
 
 .. _ckan.preview.text_formats:
 
@@ -1212,7 +1212,20 @@ Example::
 
 Default value: ``text plain text/plain``
 
-Plain text based resource formats that will be rendered by the Text view plugin (``text_view``)
+Space-delimited list of plain text based resource formats that will be rendered by the Text view plugin (``text_view``)
+
+.. _ckan.preview.image_formats:
+
+ckan.preview.image_formats
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Example::
+
+ ckan.preview.image_formats = png jpeg jpg gif
+
+Default value: ``png jpeg jpg gif``
+
+Space-delimited list of image-based resource formats that will be rendered by the Image view plugin (``image_view``)
 
 .. end_resource-views
 

doc/maintaining/data-viewer.rst

@@ -200,7 +200,8 @@ View plugin: ``image_view``
 
 If the resource format is a common image format like PNG, JPEG or GIF, it adds
 an ``<img>`` tag pointing to the resource URL. You can provide an alternative
-URL on the edit view form.
+URL on the edit view form. The available formats can be configured using the
+:ref:`ckan.preview.image_formats` configuration option.
 
 Web page view
 +++++++++++++