Fixes #94.

Author: jmdobry

CHANGELOG.md

@@ -1,9 +1,10 @@
 ##### 0.10.1 - xx July 2014
 
 ###### Backwards compatible bug fixes
-- #90 - DS.create isn't added to completedQueries
-- #91 - dist/angular-data(.min).js doesn't end with a semicolon
-- #95 - observe-js outdated
+- #90 - DS.create isn't added to completedQueries (`DS.create` now adds a completed query entry)
+- #91 - dist/angular-data(.min).js doesn't end with a semicolon (upgraded Browserify)
+- #94 - Resource object name/class inconsistency (added `useClass` option to `DS.defineResource`)
+- #95 - observe-js outdated (Upgraded observe-js.js an refactored to new API)
 
 ##### 0.10.0 - 18 July 2014
 

dist/angular-data.js

@@ -3359,6 +3359,7 @@ Defaults.prototype.filter = function (collection, resourceName, params, options)
 };
 Defaults.prototype.baseUrl = '';
 Defaults.prototype.endpoint = '';
+Defaults.prototype.useClass = false;
 /**
  * @doc property
  * @id DSProvider.properties:defaults.beforeValidate
@@ -4147,6 +4148,7 @@ function Resource(utils, options) {
  * - `{string="id"}` - `idAttribute` - The attribute that specifies the primary key for this resource.
  * - `{string=}` - `endpoint` - The attribute that specifies the primary key for this resource. Default is the value of `name`.
  * - `{string=}` - `baseUrl` - The url relative to which all AJAX requests will be made.
+ * - `{boolean=}` - `useClass` - Whether to use a wrapper class created from the ProperCase name of the resource. The wrapper will always be used for resources that have `methods` defined.
  * - `{*=}` - `meta` - A property reserved for developer use. This will never be used by the API.
  * - `{object=}` - `methods` - If provided, items of this resource will be wrapped in a constructor function that is
  * empty save for the attributes in this option which will be mixed in to the constructor function prototype. Enabling
@@ -4172,6 +4174,7 @@ function defineResource(definition) {
   var IA = this.errors.IA;
 
   if (this.utils.isString(definition)) {
+    definition = definition.replace(/\s/gi, '');
     definition = {
       name: definition
     };
@@ -4210,10 +4213,11 @@ function defineResource(definition) {
       storagePrefix: 'DS.' + def.name
     });
 
+    def.class = definition.name[0].toUpperCase() + definition.name.substring(1);
+    eval('function ' + def.class + '() {}');
+    def[def.class] = eval(def.class);
+
     if (def.methods) {
-      def.class = definition.name[0].toUpperCase() + definition.name.substring(1);
-      eval('function ' + def.class + '() {}');
-      def[def.class] = eval(def.class);
       this.utils.deepMixIn(def[def.class].prototype, def.methods);
     }
 
@@ -4886,7 +4890,7 @@ function _inject(definition, resource, attrs) {
         var item = this.get(definition.name, id);
 
         if (!item) {
-          if (definition.class) {
+          if (definition.methods || definition.useClass) {
             if (attrs instanceof definition[definition.class]) {
               item = attrs;
             } else {

dist/angular-data.min.js

@@ -184,6 +184,7 @@ Defaults.prototype.filter = function (collection, resourceName, params, options)
 };
 Defaults.prototype.baseUrl = '';
 Defaults.prototype.endpoint = '';
+Defaults.prototype.useClass = false;
 /**
  * @doc property
  * @id DSProvider.properties:defaults.beforeValidate

src/datastore/index.js

@@ -50,6 +50,7 @@ function Resource(utils, options) {
  * - `{string="id"}` - `idAttribute` - The attribute that specifies the primary key for this resource.
  * - `{string=}` - `endpoint` - The attribute that specifies the primary key for this resource. Default is the value of `name`.
  * - `{string=}` - `baseUrl` - The url relative to which all AJAX requests will be made.
+ * - `{boolean=}` - `useClass` - Whether to use a wrapper class created from the ProperCase name of the resource. The wrapper will always be used for resources that have `methods` defined.
  * - `{*=}` - `meta` - A property reserved for developer use. This will never be used by the API.
  * - `{object=}` - `methods` - If provided, items of this resource will be wrapped in a constructor function that is
  * empty save for the attributes in this option which will be mixed in to the constructor function prototype. Enabling
@@ -75,6 +76,7 @@ function defineResource(definition) {
   var IA = this.errors.IA;
 
   if (this.utils.isString(definition)) {
+    definition = definition.replace(/\s/gi, '');
     definition = {
       name: definition
     };
@@ -113,10 +115,11 @@ function defineResource(definition) {
       storagePrefix: 'DS.' + def.name
     });
 
+    def.class = definition.name[0].toUpperCase() + definition.name.substring(1);
+    eval('function ' + def.class + '() {}');
+    def[def.class] = eval(def.class);
+
     if (def.methods) {
-      def.class = definition.name[0].toUpperCase() + definition.name.substring(1);
-      eval('function ' + def.class + '() {}');
-      def[def.class] = eval(def.class);
       this.utils.deepMixIn(def[def.class].prototype, def.methods);
     }
 

src/datastore/sync_methods/defineResource.js

@@ -64,7 +64,7 @@ function _inject(definition, resource, attrs) {
         var item = this.get(definition.name, id);
 
         if (!item) {
-          if (definition.class) {
+          if (definition.methods || definition.useClass) {
             if (attrs instanceof definition[definition.class]) {
               item = attrs;
             } else {

src/datastore/sync_methods/inject.js

@@ -42,6 +42,7 @@ describe('DS.defineResource(definition)', function () {
 
     assert.doesNotThrow(function () {
       DS.defineResource('new resource');
+      assert.equal(DS.definitions.newresource.class, 'Newresource');
     }, 'Should not throw');
   });
 
@@ -95,13 +96,34 @@ describe('DS.defineResource(definition)', function () {
       }
     });
 
+    DS.defineResource({
+      name: 'dog',
+      useClass: true
+    });
+
+    DS.defineResource({
+      name: 'cat'
+    });
+
     DS.inject('person', {
       first: 'John',
       last: 'Anderson',
       id: 1
     });
 
+    DS.inject('dog', {
+      name: 'Spot',
+      id: 1
+    });
+
+    DS.inject('cat', {
+      name: 'Sam',
+      id: 1
+    });
+
     var user = DS.get('person', 1);
+    var dog = DS.get('dog', 1);
+    var cat = DS.get('cat', 1);
 
     assert.deepEqual(JSON.stringify(user), JSON.stringify({
       first: 'John',
@@ -110,10 +132,12 @@ describe('DS.defineResource(definition)', function () {
     }));
     assert.equal(user.fullName(), 'John Anderson');
     assert.isTrue(user instanceof DS.definitions.person[DS.definitions.person.class]);
+    assert.isTrue(dog instanceof DS.definitions.dog[DS.definitions.dog.class]);
+    assert.isTrue(cat instanceof Object);
     assert.equal(DS.definitions.person.class, 'Person');
     assert.equal(DS.definitions.person[DS.definitions.person.class].name, 'Person');
-    assert.equal(lifecycle.beforeInject.callCount, 1, 'beforeInject should have been called');
-    assert.equal(lifecycle.afterInject.callCount, 1, 'afterInject should have been called');
+    assert.equal(lifecycle.beforeInject.callCount, 3, 'beforeInject should have been called');
+    assert.equal(lifecycle.afterInject.callCount, 3, 'afterInject should have been called');
   });
   it('should allow definition of computed properties', function (done) {
     var callCount = 0;