Merge pull request #65 from CoorpAcademy/expose-api-set-rework

Expose api set rework

src/api.js

@@ -6,11 +6,12 @@ import {
   startsWith,
   curry
 } from 'lodash/fp';
+import {set$} from './util/etcd';
 import createDebug from 'debug';
 
 const debug = createDebug('squirrel');
 
-const createAPI = (store, client, options = {cwd: '/'}) => {
+const createAPI = (store, client) => {
   const getBy = (index, key) => {
     debug(`getBy: ${index} => ${key}`);
     return store('indexes').then(getOr(null, [index, key, 'value']));
@@ -29,9 +30,7 @@ const createAPI = (store, client, options = {cwd: '/'}) => {
   };
 
   const set = (_path, value) => {
-    _path = path.join(options.cwd, _path);
-    debug(`set => ${_path}`);
-    return _set(_path, value);
+    return set$(client, _path, value).toPromise();
   };
 
   const _get = curry((_path, node) => {
@@ -43,21 +42,6 @@ const createAPI = (store, client, options = {cwd: '/'}) => {
     }, node.nodes));
   });
 
-  const _set = (_path, value) => {
-    return new Promise(function(resolve, reject) {
-      if (!value) {
-        return resolve(value);
-      }
-      client.set(_path, value, (err, res) => {
-        if (err) {
-          return reject(err);
-        }
-
-        return resolve(res);
-      });
-    });
-  };
-
   return {
     getBy,
     getAll,

src/index.js

@@ -46,7 +46,7 @@ const createSquirrel = options => {
     save(node$),
     indexBuilder
   );
-  const api = createAPI(store, client, options);
+  const api = createAPI(store, client);
 
   return {
     ...api,

src/test/api.js

@@ -1,7 +1,7 @@
 import test from 'ava';
+import createEtcdMock from '../util/test/helpers/etcd';
 
 import createAPI from '../api';
-import Etcd from './fixtures/node-etcd';
 const node = {
   key: '/',
   dir: true,
@@ -85,10 +85,7 @@ const store = {
 };
 
 const getStore = key => Promise.resolve(store[key]);
-const client = new Etcd();
-const api = createAPI(getStore, client);
-const clientErrored = new Etcd({err: new Error('boom')});
-const apiErrored = createAPI(getStore, clientErrored);
+const api = createAPI(getStore);
 
 test('should create API', t => {
   t.truthy(api);
@@ -179,23 +176,30 @@ test('should get null if any node matches this path', async t => {
   );
 });
 
-test('should set nothing if value is null', async t => {
-  t.deepEqual(
-    await api.set('/nope', null),
-    null
-  );
-});
-
 test('should set value if value setted', async t => {
+  const client = createEtcdMock({
+    set: [{
+      assert: (key, value) => {
+        t.deepEqual(key, '/foo');
+        t.deepEqual(value, {foo: 'baz'});
+      },
+      values: [null, {foo: 'baz'}, null]
+    }]
+  });
+  const api = createAPI(getStore, client);
   t.deepEqual(
     await api.set('/foo', {foo: 'baz'}),
     {foo: 'baz'}
   );
 });
 
 test('should failed if error occured', async t => {
+  const client = createEtcdMock({
+    set: [[new Error('boom'), null, null]]
+  });
+  const api = createAPI(getStore, client);
   t.throws(
-    apiErrored.set('/foo', {foo: 'baz'}),
+    api.set('/foo', {foo: 'baz'}),
     /boom/
   );
 });