2.0

.gitignore

@@ -11,3 +11,5 @@
 *.swp
 *.swo
 node_modules
+dist
+*xunit.xml

CHANGES.md

@@ -0,0 +1,35 @@
+# Breaking Changes
+
+# 1.9
+
+## Remote Method API
+
+`loopback.remoteMethod()` is now deprecated.
+
+Defining remote methods now should be done like this:
+
+```js
+// static
+MyModel.greet = function(msg, cb) {
+  cb(null, 'greetings... ' + msg);
+}
+
+MyModel.remoteMethod(
+  'greet',
+  {
+    accepts: [{arg: 'msg', type: 'string'}],
+    returns: {arg: 'greeting', type: 'string'}
+  }
+);
+```
+
+**NOTE: remote instance method support is also now deprecated...
+Use static methods instead. If you absolutely need it you can still set
+`options.isStatic = false`** We plan to drop support for instance methods in
+`2.0`.
+
+## Remote Instance Methods
+
+All remote instance methods have been replaced with static replacements.
+
+The REST API is backwards compatible.

Gruntfile.js

@@ -1,6 +1,8 @@
 /*global module:false*/
 module.exports = function(grunt) {
 
+  grunt.loadNpmTasks('grunt-mocha-test');
+
   // Project configuration.
   grunt.initConfig({
     // Metadata.
@@ -53,86 +55,39 @@ module.exports = function(grunt) {
         }
       }
     },
-    karma: {
-      unit: {
+    mochaTest: {
+      'unit': {
+        src: 'test/*.js',
         options: {
-          // base path, that will be used to resolve files and exclude
-          basePath: '',
-
-          // frameworks to use
-          frameworks: ['mocha', 'browserify'],
-
-          // list of files / patterns to load in the browser
-          files: [
-            'test/support.js',
-            'test/model.test.js',
-            'test/geo-point.test.js'
-          ],
-
-          // list of files to exclude
-          exclude: [
-
-          ],
-
-          // test results reporter to use
-          // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
-          reporters: ['dots'],
-
-          // web server port
-          port: 9876,
-
-          // cli runner port
-          runnerPort: 9100,
-
-          // enable / disable colors in the output (reporters and logs)
-          colors: true,
-
-          // level of logging
-          // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-          logLevel: 'warn',
-
-          // enable / disable watching file and executing tests whenever any file changes
-          autoWatch: true,
-
-          // Start these browsers, currently available:
-          // - Chrome
-          // - ChromeCanary
-          // - Firefox
-          // - Opera
-          // - Safari (only Mac)
-          // - PhantomJS
-          // - IE (only Windows)
-          browsers: [
-            'Chrome'
-          ],
-
-          // If browser does not capture in given timeout [ms], kill it
-          captureTimeout: 60000,
-
-          // Continuous Integration mode
-          // if true, it capture browsers, run tests and exit
-          singleRun: false,
-
-          // Browserify config (all optional)
-          browserify: {
-            // extensions: ['.coffee'],
-            ignore: [
-              'nodemailer',
-              'passport',
-              'passport-local',
-              'superagent',
-              'supertest'
-            ],
-            // transform: ['coffeeify'],
-            // debug: true,
-            // noParse: ['jquery'],
-            watch: true,
-          },
-
-          // Add browserify to preprocessors
-          preprocessors: {'test/*': ['browserify']}
+          reporter: 'dot',
         }
       },
+      'unit-xml': {
+        src: 'test/*.js',
+        options: {
+          reporter: 'xunit',
+          captureFile: 'xunit.xml'
+        }
+      }
+    },
+    karma: {
+      'unit-once': {
+        configFile: 'test/karma.conf.js',
+        browsers: [ 'PhantomJS' ],
+        singleRun: true,
+        reporters: ['dots', 'junit'],
+
+        // increase the timeout for slow build slaves (e.g. Travis-ci)
+        browserNoActivityTimeout: 30000,
+
+        // CI friendly test output
+        junitReporter: {
+          outputFile: 'karma-xunit.xml'
+        },
+      },
+      unit: {
+        configFile: 'test/karma.conf.js',
+      },
       e2e: {
         options: {
           // base path, that will be used to resolve files and exclude
@@ -143,7 +98,8 @@ module.exports = function(grunt) {
 
           // list of files / patterns to load in the browser
           files: [
-            'test/e2e/remote-connector.e2e.js'
+            'test/e2e/remote-connector.e2e.js',
+            'test/e2e/replication.e2e.js'
           ],
 
           // list of files to exclude
@@ -232,4 +188,10 @@ module.exports = function(grunt) {
   // Default task.
   grunt.registerTask('default', ['browserify']);
 
+  grunt.registerTask('test', [
+    process.env.JENKINS_HOME ? 'mochaTest:unit-xml' : 'mochaTest:unit',
+   'karma:unit-once']);
+
+  // alias for sl-ci-run and `npm test`
+  grunt.registerTask('mocha-and-karma', ['test']);
 };

docs.json

@@ -5,9 +5,9 @@
     "lib/loopback.js",
     "lib/runtime.js",
     "lib/registry.js",
-{ "title": "Base model", "depth": 2 },     
+{ "title": "Base models", "depth": 2 },     
     "lib/models/model.js",    
-    "lib/models/data-model.js",
+    "lib/models/persisted-model.js",
 { "title": "Middleware", "depth": 2 },    
     "lib/middleware/rest.js",
     "lib/middleware/status.js",
@@ -19,7 +19,8 @@
     "lib/models/application.js",
     "lib/models/email.js",
     "lib/models/role.js",
-    "lib/models/user.js"
+    "lib/models/user.js",
+    "lib/models/change.js"
   ],
   "assets": "/docs/assets"
 }

example/client-server/models.js

@@ -1,6 +1,6 @@
 var loopback = require('../../');
 
-var CartItem = exports.CartItem = loopback.DataModel.extend('CartItem', {
+var CartItem = exports.CartItem = loopback.PersistedModel.extend('CartItem', {
   tax: {type: Number, default: 0.1},
   price: Number,
   item: String,
@@ -22,8 +22,7 @@ CartItem.sum = function(cartId, callback) {
   });
 }
 
-loopback.remoteMethod(
-  CartItem.sum,
+CartItem.remoteMethod('sum',
   {
     accepts: {arg: 'cartId', type: 'number'},
     returns: {arg: 'total', type: 'number'}

example/replication/app.js

@@ -0,0 +1,138 @@
+var loopback = require('../../');
+var app = loopback();
+var db = app.dataSource('db', {connector: loopback.Memory});
+var Color = app.model('color', {dataSource: 'db', options: {trackChanges: true}});
+var Color2 = app.model('color2', {dataSource: 'db', options: {trackChanges: true}});
+var target = Color2;
+var source = Color;
+var SPEED = process.env.SPEED || 100;
+var conflicts;
+
+var steps = [
+
+  createSomeInitialSourceData,
+
+    replicateSourceToTarget,
+    list.bind(this, source, 'current SOURCE data'),
+    list.bind(this, target, 'current TARGET data'),
+
+  updateSomeTargetData,
+
+    replicateSourceToTarget,
+    list.bind(this, source, 'current SOURCE data '),
+    list.bind(this, target, 'current TARGET data (includes conflicting update)'),
+
+  updateSomeSourceDataCausingAConflict,
+
+    replicateSourceToTarget,
+    list.bind(this, source, 'current SOURCE data (now has a conflict)'),
+    list.bind(this, target, 'current TARGET data (includes conflicting update)'),
+
+  resolveAllConflicts,
+
+    replicateSourceToTarget,
+    list.bind(this, source, 'current SOURCE data (conflict resolved)'),
+    list.bind(this, target, 'current TARGET data (conflict resolved)'),
+
+  createMoreSourceData,
+
+    replicateSourceToTarget,
+    list.bind(this, source, 'current SOURCE data'),
+    list.bind(this, target, 'current TARGET data'),
+
+  createEvenMoreSourceData,
+
+    replicateSourceToTarget,
+    list.bind(this, source, 'current SOURCE data'),
+    list.bind(this, target, 'current TARGET data'),
+
+  deleteAllSourceData,
+
+    replicateSourceToTarget,
+    list.bind(this, source, 'current SOURCE data (empty)'),
+    list.bind(this, target, 'current TARGET data (empty)'),
+
+  createSomeNewSourceData,
+
+    replicateSourceToTarget,
+    list.bind(this, source, 'current SOURCE data'),
+    list.bind(this, target, 'current TARGET data')
+];
+
+run(steps);
+
+function createSomeInitialSourceData() {
+  Color.create([
+    {name: 'red'},
+    {name: 'blue'},
+    {name: 'green'}
+  ]);
+}
+
+function replicateSourceToTarget() {
+  Color.replicate(0, Color2, {}, function(err, replicationConflicts) {
+    conflicts = replicationConflicts;
+  });
+}
+
+function resolveAllConflicts() {
+  if(conflicts.length) {
+    conflicts.forEach(function(conflict) {
+      conflict.resolve();
+    });
+  }
+}
+
+function updateSomeTargetData() {
+  Color2.findById(1, function(err, color) {
+    color.name = 'conflict';
+    color.save();
+  });
+}
+
+function createMoreSourceData() {
+  Color.create({name: 'orange'});
+}
+
+function createEvenMoreSourceData() {
+  Color.create({name: 'black'});
+}
+
+function updateSomeSourceDataCausingAConflict() {
+  Color.findById(1, function(err, color) {
+    color.name = 'red!!!!';
+    color.save();
+  });
+}
+
+function deleteAllSourceData() {
+  Color.destroyAll();
+}
+
+function createSomeNewSourceData() {
+  Color.create([
+    {name: 'violet'},
+    {name: 'amber'},
+    {name: 'olive'}
+  ]);
+}
+
+function list(model, msg) {
+  console.log(msg);
+  model.find(function(err, items) {
+    items.forEach(function(item) {
+      console.log(' -', item.name);
+    });
+    console.log();
+  });
+}
+
+function run(steps) {
+  setInterval(function() {
+    var step = steps.shift();
+    if(step) {
+      console.log(step.name);
+      step();
+    }
+  }, SPEED);
+}