Skip to content

Commit

Permalink
Added .flat
Browse files Browse the repository at this point in the history
  • Loading branch information
dcrockwell committed Aug 29, 2016
1 parent 7ca9408 commit 54ba5a1
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 2 deletions.
13 changes: 12 additions & 1 deletion es5/lib/component/propertyCollection.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ var PropertyCollection = function () {
_.multi = false;
_.isBoolean = false;
_.merged = false;
_.flat = false;
_.filters = [];

this.properties = {};
Expand All @@ -56,7 +57,11 @@ var PropertyCollection = function () {

if (_.aggregate || _.multi) {
if (_.aggregate) {
_this.properties[propertyName].push(newValue);
if (_.flat) {
_this.properties[propertyName] = _this.properties[propertyName].concat(newValue);
} else {
_this.properties[propertyName].push(newValue);
}
} else {
_this.properties[propertyName] = newValue;
}
Expand Down Expand Up @@ -184,6 +189,12 @@ var PropertyCollection = function () {
};
});

return this;
}
}, {
key: "flat",
get: function get() {
(0, _incognito2.default)(this).flat = true;
return this;
}
}]);
Expand Down
56 changes: 56 additions & 0 deletions es5/spec/propertyCollection/propertyCollection.flat.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
"use strict";

var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();

var _component = require("../../lib/component/component.js");

var _component2 = _interopRequireDefault(_component);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }

function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

var Person = function (_Component) {
_inherits(Person, _Component);

function Person() {
_classCallCheck(this, Person);

return _possibleConstructorReturn(this, Object.getPrototypeOf(Person).apply(this, arguments));
}

_createClass(Person, [{
key: "initialize",
value: function initialize() {
this.properties("placesLived").multi.aggregate.flat;
}
}]);

return Person;
}(_component2.default);

describe("propertyCollection.flat", function () {
var person = void 0;

beforeEach(function () {
person = new Person();
});

it("should be set to an empty array by default", function () {
person.placesLived().should.eql([]);
});

it("should return this to enable chaining after setting a value", function () {
person.placesLived("Denver", "Colorado").should.equal(person);
});

it("should save aggregate the values of multiple calls", function () {
person.placesLived("Denver", "Colorado");
person.placesLived("Colorado Springs", "Colorado");
person.placesLived().should.eql(["Denver", "Colorado", "Colorado Springs", "Colorado"]);
});
});
12 changes: 11 additions & 1 deletion es6/lib/component/propertyCollection.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default class PropertyCollection {
_.multi = false;
_.isBoolean = false;
_.merged = false;
_.flat = false;
_.filters = [];

this.properties = {};
Expand All @@ -31,7 +32,11 @@ export default class PropertyCollection {

if (_.aggregate || _.multi) {
if (_.aggregate) {
this.properties[propertyName].push(newValue);
if (_.flat) {
this.properties[propertyName] = this.properties[propertyName].concat(newValue);
} else {
this.properties[propertyName].push(newValue);
}
} else {
this.properties[propertyName] = newValue;
}
Expand Down Expand Up @@ -139,4 +144,9 @@ export default class PropertyCollection {

return this;
}

get flat() {
privateData(this).flat = true;
return this;
}
}
33 changes: 33 additions & 0 deletions es6/spec/propertyCollection/propertyCollection.flat.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import Component from "../../lib/component/component.js";

class Person extends Component {
initialize() {
this.properties(
"placesLived"
).multi.aggregate.flat;
}
}

describe("propertyCollection.flat", () => {
let person;

beforeEach(() => {
person = new Person();
});

it("should be set to an empty array by default", () => {
person.placesLived().should.eql([]);
});

it("should return this to enable chaining after setting a value", () => {
person.placesLived("Denver", "Colorado").should.equal(person);
});

it("should save aggregate the values of multiple calls", () => {
person.placesLived("Denver", "Colorado");
person.placesLived("Colorado Springs", "Colorado");
person.placesLived().should.eql([
"Denver", "Colorado", "Colorado Springs", "Colorado"
]);
});
});

0 comments on commit 54ba5a1

Please sign in to comment.