twitter-rest-lite - npm Package Compare versions

Comparing version 0.3.6 to 0.3.7

example/server.js

@@ -1,8 +0,15 @@
-var express = require('express'),
-    app = express(),
-    token = {};
+'use strict';
 
+var express = require('express');
+var app = express();
+var token = {};
+
+function gotAccess (res, err, response) {
+  console.log(response);
+  res.send(response);
+}
+
 app.get('/', function(req, res) {
-  res.send("<a href='/auth/twitter'>Sign In with Twitter</a><br>"+
-          "<a href='/apps/twitter'>Authorize with Twitter</a>");
+  res.send('<a href=\'/auth/twitter\'>Sign In with Twitter</a><br>' +
+          '<a href=\'/apps/twitter\'>Authorize with Twitter</a>');
 });
@@ -24,3 +31,3 @@
     oauth.authenticate(token.token, authenticate);
-  };
+  }
 
@@ -30,11 +37,11 @@ function authenticate(err, response) {
     res.redirect(response);
-  };
+  }
 });
 
 app.get('/apps/twitter', function(req, res) {
-  var Twitter= require('./../index'),
-      config = require('./config.json'),
-      oauth;
+  var Twitter= require('./../index');
+  var config = require('./config.json');
+  var oauth;
 
-  config['callback'] = 'http://localhost:9999/twitter/authorize';
+  config.callback = 'http://localhost:9999/twitter/authorize';
 
@@ -48,3 +55,3 @@ oauth = new Twitter.OAuth(config);
     oauth.authorize(token.token, authenticate);
-  };
+  }
 
@@ -54,3 +61,3 @@ function authenticate(err, response) {
     res.redirect(response);
-  };
+  }
 });
@@ -62,3 +69,3 @@
     console.log(token.token);
-    var err =  new Error("Token is not the same!");
+    var err =  new Error('Token is not the same!');
     res.send(err);
@@ -69,16 +76,11 @@ throw err;
 
-  console.log("token " + req.query.oauth_token);
-  console.log("verifier " + req.query.oauth_verifier);
+  console.log('token ' + req.query.oauth_token);
+  console.log('verifier ' + req.query.oauth_verifier);
 
-  var Twitter = require('./../index'),
-      config = require('./config.json'),
-      oauth = new Twitter.OAuth(config);
+  var Twitter = require('./../index');
+  var config = require('./config.json');
+  var oauth = new Twitter.OAuth(config);
+  
+  oauth.accessToken(req.query.oauth_token, req.query.oauth_verifier, gotAccess.bind(this, res));
 
-  oauth.accessToken(req.query.oauth_token, req.query.oauth_verifier, gotAccess);
-
-  function gotAccess(err, response) {
-    console.log(response);
-    res.send(response);
-  };
-
 });
@@ -90,24 +92,18 @@
     console.log(token.token);
-    var err = new Error("Token is not the same!");
+    var err = new Error('Token is not the same!');
     res.send(err);
     throw err;
-    return;
   }
 
-  console.log("token " + req.query.oauth_token);
-  console.log("verifier " + req.query.oauth_verifier);
+  console.log('token ' + req.query.oauth_token);
+  console.log('verifier ' + req.query.oauth_verifier);
 
-  var Twitter = require('./../index'),
-      config = require('./config.json'),
-      oauth = new Twitter.OAuth(config);
+  var Twitter = require('./../index');
+  var config = require('./config.json');
+  var oauth = new Twitter.OAuth(config);
 
-  oauth.accessToken(req.query.oauth_token, req.query.oauth_verifier, gotAccess);
-
-  function gotAccess(err, response) {
-    console.log(response);
-    res.send(response);
-  };
+  oauth.accessToken(req.query.oauth_token, req.query.oauth_verifier, gotAccess.bind(this, res));
 });
 
 app.listen(9999);
-console.log('Listening on port 9999')
+console.log('Listening on port 9999');

gulpfile.js

@@ -40,19 +40,27 @@ 'use strict';
 
+function coverage (tests, output) {
+  return gulp
+  .src(tests, {read: false})
+  .pipe(cover.instrument({
+    pattern: ['index.js', 'lib/**.js'],
+    debugDirectory: 'debug'
+  }))
+  .pipe(mocha(opts.mocha))
+  .pipe(cover.report({
+    outFile: output
+  }));
+}
+
 gulp.task('coverage', function () {
-  return gulp
-    .src(['test/*test-*.js'], {read: false})
-    .pipe(cover.instrument({
-      pattern: ['index.js', 'lib/**.js'],
-      debugDirectory: 'debug'
-    }))
-    .pipe(mocha(opts.mocha))
-    .pipe(cover.report({
-      outFile: 'coverage.html'
-    }));
+  return coverage(['test/*test-*.js'], 'test/coverage.html');
 });
 
+gulp.task('nonet-coverage', function () {
+  return coverage(['test/test-*.js'], 'test/nonet-coverage.html');
+});
+
 gulp.task('watch', function () {
   var watcher = gulp.watch(['index.js', 'lib/**', 'test/**'], ['test']);
   watcher.on('change', function(event) {
-      console.log('File '+event.path+' was '+event.type+', running tasks...');
+    console.log('File '+event.path+' was '+event.type+', running tasks...');
   });
@@ -59,0 +67,0 @@ });

index.js

@@ -0,1 +1,2 @@
+'use strict';
 // twitter-rest-lite
@@ -107,3 +108,3 @@ // =================
     OAuth: new OAuth(uri, opts)
-  }
+  };
 };
@@ -166,1 +167,3 @@
 };
+
+module.exports.helper = require('./lib/helper');

lib/api.js

@@ -97,12 +97,5 @@ 'use strict';
   var request = require('request');
+  var helper = require('./helper');
 
-  if (url == null || url === '' || typeof(url) !== 'string') {
-    if (callback != null) {
-      return callback(new Error(
-        'Missing URL parameter'
-      ));
-    } else {
-      throw new Error('Missing URL parameter');
-    }
-  }
+  helper.check(url, 'string', '', 'Missing URL parameter', callback);
 
@@ -122,6 +115,3 @@ url = self.uri.base + url;
   }, function (err, response, body) {
-    if (err)
-      return callback(err);
-
-    return callback(null, body);
+    return callback(err, body);
   });
@@ -163,32 +153,21 @@ };
   var request = require('request');
-  var body = null;
+  var helper = require('./helper');
 
-  if (url == null || url === '' || typeof(url) !== 'string') {
-    if (callback != null) {
-      return callback(new Error(
-        'Missing URL parameter'
-      ));
-    } else {
-      throw new Error('Missing URL parameter');
-    }
-  }
+  if (helper.check(url, 'string', '', 'Missing URL parameter', callback))
+    return;
 
-  url = self.uri.base + url;
+  if (helper.check(data, 'object', {}, 'Missing data parameter', callback))
+    return;
 
-  if (data != null)
-    body = JSON.stringify(data);
-
   request({
     method: 'POST',
-    uri: url,
+    uri: self.uri.base +  url,
     oauth: self.opts,
     form: data
   }, function (err, response, body) {
-    if (err)
-      return callback(err);
-
-    return callback(null, body);
+    return callback(err, body);
   });
 };
 
+
 module.exports = API;

lib/oauth.js

 'use strict';
+var helper = require('./helper');
 
@@ -234,3 +235,3 @@ //
 // `OAuth.requestToken`.
-// + `callback`          - `Callback` Function
+// + `cb`          - `Callback` Function
 //
@@ -255,16 +256,7 @@ // #### Returns
 // #### Code
-OAuth.prototype.authenticate = function(token, callback) {
+OAuth.prototype.authenticate = function(token, cb) {
   var self = this;
-
-  if ((token == null) || (typeof token !== 'string')) {
-    return callback(new Error(
-      'Error: Twitter:OAuth.authenticate requires a token as first argument.'
-    ));
-  }
-
-  return callback(
-    null,
-    self.uri.authenticate + '?oauth_token=' + token
-  );
-
+  helper.check(token, 'string','','Requires a token', cb);
+ 
+  return cb(null, self.uri.authenticate + '?oauth_token=' + token);
 };
@@ -281,3 +273,3 @@
 // `OAuth.requestToken`.
-// + `callback`          - `Callback` Function
+// + `cb`          - `Callback` Function
 //
@@ -301,17 +293,9 @@ // #### Returns
 // #### Code
-OAuth.prototype.authorize = function(token, callback) {
+OAuth.prototype.authorize = function(token, cb) {
   var self = this;
-
-  if ((token == null) || (typeof token !== 'string')) {
-    return callback(new Error(
-      'Error: Twitter:OAuth.authorize requires a token as first argument.'
-    ));
-  }
-
-  return callback(
-    null,
-    self.uri.authorize + '?oauth_token=' + token
-  );
+  helper.check(token, 'string', '', 'Requires a token', cb);
+ 
+  return cb(null, self.uri.authorize + '?oauth_token=' + token);
 };
 
 module.exports = OAuth;

package.json

 {
   "name": "twitter-rest-lite",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Twitter's REST API Lite",
@@ -5,0 +5,0 @@ "main": "index.js",

test/test-api.js

@@ -57,3 +57,3 @@ /* global describe */
 
-    it('should send an error if fails to get an URL (callback', function (done) {
+    it('should send an error if fails to get an URL (callback)', function (done) {
       api.post([], null, function (err) {
@@ -72,3 +72,19 @@ should.exist(err);
     });
+
+    it('should send an error if fails to get data (callback)', function (done) {
+      api.post('url.json', null, function (err) {
+        should.exist(err);
+        done();
+      });
+    });
+
+    it('should send an error if fails to get data (no-callback)', function () {
+      try {
+        api.post('url.json');
+      } catch (err) {
+        should.exist(err);
+      }
+    });
+
   });
 });

No alert changes

Worsened metrics

Total package byte prevSize

367085

decreased by-53.3%

Number of package files

19

decreased by-44.12%

Lines of code

1024

decreased by-33.72%

No dependency changes