1.1.1

suresh44t · Oct 6, 2016 · 21a5e2f · 21a5e2f
1 parent c7e1e0f
commit 21a5e2f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -79,7 +79,7 @@ function Osmosis(url, params) {
  * @property {bool}   keep_data          - Keep raw HTTP data in
                                            context.response.data
  * @property {bool}   timeout            - HTTP request timeout
- * @property {bool}   tries              - HTTP request retries
+ * @property {bool}   tries              - HTTP request attempts
  * @property {bool}   user_agent         - HTTP user agent
  * @memberof Osmosis
  * @instance
@@ -202,8 +202,8 @@ Osmosis.prototype.request = function (url, opts, callback, tries) {
                     }
                 }
 
-                if (err !== null && tries < opts.tries) {
-                    self.queueRequest(url, opts, callback, tries + 1);
+                if (err !== null && ++tries < opts.tries) {
+                    self.queueRequest(url, opts, callback, tries);
 
                     if (self.opts.log === true) {
                         self.command.error(err + ', retrying ' +

diff --git a/lib/Form.js b/lib/Form.js
@@ -99,6 +99,10 @@ form.getParams = function (node) {
             name = name.substr(0, name.length - 2);
         }
 
+        if (type) {
+            type = type.toLowerCase();
+        }
+
         switch (nodeName) {
             case 'select':
                 input = input.get('option[selected]') ||
@@ -117,7 +121,7 @@ form.getParams = function (node) {
                 value = input.textContent;
                 break;
             case 'input':
-                switch (input.getAttribute('type').toLowerCase()) {
+                switch (type) {
                     case 'radio':
                     case 'checkbox':
                         if (!input.hasAttribute('checked'))  {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "osmosis",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Web scraper for NodeJS",
   "keywords": [
     "web",
@@ -20,8 +20,8 @@
     "email": "[email protected]"
   },
   "dependencies": {
-    "needle": "1.0.0",
-    "libxmljs-dom": "0.0.7"
+    "needle": "1.1.2",
+    "libxmljs-dom": "0.0.8"
   },
   "devDependencies": {
     "jscs": ">=3.0.2",

diff --git a/test/get.js b/test/get.js
@@ -53,7 +53,7 @@ module.exports.error_404 = function (assert) {
     .config('ignore_http_errors', false)
     .config('tries', tries)
     .error(function (msg) {
-        if (msg.indexOf('404') > -1 && msg.indexOf('try') > -1) {
+        if (msg.indexOf('404') > -1) {
             tried++;
         }
     })
@@ -92,7 +92,7 @@ module.exports.error_parse = function (assert) {
     osmosis.get(url + '/error-parse')
     .config('tries', tries)
     .error(function (msg) {
-        if (msg.indexOf('empty') > -1 && msg.indexOf('try') > -1) {
+        if (msg.indexOf('empty') > -1) {
             tries--;
         }
     })