verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.7.4' into production

This commit is contained in:
Miroslav Bajtoš 2014-04-04 16:41:51 +02:00
parent 7ca6b0eafd 3640b2e113
commit 0726fe1517
5 changed files with 62 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,5 +1,7 @@
# LoopBack # LoopBack
For a quick introduction and overview, see http://loopback.io/.
## Documentation ## Documentation
[See the full documentation](http://docs.strongloop.com/display/DOC/LoopBack). [See the full documentation](http://docs.strongloop.com/display/DOC/LoopBack).

92
lib/application.js
View File

@ -48,8 +48,7 @@ var app = exports = module.exports = {};
/** /**
* Lazily load a set of [remote objects](http://apidocs.strongloop.com/strong-remoting/#remoteobjectsoptions). * Lazily load a set of [remote objects](http://apidocs.strongloop.com/strong-remoting/#remoteobjectsoptions).
* *
* **NOTE:** Calling `app.remotes()` multiple times will only ever return a * **NOTE:** Calling `app.remotes()` more than once returns only a single set of remote objects.
* single set of remote objects.
* @returns {RemoteObjects} * @returns {RemoteObjects}
*/ */
@ -88,13 +87,13 @@ app.disuse = function (route) {
* }); * });
* ``` * ```
* *
* @param {String} modelName The name of the model to define * @param {String} modelName The name of the model to define.
* @options {Object} config The model's configuration * @options {Object} config The model's configuration.
* @property {String|DataSource} dataSource The `DataSource` to attach the model to * @property {String|DataSource} dataSource The `DataSource` to which to attach the model.
* @property {Object} [options] an object containing `Model` options * @property {Object} [options] an object containing `Model` options.
* @property {ACL[]} [options.acls] an array of `ACL` definitions * @property {ACL[]} [options.acls] an array of `ACL` definitions.
* @property {String[]} [options.hidden] **experimental** an array of properties to hide when accessed remotely * @property {String[]} [options.hidden] **experimental** an array of properties to hide when accessed remotely.
* @property {Object} [properties] object defining the `Model` properties in [LoopBack Definition Language](http://docs.strongloop.com/loopback-datasource-juggler/#loopback-definition-language) * @property {Object} [properties] object defining the `Model` properties in [LoopBack Definition Language](http://docs.strongloop.com/loopback-datasource-juggler/#loopback-definition-language).
* @end * @end
* @returns {ModelConstructor} the model class * @returns {ModelConstructor} the model class
*/ */
@ -129,14 +128,11 @@ app.model = function (Model, config) {
} }
/** /**
* Get the models exported by the app. Only models defined using `app.model()` * Get the models exported by the app. Returns only models defined using `app.model()`
* will show up in this list.
* *
* There are two ways how to access models. * There are two ways to access models:
* *
* **1. A list of all models** * 1. Call `app.models()` to get a list of all models.
*
* Call `app.models()` to get a list of all models.
* *
* ```js * ```js
* var models = app.models(); * var models = app.models();
@ -146,12 +142,11 @@ app.model = function (Model, config) {
* }); * });
* ``` * ```
* *
* **2. By model name** * **2. Use `app.model` to access a model by name.
*
* `app.model` has properties for all defined models. * `app.model` has properties for all defined models.
* *
* In the following example the `Product` and `CustomerReceipt` models are * The following example illustrates accessing the `Product` and `CustomerReceipt` models
* accessed using the `models` object. * using the `models` object.
* *
* ```js * ```js
* var loopback = require('loopback'); * var loopback = require('loopback');
@ -178,7 +173,7 @@ app.model = function (Model, config) {
* var customerReceipt = app.models.customerReceipt; * var customerReceipt = app.models.customerReceipt;
* ``` * ```
* *
* @returns {Array} a list of model classes * @returns {Array} Array of model classes.
*/ */
app.models = function () { app.models = function () {
@ -200,6 +195,7 @@ app.dataSource = function (name, config) {
/** /**
* Get all remote objects. * Get all remote objects.
* @returns {Object} [Remote objects](http://apidocs.strongloop.com/strong-remoting/#remoteobjectsoptions).
*/ */
app.remoteObjects = function () { app.remoteObjects = function () {
@ -220,8 +216,7 @@ app.remoteObjects = function () {
/** /**
* Enable swagger REST API documentation. * Enable swagger REST API documentation.
* *
* > Note: This method is deprecated, use the extension * **Note**: This method is deprecated. Use [loopback-explorer](http://npmjs.org/package/loopback-explorer) instead.
* [loopback-explorer](http://npmjs.org/package/loopback-explorer) instead.
* *
* **Options** * **Options**
* *
@ -314,29 +309,30 @@ app.enableAuth = function() {
/** /**
* Initialize an application from an options object or a set of JSON and JavaScript files. * Initialize an application from an options object or a set of JSON and JavaScript files.
* *
* **What happens during an app _boot_?** * This function takes an optional argument that is either a string or an object.
* *
* 1. **DataSources** are created from an `options.dataSources` object or `datasources.json` in the current directory * If the argument is a string, then it sets the application root directory based on the string value. Then it:
* 2. **Models** are created from an `options.models` object or `models.json` in the current directory * 1. Creates DataSources from the `datasources.json` file in the application root directory.
* 3. Any JavaScript files in the `./models` directory are loaded with `require()`. * 2. Creates Models from the `models.json` file in the application root directory.
* 4. Any JavaScript files in the `./boot` directory are loaded with `require()`.
* *
* **Options** * If the argument is an object, then it looks for `model`, `dataSources`, and `appRootDir` properties of the object.
* If the object has no `appRootDir` property then it sets the current working directory as the application root directory.
* Then it:
* 1. Creates DataSources from the `options.dataSources` object.
* 2. Creates Models from the `options.models` object.
* *
* - `appRootDir` - _optional_ - the directory to use when loading JSON and JavaScript files * In both cases, the function loads JavaScript files in the `/models` and `/boot` subdirectories of the application root directory with `require()`.
* - `models` - _optional_ - an object containing `Model` definitions
* - `dataSources` - _optional_ - an object containing `DataSource` definitions
* *
* > **NOTE:** mixing `app.boot()` and `app.model(name, config)` in multiple * **NOTE:** mixing `app.boot()` and `app.model(name, config)` in multiple
* > files may result * files may result in models being **undefined** due to race conditions.
* > in models being **undefined** due to race conditions. To avoid this when * To avoid this when using `app.boot()` make sure all models are passed as part of the `models` definition.
* > using `app.boot()` *
* > make sure all models are passed as part of the `models` definition. * Throws an error if the config object is not valid or if boot fails.
* *
* <a name="model-definition"></a> * <a name="model-definition"></a>
* **Model Definitions** * **Model Definitions**
* *
* The following is an example of an object containing two `Model` definitions: "location" and "inventory". * The following is example JSON for two `Model` definitions: "dealership" and "location".
* *
* ```js * ```js
* { * {
@ -381,20 +377,13 @@ app.enableAuth = function() {
* } * }
* } * }
* ``` * ```
* * @options {String|Object} options Boot options; If String, this is the application root directory; if object, has below properties.
* **Model definition properties** * @property {String} appRootDir Directory to use when loading JSON and JavaScript files (optional). Defaults to the current directory (`process.cwd()`).
* * @property {Object} models Object containing `Model` definitions (optional).
* - `dataSource` - **required** - a string containing the name of the data source definition to attach the `Model` to * @property {Object} dataSources Object containing `DataSource` definitions (optional).
* - `options` - _optional_ - an object containing `Model` options * @end
* - `properties` _optional_ - an object defining the `Model` properties in [LoopBack Definition Language](http://docs.strongloop.com/loopback-datasource-juggler/#loopback-definition-language)
*
* **DataSource definition properties**
*
* - `connector` - **required** - the name of the [connector](#working-with-data-sources-and-connectors)
* *
* @header app.boot([options]) * @header app.boot([options])
* @throws {Error} If config is not valid
* @throws {Error} If boot fails
*/ */
app.boot = function(options) { app.boot = function(options) {
@ -650,7 +639,8 @@ function clearHandlerCache(app) {
app._handlers = undefined; app._handlers = undefined;
} }
/** /*!
* This function is now deprecated.
* Install all express middleware required by LoopBack. * Install all express middleware required by LoopBack.
* *
* It is possible to inject your own middleware by listening on one of the * It is possible to inject your own middleware by listening on one of the
@ -799,7 +789,7 @@ app.installMiddleware = function() {
* This way the port param contains always the real port number, even when * This way the port param contains always the real port number, even when
* listen was called with port number 0. * listen was called with port number 0.
* *
* @param {Function=} cb If specified, the callback will be added as a listener * @param {Function} cb If specified, the callback is added as a listener
* for the server's "listening" event. * for the server's "listening" event.
* @returns {http.Server} A node `http.Server` with this application configured * @returns {http.Server} A node `http.Server` with this application configured
* as the request handler. * as the request handler.

29
lib/loopback.js
View File

@ -15,27 +15,29 @@ var express = require('express')
, assert = require('assert'); , assert = require('assert');
/** /**
* `loopback` is the main entry for LoopBack core module. It provides static * Main entry for LoopBack core module. It provides static properties and
* methods to create models and data sources. The module itself is a function * methods to create models and data sources. The module itself is a function
* that creates loopback `app`. For example, * that creates loopback `app`. For example,
* *
*
* ```js * ```js
* var loopback = require('loopback'); * var loopback = require('loopback');
* var app = loopback(); * var app = loopback();
* ``` * ```
*
* @class loopback
* @header loopback
*/ */
var loopback = exports = module.exports = createApplication; var loopback = exports = module.exports = createApplication;
/** /**
* Is this a browser environment? * True if running in a browser environment; false otherwise.
*/ */
loopback.isBrowser = typeof window !== 'undefined'; loopback.isBrowser = typeof window !== 'undefined';
/** /**
* Is this a server environment? * True if running in a server environment; false otherwise.
*/ */
loopback.isServer = !loopback.isBrowser; loopback.isServer = !loopback.isBrowser;
@ -116,11 +118,10 @@ loopback.errorHandler.title = 'Loopback';
/** /**
* Create a data source with passing the provided options to the connector. * Create a data source with passing the provided options to the connector.
* *
* @param {String} name (optional) * @param {String} name Optional name.
* @param {Object} options * @options {Object} Data Source options
* * @property {Object} connector LoopBack connector.
* - connector - an loopback connector * @property {*} Other&nbsp;properties See the relevant connector documentation.
* - other values - see the specified `connector` docs
*/ */
loopback.createDataSource = function (name, options) { loopback.createDataSource = function (name, options) {
@ -141,7 +142,7 @@ loopback.createDataSource = function (name, options) {
/** /**
* Create a named vanilla JavaScript class constructor with an attached set of properties and options. * Create a named vanilla JavaScript class constructor with an attached set of properties and options.
* *
* @param {String} name - must be unique * @param {String} name Unique name.
* @param {Object} properties * @param {Object} properties
* @param {Object} options (optional) * @param {Object} options (optional)
*/ */
@ -223,7 +224,7 @@ loopback.memory = function (name) {
/** /**
* Look up a model class by name from all models created by loopback.createModel() * Look up a model class by name from all models created by loopback.createModel()
* @param {String} modelName The model name * @param {String} modelName The model name
* @return {Model} The model class * @returns {Model} The model class
*/ */
loopback.getModel = function(modelName) { loopback.getModel = function(modelName) {
return loopback.Model.modelBuilder.models[modelName]; return loopback.Model.modelBuilder.models[modelName];
@ -233,7 +234,7 @@ loopback.getModel = function(modelName) {
* Look up a model class by the base model class. The method can be used by LoopBack * Look up a model class by the base model class. The method can be used by LoopBack
* to find configured models in models.json over the base model. * to find configured models in models.json over the base model.
* @param {Model} The base model class * @param {Model} The base model class
* @return {Model} The subclass if found or the base class * @returns {Model} The subclass if found or the base class
*/ */
loopback.getModelByType = function(modelType) { loopback.getModelByType = function(modelType) {
assert(typeof modelType === 'function', 'The model type must be a constructor'); assert(typeof modelType === 'function', 'The model type must be a constructor');
@ -250,7 +251,7 @@ loopback.getModelByType = function(modelType) {
* Set the default `dataSource` for a given `type`. * Set the default `dataSource` for a given `type`.
* @param {String} type The datasource type * @param {String} type The datasource type
* @param {Object|DataSource} dataSource The data source settings or instance * @param {Object|DataSource} dataSource The data source settings or instance
* @return {DataSource} The data source instance * @returns {DataSource} The data source instance
*/ */
loopback.setDefaultDataSourceForType = function(type, dataSource) { loopback.setDefaultDataSourceForType = function(type, dataSource) {
@ -267,7 +268,7 @@ loopback.setDefaultDataSourceForType = function(type, dataSource) {
/** /**
* Get the default `dataSource` for a given `type`. * Get the default `dataSource` for a given `type`.
* @param {String} type The datasource type * @param {String} type The datasource type
* @return {DataSource} The data source instance * @returns {DataSource} The data source instance
*/ */
loopback.getDefaultDataSourceForType = function(type) { loopback.getDefaultDataSourceForType = function(type) {

3
lib/models/model.js
View File

@ -100,8 +100,9 @@ Model.setup = function () {
}; };
// Map the prototype method to /:id with data in the body // Map the prototype method to /:id with data in the body
var idDesc = ModelCtor.modelName + ' id';
ModelCtor.sharedCtor.accepts = [ ModelCtor.sharedCtor.accepts = [
{arg: 'id', type: 'any', http: {source: 'path'}} {arg: 'id', type: 'any', http: {source: 'path'}, description: idDesc}
// {arg: 'instance', type: 'object', http: {source: 'body'}} // {arg: 'instance', type: 'object', http: {source: 'body'}}
]; ];

2
package.json
View File

@ -9,7 +9,7 @@
"Platform", "Platform",
"mBaaS" "mBaaS"
], ],
"version": "1.7.3", "version": "1.7.4",
"scripts": { "scripts": {
"test": "mocha -R spec" "test": "mocha -R spec"
}, },