Merge 18c1810 into a1c8fdb

.travis.yml

@@ -0,0 +1,11 @@
+language: python
+python:
+  - "2.7"
+# command to install dependencies
+install:
+  - "pip install -e ."
+  - "pip install -r requirements.txt"
+  - "pip install -r dev_requirements.txt"
+# command to run tests
+script: coverage run --source=ckanext-gallery setup.py nosetests
+after_success: coveralls

README.md

@@ -1,6 +1,8 @@
 ckanext-gallery
 ===============
 
+[![Travis branch](https://img.shields.io/travis/NaturalHistoryMuseum/ckanext-gallery/master.svg?style=flat-square)](https://travis-ci.org/NaturalHistoryMuseum/ckanext-gallery) [![Coveralls github branch](https://img.shields.io/coveralls/github/NaturalHistoryMuseum/ckanext-gallery/master.svg?style=flat-square)](https://coveralls.io/github/NaturalHistoryMuseum/ckanext-gallery)
+
 CKAN extension for a dataset gallery view.
 
 Based on https://blueimp.github.io/Gallery/

ckanext/__init__.py

@@ -1,4 +1,9 @@
-# this is a namespace package
+#!/usr/bin/env python
+# encoding: utf-8
+#
+# This file is part of ckanext-gallery
+# Created by the Natural History Museum in London, UK
+
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)

ckanext/gallery/__init__.py

@@ -1,7 +1,12 @@
-# this is a namespace package
+#!/usr/bin/env python
+# encoding: utf-8
+#
+# This file is part of ckanext-gallery
+# Created by the Natural History Museum in London, UK
+
 try:
     import pkg_resources
     pkg_resources.declare_namespace(__name__)
 except ImportError:
     import pkgutil
-    __path__ = pkgutil.extend_path(__path__, __name__)
+    __path__ = pkgutil.extend_path(__path__, __name__)

ckanext/gallery/lib/__init__.py

@@ -1,18 +1,13 @@
-#!/usr/bin/env python
+# !/usr/bin/env python
 # encoding: utf-8
-"""
-Created by 'bens3' on 2013-06-21.
-Copyright (c) 2013 'bens3'. All rights reserved.
-"""
-
-import sys
-import os
+#
+# This file is part of ckanext-gallery
+# Created by the Natural History Museum in London, UK
 
 
 def main():
     pass
 
 
-if __name__ == '__main__':
+if __name__ == u'__main__':
     main()
-

ckanext/gallery/lib/helpers.py

@@ -1,24 +1,28 @@
-#!/usr/bin/env python
+# !/usr/bin/env python
 # encoding: utf-8
-"""
-Created by 'bens3' on 2013-06-21.
-Copyright (c) 2013 'bens3'. All rights reserved.
-"""
+#
+# This file is part of ckanext-gallery
+# Created by the Natural History Museum in London, UK
 
-import ckan.plugins as p
+from ckan.plugins import toolkit
 
 _cache = {}
 
+
 def get_datastore_fields(resource_id):
-    """
-    Retrieve list of dataset fields
+    '''Retrieve list of dataset fields
     Checked between requests so we can quickly reuse without searching again
-    :param resource_id:
-    :return:
-    """
+
+    :param resource_id: return:
+
+    '''
     try:
         fields = _cache[resource_id]
     except KeyError:
-        data = {'resource_id': resource_id, 'limit': 0}
-        fields = _cache[resource_id] = p.toolkit.get_action('datastore_search')({}, data)['fields']
-    return fields
+        data = {
+            u'resource_id': resource_id,
+            u'limit': 0
+            }
+        fields = _cache[resource_id] = \
+            toolkit.get_action(u'datastore_search')({}, data)[u'fields']
+    return fields

ckanext/gallery/logic/validators.py

@@ -1,28 +1,23 @@
-#!/usr/bin/env python
+# !/usr/bin/env python
 # encoding: utf-8
-"""
-Created by 'bens3' on 2013-06-21.
-Copyright (c) 2013 'bens3'. All rights reserved.
-"""
-
-import ckan.plugins as p
-from ckan.common import _
+#
+# This file is part of ckanext-gallery
+# Created by the Natural History Museum in London, UK
 
 from ckanext.gallery.lib.helpers import get_datastore_fields
 
-Invalid = p.toolkit.Invalid
+from ckan.plugins import toolkit
 
 
 def is_datastore_field(value, context):
-    '''
-    Make sure this field is an actual datastore field
+    '''Make sure this field is an actual datastore field
+
+    :param value: 
+    :param context: 
 
-    :raises: ckan.lib.navl.dictization_functions.Invalid for other
-        inputs or non-whole values
     '''
-    fields = get_datastore_fields(context['resource'].id)
+    fields = get_datastore_fields(toolkit.c.resource.get(u'id'))
     for field in fields:
-        if field['id'] in value:
+        if field[u'id'] in value:
             return value
-    raise Invalid(_('Field {0} not in datastore'.format(value)))
-
+    raise toolkit.Invalid(toolkit._(u'Field {0} not in datastore'.format(value)))

ckanext/gallery/plugins/__init__.py

@@ -1,18 +1,13 @@
-#!/usr/bin/env python
+# !/usr/bin/env python
 # encoding: utf-8
-"""
-Created by 'bens3' on 2013-06-21.
-Copyright (c) 2013 'bens3'. All rights reserved.
-"""
-
-import sys
-import os
+#
+# This file is part of ckanext-gallery
+# Created by the Natural History Museum in London, UK
 
 
 def main():
     pass
 
 
-if __name__ == '__main__':
+if __name__ == u'__main__':
     main()
-