Merge pull request #6 from vhx/1.1.2

1.1.2

Author: scottusrobus

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.1.2
+**2016-01-07**
+
+* Fix bug with collection items request
+* Allow for both id as stand alone param, and id as part of options object
+
 ### 1.1.1
 **2015-12-22**
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015 VHX, Inc. (https://vhx.com)
+Copyright (C) 2016 VHX, Inc. (https://vhx.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

lib/resource.js

@@ -20,11 +20,23 @@ Resource.prototype = {
             client_method: method
           };
 
-      if (method.match(/retrieve|update|files/)) {
+      if (method.match(/retrieve|update|items|files/)) {
         _this[method] = function(id, options, callback) {
-          params.id = id;
-          params.options = options;
-          params.callback = callback;
+          if (id.id && _this.isCallbackFunction(options)) {
+            params.callback = options;
+            params.id = id.id;
+            delete options.id;
+            params.options = id;
+          }
+          else {
+            params.id = id;
+            if (_this._this.isCallbackFunction(options)) {
+              params.callback = options;
+            } else {
+              params.options = options;
+              params.callback = callback;
+            }
+          }
 
           _this.makeRequest(params);
         };
@@ -133,7 +145,6 @@ Resource.prototype = {
 
   isCallbackFunction: function(obj) {
     return !!(obj && obj.constructor && obj.call && obj.apply);
-
   }
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vhx",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "VHX Node.js API Client",
   "keywords": [
     "vhx",