Move parseLink and getFacebookStats to /util, remove request dependency

Author: agentcooper

README.md

@@ -96,10 +96,15 @@ LiveJournal.jsonrpc.request('comment.get_thread', {
 
 You can access method list using `LiveJournal.jsonrpc.methods`.
 
+## API
+
+LiveJournal.API is wrapper around some resources provided at http://www.livejournal.com/bots/
+
 ## Other docs and resources
 
 * http://www.livejournal.com/developer/
 * http://lj-dev.livejournal.com/
+* http://www.livejournal.com/bots/
 
 ## Tests
 

index.js

@@ -1,9 +1,14 @@
+'use strict';
+
 module.exports = {
-  utils: require('./lib/utils'),
-  
+  utils: {
+    parseLink: require('./lib/utils/parseLink'),
+    getFacebookStats: require('./lib/utils/getFacebookStats')
+  },
+
   API: require('./lib/api'),
 
   xmlrpc: require('./lib/xmlrpc'),
-  
+
   jsonrpc: require('./lib/jsonrpc')
 };

lib/api.js

@@ -1,15 +1,19 @@
-var request = require('request');
+'use strict';
+
+var request = require('superagent');
 
 var BASE = 'http://www.livejournal.com/';
 
 function getFriends(params, callback) {
-    request({
-        url: BASE + '/misc/fdata.bml?user=' + params.journal
-    }, function(err, res, body) {
+    request.get(BASE + '/misc/fdata.bml').query({
+      user: params.journal
+    }).end(function(err, res) {
         if (err) {
             return callback(err, null);
         }
 
+        var body = res.text;
+
         if (body.charAt(0) === '!') {
             return callback({ message: body.trim() }, null);
         }

lib/utils.js

@@ -0,0 +1,43 @@
+'use strict';
+
+var request = require('superagent');
+
+function _groupBy(arr, amount) {
+  var result = [], offset = 0;
+
+  do {
+    result.push(arr.slice(offset, offset + amount));
+    offset += amount;
+  } while (offset < arr.length);
+
+  return result;
+}
+
+function getFacebookStats(urls, callback) {
+  var groups = _groupBy(urls, 10),
+      result = {},
+      done = 0;
+
+  groups.forEach(function(group) {
+    request('http://graph.facebook.com/').query({
+      ids: group.join(',')
+    }).end(function(err, res) {
+      if (!err && res.statusCode == 200) {
+        var body = JSON.parse(res.text);
+
+        for (var key in body) {
+          result[key] = body[key].shares || 0;
+        }
+
+        done++;
+        if (done >= groups.length) {
+          callback(null, result);
+        }
+      } else {
+        callback(err);
+      }
+    });
+  });
+}
+
+module.exports = getFacebookStats;

lib/utils/getFacebookStats.js

@@ -0,0 +1,25 @@
+'use strict';
+
+var rxLink = [
+  /([0-9a-zA-Z-_]+)\.livejournal\.com\/([0-9]+)\.html/,
+  /m\.livejournal\.com\/read\/[a-z]+\/([0-9a-zA-Z_-]+)\/(\d+)/,
+  /users\.livejournal\.com\/([0-9a-zA-Z-_]+)\/([0-9]+).html/
+];
+
+function parseLink(url) {
+  if (!url) {
+    return null;
+  }
+
+  for (var i = 0, match; i < rxLink.length; i++) {
+    match = url.match(rxLink[i]);
+
+    if (match && match.length === 3) {
+      return { journal: match[1], postId: match[2] };
+    }
+  }
+
+  return null;
+}
+
+module.exports = parseLink;

lib/utils/parseLink.js

@@ -15,12 +15,6 @@ var LJ = xmlrpc.createClient({
   port: 80
 });
 
-LJ.Deserializer.prototype.endBase64 = function(data) {
-  var buffer = new Buffer(data, 'base64');
-  this.push(String(buffer));
-  this.value = false;
-};
-
 var methods = [
   'checkfriends',
   'consolecommand',

lib/xmlrpc.js

@@ -18,9 +18,8 @@
     "url": "git://github.com/agentcooper/node-livejournal.git"
   },
   "dependencies": {
-    "request": ">=2.25",
     "superagent": "^1.2.0",
-    "xmlrpc": "git://github.com/agentcooper/node-xmlrpc.git"
+    "xmlrpc": "^1.3.1"
   },
   "main": "index",
   "devDependencies": {

package.json

@@ -0,0 +1,18 @@
+var LiveJournal = require('../');
+
+describe('LiveJournal.API', function() {
+  describe('getFriends', function() {
+    it('should provide friends and friendOf', function(done) {
+        LiveJournal.API.getFriends({
+          journal: 'ljreader-app'
+        }, function(err, res) {
+            expect(res.friends).toBeDefined();
+            expect(res.friendOf).toBeDefined();
+
+            expect(res.friends.length > 0).toBe(true);
+            expect(res.friendOf.length > 0).toBe(true);
+            done();
+        });
+    }, 10000);
+  });
+});

spec/apiSpec.js

@@ -0,0 +1,22 @@
+var LiveJournal = require('../../');
+
+describe('LiveJournal.utils', function() {
+  describe('getFacebookStats', function() {
+    it('should get share stats', function(done) {
+      var urls = [
+        'http://brad.livejournal.com/2409049.html',
+        'http://brad.livejournal.com/2410009.html',
+        'http://brad.livejournal.com/29215.html',
+        'http://brad.livejournal.com/badlink'
+      ];
+
+      LiveJournal.utils.getFacebookStats(urls, function(err, res) {
+        urls.forEach(function(url) {
+          expect(res[url]).toBeDefined();
+          expect(typeof res[url] === 'number').toBe(true);
+        });
+        done();
+      });
+    }, 10000);
+  });
+});