hmpo-model 4.0.0 → 4.0.1

package/lib/local-model.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const _ = require('underscore');
 const EventEmitter = require('events').EventEmitter;
 
 class LocalModel extends EventEmitter {
@@ -9,8 +8,8 @@ class LocalModel extends EventEmitter {
         super();
 
         this.options = options || {};
-        this.attributes = {};
-        this.set(attributes, {silent: true});
+        this.attributes = Object.create(null);
+        if (attributes) this.set(attributes, {silent: true});
     }
 
     get(key) {
@@ -19,32 +18,35 @@ class LocalModel extends EventEmitter {
 
     set(key, value, options) {
 
-        let attrs = {};
-
-        if (typeof key === 'string') {
+        let attrs = Object.create(null);
+        if (key instanceof Map) {
+            Object.assign(attrs, Object.fromEntries(key));
+            options = value;
+        } else if (typeof key === 'string') {
             attrs[key] = value;
         } else {
-            attrs = key;
+            Object.assign(attrs, key);
             options = value;
         }
-        options = options || {};
 
-        let old = this.toJSON(),
-            changed = {};
+        // silent set
+        if (options && options.silent) {
+            Object.assign(this.attributes, attrs);
+            return this;
+        }
 
-        _.each(attrs, (value, key) => {
-            if (value !== old[key]) {
-                changed[key] = value;
-            }
-        });
+        const changes = [];
+        for (let key in attrs) {
+            const value = attrs[key];
+            const old = this.attributes[key];
+            if (value !== old) changes.push([key, value, old]);
+        }
 
-        _.extend(this.attributes, attrs);
+        Object.assign(this.attributes, attrs);
 
-        if (!options.silent && !_.isEmpty(changed)) {
-            _.each(changed, (value, key) => {
-                this.emit('change:' + key, this.get(key), old[key]);
-            });
-            this.emit('change', changed);
+        if (changes.length) {
+            changes.forEach(([key, value, old]) => this.emit('change:' + key, value, old));
+            if (this.listenerCount('change')) this.emit('change', Object.fromEntries(changes));
         }
 
         return this;
@@ -52,38 +54,32 @@ class LocalModel extends EventEmitter {
 
 
     unset(fields, options) {
-        options = options || {};
         if (typeof fields === 'string') {
             fields = [fields];
         }
-        let old = this.toJSON(),
-            changed = {};
 
-        _.each(fields, (key) => {
-            if (old[key] !== undefined) {
-                changed[key] = undefined;
+        const changes = [];
+        for (let key of fields) {
+            const old = this.attributes[key];
+            if (old !== undefined) {
+                changes.push([key, undefined, old]);
                 delete this.attributes[key];
             }
-        });
+        }
 
-        if (!options.silent && !_.isEmpty(changed)) {
-            _.each(changed, (value, key) => {
-                this.emit('change:' + key, undefined, old[key]);
-            });
-            this.emit('change', changed);
+        if ((!options || !options.silent) && changes.length) {
+            changes.forEach(([key, value, old]) => this.emit('change:' + key, value, old));
+            if (this.listenerCount('change')) this.emit('change', Object.fromEntries(changes));
         }
 
         return this;
     }
 
     reset(options) {
-        options = options || {};
-        let keys = Object.keys(this.attributes);
-        this.attributes = {};
-        if (!options.silent) {
-            _.each(keys, (key) => {
-                this.emit('change:' + key, undefined);
-            });
+        const old = this.attributes;
+        this.attributes = Object.create(null);
+        if (!options || !options.silent) {
+            Object.keys(old).forEach(key => this.emit('change:' + key, undefined, old[key]));
             this.emit('reset');
         }
     }
@@ -97,8 +93,8 @@ class LocalModel extends EventEmitter {
         this.set(property, val + amount);
     }
 
-    toJSON() {
-        return Object.assign({}, this.attributes);
+    toJSON(bare = false) {
+        return Object.assign(bare ? Object.create(null) : {}, this.attributes);
     }
 }
 

package/lib/remote-model.js

@@ -223,7 +223,13 @@ class RemoteModel extends LocalModel {
 
     parse(data) {
         debug('parse', data);
-        if (data && typeof data === 'object') this.set(data);
+        if (data && typeof data === 'object') {
+            if (Array.isArray(data)) {
+                this.set('data', data);
+            } else {
+                this.set(data);
+            }
+        }
         return data;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hmpo-model",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Simple model for interacting with http/rest apis.",
   "main": "index.js",
   "scripts": {
@@ -28,8 +28,7 @@
     "debug": "^4.3.3",
     "got": "^11.8.3",
     "hpagent": "^0.1.2",
-    "lodash.kebabcase": "^4.1.1",
-    "underscore": "^1.13.1"
+    "lodash.kebabcase": "^4.1.1"
   },
   "devDependencies": {
     "chai": "^4.3.4",

package/test/lib/spec.local-model.js

@@ -1,13 +1,11 @@
 'use strict';
 
-describe('Local Model', () => {
+const Model = require('../../lib/local-model');
 
+describe('Local Model', () => {
     let model;
 
     beforeEach(() => {
-
-        let Model = require('../../lib/local-model');
-
         model = new Model();
     });
 
@@ -18,7 +16,7 @@ describe('Local Model', () => {
     });
 
     it('has an attributes property of type object', () => {
-        model.attributes.should.be.a('object');
+        expect(model.attributes).to.be.an('object');
     });
 
     describe('constructor', () => {
@@ -54,20 +52,28 @@ describe('Local Model', () => {
     describe('set', () => {
 
         beforeEach(() => {
-            model.attributes = {
-                name: 'Test name'
-            };
+            model = new Model({ name: 'Test name' });
         });
 
         it('adds a key to the model attributes if the key is a string', () => {
-            model.set('age', 20).attributes.should.eql({
+            model.set('age', 20);
+            expect(model.attributes).to.eql({
                 name: 'Test name',
                 age: 20
             });
         });
 
         it('accepts an object as the key', () => {
-            model.set( { placeOfBirth: 'London' } ).attributes.should.eql({
+            model.set( { placeOfBirth: 'London' } );
+            expect(model.attributes).to.eql({
+                name: 'Test name',
+                placeOfBirth: 'London'
+            });
+        });
+
+        it('accepts a Map as the key', () => {
+            model.set( new Map([['placeOfBirth', 'London']]));
+            expect(model.attributes).to.eql({
                 name: 'Test name',
                 placeOfBirth: 'London'
             });
@@ -141,17 +147,17 @@ describe('Local Model', () => {
 
         it('removes properties from model when passed a string', () => {
             model.unset('a');
-            model.toJSON().should.eql({ b: 2, c: 3 });
+            expect(model.toJSON()).to.eql({ b: 2, c: 3 });
         });
 
         it('removes properties from model when passed an array', () => {
             model.unset(['a', 'b']);
-            model.toJSON().should.eql({ c: 3 });
+            expect(model.toJSON()).to.eql({ c: 3 });
         });
 
         it('does nothing if passed a property that does not exist', () => {
             model.unset('foo');
-            model.toJSON().should.eql({ a: 1, b: 2, c: 3 });
+            expect(model.toJSON()).to.eql({ a: 1, b: 2, c: 3 });
         });
 
         it('emits a change event', () => {
@@ -225,7 +231,7 @@ describe('Local Model', () => {
 
         it('clears model attributes', () => {
             model.reset();
-            model.toJSON().should.eql({});
+            expect(model.toJSON()).to.eql({});
             expect(model.get('name')).to.be.undefined;
             expect(model.get('age')).to.be.undefined;
         });
@@ -244,9 +250,9 @@ describe('Local Model', () => {
             model.on('change:age', listener2);
             model.reset();
             listener1.should.have.been.calledOnce;
-            listener1.should.have.been.calledWithExactly(undefined);
+            listener1.should.have.been.calledWithExactly(undefined, 'John');
             listener2.should.have.been.calledOnce;
-            listener2.should.have.been.calledWithExactly(undefined);
+            listener2.should.have.been.calledWithExactly(undefined, 30);
         });
 
         it('emits no events if called with silent: true', () => {
@@ -266,10 +272,22 @@ describe('Local Model', () => {
             };
         });
 
-        it('returns an object that\'s the same as the attributes property', () => {
-            model.toJSON().should.eql({
+        it('returns a bare object that\'s the same as the attributes property', () => {
+            const result = model.toJSON(true);
+            expect(result).to.eql({
                 name: 'Test name'
             });
+
+            expect(result.constructor).to.be.undefined;
+        });
+
+        it('returns an object that\'s the same as the attributes property with object prototype', () => {
+            const result = model.toJSON();
+            expect(result).to.eql({
+                name: 'Test name'
+            });
+
+            expect(result.constructor).to.be.a('function');
         });
     });
 

package/test/lib/spec.remote-model.js

@@ -2,7 +2,6 @@
 
 const Model = require('../../lib/remote-model');
 const BaseModel = require('../../lib/local-model');
-const _ = require('underscore');
 const logger = require('hmpo-logger');
 
 const { HttpProxyAgent, HttpsProxyAgent } = require('hpagent');
@@ -543,7 +542,7 @@ describe('Remote Model', () => {
                 }
             };
 
-            let savedConfig = _.clone(config);
+            let savedConfig = Object.assign({}, config);
 
             let returnedConfig = model.requestConfig(config);
 
@@ -573,7 +572,7 @@ describe('Remote Model', () => {
                 method: 'VERB'
             };
 
-            requestSettings = _.clone(settings);
+            requestSettings = Object.assign({}, settings);
         });
 
         afterEach(() => {
@@ -910,6 +909,11 @@ describe('Remote Model', () => {
             model.get('foo').should.equal('bar');
         });
 
+        it('sets the parsed array data to the model as "data"', () => {
+            model.parse([1, 2, 3, 4]);
+            model.get('data').should.eql([1, 2, 3, 4]);
+        });
+
         it('does not set if the data falsey', () => {
             model.set = sinon.stub();
             model.parse(null);