From b73cbe850e37704a20234489914fd280897ffe4d Mon Sep 17 00:00:00 2001
From: Joshua Thomas <joshua.thomas@gmail.com>
Date: Tue, 30 Dec 2014 12:38:19 -0800
Subject: [PATCH 1/2] properly applying timeout parameter to request

---
 history.md   | 4 ++++
 lib/index.js | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/history.md b/history.md
index ca1f40e..2de2347 100644
--- a/history.md
+++ b/history.md
@@ -1,3 +1,7 @@
+# v0.1.6 - 2014/12/30
+
+* Bugfix - now properly obeying `timeout` option when supplied for each API call
+
 # v0.1.5 - 2014/12/30
 
 * Added support for request retry in the event of an error using constructor option: `maxRetryCount`
diff --git a/lib/index.js b/lib/index.js
index 8577d57..19346c4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -134,6 +134,7 @@ var threeTaps = (function (self) {
 				timestamp : getParam('timestamp', options)
 			},
 			strictSSL : getParam('strictSSL', options),
+			timeout : getParam('timeout', options),
 			url : [getParam('pollingUrl', options), 'anchor'].join('/')
 		};
 
@@ -162,6 +163,7 @@ var threeTaps = (function (self) {
 				'auth_token' : getParam('apikey', options)
 			},
 			strictSSL : getParam('strictSSL', options),
+			timeout : getParam('timeout', options),
 			url : [getParam('referenceUrl', options), 'categories'].join('/')
 		};
 
@@ -183,6 +185,7 @@ var threeTaps = (function (self) {
 				'auth_token' : getParam('apikey', options)
 			},
 			strictSSL : getParam('strictSSL', options),
+			timeout : getParam('timeout', options),
 			url : [getParam('referenceUrl', options), 'category_groups'].join('/')
 		};
 
@@ -204,6 +207,7 @@ var threeTaps = (function (self) {
 				'auth_token' : getParam('apikey', options)
 			},
 			strictSSL : getParam('strictSSL', options),
+			timeout : getParam('timeout', options),
 			url : [getParam('referenceUrl', options), 'sources'].join('/')
 		};
 
@@ -234,6 +238,7 @@ var threeTaps = (function (self) {
 				zipcode : getParam('zipcode', options)
 			},
 			strictSSL : getParam('strictSSL', options),
+			timeout : getParam('timeout', options),
 			url : [getParam('referenceUrl', options), 'locations'].join('/')
 		};
 
@@ -256,6 +261,7 @@ var threeTaps = (function (self) {
 				code : getParam('code', options)
 			},
 			strictSSL : getParam('strictSSL', options),
+			timeout : getParam('timeout', options),
 			url : [
 				getParam('referenceUrl', options),
 				'locations',
@@ -295,6 +301,7 @@ var threeTaps = (function (self) {
 				status : getParam('status', options)
 			},
 			strictSSL : getParam('strictSSL', options),
+			timeout : getParam('timeout', options),
 			url : [getParam('pollingUrl', options), 'poll'].join('/')
 		};
 
@@ -360,6 +367,7 @@ var threeTaps = (function (self) {
 				tier : getParam('tier', options)
 			},
 			strictSSL : getParam('strictSSL', options),
+			timeout : getParam('timeout', options),
 			url : getParam('searchUrl', options)
 		};
 

From 3961fbcdfb760699dca1aec30512cd358d7d2226 Mon Sep 17 00:00:00 2001
From: Joshua Thomas <joshua.thomas@gmail.com>
Date: Tue, 30 Dec 2014 12:38:23 -0800
Subject: [PATCH 2/2] 0.1.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1380173..2985229 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "3taps",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Node client for 3taps API",
   "main": "./lib",
   "scripts": {