diff --git a/controllers/entity.js b/controllers/entity.js
index aae20e0..0011905 100644
--- a/controllers/entity.js
+++ b/controllers/entity.js
@@ -114,6 +114,9 @@ module.exports = function(io){
createRelatedResource: function(req, res) {
var form = validator.request(req);
+ // check if it contains a silly annotation....
+ if(!form.isValid)
+ return helpers.formError(form.errors, res);
Entity.createRelatedResource({
id: +form.params.entity_id
diff --git a/parser.js b/parser.js
index 8e852e1..6af7534 100644
--- a/parser.js
+++ b/parser.js
@@ -232,6 +232,9 @@ module.exports = {
return YAML.parse(yaml)
},
+ toYaml: function(item) {
+ return YAML.stringify(item, 2)
+ },
/*
get the chunks from a YAML content for the specific ids only,
then annotate them.
diff --git a/test/controllers.entity.js b/test/controllers.entity.js
index 00bfd63..f8633bc 100644
--- a/test/controllers.entity.js
+++ b/test/controllers.entity.js
@@ -213,7 +213,53 @@ describe('controller:entity related items', function() {
});
})
+ it('should create a manual connection with ANNOTATION!, with frequence = 1 resource B', function(done) {
+ var parser = require('../parser');
+ session
+ .post('/api/entity/' + __entity.id +'/related/resource/'+ __resourceB.id)
+ .send({
+ annotation: parser.toYaml([{
+ text: "A note I wrote", // content of annotation
+ quote: "the text that was annotated", // the annotated text (added by frontend)
+ ranges: [{
+ end: "/blockquote[1]/p[1]",
+ endOffset: 222,
+ start: "/blockquote[1]/p[1]",
+ startOffset: 208,
+ }
+ ]
+ }])
+ })
+ .expect('Content-Type', /json/)
+ .expect(200)
+ .end(function (err, res) {
+ should.exist(res.body.result.item.rel)
+ should.exist(res.body.result.item.related.action.props)
+ should.exist(res.body.result.item.rel.created_by)
+ should.not.exists(err);
+
+ // should remove the action
+ Action.remove(res.body.result.item.related.action, function(){
+ should.not.exist(err)
+ done();
+ });
+ });
+ });
+
+ it('should delete the manual connection', function(done) {
+ session
+ .delete('/api/entity/' + __entity.id +'/related/resource/'+ __resourceB.id)
+ .expect('Content-Type', /json/)
+ .expect(200)
+ .end(function (err, res) {
+ should.equal(res.body.result.item.id, __entity.id)
+ should.equal(res.body.result.item.related.resource.id, __resourceB.id)
+ // console.log('DELETE', res.body)
+ should.not.exists(err);
+ done();
+ });
+ })
});
describe('controller:entity related issues', function() {
diff --git a/test/parser.js b/test/parser.js
index 3b4fdf8..215e634 100644
--- a/test/parser.js
+++ b/test/parser.js
@@ -37,6 +37,24 @@ describe('parser:lucene', function() {
})
});
+describe('parser:annotation', function(){
+ it('should correctly parse a annotatrjs annotation', function (done) {
+ var q = parser.toYaml({
+ text: "A note I wrote", // content of annotation
+ quote: "the text that was annotated", // the annotated text (added by frontend)
+ ranges: [{
+ end: "/blockquote[1]/p[1]",
+ endOffset: 222,
+ start: "/blockquote[1]/p[1]",
+ startOffset: 208,
+ }
+ ]
+ });
+ var _q = parser.yaml(q);
+ should.equal(_q.ranges[0].endOffset, 222);
+ done();
+ })
+})
describe('parser:lucene real use case', function() {
it('understand "jacques delors" (@todo use case)', function (done) {
diff --git a/validator.js b/validator.js
index 3a0727a..1ec9826 100644
--- a/validator.js
+++ b/validator.js
@@ -21,6 +21,16 @@ validator.extend('includedIn', function (str, choices) {
return _.difference(str.split(','), choices).length === 0;
});
+validator.extend('isAnnotatorjs', function (str) {
+ var q = {};
+ try{
+ q = YAML.parse(str);
+ return true;
+ } catch(e) {
+ return false;
+ }
+})
+
/*
Verify that for each field in form, everything looks good.
@params form - req.body and/or req.params
@@ -142,6 +152,14 @@ module.exports = {
],
error: 'id not valid'
},
+ {
+ field: 'annotation',
+ check: 'isAnnotatorjs',
+ args: [
+ 0
+ ],
+ error: 'annotation not valid, should be annotatorjs compatible.'
+ },
{
field: 'center',
check: 'isInt',