better unique function and tests

Author: Olaf Kwant

lib/client_v2.js

@@ -1,19 +1,28 @@
 import Client from './client'
 
 const _cache = {}
-function cache (key, value) {
-  if (value === undefined) {
-    return _cache[key]
-  } else {
-    _cache[key] = value
-    return value
+export const tools = {
+  unqiue: function (obj) {
+    return Object.keys(obj).map((key) => {
+      const value = obj[key]
+      return (typeof value === 'object') ? tools.unqiue(value) : `${key}:${value}`
+    }).join(' ')
+  },
+
+  cache: function (key, value) {
+    if (value === undefined) {
+      return _cache[key]
+    } else {
+      _cache[key] = value
+      return value
+    }
   }
 }
 
 export default class ClientV2 extends Client {
   get (stringOrArray) {
     if (typeof stringOrArray !== 'string' && !Array.isArray(stringOrArray)) {
-      throw new Error('type for get not supported.')
+      throw new Error('Type for get not supported, get expects String or Array of Strings')
     }
 
     return Client.prototype.get.call(this, stringOrArray).then((data) => {
@@ -50,18 +59,16 @@ export default class ClientV2 extends Client {
 
   request (obj) {
     var cached = !!obj.cachable
-    var cacheName = Object.keys(obj).map((k) => {
-      return obj[k]
-    }).join(':')
     delete obj.cachable
+    var cacheName = tools.unqiue(obj)
 
     if (cached) {
-      var currently = cache(cacheName)
+      var currently = tools.cache(cacheName)
       if (currently !== undefined) return Promise.resolve(currently)
     }
 
     return Client.prototype.request.call(this, obj).then((data) => {
-      if (cached) cache(cacheName, data)
+      if (cached) tools.cache(cacheName, data)
       return data
     })
   }

spec/client_v2_spec.js

@@ -1,5 +1,5 @@
 /* eslint-env mocha */
-import ClientV2 from '../lib/client_v2'
+import ClientV2, { tools } from '../lib/client_v2'
 import sinon from 'sinon'
 
 describe('ClientV2', () => {
@@ -8,19 +8,62 @@ describe('ClientV2', () => {
   const appGuid = 'ABC123'
   let subject, source
 
-  beforeEach(() => {
+  before(() => {
     sandbox.stub(window, 'addEventListener')
     sandbox.stub(window, 'postMessage')
     source = { postMessage: sandbox.stub() }
     subject = new ClientV2({ origin, appGuid, source })
   })
 
-  afterEach(() => {
+  after(() => {
     sandbox.restore()
   })
 
-  describe('isOriginValid', () => {
-    it('instantiates the client when the domain is valid', () => {
+  describe('request', () => {
+    let cacheSpy
+
+    before(() => {
+      cacheSpy = sandbox.stub(tools, 'cache')
+    })
+
+    it('1', () => {
+      subject.request({
+        url: '/api/v2/tickets',
+        cachable: true
+      })
+      assert(cacheSpy.withArgs('url:/api/v2/tickets').called)
+    })
+
+    it('2', () => {
+      subject.request({
+        type: 'get',
+        url: '/api/v2/tickets',
+        cachable: true
+      })
+      assert(cacheSpy.withArgs('type:get url:/api/v2/tickets').called)
+    })
+
+    it('3', () => {
+      subject.request({
+        url: '/api/v2/tickets',
+        data: {
+          test: true
+        },
+        cachable: true
+      })
+      assert(cacheSpy.withArgs('url:/api/v2/tickets test:true').called)
+    })
+
+    it('4', () => {
+      subject.request({
+        url: '/api/v2/tickets',
+        data: {
+          test: true
+        },
+        other: function () {},
+        cachable: true
+      })
+      assert(cacheSpy.withArgs('url:/api/v2/tickets test:true other:function () {}').called)
     })
   })
 })