Merge branch '621-bug-move-extras_validation_into___before'

ckan/logic/schema.py

@@ -116,6 +116,7 @@ def default_create_tag_schema():
 
 def default_create_package_schema():
     schema = {
+        '__before': [duplicate_extras_key, ignore],
         'id': [empty],
         'revision_id': [ignore],
         'name': [not_empty, unicode, name_validator, package_name_validator],
@@ -139,7 +140,6 @@ def default_create_package_schema():
         'tags': default_tags_schema(),
         'tag_string': [ignore_missing, tag_string_convert],
         'extras': default_extras_schema(),
-        'extras_validation': [duplicate_extras_key, ignore],
         'save': [ignore],
         'return_to': [ignore],
         'relationships_as_object': default_relationship_schema(),

ckan/logic/validators.py

@@ -313,7 +313,9 @@ def duplicate_extras_key(key, data, errors, context):
     for extra_key in set(extras_keys):
         extras_keys.remove(extra_key)
     if extras_keys:
-        errors[key].append(_('Duplicate key "%s"') % extras_keys[0])
+        key_ = ('extras_validation',)
+        assert key_ not in errors
+        errors[key_] = [_('Duplicate key "%s"') % extras_keys[0]]
 
 def group_name_validator(key, data, errors, context):
     model = context['model']

ckan/tests/logic/test_action.py

@@ -1132,6 +1132,40 @@ def test_42_resource_search_accessible_via_get_request(self):
             assert "index" in resource['description'].lower()
             assert "json" in resource['format'].lower()
 
+    def test_package_create_duplicate_extras_error(self):
+        import ckan.tests
+        import paste.fixture
+        import pylons.test
+
+        # Posting a dataset dict to package_create containing two extras dicts
+        # with the same key, should return a Validation Error.
+        app = paste.fixture.TestApp(pylons.test.pylonsapp)
+        error = ckan.tests.call_action_api(app, 'package_create',
+                apikey=self.sysadmin_user.apikey, status=409,
+                name='foobar', extras=[{'key': 'foo', 'value': 'bar'},
+                    {'key': 'foo', 'value': 'gar'}])
+        assert error['__type'] == 'Validation Error'
+        assert error['extras_validation'] == ['Duplicate key "foo"']
+
+    def test_package_update_duplicate_extras_error(self):
+        import ckan.tests
+        import paste.fixture
+        import pylons.test
+
+        # We need to create a package first, so that we can update it.
+        app = paste.fixture.TestApp(pylons.test.pylonsapp)
+        package = ckan.tests.call_action_api(app, 'package_create',
+                apikey=self.sysadmin_user.apikey, name='foobar')
+
+        # Posting a dataset dict to package_update containing two extras dicts
+        # with the same key, should return a Validation Error.
+        package['extras'] = [{'key': 'foo', 'value': 'bar'},
+                    {'key': 'foo', 'value': 'gar'}]
+        error = ckan.tests.call_action_api(app, 'package_update',
+                apikey=self.sysadmin_user.apikey, status=409, **package)
+        assert error['__type'] == 'Validation Error'
+        assert error['extras_validation'] == ['Duplicate key "foo"']
+
 class TestActionTermTranslation(WsgiAppCase):
 
     @classmethod
@@ -1553,5 +1587,3 @@ def test_02_bulk_delete(self):
 
         res = self.app.get('/api/action/package_search?q=*:*')
         assert json.loads(res.body)['result']['count'] == 0
-
-