Merge pull request #43 from kurenai-ryu/master

Fix named associations endpoints

lib/Resource.js

@@ -68,7 +68,7 @@ var Resource = function(options) {
       this.attributes = getKeys(this.model.rawAttributes);
     }
   }
-  
+
   this.actions = options.actions;
   this.endpoints = {
     plural: options.endpoints[0],
@@ -227,23 +227,24 @@ function autoAssociate(resource) {
 
     var subResourceName;
     if (association.associationType === 'HasOne') {
-      subResourceName =
+      subResourceName = association.as ? association.as.toLowerCase() :
         association.target.options.name.singular.toLowerCase();
       resource[subResourceName] = hasOneResource(Resource, resource, association);
     } else if (association.associationType === 'HasMany') {
-      subResourceName =
+      subResourceName = association.as ? association.as.toLowerCase() :
         association.target.options.name.plural.toLowerCase();
       resource[subResourceName] = hasManyResource(Resource, resource, association);
     } else if (association.associationType === 'BelongsTo') {
-      subResourceName =
+      subResourceName = association.as ? association.as.toLowerCase() :
         association.target.options.name.singular.toLowerCase();
       resource[subResourceName] = belongsToResource(Resource, resource, association);
     } else if (association.associationType === 'BelongsToMany') {
-     subResourceName =
-       association.target.options.name.plural.toLowerCase();
-     resource[subResourceName] = belongsToManyResource(Resource, resource, association);
+      subResourceName = association.as ? association.as.toLowerCase() :
+        association.target.options.name.plural.toLowerCase();
+      resource[subResourceName] = belongsToManyResource(Resource, resource, association);
     }
+    //console.log("REsource.autoAsociate srn", subResourceName);
   });
 }
 
-module.exports = Resource;
+module.exports = Resource;

lib/associations/belongs-to-many.js

@@ -4,8 +4,8 @@ var _ = require('lodash');
 
 module.exports = function(Resource, resource, association) {
   // access points
-  var subResourceName =
-    association.target.options.name.plural.toLowerCase();
+  var subResourceName = association.as ? association.as.toLowerCase() :
+      association.target.options.name.plural.toLowerCase();
 
   // Find reverse association
   var associationPaired;

lib/associations/belongs-to.js

@@ -2,8 +2,8 @@
 
 module.exports = function(Resource, resource, association) {
   // access points
-  var subResourceName =
-    association.target.options.name.singular.toLowerCase();
+  var subResourceName = association.as ? association.as.toLowerCase() :
+      association.target.options.name.singular.toLowerCase();
 
   var associatedResource = new Resource({
     app: resource.app,

lib/associations/has-many.js

@@ -2,8 +2,8 @@
 
 module.exports = function(Resource, resource, association) {
   // access points
-  var subResourceName =
-    association.target.options.name.plural.toLowerCase();
+  var subResourceName = association.as ? association.as.toLowerCase() :
+      association.target.options.name.plural.toLowerCase();
 
   var associatedResource = new Resource({
     app: resource.app,

lib/associations/has-one.js

@@ -2,8 +2,8 @@
 
 module.exports = function(Resource, resource, association) {
   // access points
-  var subResourceName =
-    association.target.options.name.singular.toLowerCase();
+  var subResourceName = association.as ? association.as.toLowerCase() :
+      association.target.options.name.singular.toLowerCase();
 
   var associatedResource = new Resource({
     app: resource.app,

tests/associations/sub-resource-name.test.js

@@ -0,0 +1,48 @@
+'use strict';
+
+var expect = require('chai').expect,
+    rest = require('../../lib'),
+    test = require('../support');
+
+describe('Associations(named sub-resources)', function() {
+  describe('without using "as" to name an association', function() {
+    it('should name the sub-resources according to the model name', function(done) {
+      var Person = test.db.define('person', { name: { type: test.Sequelize.STRING } }, { underscored: true }),
+          Course = test.db.define('course', { name: { type: test.Sequelize.STRING } }, { underscored: true });
+      Course.hasMany(Person);
+      Course.hasOne(Person);
+      rest.initialize({
+        app: test.app,
+        sequelize: test.Sequelize
+      });
+      var resource = rest.resource({model: Course,
+                                    endpoints: ['/courses', '/courses/:id'],
+                                    associations: true});
+      expect(resource).to.not.have.property('students');
+      expect(resource).to.not.have.property('teacher');
+      expect(resource).to.have.property('people');
+      expect(resource).to.have.property('person');
+      done();
+    });
+  });
+  describe('using "as" to name an association', function() {
+    it('should name the sub-resources using the name provided by "as"', function(done) {
+      var Person = test.db.define('person', { name: { type: test.Sequelize.STRING } }, { underscored: true }),
+          Course = test.db.define('course', { name: { type: test.Sequelize.STRING } }, { underscored: true });
+      Course.hasMany(Person, { as: 'students' });
+      Course.hasOne(Person, { as: 'teacher' });
+      rest.initialize({
+        app: test.app,
+        sequelize: test.Sequelize
+      });
+      var resource = rest.resource({model: Course,
+                                    endpoints: ['/courses', '/courses/:id'],
+                                    associations: true});
+      expect(resource).to.have.property('students');
+      expect(resource).to.have.property('teacher');
+      expect(resource).to.not.have.property('people');
+      expect(resource).to.not.have.property('person');
+      done();
+    });
+  });
+});