Merge branch 'master' into 471-helper-clean-link-functions

.travis.yml

@@ -30,5 +30,7 @@ notifications:
   irc:
     channels:
       - "irc.freenode.org#ckan"
+    on_success: never
+    on_failure: change
     template:
-      - "%{repository} (%{branch} - %{commit}) [%{build_url}] %{author}: %{message}"
+      - "%{repository} %{branch} %{commit} %{build_url} %{author}: %{message}"

ckan/controllers/package.py

@@ -854,7 +854,7 @@ def _get_package_type(self, id):
         """
         pkg = model.Package.get(id)
         if pkg:
-            return pkg.type or 'package'
+            return pkg.type or 'dataset'
         return None
 
     def _tag_string_to_list(self, tag_string):
@@ -1004,10 +1004,10 @@ def _form_save_redirect(self, pkgname, action, package_type=None):
         if url:
             url = url.replace('<NAME>', pkgname)
         else:
-            if package_type:
-                url = h.url_for('{0}_read'.format(package_type), id=pkgname)
-            else:
+            if package_type is None or package_type == 'dataset':
                 url = h.url_for(controller='package', action='read', id=pkgname)
+            else:
+                url = h.url_for('{0}_read'.format(package_type), id=pkgname)
         redirect(url)
 
     def _adjust_license_id_options(self, pkg, fs):

ckan/lib/helpers.py

@@ -85,7 +85,7 @@ def url_for(*args, **kw):
     if kw.get('controller') == 'api':
         ver = kw.get('ver')
         if not ver:
-            raise Exception('api calls must specify the version! e.g. ver=1')
+            raise Exception('api calls must specify the version! e.g. ver=3')
         # fix ver to include the slash
         kw['ver'] = '/%s' % ver
     my_url = _routes_default_url_for(*args, **kw)

ckan/lib/jinja_extensions.py

@@ -185,6 +185,12 @@ def get_source(self, environment, template):
                 continue
             try:
                 contents = f.read().decode(self.encoding)
+            except UnicodeDecodeError, e:
+                log.critical(
+                    'Template corruption in `%s` unicode decode errors'
+                    % filename
+                )
+                raise e
             finally:
                 f.close()
 

ckan/templates/package/search.html

@@ -78,7 +78,7 @@
   <section class="module">
     <div class="module-content">
       <small>
-        You can also access this registry using the {{ h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=1)) }}
+        You can also access this registry using the {{ h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=3)) }}
         (see {{ h.link_to(_('API Docs'), 'http://docs.ckan.org/en/ckan-{0}/api.html'.format(g.ckan_base_version)) }})
         {% if g.dumps_url -%}
           or download a <a href="{{ g.dumps_url }}">full {{ g.dumps_format }} dump</a>

ckan/templates_legacy/package/search.html

@@ -34,7 +34,7 @@ <h2>Other access</h2>
 ?>
         <p>
             You can also access this registry using the 
-            ${h.link_to(_('API'), h.url_for(controller='api', action='get_api', id=None, ver=1))}
+            ${h.link_to(_('API'), h.url_for(controller='api', action='get_api', id=None, ver=3))}
             (see ${h.link_to(_('API Docs'), 'http://docs.ckan.org/en/latest/api.html')})<py:if test="dumps_url">
                 or download a <a href="${dumps_url}">full ${dumps_format} 
                 dump</a></py:if>.

ckan/tests/functional/api/base.py

@@ -315,14 +315,6 @@ def assert_msg_represents_anna(self, msg):
         super(Api2TestCase, self).assert_msg_represents_anna(msg)
         assert 'download_url' not in msg, msg
 
-class ApiUnversionedTestCase(Api1TestCase):
-
-    api_version = ''
-    oldest_api_version = 1
-
-    def get_expected_api_version(self):
-        return self.oldest_api_version
-
 
 class BaseModelApiTestCase(ApiTestCase, ControllerTestCase):
 

ckan/tests/functional/api/model/test_group.py

@@ -8,7 +8,7 @@
 from ckan.tests.functional.api.base import BaseModelApiTestCase
 from ckan.tests.functional.api.base import Api1TestCase as Version1TestCase
 from ckan.tests.functional.api.base import Api2TestCase as Version2TestCase
-from ckan.tests.functional.api.base import ApiUnversionedTestCase as UnversionedTestCase
+
 
 class GroupsTestCase(BaseModelApiTestCase):
 
@@ -225,4 +225,3 @@ def test_13_delete_group_404(self):
 
 class TestGroupsVersion1(Version1TestCase, GroupsTestCase): pass
 class TestGroupsVersion2(Version2TestCase, GroupsTestCase): pass
-class TestGroupsUnversioned(UnversionedTestCase, GroupsTestCase): pass

ckan/tests/functional/api/model/test_licenses.py

@@ -6,7 +6,6 @@
 from ckan.tests.functional.api.base import BaseModelApiTestCase
 from ckan.tests.functional.api.base import Api1TestCase as Version1TestCase 
 from ckan.tests.functional.api.base import Api2TestCase as Version2TestCase 
-from ckan.tests.functional.api.base import ApiUnversionedTestCase as UnversionedTestCase 
 
 class LicensesTestCase(BaseModelApiTestCase):
 
@@ -35,4 +34,3 @@ def test_register_get_ok(self):
 
 class TestLicensesVersion1(Version1TestCase, LicensesTestCase): pass
 class TestLicensesVersion2(Version2TestCase, LicensesTestCase): pass
-class TestLicensesUnversioned(UnversionedTestCase, LicensesTestCase): pass

ckan/tests/functional/api/model/test_package.py

@@ -10,7 +10,6 @@
 from ckan.tests.functional.api.base import BaseModelApiTestCase
 from ckan.tests.functional.api.base import Api1TestCase as Version1TestCase
 from ckan.tests.functional.api.base import Api2TestCase as Version2TestCase
-from ckan.tests.functional.api.base import ApiUnversionedTestCase as UnversionedTestCase
 
 # Todo: Remove this ckan.model stuff.
 import ckan.model as model
@@ -825,4 +824,3 @@ def test_10_edit_pkg_with_download_url(self):
         assert pkg.resources[0].url == pkg_vals['download_url']
 
 class TestPackagesVersion2(Version2TestCase, PackagesTestCase): pass
-class TestPackagesUnversioned(UnversionedTestCase, PackagesTestCase): pass

ckan/tests/functional/api/model/test_ratings.py

@@ -7,7 +7,6 @@
 from ckan.tests.functional.api.base import BaseModelApiTestCase
 from ckan.tests.functional.api.base import Api1TestCase as Version1TestCase 
 from ckan.tests.functional.api.base import Api2TestCase as Version2TestCase 
-from ckan.tests.functional.api.base import ApiUnversionedTestCase as UnversionedTestCase 
 
 class RatingsTestCase(BaseModelApiTestCase):
 
@@ -101,4 +100,3 @@ def test_entity_post_invalid(self):
 
 class TestRatingsVersion1(Version1TestCase, RatingsTestCase): pass
 class TestRatingsVersion2(Version2TestCase, RatingsTestCase): pass
-class TestRatingsUnversioned(UnversionedTestCase, RatingsTestCase): pass

ckan/tests/functional/api/model/test_relationships.py

@@ -7,7 +7,6 @@
 from ckan.tests.functional.api.base import BaseModelApiTestCase
 from ckan.tests.functional.api.base import Api1TestCase as Version1TestCase 
 from ckan.tests.functional.api.base import Api2TestCase as Version2TestCase 
-from ckan.tests.functional.api.base import ApiUnversionedTestCase as UnversionedTestCase 
 
 class RelationshipsTestCase(BaseModelApiTestCase):
 
@@ -327,4 +326,3 @@ def check_relationship_dict(self, rel_dict, subject_name, type, object_name, com
 
 class TestRelationshipsVersion1(Version1TestCase, RelationshipsTestCase): pass
 class TestRelationshipsVersion2(Version2TestCase, RelationshipsTestCase): pass
-class TestRelationshipsUnversioned(UnversionedTestCase, RelationshipsTestCase): pass

ckan/tests/functional/api/model/test_revisions.py

@@ -6,7 +6,6 @@
 from ckan.tests.functional.api.base import BaseModelApiTestCase
 from ckan.tests.functional.api.base import Api1TestCase as Version1TestCase 
 from ckan.tests.functional.api.base import Api2TestCase as Version2TestCase 
-from ckan.tests.functional.api.base import ApiUnversionedTestCase as UnversionedTestCase 
 
 class RevisionsTestCase(BaseModelApiTestCase):
 
@@ -64,4 +63,3 @@ def test_entity_get_301(self):
 
 class TestRevisionsVersion1(Version1TestCase, RevisionsTestCase): pass
 class TestRevisionsVersion2(Version2TestCase, RevisionsTestCase): pass
-class TestRevisionsUnversioned(UnversionedTestCase, RevisionsTestCase): pass

ckan/tests/functional/api/model/test_tag.py

@@ -9,7 +9,6 @@
 from ckan.tests.functional.api.base import BaseModelApiTestCase
 from ckan.tests.functional.api.base import Api1TestCase as Version1TestCase 
 from ckan.tests.functional.api.base import Api2TestCase as Version2TestCase 
-from ckan.tests.functional.api.base import ApiUnversionedTestCase as UnversionedTestCase 
 
 class TagsTestCase(BaseModelApiTestCase):
 
@@ -58,4 +57,3 @@ def test_entity_get_not_found(self):
 
 class TestTagsVersion1(Version1TestCase, TagsTestCase): pass
 class TestTagsVersion2(Version2TestCase, TagsTestCase): pass
-class TestTagsUnversioned(UnversionedTestCase, TagsTestCase): pass

ckan/tests/functional/api/test_api.py

@@ -54,8 +54,3 @@ class TestApi1(Api1TestCase, ApiTestCase): pass
 
 # Tests for Version 2 of the API.
 class TestApi2(Api2TestCase, ApiTestCase): pass
-
-# Tests for unversioned API.
-class TestApiUnversioned(ApiUnversionedTestCase, ApiTestCase): pass
-
-

ckan/tests/functional/api/test_misc.py

@@ -43,6 +43,4 @@ def test_throughput(self):
 class TestMiscApi1(Api1TestCase, MiscApiTestCase): pass
 class TestQosApi1(Api1TestCase, QosApiTestCase): pass
 class TestMiscApi2(Api2TestCase, MiscApiTestCase): pass
-class TestQosApi2(Api2TestCase, QosApiTestCase): pass
-class TestMiscApiUnversioned(ApiUnversionedTestCase, MiscApiTestCase): pass
-class TestQosApiUnversioned(ApiUnversionedTestCase, QosApiTestCase): pass
+class TestQosApi2(Api2TestCase, QosApiTestCase): pass

ckan/tests/functional/api/test_package_search.py

@@ -476,11 +476,3 @@ def test_13_just_groups(self):
         res = self.app.get(offset, status=200)
         res_dict = self.data_from_res(res)
         assert res_dict['count'] == 1, res_dict
-
-
-class TestPackageSearchApiUnversioned(PackageSearchApiTestCase,
-                                      ApiUnversionedTestCase,
-                                      LegacyOptionsTestCase): pass
-
-
-

ckan/tests/functional/api/test_resource_search.py

@@ -81,5 +81,3 @@ def test_05_options(self):
 
 class TestResourceSearchApi1(Api1TestCase, ResourceSearchApiTestCase): pass
 class TestResourceSearchApi2(Api2TestCase, ResourceSearchApiTestCase): pass
-class TestResourceSearchApiUnversioned(ApiUnversionedTestCase, ResourceSearchApiTestCase):
-    pass

ckanext/resourceproxy/controller.py

@@ -18,7 +18,7 @@ def proxy_resource(context, data_dict):
         url = resource['url']
 
         try:
-            r = requests.get(url, prefetch=False)
+            r = requests.get(url)
             r.raise_for_status()
 
             # write body

pip-requirements-test.txt

@@ -1,5 +1,5 @@
 # These are packages that required when running ckan tests
 
-nose
+nose==1.2.1
 -e git+https://github.com/okfn/ckanclient#egg=ckanclient
 

pip-requirements.txt

@@ -27,4 +27,5 @@ routes==1.13
 paste==1.7.5.1
 Jinja2==2.6
 fanstatic==0.12
-requests==0.14
+requests==1.1.0
+WebTest==1.4.3