Merge branch 'refs/heads/1.1.X'

Author: jkutianski

lib/meetup.js

@@ -109,10 +109,9 @@ class Meetup {
 
     // OAUTH functions
     getOAuthRequestToken(callback) {
-        var errMessage = (OAuth) ?
-            (MeetupAPIkey && MeetupAPIkey.key && MeetupAPIkey.secret) ? null : 'No OAuth Keys' :
-            'No OAuth support';
-
+        var errMessage = (MeetupAPIkey && MeetupAPIkey.key && MeetupAPIkey.secret) ? null : 'No OAuth Keys';
+        errMessage = (OAuth) ? errMessage : 'No OAuth support';
+        
         if (errMessage) {
             callback({
                 message: errMessage
@@ -129,7 +128,7 @@ class Meetup {
             );
 
             return Meetup.oauth.getOAuthRequestToken({}, (error, oauth_token, oauth_token_secret) => {
-                var authorizeURL = null;
+                let authorizeURL = null;
                 if (!error) {
                     MeetupAPIkey.oauth_token = oauth_token;
                     MeetupAPIkey.oauth_token_secret = oauth_token_secret;
@@ -273,10 +272,8 @@ class APIRequest {
     static stream(req, callback) {
         // create stream
         req.pipe(JSONStream.parse()).pipe(
-            evStream.map(data => {
-                // return data on event
-                callback(data);
-            })
+            // return data on event
+            evStream.map(data => callback(data))
         );
     }
 
@@ -289,14 +286,14 @@ class APIRequest {
                 //add oauth keys
                 req.sign(
                     Meetup.oauth,
-                    params.access_token_key || MeetupAPIkey.access_token,
-                    params.access_token_secret || MeetupAPIkey.access_token_secret
+                    params && params.access_token_key || MeetupAPIkey.access_token,
+                    params && params.access_token_secret || MeetupAPIkey.access_token_secret
                 );
             }
 
             if (Meetup.oauth2) {
                 //add oauth2 bearer
-                var bearer = params.access_token_key || MeetupAPIkey.access_token;
+                var bearer = params && params.access_token_key || MeetupAPIkey.access_token;
                 req.set('Authorization', 'Bearer ' + bearer);
             }
 
@@ -416,7 +413,12 @@ class APIRequest {
         };
 
         // listeners functions
-        ['removeListener', 'removeAllListeners', 'setMaxListeners'].forEach(fnct => {
+        let listeners = [
+            'removeListener',
+            'removeAllListeners',
+            'setMaxListeners'
+        ];
+        listeners.forEach(fnct => {
             this[fnct] = ws[fnct];
             return this;
         });

lib/test.js

@@ -0,0 +1,21 @@
+$scope.updateItem = function(){
+$http.put(API.db+ '/' +$scope.section+ '/' +$scope.item._id, $scope.item)
+.then(function(response) {
+//var id = getID(response.headers('Location'));
+//$state.go('admin.editItem', {section: $scope.section, id: id});
+console.log(response);
+})
+.catch(function(err, status) {
+toast.msgToast($scope.section + ' ...ocorreu um erro ao criar o item!');
+})
+.finally(function(){
+toast.msgToast($scope.section + ' ...item atualizado!');
+});
+
+};
+
+$scope.loadItem = function(){
+ApiRestangular.one($scope.section, $stateParams.id).get().then(function(item) {
+$scope.item = item;
+});
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "meetup-api",
   "description": "Meetup API library",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "license": "GPL-3.0",
   "directories": {
     "lib": "./lib",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "superagent": "1.4.x",
-    "websocket-stream": "2.0.x",
+    "websocket-stream": "2.1.x",
     "JSONStream": "1.0.x",
     "event-stream": "3.3.x"
   },

test/testEndpoints.js

@@ -74,8 +74,9 @@ checkEndpoint.http = function(endpointkey, cb) {
 			});
 	} else {
 		meetup[endpointkey](endpoints[endpointkey].test.params, (err, ret) => {
+			ret = ret || {};
+			
 			((errors) => {
-				ret = ret || {};
 				ret.problem = errors || ret.problem;
 				ret.code = errors && errors.code || ret.problem;
 				ret.details = errors && errors.message || ret.details;