Merge branch 'master' of https://github.com/biocore/qiita into listing-tags

Author: antgonza

qiita_db/study.py

@@ -1137,7 +1137,7 @@ def unshare(self, user):
             qdb.sql_connection.TRN.add(sql, [self._id, user.id])
             qdb.sql_connection.TRN.execute()
 
-    def updata_tags(self, user, tags):
+    def update_tags(self, user, tags):
         """Sets the tags of the study
 
         Parameters

qiita_db/test/test_study.py

@@ -855,19 +855,19 @@ def test_study_tags(self):
         # assigning the tags to study as user
         study = qdb.study.Study(1)
         tags = ['this is my tag', 'actual GOLD!']
-        message = study.updata_tags(user, tags)
+        message = study.update_tags(user, tags)
         self.assertItemsEqual(study.tags, tags[:1])
         self.assertEqual(message, 'Only admins can assign: actual GOLD!')
         # now like admin
-        message = study.updata_tags(admin, tags)
+        message = study.update_tags(admin, tags)
         self.assertItemsEqual(study.tags, tags)
         self.assertEqual(message, '')
 
         # cleaning tags
-        message = study.updata_tags(user, [])
+        message = study.update_tags(user, [])
         self.assertEqual(study.tags, ['actual GOLD!'])
         self.assertEqual(message, 'You cannot remove: actual GOLD!')
-        message = study.updata_tags(admin, [])
+        message = study.update_tags(admin, [])
         self.assertEqual(study.tags, [])
         self.assertEqual(message, '')
 

qiita_pet/handlers/api_proxy/studies.py

@@ -384,7 +384,7 @@ def study_tags_patch_request(user_id, study_id,
         study = Study(study_id)
 
         if attribute == 'tags':
-            message = study.updata_tags(User(user_id), req_value)
+            message = study.update_tags(User(user_id), req_value)
             return {'status': 'success',
                     'message': message}
         else:

qiita_pet/handlers/study_handlers/tests/test_base.py

@@ -75,21 +75,29 @@ def test_get(self):
         self.assertEqual(response.code, 200)
         self.assertEqual(response.body, exp)
 
+        # test error
+        response = self.get('/study/tags/bla')
+        self.assertEqual(response.code, 400)
+
     def test_patch(self):
         arguments = {'op': 'replace', 'path': '/tags',
                      'value[]': "['testA', 'testB']"}
         obs = self.patch('/study/tags/1', headers=self.header, data=arguments)
 
         self.assertEqual(obs.code, 200)
         self.assertEqual(obs.body, '{"status": "success", "message": ""}')
-
         # checking the tags were added
         response = self.get('/study/tags/1')
         exp = ('{"status": "success", "message": "", "tags": '
                '["[\'testA\', \'testB\']"]}')
         self.assertEqual(response.code, 200)
         self.assertEqual(response.body, exp)
 
+        arguments = {'op': 'replace', 'path': '/tags',
+                     'value[]': "['testA', 'testB']"}
+        obs = self.patch('/study/tags/b', headers=self.header, data=arguments)
+        self.assertEqual(obs.code, 400)
+
 
 if __name__ == "__main__":
     main()

qiita_pet/static/vendor/licences/tag-it_license.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2011-2014 Twitter, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.