feedr - npm Package Compare versions

Comparing version 2.4.0 to 2.4.1

History.md

 ## History
 
+- v2.4.1 February 1, 2013
+	- Added timeout support
+
 - v2.4.0 December 2, 2012
@@ -4,0 +7,0 @@ - Dropped the request dependency

LICENSE.txt

 (The MIT License)
 
-Copyright (c) 2012 Bevry Pty Ltd <[e-mail]>
+Copyright (c) 2012+ Bevry Pty Ltd <[e-mail]>
 
@@ -5,0 +5,0 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

out/lib/feedr.js

@@ -1,2 +0,2 @@
-// Generated by CoffeeScript 1.3.3
+// Generated by CoffeeScript 1.4.0
 var Feedr, balUtil, pathUtil,
@@ -17,3 +17,4 @@ __hasProp = {}.hasOwnProperty;
     cacheTime: 1000 * 60 * 5,
-    xmljsOptions: null
+    xmljsOptions: null,
+    timeout: 10 * 1000
   };
@@ -160,6 +161,14 @@
       }
-      return balUtil.readPath(feedDetails.url, function(err, data) {
-        var body, parser, xml2js;
+      return balUtil.readPath(feedDetails.url, {
+        timeout: feedr.config.timeout
+      }, function(err, data) {
+        var body, handleError, parser, xml2js;
+        handleError = function(err) {
+          if (cache !== false) {
+            return viaCache();
+          }
+          return next(err);
+        };
         if (err) {
-          return viaCache();
+          return handleError(err);
         }
@@ -180,3 +189,3 @@ body = data.toString().trim();
             if (err) {
-              return next(err);
+              return handleError(err);
             }
@@ -194,3 +203,3 @@ }
               if (err) {
-                return next(err);
+                return handleError(err);
               }
@@ -197,0 +206,0 @@ }

package.json

 {
 	"name": "feedr",
-	"version": "2.4.0",
+	"version": "2.4.1",
 	"description": "Takes in a remote feed and converts it to json data",
@@ -33,8 +33,8 @@ "homepage": "http://bevry.me/project/feedr",
 	"dependencies": {
-		"bal-util": "1.14.x",
-		"xml2js": "0.2.x"
+		"bal-util": "~1.16.2",
+		"xml2js": "~0.2.3"
 	},
 	"devDependencies": {
-		"coffee-script": "1.3.x",
-		"joe": "1.0.x"
+		"coffee-script": "~1.4.0",
+		"joe": "1.1.x"
 	},
@@ -41,0 +41,0 @@ "main": "./out/lib/feedr.js",

README.md

@@ -48,3 +48,4 @@ # Feedr [![Build Status](https://secure.travis-ci.org/bevry/feedr.png?branch=master)](http://travis-ci.org/bevry/feedr)
 - `cache: true` whether or not we should cache the results
-- `cacheTime: 1000*60*5` how long should the cache stay active
+- `cacheTime: 1000*60*5` how long should the cache stay active in milliseconds
+- `timeout: 10*1000` how long should we wait before aborting the request in milliseconds
 - `xmljsOptions: null` what options should we pass to [xml2js](https://github.com/Leonidas-from-XIV/node-xml2js) (can be a string which will reference to `xml2js.defaults`)
@@ -62,2 +63,2 @@
 Licensed under the [MIT License](http://creativecommons.org/licenses/MIT/)
-<br/>Copyright &copy; 2012 [Bevry Pty Ltd](http://bevry.me)
+<br/>Copyright &copy; 2012+ [Bevry Pty Ltd](http://bevry.me)

No alert changes

Improved metrics

Total package byte prevSize

12200

increased by3.57%

Lines of code

227

increased by4.13%

Number of lines in readme file

62

increased by1.64%

Dependency changes

• + Addedbal-util@1.16.13(transitive)

• - Removedbal-util@1.14.1(transitive)

• Updatedbal-util@~1.16.2

• Updatedxml2js@~0.2.3