Merge branch 'release/1.2.2' into production

LICENSE

@@ -1,7 +1,7 @@
 Copyright (c) 2013-2014 StrongLoop, Inc.
 
-loopback-push-notification uses a 'dual license' model. Users may use
-loopback-push-notification under the terms of the Artistic 2.0 license, or under
+loopback-component-push uses a 'dual license' model. Users may use
+loopback-component-push under the terms of the Artistic 2.0 license, or under
 the StrongLoop License. The text of both is included below.
 
 Artistic License 2.0

README.md

@@ -1,8 +1,10 @@
-# LoopBack Push Notification
+# LoopBack Push Notification Component
+
+**NOTE: The loopback-component-push module supersedes [loopback-push-notification](https://www.npmjs.org/package/loopback-push-notification). Please update your package.json accordingly.**
 
 This module provides a set of LoopBack models to enable mobile device push notifications.
 
-Please see the full documentation: [Creating push notifications](http://docs.strongloop.com/display/DOC/Creating+push+notifications).
+Please see the full documentation: [Creating push notifications](http://docs.strongloop.com/display/LB/Creating+push+notifications).
 
 ## Architecture
 

example/android/src/com/google/android/gcm/demo/app/DemoActivity.java

@@ -49,7 +49,7 @@ public class DemoActivity extends Activity {
      * application you registered in your LoopBack server by calling
      * Application.register().
      */
-    String LOOPBACK_APP_ID = "loopback-push-notification-app";
+    String LOOPBACK_APP_ID = "loopback-component-push-app";
 
     /**
      * Tag used on log messages.

example/ios/apnagent/Settings.plist

@@ -5,7 +5,7 @@
 	<key>RootPath</key>
 	<string>http://demo.strongloop.com:3010/api</string>
 	<key>AppId</key>
-	<string>loopback-push-notification-app</string>
+	<string>loopback-component-push-app</string>
 	<key>AppVersion</key>
 	<string>1.0.0</string>
 </dict>

example/server/app.js

@@ -5,7 +5,7 @@ var app = module.exports = loopback();
 // Load up the push data source as the example cannot declaratively define
 // the push data source in datasources.json as it cannot resolve the connector
 // module by name
-var connector = require('loopback-push-notification');
+var connector = require('loopback-component-push');
 app.dataSources.push = loopback.createDataSource("push", {
   "defaultForType": "push",
   "connector": connector
@@ -165,7 +165,7 @@ function startPushServer() {
   var config = require('./config');
 
   var demoApp = {
-    id: 'loopback-push-notification-app',
+    id: 'loopback-component-push-app',
     userId: 'strongloop',
     name: config.appName,
 
@@ -215,7 +215,7 @@ function startPushServer() {
     // the client settings
     Application.beforeSave = function (next) {
       if(this.name === demoApp.name) {
-        this.id = 'loopback-push-notification-app';
+        this.id = 'loopback-component-push-app';
       }
       next();
     };

example/server/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "loopback": "~1.7.0",
-    "loopback-push-notification": "~1.2.0",
+    "loopback-component-push": "~1.2.0",
     "loopback-connector-mongodb": "~1.2.0"
   },
   "optionalDependencies": {

lib/providers/apns.js

@@ -2,7 +2,7 @@
 var inherits = require('util').inherits;
 var EventEmitter = require('events').EventEmitter;
 
-var debug = require('debug')('loopback-push-notification:provider:apns');
+var debug = require('debug')('loopback:component:push:provider:apns');
 var apn = require('apn');
 
 function ApnsProvider(pushSettings) {

lib/providers/gcm.js

@@ -3,7 +3,7 @@ var inherits = require('util').inherits;
 var extend = require('util')._extend;
 var EventEmitter = require('events').EventEmitter;
 var gcm = require('node-gcm');
-var debug = require('debug')('loopback-push-notification:provider:gcm');
+var debug = require('debug')('loopback:component:push:provider:gcm');
 
 function GcmProvider(pushSettings) {
   var settings = pushSettings.gcm || {};
@@ -58,8 +58,10 @@ GcmProvider.prototype._createMessage = function(notification) {
     delayWhileIdle: notification.delayWhileIdle
   });
 
-  Object.keys(notification).forEach(function(key) {
-    message.addData(key, notification[key]);
+  Object.keys(notification).forEach(function (key) {
+    if (notification[key] != null) {
+      message.addData(key, notification[key]);
+    }
   });
 
   return message;

lib/push-manager.js

@@ -5,7 +5,7 @@ var format = require('util').format;
 var async = require('async');
 var providers = require('./providers');
 var loopback = require('loopback');
-var debug = require('debug')('loopback-push-notification:push-manager');
+var debug = require('debug')('loopback:component:push:push-manager');
 
 var Installation = require('../models/installation');
 var Notification = require('../models/notification');

models/notification.js

@@ -102,6 +102,9 @@ var Notification = loopback.createModel(
   }
 );
 
+// Avoid exposure of internal properties such __data
+Notification.hideInternalProperties = true;
+
 Notification.beforeCreate = function(next) {
   var notification = this;
   notification.created = notification.modified = notification.scheduledTime = new Date();

package.json

@@ -1,16 +1,16 @@
 {
-  "name": "loopback-push-notification",
-  "version": "1.2.1",
+  "name": "loopback-component-push",
+  "version": "1.2.2",
   "description": "Loopback Push Notification",
   "main": "index.js",
   "scripts": {
     "test": "./node_modules/.bin/mocha --timeout 30000 test/*test.js"
   },
   "dependencies": {
-    "async": "~0.2.10",
-    "debug": "~0.7.4",
-    "apn": "~1.4.4",
-    "node-gcm": "~0.9.9",
+    "async": "~0.9.0",
+    "debug": "~1.0.2",
+    "apn": "~1.5.2",
+    "node-gcm": "~0.9.11",
     "mpns": "~2.1.0"
   },
   "peerDependencies": {
@@ -19,7 +19,7 @@
   "devDependencies": {
     "loopback": "1.x >=1.7.0",
     "loopback-connector-mongodb": "1.x",
-    "loopback-testing": "~0.1.2",
+    "loopback-testing": "~0.2.0",
     "should": "*",
     "mocha": "*",
     "sinon": "*",
@@ -28,11 +28,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/strongloop/loopback-push-notification.git"
+    "url": "https://github.com/strongloop/loopback-component-push.git"
   },
   "license": {
     "name": "Dual Artistic-2.0/StrongLoop",
-    "url": "https://github.com/strongloop/loopback-push-notification/blob/master/LICENSE"
+    "url": "https://github.com/strongloop/loopback-component-push/blob/master/LICENSE"
   }
 
 }