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

Merge pull request #640 from strongloop/feature/move-models-to-common 

Move models to common/models
This commit is contained in:
Miroslav Bajtoš 2014-10-13 19:14:41 +02:00
parent 0fda4c4193 1fe0110849
commit 905fbf4267
20 changed files with 76 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
lib/models/README.md → common/models/README.md
View File

2
lib/models/access-token.js → common/models/access-token.js
View File

@ -2,7 +2,7 @@
* Module Dependencies.
*/
var loopback = require('../loopback')
var loopback = require('../../lib/loopback')
, assert = require('assert')
, crypto = require('crypto')
, uid = require('uid2')

4
lib/models/acl.js → common/models/acl.js
View File

@ -31,12 +31,12 @@
*/
var loopback = require('../loopback');
var loopback = require('../../lib/loopback');
var async = require('async');
var assert = require('assert');
var debug = require('debug')('loopback:security:acl');
var ctx = require('./access-context');
var ctx = require('../../lib/access-context');
var AccessContext = ctx.AccessContext;
var Principal = ctx.Principal;
var AccessRequest = ctx.AccessRequest;

2
lib/models/application.js → common/models/application.js
View File

@ -1,4 +1,4 @@
var loopback = require('../loopback');
var loopback = require('../../lib/loopback');
var assert = require('assert');
// Authentication schemes

4
lib/models/change.js → common/models/change.js
View File

@ -2,8 +2,8 @@
* Module Dependencies.
*/
var PersistedModel = require('./persisted-model')
, loopback = require('../loopback')
var PersistedModel = require('../../lib/loopback').PersistedModel
, loopback = require('../../lib/loopback')
, crypto = require('crypto')
, CJSON = {stringify: require('canonical-json')}
, async = require('async')

4
lib/models/checkpoint.js → common/models/checkpoint.js
View File

@ -2,8 +2,8 @@
* Module Dependencies.
*/
var PersistedModel = require('../loopback').PersistedModel
, loopback = require('../loopback')
var PersistedModel = require('../../lib/loopback').PersistedModel
, loopback = require('../../lib/loopback')
, assert = require('assert');
/**

4
lib/models/email.js → common/models/email.js
View File

@ -2,8 +2,8 @@
* Module Dependencies.
*/
var Model = require('../loopback').Model
, loopback = require('../loopback');
var Model = require('../../lib/loopback').Model
, loopback = require('../../lib/loopback');
var properties = {
to: {type: String, required: true},

4
lib/models/role.js → common/models/role.js
View File

@ -1,9 +1,9 @@
var loopback = require('../loopback');
var loopback = require('../../lib/loopback');
var debug = require('debug')('loopback:security:role');
var assert = require('assert');
var async = require('async');
var AccessContext = require('./access-context').AccessContext;
var AccessContext = require('../../lib/access-context').AccessContext;
// Role model
var RoleSchema = {

4
lib/models/user.js → common/models/user.js
View File

@ -2,8 +2,8 @@
* Module Dependencies.
*/
var PersistedModel = require('../loopback').PersistedModel
, loopback = require('../loopback')
var PersistedModel = require('../../lib/loopback').PersistedModel
, loopback = require('../../lib/loopback')
, path = require('path')
, SALT_WORK_FACTOR = 10
, crypto = require('crypto')

26
docs.json
View File

@ -5,22 +5,22 @@
"lib/loopback.js",
"lib/runtime.js",
"lib/registry.js",
{ "title": "Base models", "depth": 2 },
"lib/models/model.js",
"lib/models/persisted-model.js",
{ "title": "Middleware", "depth": 2 },
{ "title": "Base models", "depth": 2 },
"lib/model.js",
"lib/persisted-model.js",
{ "title": "Middleware", "depth": 2 },
"lib/middleware/rest.js",
"lib/middleware/status.js",
"lib/middleware/token.js",
"lib/middleware/token.js",
"lib/middleware/urlNotFound.js",
{ "title": "Built-in models", "depth": 2 },
"lib/models/access-token.js",
"lib/models/acl.js",
"lib/models/application.js",
"lib/models/email.js",
"lib/models/role.js",
"lib/models/user.js",
"lib/models/change.js"
{ "title": "Built-in models", "depth": 2 },
"common/models/access-token.js",
"common/models/acl.js",
"common/models/application.js",
"common/models/email.js",
"common/models/role.js",
"common/models/user.js",
"common/models/change.js"
],
"assets": "/docs/assets"
}

6
lib/models/access-context.js → lib/access-context.js
View File

@ -1,5 +1,5 @@
var loopback = require('../loopback');
var AccessToken = require('./access-token');
var loopback = require('./loopback');
var AccessToken = require('../common/models/access-token');
var debug = require('debug')('loopback:security:access-context');
/**
@ -280,7 +280,7 @@ AccessRequest.prototype.exactlyMatches = function(acl) {
*/
AccessRequest.prototype.isAllowed = function() {
return this.permission !== require('./acl').ACL.DENY;
return this.permission !== require('../common/models/acl').ACL.DENY;
}
AccessRequest.prototype.debug = function() {

30
lib/builtin-models.js Normal file
View File

@ -0,0 +1,30 @@
module.exports = function(loopback) {
loopback.Email = require('../common/models/email');
loopback.User = require('../common/models/user');
loopback.Application = require('../common/models/application');
loopback.AccessToken = require('../common/models/access-token');
loopback.Role = require('../common/models/role').Role;
loopback.RoleMapping = require('../common/models/role').RoleMapping;
loopback.ACL = require('../common/models/acl').ACL;
loopback.Scope = require('../common/models/acl').Scope;
loopback.Change = require('../common/models/change');
/*!
* Automatically attach these models to dataSources
*/
var dataSourceTypes = {
DB: 'db',
MAIL: 'mail'
};
loopback.Email.autoAttach = dataSourceTypes.MAIL;
loopback.PersistedModel.autoAttach = dataSourceTypes.DB;
loopback.User.autoAttach = dataSourceTypes.DB;
loopback.AccessToken.autoAttach = dataSourceTypes.DB;
loopback.Role.autoAttach = dataSourceTypes.DB;
loopback.RoleMapping.autoAttach = dataSourceTypes.DB;
loopback.ACL.autoAttach = dataSourceTypes.DB;
loopback.Scope.autoAttach = dataSourceTypes.DB;
loopback.Application.autoAttach = dataSourceTypes.DB;
};

29
lib/loopback.js
View File

@ -165,31 +165,4 @@ loopback.template = function (file) {
* Built in models / services
*/
loopback.Email = require('./models/email');
loopback.User = require('./models/user');
loopback.Application = require('./models/application');
loopback.AccessToken = require('./models/access-token');
loopback.Role = require('./models/role').Role;
loopback.RoleMapping = require('./models/role').RoleMapping;
loopback.ACL = require('./models/acl').ACL;
loopback.Scope = require('./models/acl').Scope;
loopback.Change = require('./models/change');
/*!
* Automatically attach these models to dataSources
*/
var dataSourceTypes = {
DB: 'db',
MAIL: 'mail'
};
loopback.Email.autoAttach = dataSourceTypes.MAIL;
loopback.PersistedModel.autoAttach = dataSourceTypes.DB;
loopback.User.autoAttach = dataSourceTypes.DB;
loopback.AccessToken.autoAttach = dataSourceTypes.DB;
loopback.Role.autoAttach = dataSourceTypes.DB;
loopback.RoleMapping.autoAttach = dataSourceTypes.DB;
loopback.ACL.autoAttach = dataSourceTypes.DB;
loopback.Scope.autoAttach = dataSourceTypes.DB;
loopback.Application.autoAttach = dataSourceTypes.DB;
require('./builtin-models')(loopback);

6
lib/models/model.js → lib/model.js
View File

@ -1,7 +1,7 @@
/*!
* Module Dependencies.
*/
var registry = require('../registry');
var registry = require('./registry');
var assert = require('assert');
var RemoteObjects = require('strong-remoting');
var SharedClass = require('strong-remoting').SharedClass;
@ -250,7 +250,7 @@ Model._ACL = function getACL(ACL) {
if(_aclModel) {
return _aclModel;
}
var aclModel = require('./acl').ACL;
var aclModel = loopback.ACL;
_aclModel = registry.getModelByType(aclModel);
return _aclModel;
};
@ -268,7 +268,7 @@ Model._ACL = function getACL(ACL) {
*/
Model.checkAccess = function(token, modelId, sharedMethod, ctx, callback) {
var ANONYMOUS = require('./access-token').ANONYMOUS;
var ANONYMOUS = loopback.AccessToken.ANONYMOUS;
token = token || ANONYMOUS;
var aclModel = Model._ACL();

12
lib/models/index.js
View File

@ -1,12 +0,0 @@
exports.Model = require('./model');
exports.Email = require('./email');
exports.User = require('./user');
exports.AccessToken = require('./access-token');
exports.Application = require('./application');
exports.ACL = require('./acl');
exports.Role = require('./role');

4
lib/models/persisted-model.js → lib/persisted-model.js
View File

@ -3,7 +3,7 @@
*/
var Model = require('./model');
var runtime = require('../runtime');
var runtime = require('./runtime');
var assert = require('assert');
var async = require('async');
@ -960,7 +960,7 @@ PersistedModel.enableChangeTracking = function() {
}
PersistedModel._defineChangeModel = function() {
var BaseChangeModel = require('./change');
var BaseChangeModel = require('./../common/models/change');
return this.Change = BaseChangeModel.extend(this.modelName + '-change',
{},
{

4
lib/registry.js
View File

@ -371,8 +371,8 @@ registry.DataSource = DataSource;
* @private
*/
registry.Model = require('./models/model');
registry.PersistedModel = require('./models/persisted-model');
registry.Model = require('./model');
registry.PersistedModel = require('./persisted-model');
// temporary alias to simplify migration of code based on <=2.0.0-beta3
Object.defineProperty(registry, 'DataModel', {

10
test/acl.test.js
View File

@ -1,11 +1,9 @@
var assert = require('assert');
var loopback = require('../index');
var acl = require('../lib/models/acl');
var Scope = acl.Scope;
var ACL = acl.ACL;
var role = require('../lib/models/role');
var Role = role.Role;
var RoleMapping = role.RoleMapping;
var Scope = loopback.Scope;
var ACL = loopback.ACL;
var Role = loopback.Role;
var RoleMapping = loopback.RoleMapping;
var User = loopback.User;
var testModel;

2
test/checkpoint.test.js
View File

@ -2,7 +2,7 @@ var async = require('async');
var loopback = require('../');
// create a unique Checkpoint model
var Checkpoint = require('../lib/models/checkpoint').extend('TestCheckpoint');
var Checkpoint = require('../common/models/checkpoint').extend('TestCheckpoint');
Checkpoint.attachTo(loopback.memory());
describe('Checkpoint', function() {

7
test/role.test.js
View File

@ -1,10 +1,9 @@
var assert = require('assert');
var loopback = require('../index');
var role = require('../lib/models/role');
var Role = role.Role;
var RoleMapping = role.RoleMapping;
var Role = loopback.Role;
var RoleMapping = loopback.RoleMapping;
var User = loopback.User;
var ACL = require('../lib/models/acl');
var ACL = loopback.ACL;
function checkResult(err, result) {
// console.log(err, result);