Skip to content

Commit

Permalink
Renaming to ember-object-utils
Browse files Browse the repository at this point in the history
  • Loading branch information
AdityaHegde committed Jun 3, 2015
1 parent 1410846 commit 6ab0d50
Show file tree
Hide file tree
Showing 14 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ember-utils-core

Docs : http://adityahegde.github.io/ember-utils-core/
Docs : http://adityahegde.github.io/ember-object-utils/

## Installation

Expand Down
2 changes: 1 addition & 1 deletion addon/belongsTo.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Ember from 'ember';
* 8th argument is the idKey
*
* @method belongsTo
* @for EmberUtilsCore
* @for EmberObjectUtils
* @static
* @param {Class|Object} modelClass
* @param {String} [modelClassKey]
Expand Down
2 changes: 1 addition & 1 deletion addon/hasMany.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Ember from 'ember';
* 5th argument is the idKey
*
* @method hasMany
* @for EmberUtilsCore
* @for EmberObjectUtils
* @static
* @param {Class|Object} modelClass
* @param {String} [modelClassKey]
Expand Down
2 changes: 1 addition & 1 deletion addon/hierarchy/registerHierarchy.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function getMetaFromHierarchy(hasManyHierarchy) {
* Register a hierarchy. This will setup the meta of the hierarchy.
*
* @method registerHierarchy
* @for EmberUtilsCore
* @for EmberObjectUtils
* @static
* @param {Object} hierarchy
*/
Expand Down
14 changes: 7 additions & 7 deletions addon/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @module ember-utils-core
* @module ember-object-utils
*/

import Ember from "ember";
Expand All @@ -9,19 +9,19 @@ import hierarchy from "./hierarchy/index";
import objectWithArrayMixin from "./objectWithArrayMixin";

var
EmberUtilsCore = Ember.Namespace.create(),
EmberObjectUtils = Ember.Namespace.create(),
modules = [hierarchy];

for(var i = 0; i < modules.length; i++) {
for(var k in modules[i]) {
if(modules[i].hasOwnProperty(k)) {
EmberUtilsCore[k] = modules[i][k];
EmberObjectUtils[k] = modules[i][k];
}
}
}

EmberUtilsCore.hasMany = hasMany;
EmberUtilsCore.belongsTo = belongsTo;
EmberUtilsCore.ObjectWithArrayMixin = objectWithArrayMixin;
EmberObjectUtils.hasMany = hasMany;
EmberObjectUtils.belongsTo = belongsTo;
EmberObjectUtils.ObjectWithArrayMixin = objectWithArrayMixin;

export default EmberUtilsCore;
export default EmberObjectUtils;
2 changes: 1 addition & 1 deletion addon/objectWithArrayMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function getArrayFromRange(l, h, s) {
/**
* A mixin to add observers to array properties.
*
* @class EmberUtilsCore.ObjectWithArrayMixin
* @class EmberObjectUtils.ObjectWithArrayMixin
* @static
*/
export default Ember.Mixin.create({
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ember-utils-core",
"name": "ember-object-utils",
"dependencies": {
"ember": "1.12.0",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
'use strict';

module.exports = {
name: 'ember-utils-core'
name: 'ember-object-utils'
};
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "ember-utils-core",
"name": "ember-object-utils",
"version": "1.0.0",
"description": "Utility modules for ember",
"description": "Object utils for Ember",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"start": "ember server",
"build": "ember build",
"test": "ember try:testall"
"test": "ember test"
},
"repository": "",
"engines": {
Expand Down
32 changes: 16 additions & 16 deletions tests/unit/belongsTo-test.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import Ember from "ember";
import EmberUtilsCore from "ember-utils-core";
import EmberObjectUtils from "ember-object-utils";
import { module, test } from "qunit";

module("EmberUtilsCore.belongsTo");
module("EmberObjectUtils.belongsTo");

test("Simple EmberUtilsCore.belongsTo", function(assert) {
test("Simple EmberObjectUtils.belongsTo", function(assert) {
var
classChild = Ember.Object.extend({
vara : "child1",
}),
classObj = Ember.Object.extend({
obj0 : EmberUtilsCore.belongsTo(),
obj1 : EmberUtilsCore.belongsTo(classChild),
obj2 : EmberUtilsCore.belongsTo("Ember.ClassChild"),
obj3 : EmberUtilsCore.belongsTo(),
obj0 : EmberObjectUtils.belongsTo(),
obj1 : EmberObjectUtils.belongsTo(classChild),
obj2 : EmberObjectUtils.belongsTo("Ember.ClassChild"),
obj3 : EmberObjectUtils.belongsTo(),
});
Ember.ClassChild = Ember.Object.extend({
vara : "child2",
Expand Down Expand Up @@ -43,7 +43,7 @@ test("Simple EmberUtilsCore.belongsTo", function(assert) {
assert.ok(rightValues);
});

test("EmberUtilsCore.belongsTo with map", function(assert) {
test("EmberObjectUtils.belongsTo with map", function(assert) {
var
classChild1 = Ember.Object.extend({
vara : "child1",
Expand All @@ -60,14 +60,14 @@ test("EmberUtilsCore.belongsTo with map", function(assert) {
"c3" : classChild3,
},
classObj = Ember.Object.extend({
obj00 : EmberUtilsCore.belongsTo(map, "varb", "c1"),
obj01 : EmberUtilsCore.belongsTo(map, "varb", "c1"),
obj02 : EmberUtilsCore.belongsTo(map, "varb", "c1"),
obj03 : EmberUtilsCore.belongsTo(map, "varb", "c1"),
obj10 : EmberUtilsCore.belongsTo("Ember.BelongsToMap", "varb", "c1"),
obj11 : EmberUtilsCore.belongsTo("Ember.BelongsToMap", "varb", "c1"),
obj12 : EmberUtilsCore.belongsTo("Ember.BelongsToMap", "varb", "c1"),
obj13 : EmberUtilsCore.belongsTo("Ember.BelongsToMap", "varb", "c1"),
obj00 : EmberObjectUtils.belongsTo(map, "varb", "c1"),
obj01 : EmberObjectUtils.belongsTo(map, "varb", "c1"),
obj02 : EmberObjectUtils.belongsTo(map, "varb", "c1"),
obj03 : EmberObjectUtils.belongsTo(map, "varb", "c1"),
obj10 : EmberObjectUtils.belongsTo("Ember.BelongsToMap", "varb", "c1"),
obj11 : EmberObjectUtils.belongsTo("Ember.BelongsToMap", "varb", "c1"),
obj12 : EmberObjectUtils.belongsTo("Ember.BelongsToMap", "varb", "c1"),
obj13 : EmberObjectUtils.belongsTo("Ember.BelongsToMap", "varb", "c1"),
});
var classes = [classChild1, classChild2, classChild3];
Ember.BelongsToMap = {
Expand Down
18 changes: 9 additions & 9 deletions tests/unit/hasMany-test.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import Ember from "ember";
import EmberUtilsCore from "ember-utils-core";
import EmberObjectUtils from "ember-object-utils";
import { module, test } from "qunit";

module("EmberUtilsCore.hasMany");
module("EmberObjectUtils.hasMany");

test("Simple EmberUtilsCore.hasMany", function(assert) {
test("Simple EmberObjectUtils.hasMany", function(assert) {
var
classChild = Ember.Object.extend({
vara : "child1",
}),
classObj = Ember.Object.extend({
arr1 : EmberUtilsCore.hasMany(),
arr2 : EmberUtilsCore.hasMany(classChild),
arr3 : EmberUtilsCore.hasMany("Ember.ClassChild"),
arr1 : EmberObjectUtils.hasMany(),
arr2 : EmberObjectUtils.hasMany(classChild),
arr3 : EmberObjectUtils.hasMany("Ember.ClassChild"),
});
Ember.ClassChild = Ember.Object.extend({
vara : "child2",
Expand Down Expand Up @@ -44,7 +44,7 @@ test("Simple EmberUtilsCore.hasMany", function(assert) {
assert.ok(rightValues);
});

test("EmberUtilsCore.hasMany with map", function(assert) {
test("EmberObjectUtils.hasMany with map", function(assert) {
var
classChild1 = Ember.Object.extend({
vara : "child1",
Expand All @@ -61,8 +61,8 @@ test("EmberUtilsCore.hasMany with map", function(assert) {
"c3" : classChild3,
},
classObj = Ember.Object.extend({
arr1 : EmberUtilsCore.hasMany(map, "varb", "c1"),
arr2 : EmberUtilsCore.hasMany("Ember.HasManyMap", "varb", "c1"),
arr1 : EmberObjectUtils.hasMany(map, "varb", "c1"),
arr2 : EmberObjectUtils.hasMany("Ember.HasManyMap", "varb", "c1"),
});
var classes = [classChild1, classChild2, classChild3];
Ember.HasManyMap = {
Expand Down
44 changes: 22 additions & 22 deletions tests/unit/hasManyWithHeirarchy-test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from "ember";
import EmberUtilsCore from "ember-utils-core";
import EmberObjectUtils from "ember-object-utils";
import { module, test } from "qunit";

function getOffset(ele, type, parentSelector) {
Expand Down Expand Up @@ -31,14 +31,14 @@ function emberDeepEqual(src, tar) {
return true;
}

module("EmberUtilsCore.hasManyWithHierarchy");
module("EmberObjectUtils.hasManyWithHierarchy");

test("2 Levels of hierarchy", function(assert) {
Ember.hierarchy = [
{
classes : {
base00 : Ember.Object.extend({vara : "level0-base0", children0 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base01 : Ember.Object.extend({vara : "level0-base1", children0 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base00 : Ember.Object.extend({vara : "level0-base0", children0 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base01 : Ember.Object.extend({vara : "level0-base1", children0 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
},
base : "base00",
keysInArray : ["type", "children0", "varb", "varc"],
Expand All @@ -53,9 +53,9 @@ test("2 Levels of hierarchy", function(assert) {
keysInArray : ["type", "varb", "varc"],
},
];
EmberUtilsCore.registerHierarchy(Ember.hierarchy);
EmberObjectUtils.registerHierarchy(Ember.hierarchy);
var objClass = Ember.Object.extend({
children : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 0, "type"),
children : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 0, "type"),
});

var assertions = [{
Expand Down Expand Up @@ -194,17 +194,17 @@ test("3 Levels of hierarchy", function(assert) {
Ember.hierarchy = [
{
classes : {
base00 : Ember.Object.extend({vara : "level0-base0", children0 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base01 : Ember.Object.extend({vara : "level0-base1", children0 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base00 : Ember.Object.extend({vara : "level0-base0", children0 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base01 : Ember.Object.extend({vara : "level0-base1", children0 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
},
base : "base00",
keysInArray : ["type", "children0", "varb", "varc"],
childrenKey : "children0",
},
{
classes : {
base10 : Ember.Object.extend({vara : "level1-base0", children1 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
base11 : Ember.Object.extend({vara : "level1-base1", children1 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
base10 : Ember.Object.extend({vara : "level1-base0", children1 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
base11 : Ember.Object.extend({vara : "level1-base1", children1 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
},
base : "base10",
keysInArray : ["type", "children1", "varb", "varc"],
Expand All @@ -219,9 +219,9 @@ test("3 Levels of hierarchy", function(assert) {
keysInArray : ["type", "varb", "varc"],
},
];
EmberUtilsCore.registerHierarchy(Ember.hierarchy);
EmberObjectUtils.registerHierarchy(Ember.hierarchy);
var objClass = Ember.Object.extend({
children : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 0, "type"),
children : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 0, "type"),
});

var assertions = [{
Expand Down Expand Up @@ -293,21 +293,21 @@ test("3 Levels of hierarchy", function(assert) {
}
});

test("EmberUtilsCore.addToHierarchy", function(assert) {
test("EmberObjectUtils.addToHierarchy", function(assert) {
Ember.hierarchy = [
{
classes : {
base00 : Ember.Object.extend({vara : "level0-base0", children0 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base01 : Ember.Object.extend({vara : "level0-base1", children0 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base00 : Ember.Object.extend({vara : "level0-base0", children0 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
base01 : Ember.Object.extend({vara : "level0-base1", children0 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
},
base : "base00",
keysInArray : ["type", "children0", "varb", "varc"],
childrenKey : "children0",
},
{
classes : {
base10 : Ember.Object.extend({vara : "level1-base0", children1 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
base11 : Ember.Object.extend({vara : "level1-base1", children1 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
base10 : Ember.Object.extend({vara : "level1-base0", children1 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
base11 : Ember.Object.extend({vara : "level1-base1", children1 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
},
base : "base10",
keysInArray : ["type", "children1", "varb", "varc"],
Expand All @@ -322,15 +322,15 @@ test("EmberUtilsCore.addToHierarchy", function(assert) {
keysInArray : ["type", "varb", "varc"],
},
];
EmberUtilsCore.registerHierarchy(Ember.hierarchy);
EmberObjectUtils.registerHierarchy(Ember.hierarchy);
var objClass = Ember.Object.extend({
children : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 0, "type"),
children : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 0, "type"),
});

var assertions = [{
input : {
type : "base02",
classObj : Ember.Object.extend({vara : "level0-base2", children0 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
classObj : Ember.Object.extend({vara : "level0-base2", children0 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 1, "type")}),
level : 0,
create : Ember.A([
Ember.A(["base02", Ember.A([]), "varb0", "varc0"]),
Expand All @@ -344,7 +344,7 @@ test("EmberUtilsCore.addToHierarchy", function(assert) {
}, {
input : {
type : "base12",
classObj : Ember.Object.extend({vara : "level1-base2", children0 : EmberUtilsCore.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
classObj : Ember.Object.extend({vara : "level1-base2", children0 : EmberObjectUtils.hasManyWithHierarchy("Ember.hierarchy", 2, "type")}),
level : 1,
create : Ember.A([
Ember.A(["base12", Ember.A([]), "varb0", "varc0"]),
Expand All @@ -361,7 +361,7 @@ test("EmberUtilsCore.addToHierarchy", function(assert) {
}];

for(var i = 0; i < assertions.length; i++) {
EmberUtilsCore.addToHierarchy(Ember.hierarchy, assertions[i].input.type, assertions[i].input.classObj, assertions[i].input.level);
EmberObjectUtils.addToHierarchy(Ember.hierarchy, assertions[i].input.type, assertions[i].input.classObj, assertions[i].input.level);
assert.equal(Ember.hierarchy[assertions[i].input.level].classes[assertions[i].input.type], assertions[i].input.classObj);
var c = objClass.create({
children : assertions[i].input.create,
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/objectWithArrayMixin-test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Ember from "ember";
import EmberUtilsCore from "ember-utils-core";
import EmberObjectUtils from "ember-object-utils";
import { module, test } from "qunit";

module("EmberUtilsCore.objectWithArrayMixin");
module("EmberObjectUtils.objectWithArrayMixin");

/* jshint ignore:start */
function setupObjectWithArrayMixin() {
Expand All @@ -12,7 +12,7 @@ function setupObjectWithArrayMixin() {
canAddEle : null, canAddIdx : null, canAddSpecific : null,
addedEles : null, addedIdxs : null, addedSpecific : null,
},
classObj = Ember.Object.extend(EmberUtilsCore.ObjectWithArrayMixin, {
classObj = Ember.Object.extend(EmberObjectUtils.ObjectWithArrayMixin, {
arrayProps : ["var0", "var1", "var2", "var3"],
var0 : null,
var1 : null,
Expand Down
4 changes: 2 additions & 2 deletions yuidoc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-utils-core",
"description": "Utility modules for ember",
"name": "ember-object-utils",
"description": "Object utilities for Ember",
"version": "1.0.0",
"options": {
"paths": [
Expand Down

0 comments on commit 6ab0d50

Please sign in to comment.