From d05911678217b94e5838d5b413224f2685a98a1c Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 6 Nov 2015 14:07:53 -0800 Subject: [PATCH] [Creation] Rename creation capability ...to instantiation, to distinguish from creation (which typically includes persistence.) --- .../browse/src/creation/CreationService.js | 2 +- .../test/creation/CreationServiceSpec.js | 10 +++++----- platform/core/bundle.json | 4 ++-- ...apability.js => InstantiationCapability.js} | 4 ++-- ...ySpec.js => InstantiationCapabilitySpec.js} | 18 +++++++++--------- platform/core/test/suite.json | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) rename platform/core/src/capabilities/{CreationCapability.js => InstantiationCapability.js} (96%) rename platform/core/test/capabilities/{CreationCapabilitySpec.js => InstantiationCapabilitySpec.js} (86%) diff --git a/platform/commonUI/browse/src/creation/CreationService.js b/platform/commonUI/browse/src/creation/CreationService.js index bfd8a0c403..4b7c0119c9 100644 --- a/platform/commonUI/browse/src/creation/CreationService.js +++ b/platform/commonUI/browse/src/creation/CreationService.js @@ -68,7 +68,7 @@ define( */ CreationService.prototype.createObject = function (model, parent) { var persistence = parent.getCapability("persistence"), - newObject = parent.useCapability("creation", model), + newObject = parent.useCapability("instantiation", model), newObjectPersistence = newObject.getCapability("persistence"), self = this; diff --git a/platform/commonUI/browse/test/creation/CreationServiceSpec.js b/platform/commonUI/browse/test/creation/CreationServiceSpec.js index a35bf39f97..e0704ba702 100644 --- a/platform/commonUI/browse/test/creation/CreationServiceSpec.js +++ b/platform/commonUI/browse/test/creation/CreationServiceSpec.js @@ -91,14 +91,14 @@ define( ); mockCreationCapability = jasmine.createSpyObj( "creation", - ["create", "invoke"] + ["instantiate", "invoke"] ); mockCapabilities = { mutation: mockMutationCapability, persistence: mockPersistenceCapability, composition: mockCompositionCapability, context: mockContextCapability, - creation: mockCreationCapability + instantiation: mockCreationCapability }; mockNewPersistenceCapability = jasmine.createSpyObj( "new-persistence", @@ -130,9 +130,9 @@ define( mockPromise([mockNewObject]) ); mockCompositionCapability.add.andReturn(mockPromise(true)); - mockCreationCapability.create.andReturn(mockNewObject); + mockCreationCapability.instantiate.andReturn(mockNewObject); mockCreationCapability.invoke.andCallFake(function (model) { - return mockCreationCapability.create(model); + return mockCreationCapability.instantiate(model); }); creationService = new CreationService( @@ -144,7 +144,7 @@ define( it("allows new objects to be created", function () { var model = { someKey: "some value" }; creationService.createObject(model, mockParentObject); - expect(mockCreationCapability.create) + expect(mockCreationCapability.instantiate) .toHaveBeenCalledWith(model); }); diff --git a/platform/core/bundle.json b/platform/core/bundle.json index 76c94435ce..558e8292a5 100644 --- a/platform/core/bundle.json +++ b/platform/core/bundle.json @@ -200,8 +200,8 @@ "depends": [ "$q" ] }, { - "key": "creation", - "implementation": "capabilities/CreationCapability.js", + "key": "instantiation", + "implementation": "capabilities/InstantiationCapability.js", "depends": [ "$injector" ] } ], diff --git a/platform/core/src/capabilities/CreationCapability.js b/platform/core/src/capabilities/InstantiationCapability.js similarity index 96% rename from platform/core/src/capabilities/CreationCapability.js rename to platform/core/src/capabilities/InstantiationCapability.js index 334cb17d9e..1d1e38ce8a 100644 --- a/platform/core/src/capabilities/CreationCapability.js +++ b/platform/core/src/capabilities/InstantiationCapability.js @@ -61,7 +61,7 @@ define( * * @returns {DomainObject} the new domain object */ - CreationCapability.prototype.create = function (model) { + CreationCapability.prototype.instantiate = function (model) { var id = uuid(), capabilities = this.getCapabilities(model); return new DomainObjectImpl(id, model, capabilities); @@ -72,7 +72,7 @@ define( * @see {platform/core.CreationCapability#create} */ CreationCapability.prototype.invoke = - CreationCapability.prototype.create; + CreationCapability.prototype.instantiate; return CreationCapability; } diff --git a/platform/core/test/capabilities/CreationCapabilitySpec.js b/platform/core/test/capabilities/InstantiationCapabilitySpec.js similarity index 86% rename from platform/core/test/capabilities/CreationCapabilitySpec.js rename to platform/core/test/capabilities/InstantiationCapabilitySpec.js index bfc847fcc7..90b0108721 100644 --- a/platform/core/test/capabilities/CreationCapabilitySpec.js +++ b/platform/core/test/capabilities/InstantiationCapabilitySpec.js @@ -25,14 +25,14 @@ * ContextCapability. Created by vwoeltje on 11/6/14. */ define( - ["../../src/capabilities/CreationCapability"], - function (CreationCapability) { + ["../../src/capabilities/InstantiationCapability"], + function (InstantiationCapability) { 'use strict'; - describe("The 'creation' capability", function () { + describe("The 'instantiation' capability", function () { var mockInjector, mockCapabilityService, - creation; + instantiation; beforeEach(function () { mockInjector = jasmine.createSpyObj("$injector", ["get"]); @@ -46,12 +46,12 @@ define( mockCapabilityService : undefined; }); - creation = new CreationCapability(mockInjector); + instantiation = new InstantiationCapability(mockInjector); }); - it("aliases 'create' as 'invoke'", function () { - expect(creation.invoke).toBe(creation.create); + it("aliases 'instantiate' as 'invoke'", function () { + expect(instantiation.invoke).toBe(instantiation.instantiate); }); describe("when creating an object", function () { @@ -71,7 +71,7 @@ define( testModel = { someKey: "some value" }; - domainObject = creation.create(testModel); + domainObject = instantiation.instantiate(testModel); }); it("loads capabilities from the capability service", function () { @@ -92,7 +92,7 @@ define( it("provides unique identifiers", function () { expect(domainObject.getId()).toEqual(jasmine.any(String)); - expect(creation.create(testModel).getId()) + expect(instantiation.instantiate(testModel).getId()) .not.toEqual(domainObject.getId()); }); }); diff --git a/platform/core/test/suite.json b/platform/core/test/suite.json index 3b0613629d..390962f22a 100644 --- a/platform/core/test/suite.json +++ b/platform/core/test/suite.json @@ -8,8 +8,8 @@ "capabilities/ContextCapability", "capabilities/ContextualDomainObject", "capabilities/CoreCapabilityProvider", - "capabilities/CreationCapability", "capabilities/DelegationCapability", + "capabilities/InstantiationCapability", "capabilities/MetadataCapability", "capabilities/MutationCapability", "capabilities/PersistenceCapability",