Merge pull request #75 from nono/m4dz-chore/umd

Build UMD modules in root['cozy']

Author: nono

src/index.js

@@ -1,4 +1,5 @@
 /* global fetch */
+
 import {unpromiser, retry, warn} from './utils'
 import {LocalStorage, MemoryStorage} from './auth_storage'
 import {AppToken as AppTokenV2, getAppToken as getAppTokenV2} from './auth_v2'
@@ -92,7 +93,7 @@ const settingsProto = {
   diskUsage: settings.diskUsage
 }
 
-class Cozy {
+class Client {
   constructor (options) {
     this.data = {}
     this.files = {}
@@ -246,12 +247,5 @@ function addToProto (ctx, obj, proto, disablePromises) {
   }
 }
 
-const cozy = new Cozy()
-
-export default cozy
-export { Cozy, LocalStorage, MemoryStorage }
-
-if ((typeof window) !== 'undefined') {
-  window.cozy = cozy
-  window.Cozy = Cozy
-}
+module.exports = new Client()
+Object.assign(module.exports, {Client, LocalStorage, MemoryStorage})

test/integration/data.js

@@ -3,7 +3,7 @@
 // eslint-disable-next-line no-unused-vars
 import should from 'should'
 import 'isomorphic-fetch'
-import {Cozy} from '../../src'
+import {Client} from '../../src'
 import mockTokenRetrieve from '../mock-iframe-token'
 
 const COZY_STACK_URL = process.env && process.env.COZY_STACK_URL || ''
@@ -13,14 +13,14 @@ const COZY_STACK_TOKEN = process.env && process.env.COZY_STACK_TOKEN
 describe('data API', function () {
   let docID = null
   let docRev = null
-  let cozy
+  const cozy = {}
 
   if (COZY_STACK_VERSION === '2') {
     before(mockTokenRetrieve)
   }
 
   beforeEach(() => {
-    cozy = new Cozy({
+    cozy.client = new Client({
       cozyURL: COZY_STACK_URL,
       token: COZY_STACK_TOKEN
     })
@@ -31,7 +31,7 @@ describe('data API', function () {
       const testDoc = {
         'test': 'value'
       }
-      const created = await cozy.data.create('io.cozy.testobject', testDoc)
+      const created = await cozy.client.data.create('io.cozy.testobject', testDoc)
       created.should.have.property('_id')
       created.should.have.property('_rev')
       created.should.have.property('test', 'value')
@@ -42,7 +42,7 @@ describe('data API', function () {
 
   describe('Fetch document', function () {
     it('Works', async function () {
-      let fetched = await cozy.data.find('io.cozy.testobject', docID)
+      let fetched = await cozy.client.data.find('io.cozy.testobject', docID)
       fetched.should.have.property('_id', docID)
       fetched.should.have.property('_rev', docRev)
       fetched.should.have.property('test', 'value')
@@ -54,7 +54,7 @@ describe('data API', function () {
       const changes = {
         'test': 'value2'
       }
-      const updated = await cozy.data.update('io.cozy.testobject', { _id: docID, _rev: docRev }, changes)
+      const updated = await cozy.client.data.update('io.cozy.testobject', { _id: docID, _rev: docRev }, changes)
       updated.should.have.property('_id', docID)
       updated.should.have.property('_rev')
       updated.should.have.property('test', 'value2')
@@ -65,7 +65,7 @@ describe('data API', function () {
 
   describe('Delete document', function () {
     it('Works', async function () {
-      const deleted = await cozy.data.delete('io.cozy.testobject', { _id: docID, _rev: docRev })
+      const deleted = await cozy.client.data.delete('io.cozy.testobject', { _id: docID, _rev: docRev })
       deleted.should.have.property('id', docID)
       deleted.should.have.property('rev')
     })

test/integration/files.js

@@ -5,7 +5,7 @@
 import should from 'should'
 import 'isomorphic-fetch'
 import { Readable } from 'stream'
-import {Cozy} from '../../src'
+import {Client} from '../../src'
 import {randomGenerator} from '../helpers'
 
 const COZY_STACK_URL = process.env && process.env.COZY_STACK_URL || ''
@@ -14,13 +14,13 @@ const COZY_STACK_TOKEN = process.env && process.env.COZY_STACK_TOKEN
 
 describe('files API', async function () {
   let random
-  let cozy
+  const cozy = {}
 
   beforeEach(function () {
     if (COZY_STACK_VERSION === '2') {
       this.skip()
     }
-    cozy = new Cozy({
+    cozy.client = new Client({
       cozyURL: COZY_STACK_URL,
       token: COZY_STACK_TOKEN
     })
@@ -31,7 +31,7 @@ describe('files API', async function () {
     const filename = 'foo_' + random()
     const date = new Date('Wed, 01 Feb 2017 10:24:42 GMT')
 
-    const created = await cozy.files.create('datastring1', {
+    const created = await cozy.client.files.create('datastring1', {
       name: filename,
       contentType: 'application/json',
       lastModifiedDate: date
@@ -50,7 +50,7 @@ describe('files API', async function () {
     stream.push('datastring1')
     stream.push(null)
 
-    const created = await cozy.files.create(stream, {
+    const created = await cozy.client.files.create(stream, {
       name: filename,
       contentType: 'application/json'
     })
@@ -62,34 +62,34 @@ describe('files API', async function () {
   it('updates a file', async function () {
     const filename = 'foo_' + random()
 
-    const created = await cozy.files.create('datastring1', { name: filename })
+    const created = await cozy.client.files.create('datastring1', { name: filename })
     created.should.have.property('attributes')
 
     const createdId = created._id
 
-    const updated = await cozy.files.updateById(createdId, 'datastring2')
+    const updated = await cozy.client.files.updateById(createdId, 'datastring2')
     updated.should.have.property('attributes')
     updated.attributes.md5sum.should.equal('iWpp8tcTP/DWTJSLf0hoyQ==')
   })
 
   it('updates attributes', async function () {
     const filename = 'foo_' + random()
 
-    const created = await cozy.files.create('datastring1', { name: filename })
+    const created = await cozy.client.files.create('datastring1', { name: filename })
     created.should.have.property('attributes')
 
     const createdId = created._id
 
     const newname1 = 'newname1_' + random()
     const attrs1 = { tags: ['foo', 'bar'], name: newname1 }
-    const updated1 = await cozy.files.updateAttributesById(createdId, attrs1)
+    const updated1 = await cozy.client.files.updateAttributesById(createdId, attrs1)
     updated1.should.have.property('attributes')
     updated1.attributes.name.should.startWith('newname1_')
     updated1.attributes.tags.should.eql(['foo', 'bar'])
 
     const newname2 = 'newname2_' + random()
     const attrs2 = { tags: ['foo'], name: newname2 }
-    const updated2 = await cozy.files.updateAttributesByPath('/' + newname1, attrs2)
+    const updated2 = await cozy.client.files.updateAttributesByPath('/' + newname1, attrs2)
     updated2.should.have.property('attributes')
     updated2.attributes.name.should.startWith('newname2_')
     updated2.attributes.tags.should.eql(['foo'])
@@ -99,7 +99,7 @@ describe('files API', async function () {
     const dirname = 'foo_' + random()
     const date = new Date('Wed, 01 Feb 2017 10:24:42 GMT')
 
-    const created = await cozy.files.createDirectory({ name: dirname, lastModifiedDate: date })
+    const created = await cozy.client.files.createDirectory({ name: dirname, lastModifiedDate: date })
     created.should.have.property('attributes')
     new Date(created.attributes.created_at).should.eql(date)
     new Date(created.attributes.updated_at).should.eql(date)
@@ -108,66 +108,66 @@ describe('files API', async function () {
   it('gets directory info by ID', async function () {
     const dirname = 'foo_' + random()
 
-    const created = await cozy.files.createDirectory({ name: dirname })
+    const created = await cozy.client.files.createDirectory({ name: dirname })
     let directoryID = created._id
 
-    const stats = await cozy.files.statById(directoryID)
+    const stats = await cozy.client.files.statById(directoryID)
     stats.should.have.property('attributes')
   })
 
   it('gets directory info by Path', async function () {
     const dirname = 'foo_' + random()
 
-    const created = await cozy.files.createDirectory({ name: dirname })
+    const created = await cozy.client.files.createDirectory({ name: dirname })
 
-    const stats = await cozy.files.statByPath('/' + dirname)
+    const stats = await cozy.client.files.statByPath('/' + dirname)
     stats.should.have.property('attributes')
     stats.should.have.property('_id', created._id)
   })
 
   it('trashes file or directory', async function () {
     const dirname = 'foo_' + random()
 
-    const created = await cozy.files.createDirectory({ name: dirname })
+    const created = await cozy.client.files.createDirectory({ name: dirname })
     const createdId = created._id
 
-    await cozy.files.trashById(createdId)
+    await cozy.client.files.trashById(createdId)
   })
 
   it('downloads a file by path and id', async function () {
     const filename = 'foo_' + random()
 
-    const created = await cozy.files.create('foo', {
+    const created = await cozy.client.files.create('foo', {
       name: filename,
       contentType: 'application/json'
     })
 
-    const downloaded1 = await cozy.files.downloadById(created._id)
+    const downloaded1 = await cozy.client.files.downloadById(created._id)
     const txt1 = await downloaded1.text()
 
     txt1.should.equal('foo')
 
-    const downloaded2 = await cozy.files.downloadByPath('/' + filename)
+    const downloaded2 = await cozy.client.files.downloadByPath('/' + filename)
     const txt2 = await downloaded2.text()
 
     txt2.should.equal('foo')
   })
 
   it('destroy all trashed files and directories', async function () {
-    await createTrashedDirectory(cozy, 'foo_' + random())
-    await createTrashedDirectory(cozy, 'foo_' + random())
-    await cozy.files.clearTrash()
+    await createTrashedDirectory(cozy.client, 'foo_' + random())
+    await createTrashedDirectory(cozy.client, 'foo_' + random())
+    await cozy.client.files.clearTrash()
 
-    let trashed = await cozy.files.listTrash()
+    let trashed = await cozy.client.files.listTrash()
     trashed.should.be.an.Array()
     trashed.should.have.length(0)
   })
 
   it('list trashed files and directories', async function () {
-    await cozy.files.clearTrash()
-    const created1 = await createTrashedDirectory(cozy, 'foo_' + random())
-    const created2 = await createTrashedDirectory(cozy, 'foo_' + random())
-    let trashed = await cozy.files.listTrash()
+    await cozy.client.files.clearTrash()
+    const created1 = await createTrashedDirectory(cozy.client, 'foo_' + random())
+    const created2 = await createTrashedDirectory(cozy.client, 'foo_' + random())
+    let trashed = await cozy.client.files.listTrash()
     trashed.should.be.an.Array()
     trashed.should.have.length(2)
     let found1 = false
@@ -182,50 +182,50 @@ describe('files API', async function () {
   })
 
   it('restore a trashed file or directory', async function () {
-    await cozy.files.clearTrash()
-    const created = await createTrashedDirectory(cozy, 'foo_' + random())
-    await cozy.files.restoreById(created._id)
+    await cozy.client.files.clearTrash()
+    const created = await createTrashedDirectory(cozy.client, 'foo_' + random())
+    await cozy.client.files.restoreById(created._id)
   })
 
   it('destroy a trashed file or directory', async function () {
-    await cozy.files.clearTrash()
-    const created = await createTrashedDirectory(cozy, 'foo_' + random())
-    await cozy.files.destroyById(created._id)
-    let trashed = await cozy.files.listTrash()
+    await cozy.client.files.clearTrash()
+    const created = await createTrashedDirectory(cozy.client, 'foo_' + random())
+    await cozy.client.files.destroyById(created._id)
+    let trashed = await cozy.client.files.listTrash()
     trashed.should.be.an.Array()
     trashed.should.have.length(0)
   })
 
   it('creates download link for 1 file', async function () {
     const filename = 'foo_' + random()
-    const created = await cozy.files.create('foo', {
+    const created = await cozy.client.files.create('foo', {
       name: filename,
       contentType: 'application/json'
     })
     const path = '/' + created.attributes.name
-    let link = await cozy.files.getDowloadLink(path)
+    let link = await cozy.client.files.getDowloadLink(path)
     let downloaded = await fetch(COZY_STACK_URL + link)
     const txt1 = await downloaded.text()
     txt1.should.equal('foo')
   })
 
   it('creates download link for archive', async function () {
     const filename = 'foo_' + random()
-    const created = await cozy.files.create('foo', {
+    const created = await cozy.client.files.create('foo', {
       name: filename,
       contentType: 'application/json'
     })
 
     const filename2 = 'bar_' + random()
-    const created2 = await cozy.files.create('bar', {
+    const created2 = await cozy.client.files.create('bar', {
       name: filename2,
       contentType: 'application/json'
     })
     const toDownload = [
       '/' + created.attributes.name,
       '/' + created2.attributes.name
     ]
-    let link = await cozy.files.getArchiveLink(toDownload, 'foobar')
+    let link = await cozy.client.files.getArchiveLink(toDownload, 'foobar')
     let downloaded = await fetch(COZY_STACK_URL + link)
     downloaded.ok.should.be.true
     downloaded.headers.get('Content-Type').should.equal('application/zip')
@@ -235,21 +235,21 @@ describe('files API', async function () {
 
   describe('offline', async () => {
     beforeEach(() => {
-      cozy = new Cozy({
+      cozy.client = new Client({
         cozyURL: COZY_STACK_URL,
         token: COZY_STACK_TOKEN,
         offline: {doctypes: ['io.cozy.files'], options: {adapter: 'memory'}}
       })
     })
     afterEach(() => {
-      cozy.offline.destroyDatabase('io.cozy.files')
+      cozy.client.offline.destroyDatabase('io.cozy.files')
     })
 
     it('should be same document offline/online', async () => {
-      const folder = await createRandomDirectory(cozy)
-      await cozy.offline.replicateFromCozy('io.cozy.files')
-      const offline = await cozy.files.statById(folder._id)
-      const online = await cozy.files.statById(folder._id, false)
+      const folder = await createRandomDirectory(cozy.client)
+      await cozy.client.offline.replicateFromCozy('io.cozy.files')
+      const offline = await cozy.client.files.statById(folder._id)
+      const online = await cozy.client.files.statById(folder._id, false)
       Object.keys(online).forEach(key => { key === 'links' || offline.should.have.keys(key) })
       Object.keys(offline).forEach(key => { online.should.have.keys(key) })
       Object.keys(online.attributes).forEach(key => { offline.attributes.should.have.keys(key) })
@@ -258,14 +258,14 @@ describe('files API', async function () {
   })
 })
 
-async function createTrashedDirectory (cozy, dirname) {
-  const created = await cozy.files.createDirectory({ name: dirname })
-  await cozy.files.trashById(created._id)
+async function createTrashedDirectory (client, dirname) {
+  const created = await client.files.createDirectory({ name: dirname })
+  await client.files.trashById(created._id)
   return created
 }
 
-async function createRandomDirectory (cozy) {
+async function createRandomDirectory (client) {
   const dirname = 'foo_' + randomGenerator()()
-  const created = await cozy.files.createDirectory({ name: dirname })
+  const created = await client.files.createDirectory({ name: dirname })
   return created
 }