Merge pull request #30 from deskbookers/develop

v2.1.1

Author: izolate

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.1 - 2017-05-23
+### Fixed
+- Attached `Actions` resource to global class
+
 ## 2.1.0 - 2017-05-23
 ### Added
 - `setTimezone`, `setLanguage` and `preferences` methods to `Account` resource

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deskbookers",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Deskbookers API JavaScript SDK",
   "main": "dist/index.js",
   "scripts": {

src/DeskbookersError.js

@@ -1,11 +1,17 @@
-import DeskbookersError from './DeskbookersError'
-
 const MAX_ERROR_LENGTH = 100
 
-export default class InvalidResponseError extends DeskbookersError {
+export class DeskbookersError extends Error {
+  constructor (message) {
+    super(message)
+    this.name = 'DeskbookersError'
+  }
+}
+
+export class InvalidResponseError extends DeskbookersError {
   constructor (text) {
     // Prepare text
     text = `${text || ''}`
+
     if (text.length > MAX_ERROR_LENGTH) {
       text = `${text.substr(0, MAX_ERROR_LENGTH)}...`
     }

src/InvalidResponseError.js renamed to src/errors.js

@@ -1,20 +1,10 @@
-import Account from './resources/account'
-import Cart from './resources/Cart'
-import Events from './resources/Events'
-import Workplaces from './resources/Workplaces'
+import resources from './resources'
 
 const API_HOST = 'backoffice.2cnnct.com'
 const API_VERSION = 1
 const API_LANGUAGE = 'en-gb'
 const API_RESELLER_ID = 10000
 
-const resources = {
-  account: Account,
-  cart: Cart,
-  events: Events,
-  workplaces: Workplaces
-}
-
 export default class Deskbookers {
   constructor ({
     https = true,
@@ -31,9 +21,9 @@ export default class Deskbookers {
     this.resellerId = resellerId
     this.session = null
 
-    // Init resources
-    for (let name in resources) {
-      this[name] = new resources[name](this)
+    // Initialise resources
+    for (const resource in resources) {
+      this[resource] = new resources[resource](this)
     }
   }
 }

src/index.js

@@ -1,5 +1,5 @@
 import Resource from './Resource'
-import DeskbookersError from '../DeskbookersError'
+import { DeskbookersError } from '../errors'
 
 export default class Events extends Resource {
   constructor (api) {

src/resources/Events.js

@@ -1,6 +1,8 @@
 import { signer, formatArgs } from '../utils/requests'
-import DeskbookersError from '../DeskbookersError'
-import InvalidResponseError from '../InvalidResponseError'
+import {
+  DeskbookersError,
+  InvalidResponseError
+} from '../errors'
 
 export default class Resource {
   constructor (api) {

src/resources/Resource.js

@@ -1,5 +1,5 @@
 import Resource from './Resource'
-import DeskbookersError from '../DeskbookersError'
+import { DeskbookersError } from '../errors'
 
 export default class Workplaces extends Resource {
   constructor (api) {

src/resources/Workplaces.js

@@ -1,4 +1,4 @@
-import DeskbookersError from '../../DeskbookersError'
+import { DeskbookersError } from '../../errors'
 import Resource from '../Resource'
 import { pickAll } from 'ramda'
 

src/resources/account/Preferences.js

@@ -0,0 +1,13 @@
+import Account from './account'
+import Actions from './Actions'
+import Cart from './Cart'
+import Events from './Events'
+import Workplaces from './Workplaces'
+
+export default {
+  account: Account,
+  actions: Actions,
+  cart: Cart,
+  events: Events,
+  workplaces: Workplaces
+}