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

Fix generated ID issue and other minor bugs in browser example

This commit is contained in:
Ritchie Martori 2014-02-05 15:22:07 -08:00
parent 4b8e358cbe
commit 0deb161400
5 changed files with 38 additions and 611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

615
dist/loopback.js vendored
View File

@ -3127,7 +3127,7 @@ var Model = require('../loopback').Model
*/
var properties = {
id: {type: String, generated: true, id: true},
id: {type: String, id: true},
rev: {type: String},
prev: {type: String},
checkpoint: {type: Number},
@ -3244,6 +3244,10 @@ Change.findOrCreate = function(modelName, modelId, callback) {
var id = this.idForModel(modelName, modelId);
var Change = this;
console.log(modelId);
if(!modelId) debugger;
this.findById(id, function(err, change) {
if(err) return callback(err);
if(change) {
@ -4234,8 +4238,8 @@ Model.enableChangeTracking = function() {
});
});
Model.on('deleted', function(obj) {
Change.track(Model.modelName, [obj.id], function(err) {
Model.on('deleted', function(id) {
Change.track(Model.modelName, [id], function(err) {
if(err) {
console.error(Model.modelName + ' Change Tracking Error:');
console.error(err);
@ -5309,7 +5313,10 @@ var process=require("__browserify_process");/*global setImmediate: false, setTim
else {
async.nextTick = process.nextTick;
if (typeof setImmediate !== 'undefined') {
async.setImmediate = setImmediate;
async.setImmediate = function (fn) {
// not a direct alias for IE10 compatibility
setImmediate(fn);
};
}
else {
async.setImmediate = async.nextTick;
@ -24587,605 +24594,7 @@ util.inherits(ValidationError, Error);
},{"__browserify_process":39,"util":58}],84:[function(require,module,exports){
module.exports=require(20)
},{"__browserify_process":39}],85:[function(require,module,exports){
/*!
* inflection
* Copyright(c) 2011 Ben Lin <ben@dreamerslab.com>
* MIT Licensed
*
* @fileoverview
* A port of inflection-js to node.js module.
*/
( function ( root ){
/**
* @description This is a list of nouns that use the same form for both singular and plural.
* This list should remain entirely in lower case to correctly match Strings.
* @private
*/
var uncountable_words = [
'equipment', 'information', 'rice', 'money', 'species',
'series', 'fish', 'sheep', 'moose', 'deer', 'news'
];
/**
* @description These rules translate from the singular form of a noun to its plural form.
* @private
*/
var plural_rules = [
// do not replace if its already a plural word
[ new RegExp( '(m)en$', 'gi' )],
[ new RegExp( '(pe)ople$', 'gi' )],
[ new RegExp( '(child)ren$', 'gi' )],
[ new RegExp( '([ti])a$', 'gi' )],
[ new RegExp( '((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$','gi' )],
[ new RegExp( '(hive)s$', 'gi' )],
[ new RegExp( '(tive)s$', 'gi' )],
[ new RegExp( '(curve)s$', 'gi' )],
[ new RegExp( '([lr])ves$', 'gi' )],
[ new RegExp( '([^fo])ves$', 'gi' )],
[ new RegExp( '([^aeiouy]|qu)ies$', 'gi' )],
[ new RegExp( '(s)eries$', 'gi' )],
[ new RegExp( '(m)ovies$', 'gi' )],
[ new RegExp( '(x|ch|ss|sh)es$', 'gi' )],
[ new RegExp( '([m|l])ice$', 'gi' )],
[ new RegExp( '(bus)es$', 'gi' )],
[ new RegExp( '(o)es$', 'gi' )],
[ new RegExp( '(shoe)s$', 'gi' )],
[ new RegExp( '(cris|ax|test)es$', 'gi' )],
[ new RegExp( '(octop|vir)i$', 'gi' )],
[ new RegExp( '(alias|status)es$', 'gi' )],
[ new RegExp( '^(ox)en', 'gi' )],
[ new RegExp( '(vert|ind)ices$', 'gi' )],
[ new RegExp( '(matr)ices$', 'gi' )],
[ new RegExp( '(quiz)zes$', 'gi' )],
// original rule
[ new RegExp( '(m)an$', 'gi' ), '$1en' ],
[ new RegExp( '(pe)rson$', 'gi' ), '$1ople' ],
[ new RegExp( '(child)$', 'gi' ), '$1ren' ],
[ new RegExp( '^(ox)$', 'gi' ), '$1en' ],
[ new RegExp( '(ax|test)is$', 'gi' ), '$1es' ],
[ new RegExp( '(octop|vir)us$', 'gi' ), '$1i' ],
[ new RegExp( '(alias|status)$', 'gi' ), '$1es' ],
[ new RegExp( '(bu)s$', 'gi' ), '$1ses' ],
[ new RegExp( '(buffal|tomat|potat)o$', 'gi' ), '$1oes' ],
[ new RegExp( '([ti])um$', 'gi' ), '$1a' ],
[ new RegExp( 'sis$', 'gi' ), 'ses' ],
[ new RegExp( '(?:([^f])fe|([lr])f)$', 'gi' ), '$1$2ves' ],
[ new RegExp( '(hive)$', 'gi' ), '$1s' ],
[ new RegExp( '([^aeiouy]|qu)y$', 'gi' ), '$1ies' ],
[ new RegExp( '(x|ch|ss|sh)$', 'gi' ), '$1es' ],
[ new RegExp( '(matr|vert|ind)ix|ex$', 'gi' ), '$1ices' ],
[ new RegExp( '([m|l])ouse$', 'gi' ), '$1ice' ],
[ new RegExp( '(quiz)$', 'gi' ), '$1zes' ],
[ new RegExp( 's$', 'gi' ), 's' ],
[ new RegExp( '$', 'gi' ), 's' ]
];
/**
* @description These rules translate from the plural form of a noun to its singular form.
* @private
*/
var singular_rules = [
// do not replace if its already a singular word
[ new RegExp( '(m)an$', 'gi' )],
[ new RegExp( '(pe)rson$', 'gi' )],
[ new RegExp( '(child)$', 'gi' )],
[ new RegExp( '^(ox)$', 'gi' )],
[ new RegExp( '(ax|test)is$', 'gi' )],
[ new RegExp( '(octop|vir)us$', 'gi' )],
[ new RegExp( '(alias|status)$', 'gi' )],
[ new RegExp( '(bu)s$', 'gi' )],
[ new RegExp( '(buffal|tomat|potat)o$', 'gi' )],
[ new RegExp( '([ti])um$', 'gi' )],
[ new RegExp( 'sis$', 'gi' )],
[ new RegExp( '(?:([^f])fe|([lr])f)$', 'gi' )],
[ new RegExp( '(hive)$', 'gi' )],
[ new RegExp( '([^aeiouy]|qu)y$', 'gi' )],
[ new RegExp( '(x|ch|ss|sh)$', 'gi' )],
[ new RegExp( '(matr|vert|ind)ix|ex$', 'gi' )],
[ new RegExp( '([m|l])ouse$', 'gi' )],
[ new RegExp( '(quiz)$', 'gi' )],
// original rule
[ new RegExp( '(m)en$', 'gi' ), '$1an' ],
[ new RegExp( '(pe)ople$', 'gi' ), '$1rson' ],
[ new RegExp( '(child)ren$', 'gi' ), '$1' ],
[ new RegExp( '([ti])a$', 'gi' ), '$1um' ],
[ new RegExp( '((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$','gi' ), '$1$2sis' ],
[ new RegExp( '(hive)s$', 'gi' ), '$1' ],
[ new RegExp( '(tive)s$', 'gi' ), '$1' ],
[ new RegExp( '(curve)s$', 'gi' ), '$1' ],
[ new RegExp( '([lr])ves$', 'gi' ), '$1f' ],
[ new RegExp( '([^fo])ves$', 'gi' ), '$1fe' ],
[ new RegExp( '([^aeiouy]|qu)ies$', 'gi' ), '$1y' ],
[ new RegExp( '(s)eries$', 'gi' ), '$1eries' ],
[ new RegExp( '(m)ovies$', 'gi' ), '$1ovie' ],
[ new RegExp( '(x|ch|ss|sh)es$', 'gi' ), '$1' ],
[ new RegExp( '([m|l])ice$', 'gi' ), '$1ouse' ],
[ new RegExp( '(bus)es$', 'gi' ), '$1' ],
[ new RegExp( '(o)es$', 'gi' ), '$1' ],
[ new RegExp( '(shoe)s$', 'gi' ), '$1' ],
[ new RegExp( '(cris|ax|test)es$', 'gi' ), '$1is' ],
[ new RegExp( '(octop|vir)i$', 'gi' ), '$1us' ],
[ new RegExp( '(alias|status)es$', 'gi' ), '$1' ],
[ new RegExp( '^(ox)en', 'gi' ), '$1' ],
[ new RegExp( '(vert|ind)ices$', 'gi' ), '$1ex' ],
[ new RegExp( '(matr)ices$', 'gi' ), '$1ix' ],
[ new RegExp( '(quiz)zes$', 'gi' ), '$1' ],
[ new RegExp( 'ss$', 'gi' ), 'ss' ],
[ new RegExp( 's$', 'gi' ), '' ]
];
/**
* @description This is a list of words that should not be capitalized for title case.
* @private
*/
var non_titlecased_words = [
'and', 'or', 'nor', 'a', 'an', 'the', 'so', 'but', 'to', 'of', 'at','by',
'from', 'into', 'on', 'onto', 'off', 'out', 'in', 'over', 'with', 'for'
];
/**
* @description These are regular expressions used for converting between String formats.
* @private
*/
var id_suffix = new RegExp( '(_ids|_id)$', 'g' );
var underbar = new RegExp( '_', 'g' );
var space_or_underbar = new RegExp( '[\ _]', 'g' );
var uppercase = new RegExp( '([A-Z])', 'g' );
var underbar_prefix = new RegExp( '^_' );
var inflector = {
/**
* A helper method that applies rules based replacement to a String.
* @private
* @function
* @param {String} str String to modify and return based on the passed rules.
* @param {Array: [RegExp, String]} rules Regexp to match paired with String to use for replacement
* @param {Array: [String]} skip Strings to skip if they match
* @param {String} override String to return as though this method succeeded (used to conform to APIs)
* @returns {String} Return passed String modified by passed rules.
* @example
*
* this._apply_rules( 'cows', singular_rules ); // === 'cow'
*/
_apply_rules : function( str, rules, skip, override ){
if( override ){
str = override;
}else{
var ignore = ( inflector.indexOf( skip, str.toLowerCase()) > -1 );
if( !ignore ){
var i = 0;
var j = rules.length;
for( ; i < j; i++ ){
if( str.match( rules[ i ][ 0 ])){
if( rules[ i ][ 1 ] !== undefined ){
str = str.replace( rules[ i ][ 0 ], rules[ i ][ 1 ]);
}
break;
}
}
}
}
return str;
},
/**
* This lets us detect if an Array contains a given element.
* @public
* @function
* @param {Array} arr The subject array.
* @param {Object} item Object to locate in the Array.
* @param {Number} fromIndex Starts checking from this position in the Array.(optional)
* @param {Function} compareFunc Function used to compare Array item vs passed item.(optional)
* @returns {Number} Return index position in the Array of the passed item.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.indexOf([ 'hi','there' ], 'guys' ); // === -1
* inflection.indexOf([ 'hi','there' ], 'hi' ); // === 0
*/
indexOf : function( arr, item, fromIndex, compareFunc ){
if( !fromIndex ){
fromIndex = -1;
}
var index = -1;
var i = fromIndex;
var j = arr.length;
for( ; i < j; i++ ){
if( arr[ i ] === item || compareFunc && compareFunc( arr[ i ], item )){
index = i;
break;
}
}
return index;
},
/**
* This function adds pluralization support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @param {String} plural Overrides normal output with said String.(optional)
* @returns {String} Singular English language nouns are returned in plural form.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.pluralize( 'person' ); // === 'people'
* inflection.pluralize( 'octopus' ); // === "octopi"
* inflection.pluralize( 'Hat' ); // === 'Hats'
* inflection.pluralize( 'person', 'guys' ); // === 'guys'
*/
pluralize : function ( str, plural ){
return inflector._apply_rules( str, plural_rules, uncountable_words, plural );
},
/**
* This function adds singularization support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @param {String} singular Overrides normal output with said String.(optional)
* @returns {String} Plural English language nouns are returned in singular form.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.singularize( 'people' ); // === 'person'
* inflection.singularize( 'octopi' ); // === "octopus"
* inflection.singularize( 'Hats' ); // === 'Hat'
* inflection.singularize( 'guys', 'person' ); // === 'person'
*/
singularize : function ( str, singular ){
return inflector._apply_rules( str, singular_rules, uncountable_words, singular );
},
/**
* This function adds camelization support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @param {Boolean} lowFirstLetter Default is to capitalize the first letter of the results.(optional)
* Passing true will lowercase it.
* @returns {String} Lower case underscored words will be returned in camel case.
* additionally '/' is translated to '::'
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.camelize( 'message_properties' ); // === 'MessageProperties'
* inflection.camelize( 'message_properties', true ); // === 'messageProperties'
*/
camelize : function ( str, lowFirstLetter ){
var str_path = str.toLowerCase().split( '/' );
var i = 0;
var j = str_path.length;
for( ; i < j; i++ ){
var str_arr = str_path[ i ].split( '_' );
var initX = (( lowFirstLetter && i + 1 === j ) ? ( 1 ) : ( 0 ));
var k = initX;
var l = str_arr.length;
for( ; k < l; k++ ){
str_arr[ k ] = str_arr[ k ].charAt( 0 ).toUpperCase() + str_arr[ k ].substring( 1 );
}
str_path[ i ] = str_arr.join( '' );
}
return str_path.join( '::' );
},
/**
* This function adds underscore support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @param {Boolean} allUpperCase Default is to lowercase and add underscore prefix.(optional)
* Passing true will return as entered.
* @returns {String} Camel cased words are returned as lower cased and underscored.
* additionally '::' is translated to '/'.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.underscore( 'MessageProperties' ); // === 'message_properties'
* inflection.underscore( 'messageProperties' ); // === 'message_properties'
* inflection.underscore( 'MP', true ); // === 'MP'
*/
underscore : function ( str, allUpperCase ){
if( allUpperCase && str === str.toUpperCase()) return str;
var str_path = str.split( '::' );
var i = 0;
var j = str_path.length;
for( ; i < j; i++ ){
str_path[ i ] = str_path[ i ].replace( uppercase, '_$1' );
str_path[ i ] = str_path[ i ].replace( underbar_prefix, '' );
}
return str_path.join( '/' ).toLowerCase();
},
/**
* This function adds humanize support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @param {Boolean} lowFirstLetter Default is to capitalize the first letter of the results.(optional)
* Passing true will lowercase it.
* @returns {String} Lower case underscored words will be returned in humanized form.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.humanize( 'message_properties' ); // === 'Message properties'
* inflection.humanize( 'message_properties', true ); // === 'message properties'
*/
humanize : function( str, lowFirstLetter ){
str = str.toLowerCase();
str = str.replace( id_suffix, '' );
str = str.replace( underbar, ' ' );
if( !lowFirstLetter ){
str = inflector.capitalize( str );
}
return str;
},
/**
* This function adds capitalization support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @returns {String} All characters will be lower case and the first will be upper.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.capitalize( 'message_properties' ); // === 'Message_properties'
* inflection.capitalize( 'message properties', true ); // === 'Message properties'
*/
capitalize : function ( str ){
str = str.toLowerCase();
return str.substring( 0, 1 ).toUpperCase() + str.substring( 1 );
},
/**
* This function adds dasherization support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @returns {String} Replaces all spaces or underbars with dashes.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.dasherize( 'message_properties' ); // === 'message-properties'
* inflection.dasherize( 'Message Properties' ); // === 'Message-Properties'
*/
dasherize : function ( str ){
return str.replace( space_or_underbar, '-' );
},
/**
* This function adds titleize support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @returns {String} Capitalizes words as you would for a book title.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.titleize( 'message_properties' ); // === 'Message Properties'
* inflection.titleize( 'message properties to keep' ); // === 'Message Properties to Keep'
*/
titleize : function ( str ){
str = str.toLowerCase().replace( underbar, ' ');
var str_arr = str.split(' ');
var i = 0;
var j = str_arr.length;
for( ; i < j; i++ ){
var d = str_arr[ i ].split( '-' );
var k = 0;
var l = d.length;
for( ; k < l; k++){
if( inflector.indexOf( non_titlecased_words, d[ k ].toLowerCase()) < 0 ){
d[ k ] = inflector.capitalize( d[ k ]);
}
}
str_arr[ i ] = d.join( '-' );
}
str = str_arr.join( ' ' );
str = str.substring( 0, 1 ).toUpperCase() + str.substring( 1 );
return str;
},
/**
* This function adds demodulize support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @returns {String} Removes module names leaving only class names.(Ruby style)
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.demodulize( 'Message::Bus::Properties' ); // === 'Properties'
*/
demodulize : function ( str ){
var str_arr = str.split( '::' );
return str_arr[ str_arr.length - 1 ];
},
/**
* This function adds tableize support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @returns {String} Return camel cased words into their underscored plural form.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.tableize( 'MessageBusProperty' ); // === 'message_bus_properties'
*/
tableize : function ( str ){
str = inflector.underscore( str );
str = inflector.pluralize( str );
return str;
},
/**
* This function adds classification support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @returns {String} Underscored plural nouns become the camel cased singular form.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.classify( 'message_bus_properties' ); // === 'MessageBusProperty'
*/
classify : function ( str ){
str = inflector.camelize( str );
str = inflector.singularize( str );
return str;
},
/**
* This function adds foreign key support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @param {Boolean} dropIdUbar Default is to seperate id with an underbar at the end of the class name,
you can pass true to skip it.(optional)
* @returns {String} Underscored plural nouns become the camel cased singular form.
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.foreign_key( 'MessageBusProperty' ); // === 'message_bus_property_id'
* inflection.foreign_key( 'MessageBusProperty', true ); // === 'message_bus_propertyid'
*/
foreign_key : function( str, dropIdUbar ){
str = inflector.demodulize( str );
str = inflector.underscore( str ) + (( dropIdUbar ) ? ( '' ) : ( '_' )) + 'id';
return str;
},
/**
* This function adds ordinalize support to every String object.
* @public
* @function
* @param {String} str The subject string.
* @returns {String} Return all found numbers their sequence like "22nd".
* @example
*
* var inflection = require( 'inflection' );
*
* inflection.ordinalize( 'the 1 pitch' ); // === 'the 1st pitch'
*/
ordinalize : function ( str ){
var str_arr = str.split(' ');
var i = 0;
var j = str_arr.length;
for( ; i < j; i++ ){
var k = parseInt( str_arr[ i ], 10 );
if( !isNaN( k )){
var ltd = str_arr[ i ].substring( str_arr[ i ].length - 2 );
var ld = str_arr[ i ].substring( str_arr[ i ].length - 1 );
var suf = 'th';
if( ltd != '11' && ltd != '12' && ltd != '13' ){
if( ld === '1' ){
suf = 'st';
}else if( ld === '2' ){
suf = 'nd';
}else if( ld === '3' ){
suf = 'rd';
}
}
str_arr[ i ] += suf;
}
}
return str_arr.join( ' ' );
}
};
if( typeof exports === 'undefined' ) return root.inflection = inflector;
/**
* @public
*/
inflector.version = "1.2.5";
/**
* Exports module.
*/
module.exports = inflector;
})( this );
module.exports=require(64)
},{}],86:[function(require,module,exports){
/**
* Object#toString() ref for stringify().

19
example/browser/client.js
View File

@ -19,12 +19,18 @@ var LocalColor = app.model('LocalColor', {
options: {trackChanges: true}
});
LocalColor.beforeCreate = function(next, color) {
color.id = Math.random().toString().split('.')[1];
next();
}
function replicate() {
LocalColor.currentCheckpoint(function(err, cp) {
LocalColor.replicate(cp, Color, {}, function() {
console.log('replicated local to remote');
});
setTimeout(function() {
LocalColor.replicate(cp, Color, {}, function() {
console.log('replicated local to remote');
});
}, 0);
});
}
@ -38,7 +44,7 @@ setInterval(function() {
console.log('replicated remote to local');
});
});
}, 100);
}, 1000);
function ListCtrl($scope) {
LocalColor.on('changed', update);
@ -47,6 +53,7 @@ function ListCtrl($scope) {
function update() {
LocalColor.find({sort: 'name'}, function(err, colors) {
$scope.colors = colors;
console.log(colors);
$scope.$apply();
});
}
@ -56,6 +63,10 @@ function ListCtrl($scope) {
$scope.newColor = null;
}
$scope.del = function(color) {
color.destroy();
}
update();
}

5
example/browser/index.html
View File

@ -11,7 +11,10 @@
</style>
<ul ng-controller="ListCtrl">
<li ng-repeat="color in colors" style="color: {{color.name}}">
{{color.name}}
<form ng-submit="color.save()">
<input placeholder="{{color.name}}" ng-model="color.name" />
<a href="#" ng-click="del(color)">delete</a>
</form>
</li>
<li>
<form ng-submit="add()">

6
lib/models/change.js
View File

@ -14,7 +14,7 @@ var Model = require('../loopback').Model
*/
var properties = {
id: {type: String, generated: true, id: true},
id: {type: String, id: true},
rev: {type: String},
prev: {type: String},
checkpoint: {type: Number},
@ -131,6 +131,10 @@ Change.findOrCreate = function(modelName, modelId, callback) {
var id = this.idForModel(modelName, modelId);
var Change = this;
console.log(modelId);
if(!modelId) debugger;
this.findById(id, function(err, change) {
if(err) return callback(err);
if(change) {

4
lib/models/model.js
View File

@ -559,8 +559,8 @@ Model.enableChangeTracking = function() {
});
});
Model.on('deleted', function(obj) {
Change.track(Model.modelName, [obj.id], function(err) {
Model.on('deleted', function(id) {
Change.track(Model.modelName, [id], function(err) {
if(err) {
console.error(Model.modelName + ' Change Tracking Error:');
console.error(err);