Merge pull request #199 from fabien/feature/normalize-url

Customize/Normalize class-level remoting http path

lib/model-builder.js

@@ -111,6 +111,9 @@ ModelBuilder.prototype.define = function defineClass(className, properties, sett
   var pluralName = (settings && settings.plural) ||
     inflection.pluralize(className);
   
+  var httpOptions = (settings && settings.http) || {};
+  var pathName = httpOptions.path || pluralName;
+  
   if (!className) {
     throw new Error('Class name required');
   }
@@ -188,7 +191,7 @@ ModelBuilder.prototype.define = function defineClass(className, properties, sett
   hiddenProperty(ModelClass, 'dataSource', modelBuilder); // Keep for back-compatibility
   hiddenProperty(ModelClass, 'pluralModelName', pluralName);
   hiddenProperty(ModelClass, 'relations', {});
-  hiddenProperty(ModelClass, 'http', { path: '/' + pluralName });
+  hiddenProperty(ModelClass, 'http', { path: '/' + pathName });
   hiddenProperty(ModelClass, 'base', ModelBaseClass);
 
   // inherit ModelBaseClass static methods

lib/relation-definition.js

@@ -70,11 +70,7 @@ function extendScopeMethods(definition, scopeMethods, ext) {
         return relationMethod.apply(relation, arguments);
       };
       if (relationMethod.shared) {
-        method.shared = true;
+        sharedMethod(definition, key, method, relationMethod);
-        method.accepts = relationMethod.accepts;
-        method.returns = relationMethod.returns;
-        method.http = relationMethod.http;
-        method.description = relationMethod.description;
       }
       customMethods.push(key);
     }
@@ -573,14 +569,18 @@ function scopeMethod(definition, methodName) {
 
   var relationMethod = relationClass.prototype[methodName];
   if (relationMethod.shared) {
+    sharedMethod(definition, methodName, method, relationMethod);
+  }
+  return method;
+}
+
+function sharedMethod(definition, methodName, method, relationMethod) {
   method.shared = true;
   method.accepts = relationMethod.accepts;
   method.returns = relationMethod.returns;
   method.http = relationMethod.http;
   method.description = relationMethod.description;
-  }
+};
-  return method;
-}
 
 /**
  * Find a related item by foreign key
@@ -1295,6 +1295,15 @@ RelationDefinition.hasOne = function (modelFrom, modelTo, params) {
       return relationMethod;
     }
   });
+  
+  // FIXME: [rfeng] Wrap the property into a function for remoting
+  // so that it can be accessed as /api/<model>/<id>/<hasOneRelationName>
+  // For example, /api/orders/1/customer
+  var fn = function() {
+    var f = this[relationName];
+    f.apply(this, arguments);
+  };
+  modelFrom.prototype['__get__' + relationName] = fn;
 };
 
 /**

test/loopback-dl.test.js

@@ -549,6 +549,15 @@ describe('DataSource define model', function () {
     done();
   });
   
+  it('should allow an explicit remoting path', function () {
+    var ds = new DataSource('memory');
+    
+    var User = ds.define('User', {name: String, bio: String}, { 
+      http: { path: 'accounts' }
+    });
+    User.http.path.should.equal('/accounts');
+  });
+
 });
 
 describe('Load models with base', function () {