Update dependencies, re-test, remove defunct topics API

Author: hildjj

Gruntfile.coffee

@@ -71,13 +71,10 @@ module.exports = (grunt) ->
     "clean"
     "coffee"
     "codo"
-    "markedman"
   ]
   grunt.registerTask "doc", [
     "clean:doc"
     "codo"
-    "clean:man"
-    "markedman"
   ]
   grunt.registerTask "test", [
     "coffee"

lib/BufferStream.js

@@ -1,8 +1,8 @@
 (function() {
   var BufferStream, EMPTY, assert, createEOF, stream, util,
-    __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    __slice = [].slice;
+    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    hasProp = {}.hasOwnProperty,
+    slice = [].slice;
 
   assert = require('assert');
 
@@ -19,19 +19,19 @@
     return e;
   };
 
-  BufferStream = (function(_super) {
-    __extends(BufferStream, _super);
+  BufferStream = (function(superClass) {
+    extend(BufferStream, superClass);
 
     function BufferStream(options) {
-      var buf, startEnded, _ref, _ref1, _ref2;
+      var buf, ref, ref1, ref2, startEnded;
       if (options == null) {
         options = {};
       }
       this.clear();
       this._resetCB();
       BufferStream.__super__.constructor.call(this, options);
-      this.growSize = (_ref = options.bsGrowSize) != null ? _ref : 512;
-      this.zero = (_ref1 = options.bsZero) != null ? _ref1 : false;
+      this.growSize = (ref = options.bsGrowSize) != null ? ref : 512;
+      this.zero = (ref1 = options.bsZero) != null ? ref1 : false;
       this.on("finish", (function(_this) {
         return function() {
           return _this._resetCB(createEOF());
@@ -40,7 +40,7 @@
       buf = options.bsInit;
       if (Buffer.isBuffer(buf)) {
         this.append(buf);
-        startEnded = (_ref2 = options.bsStartEnded) != null ? _ref2 : true;
+        startEnded = (ref2 = options.bsStartEnded) != null ? ref2 : true;
         if (!!startEnded) {
           this.end();
         }
@@ -86,9 +86,9 @@
     };
 
     BufferStream.prototype._resetCB = function() {
-      var args, cb, _ref;
-      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-      _ref = [this.waitingCB, null, Number.MAX_VALUE], cb = _ref[0], this.waitingCB = _ref[1], this.waitingLen = _ref[2];
+      var args, cb, ref;
+      args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+      ref = [this.waitingCB, null, Number.MAX_VALUE], cb = ref[0], this.waitingCB = ref[1], this.waitingLen = ref[2];
       if (cb && args.length) {
         cb.apply(this, args);
       }

lib/feedly.js

@@ -1,5 +1,5 @@
 (function() {
-  var Feedly, fs, http, open, path, q, request, untildify, url, utils, _normalizeTag;
+  var Feedly, _normalizeTag, fs, http, open, path, q, request, untildify, url, utils;
 
   fs = require('fs');
 
@@ -112,8 +112,8 @@
     };
 
     Feedly.prototype._auth = function() {
-      var addr, result, u, _ref;
-      _ref = utils.qserver(this.options.port, this.options.html_text), addr = _ref[0], result = _ref[1];
+      var addr, ref, result, u;
+      ref = utils.qserver(this.options.port, this.options.html_text), addr = ref[0], result = ref[1];
       u = url.parse(this.options.base);
       return addr.then((function(_this) {
         return function(cb_url) {
@@ -321,13 +321,13 @@
     };
 
     Feedly.prototype.counts = function(autorefresh, newerThan, streamId, cb) {
-      var found, input, _ref, _ref1, _ref2;
+      var found, input, ref, ref1, ref2;
       if (typeof autorefresh === 'function') {
-        _ref = [autorefresh, null, null, null], cb = _ref[0], autorefresh = _ref[1], newerThan = _ref[2], streamId = _ref[3];
+        ref = [autorefresh, null, null, null], cb = ref[0], autorefresh = ref[1], newerThan = ref[2], streamId = ref[3];
       } else if (typeof newerThan === 'function') {
-        _ref1 = [newerThan, null, null], cb = _ref1[0], newerThan = _ref1[1], streamId = _ref1[2];
+        ref1 = [newerThan, null, null], cb = ref1[0], newerThan = ref1[1], streamId = ref1[2];
       } else if (typeof streamId === 'function') {
-        _ref2 = [streamId, null], cb = _ref2[0], streamId = _ref2[1];
+        ref2 = [streamId, null], cb = ref2[0], streamId = ref2[1];
       }
       input = {};
       found = false;
@@ -372,12 +372,12 @@
     };
 
     Feedly.prototype.markFeedRead = function(ids, since, cb) {
-      var body, _ref;
+      var body, ref;
       if (typeof ids === 'string') {
         ids = [ids];
       }
       if (typeof since === 'function') {
-        _ref = [since, null], cb = _ref[0], since = _ref[1];
+        ref = [since, null], cb = ref[0], since = ref[1];
       }
       body = {
         feedIds: ids,
@@ -393,12 +393,12 @@
     };
 
     Feedly.prototype.markCategoryRead = function(ids, since, cb) {
-      var _ref;
+      var ref;
       if (typeof ids === 'string') {
         ids = [ids];
       }
       if (typeof since === 'function') {
-        _ref = [since, null], cb = _ref[0], since = _ref[1];
+        ref = [since, null], cb = ref[0], since = ref[1];
       }
       return this.ready.then((function(_this) {
         return function() {
@@ -419,9 +419,9 @@
     };
 
     Feedly.prototype.reads = function(newerThan, cb) {
-      var input, _ref;
+      var input, ref;
       if (typeof newerThan === 'function') {
-        _ref = [newerThan, null], cb = _ref[0], newerThan = _ref[1];
+        ref = [newerThan, null], cb = ref[0], newerThan = ref[1];
       }
       input = null;
       if (newerThan != null) {
@@ -433,9 +433,9 @@
     };
 
     Feedly.prototype.tags = function(newerThan, cb) {
-      var input, _ref;
+      var input, ref;
       if (typeof newerThan === 'function') {
-        _ref = [newerThan, null], cb = _ref[0], newerThan = _ref[1];
+        ref = [newerThan, null], cb = ref[0], newerThan = ref[1];
       }
       input = null;
       if (newerThan != null) {
@@ -491,9 +491,9 @@
     };
 
     Feedly.prototype.stream = function(id, continuation, cb) {
-      var input, _ref;
+      var input, ref;
       if (typeof continuation === 'function') {
-        _ref = [continuation, null], cb = _ref[0], continuation = _ref[1];
+        ref = [continuation, null], cb = ref[0], continuation = ref[1];
       }
       input = {};
       if (continuation != null) {
@@ -516,12 +516,12 @@
     };
 
     Feedly.prototype.subscribe = function(url, categories, cb) {
-      var input, _ref;
+      var input, ref;
       if (!url.match(/^feed\//)) {
         url = "feed/" + url;
       }
       if (typeof categories === 'function') {
-        _ref = [categories, null], cb = _ref[0], categories = _ref[1];
+        ref = [categories, null], cb = ref[0], categories = ref[1];
       }
       input = {
         id: url
@@ -537,7 +537,7 @@
             categories = categories.map(function(c) {
               var id, m, name;
               if (typeof c === 'string') {
-                m = c.match(/^user\/[^/]+\/(.*)/);
+                m = c.match(/^user\/[^\/]+\/(.*)/);
                 name = null;
                 id = null;
                 if (!m) {
@@ -628,35 +628,6 @@
       })(this));
     };
 
-    Feedly.prototype.topics = function(cb) {
-      return this._request(cb, '/v3/topics');
-    };
-
-    Feedly.prototype.addTopic = function(topic, interest, cb) {
-      return this.ready.then((function(_this) {
-        return function() {
-          if (!topic.match(/^user\//)) {
-            topic = "user/" + _this.state.id + "/topic/" + topic;
-          }
-          return _this._request(cb, '/v3/topics', 'POST', {
-            id: topic,
-            interest: interest
-          });
-        };
-      })(this));
-    };
-
-    Feedly.prototype.deleteTopic = function(topic, cb) {
-      return this.ready.then((function(_this) {
-        return function() {
-          if (!topic.match(/^user\//)) {
-            topic = "user/" + _this.state.id + "/topic/" + topic;
-          }
-          return _this._request(cb, "/v3/topics/" + (encodeURIComponent(topic)), 'DELETE');
-        };
-      })(this));
-    };
-
     return Feedly;
 
   })();

lib/utils.js

@@ -1,6 +1,6 @@
 (function() {
   var BufferStream, http, q, request, url,
-    __slice = [].slice;
+    slice = [].slice;
 
   http = require('http');
 
@@ -13,13 +13,13 @@
   BufferStream = require('./BufferStream');
 
   exports.extend = function() {
-    var a, adds, k, old, v, _i, _len;
-    old = arguments[0], adds = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+    var a, adds, j, k, len, old, v;
+    old = arguments[0], adds = 2 <= arguments.length ? slice.call(arguments, 1) : [];
     if (old == null) {
       old = {};
     }
-    for (_i = 0, _len = adds.length; _i < _len; _i++) {
-      a = adds[_i];
+    for (j = 0, len = adds.length; j < len; j++) {
+      a = adds[j];
       for (k in a) {
         v = a[k];
         old[k] = v;

package.json

@@ -27,22 +27,25 @@
   },
   "homepage": "https://github.com/hildjj/node-feedly",
   "devDependencies": {
-    "grunt": "^0.4.4",
-    "grunt-codo": "^0.1.0",
-    "grunt-coffeelint": "0.0.10",
-    "grunt-contrib-clean": "^0.5.0",
-    "grunt-contrib-coffee": "^0.10.1",
-    "grunt-contrib-nodeunit": "^0.3.3",
+    "coffee-script": "^1.9.2",
+    "coffeelint": "^1.9.6",
+    "grunt": "^0.4.5",
+    "grunt-codo": "^0.2.0",
+    "grunt-coffeelint": "0.0.13",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-coffee": "^0.13.0",
+    "grunt-contrib-nodeunit": "^0.4.1",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-express": "^1.2.1",
-    "grunt-release": "^0.7.0",
-    "grunt-shell": "^0.7.0",
-    "jit-grunt": "^0.5.0"
+    "grunt-express": "^1.4.1",
+    "grunt-release": "^0.12.0",
+    "grunt-shell": "^1.1.2",
+    "jit-grunt": "^0.9.1",
+    "nodeunit": "^0.9.1"
   },
   "dependencies": {
     "open": "0.0.5",
-    "q": "^1.0.1",
-    "request": "^2.34.0",
-    "untildify": "^0.1.0"
+    "q": "^1.4.0",
+    "request": "^2.55.0",
+    "untildify": "^2.0.0"
   }
 }

src/feedly.coffee

@@ -653,35 +653,3 @@ module.exports = class Feedly
         tags = [tags]
       tags = @_normalizeTags tags
       @_request cb, "/v3/tags/#{tags.join(',')}", 'DELETE'
-
-  # List all topics
-  #
-  # @param cb [function(error, Array(Topic))] Optional callback
-  # @return [promise(Array(Topic))]
-  topics: (cb) ->
-    @_request cb, '/v3/topics'
-
-  # Add a topic
-  #
-  # @param topic [string] the topic in which to express interest
-  # @param interest [string] "high", "medium", or "low"
-  # @param cb [function(error)] Optional callback
-  # @return [promise()]
-  addTopic: (topic, interest, cb) ->
-    @ready.then () =>
-      if !topic.match(/^user\//)
-        topic = "user/#{@state.id}/topic/#{topic}"
-      @_request cb, '/v3/topics', 'POST',
-        id: topic
-        interest: interest
-
-  # Remove a topic
-  #
-  # @param topic [string] the topic in which to express interest
-  # @param cb [function(error)] Optional callback
-  # @return [promise()]
-  deleteTopic: (topic, cb) ->
-    @ready.then () =>
-      if !topic.match(/^user\//)
-        topic = "user/#{@state.id}/topic/#{topic}"
-      @_request cb, "/v3/topics/#{encodeURIComponent(topic)}", 'DELETE'

test/feedly.test.coffee

@@ -120,12 +120,6 @@ module.exports =
     .then (reads) ->
       test.ok reads
       test.ok Array.isArray(reads.entries)
-      f.addTopic 'music', 'medium'
-    .then ->
-      f.topics()
-    .then (topics) ->
-      test.ok Array.isArray(topics)
-      f.deleteTopic 'music'
     .then ->
       f.searchFeeds 'arduino'
     .then (results) ->