Merge pull request #26 from dadi/feature/batch_delete

Separate filters and terminators into a separate module (WIP)

Author: jimlambie

CHANGELOG.md

@@ -4,7 +4,13 @@ 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/).
 
-## [1.3.0] (2016-11-24)
+## [1.4.0] - 2016-12-09
+
+### Changed
+
+The core functionality of API Wrapper has been extracted to form a new module [api-wrapper-core](https://github.com/dadi/api-wrapper-core). The change allows the use of the API Wrapper functionality in the browser as well as within server-side applications.
+
+## [1.3.0] - 2016-11-24
 ### Added
 * Check for invalid bearer tokens
 * Integrate DADI Logger to enable logging of queries

README.md

@@ -3,7 +3,7 @@
 > A high-level library for interacting with DADI API
 
 [![npm (scoped)](https://img.shields.io/npm/v/@dadi/api-wrapper.svg?maxAge=10800&style=flat-square)](https://www.npmjs.com/package/@dadi/api-wrapper)
-![coverage](https://img.shields.io/badge/coverage-92%25-brightgreen.svg?style=flat-square)
+![coverage](https://img.shields.io/badge/coverage-93%25-brightgreen.svg?style=flat-square)
 [![Build Status](https://travis-ci.org/dadi/api-wrapper.svg?branch=master)](https://travis-ci.org/dadi/api-wrapper)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com/)
 

index.js

@@ -1,6 +1,8 @@
 'use strict'
 
-const DadiAPI = function (options) {
+const APIWrapperCore = require('@dadi/api-wrapper-core')
+
+const APIWrapper = function (options) {
   this.options = options
 
   this.options.appId = this.options.appId || 'DADI API wrapper'
@@ -20,18 +22,6 @@ const DadiAPI = function (options) {
     }
   }
 
-  this.reservedProperties = [
-    '_id',
-    'apiVersion',
-    'createdBy',
-    'createdAt',
-    'lastModifiedAt',
-    'lastModifiedBy',
-    'v',
-    'history',
-    'composed'
-  ]
-
   // Initialise logger
   this.logger = require('@dadi/logger')
   this.logger.init({
@@ -41,22 +31,18 @@ const DadiAPI = function (options) {
   })
 }
 
-// -----------------------------------------
-// Attach helpers
-// -----------------------------------------
-
-require('./lib/helpers')(DadiAPI)
+APIWrapper.prototype = new APIWrapperCore()
 
 // -----------------------------------------
-// Attach filters
+// Attach helpers
 // -----------------------------------------
 
-require('./lib/filters')(DadiAPI)
+require('./lib/helpers')(APIWrapper)
 
 // -----------------------------------------
 // Attach terminators
 // -----------------------------------------
 
-require('./lib/terminators')(DadiAPI)
+require('./lib/terminators')(APIWrapper)
 
-module.exports = DadiAPI
+module.exports = APIWrapper