Merge branch 'release/0.8.0'

Author: hbredin

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.8.0 (2016-10-27)
+
+  - BREAKING: use promises instead of callbacks
+  - chore: make (un)watch API coherent with Python API
+
 ## Version 0.7.0 (2016-10-07)
 
   - feat: options.returns_count

README.md

@@ -18,27 +18,36 @@
 
 ```javascript
   var client = new Camomile('http://camomile.fr/api');
-  client.login('username', 'password', callback);
-  client.logout(callback);
+  client.login('username', 'password');
+  client.logout();
 
-  client.getCorpora(callback);
+  client.getCorpora();
   client.createCorpus(...);
 
 ```
 
 ### Server Sent Event
 
-```javascript
+See [listen.js](examples/listen.js)
 
-    client.listen(function(err, channel_id, eventSource) {
-        var cancelWatcher = eventSource.watchCorpus(<corpus_id>, function(error, datas) {
-            console.log(error, data);
-        });
-        
-        // For unwatch Corpus :
-        cancelWatcher();
-    });
-    
+```javascript
+var listener=function(error, data) {
+  console.log(error, data);
+};
+
+var client=new Camomile('http://camomile.fr/api');
+client
+  .login('username', 'password')
+  .then(result =>  {
+    console.log(result);
+    return client.watchCorpus(corpusId, listener);
+  })
+  .then(() => {
+      // To unwatch the corpus :
+
+      //client.unwatchCorpus(corpusId, listener);
+    })
+  .catch(err => console.log(err));
 ```
 
 ## Documentation

camomile.js

@@ -15,18 +15,11 @@ var user=process.argv[3];
 var password=process.argv[4];
 
 var client=new Camomile(host);
-client.login(user, password, function(err,result) {
-  if(err) {
-    console.log(err);
-    return;
-  }
-  console.log(result);
-
-  client.me(function(err,data) {
-    if(err) {
-      console.log(err);
-      return;
-    }
-    console.log(data)
-  });
-});
+client
+  .login(user, password)
+  .then(result =>  {
+    console.log(result);
+    return client.me();
+  })
+  .then(result => console.log(result))
+  .catch(err => console.log(err));

example.js

@@ -0,0 +1,33 @@
+/*
+ * An example showing the sse channel listen functionality
+ */
+
+var Camomile = require('..');
+
+if(process.argv.length !=6) {
+  console.log("Usage : node example.js <host> <user> <password> <corpus_id>");
+  process.exit(1);
+}
+
+var host=process.argv[2];
+var user=process.argv[3];
+var password=process.argv[4];
+var corpusId=process.argv[5];
+
+var listener=function(error, data) {
+  console.log(error, data);
+};
+
+var client=new Camomile(host);
+client
+  .login(user, password)
+  .then(result =>  {
+    console.log(result);
+    return client.watchCorpus(corpusId, listener);
+  })
+  .then(() => {
+      // To unwatch the corpus :
+
+      //client.unwatchCorpus(corpusId, listener);
+    })
+  .catch(err => console.log(err));