Merge pull request #34 from hapijs/33/hasOwnProperty

use Object.prototype.hasOwnProperty.call instead of obj.hasOwnProperty

Author: Eran Hammer

lib/parse.js

@@ -138,16 +138,16 @@ module.exports = function (str, options) {
     options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : internals.arrayLimit;
     options.parameterLimit = typeof options.parameterLimit === 'number' ? options.parameterLimit : internals.parameterLimit;
 
-    var tempObj = typeof str === 'string' ? internals.parseValues(str, options) : Utils.clone(str);
+    var tempObj = typeof str === 'string' ? internals.parseValues(str, options) : str;
     var obj = {};
 
     // Iterate over the keys and setup the new object
-    //
-    for (var key in tempObj) {
-        if (tempObj.hasOwnProperty(key)) {
-            var newObj = internals.parseKeys(key, tempObj[key], options);
-            obj = Utils.merge(obj, newObj);
-        }
+
+    var keys = Object.keys(tempObj);
+    for (var i = 0, il = keys.length; i < il; ++i) {
+        var key = keys[i];
+        var newObj = internals.parseKeys(key, tempObj[key], options);
+        obj = Utils.merge(obj, newObj);
     }
 
     return Utils.compact(obj);

lib/utils.js

@@ -20,39 +20,6 @@ exports.arrayToObject = function (source) {
 };
 
 
-exports.clone = function (source, refs) {
-
-    if (typeof source !== 'object' ||
-        source === null) {
-
-        return source;
-    }
-
-    if (exports.isBuffer(source)) {
-        return source.toString();
-    }
-
-    refs = refs || [];
-
-    var lookup = refs.indexOf(source);
-    if (lookup !== -1) {
-        return refs[lookup];
-    }
-
-    var copy = Array.isArray(source) ? [] : source;
-
-    refs.push(source);
-
-    for (var i in source) {
-        if (source.hasOwnProperty(i)) {
-            copy[i] = exports.clone(source[i], refs);
-        }
-    }
-
-    return copy;
-};
-
-
 exports.merge = function (target, source) {
 
     if (!source) {
@@ -93,7 +60,7 @@ exports.merge = function (target, source) {
             typeof value === 'object') {
 
             if (!target[key]) {
-                target[key] = exports.clone(value);
+                target[key] = value;
             }
             else {
                 target[key] = exports.merge(target[key], value);
@@ -146,10 +113,10 @@ exports.compact = function (obj, refs) {
         return compacted;
     }
 
-    for (var key in obj) {
-        if (obj.hasOwnProperty(key)) {
-            obj[key] = exports.compact(obj[key], refs);
-        }
+    var keys = Object.keys(obj);
+    for (var i = 0, il = keys.length; i < il; ++i) {
+        var key = keys[i];
+        obj[key] = exports.compact(obj[key], refs);
     }
 
     return obj;

test/parse.js

@@ -205,10 +205,10 @@ describe('#parse', function () {
         done();
     });
 
-    it('parses buffers to strings', function (done) {
+    it('parses buffers correctly', function (done) {
 
         var b = new Buffer('test');
-        expect(Qs.parse({ a: b })).to.deep.equal({ a: b.toString() });
+        expect(Qs.parse({ a: b })).to.deep.equal({ a: b });
         done();
     });
 
@@ -356,4 +356,28 @@ describe('#parse', function () {
         expect(parsed.foo.baz).to.deep.equal(a);
         done();
     });
+
+    it('parses plain objects correctly', function (done) {
+
+        var a = Object.create(null);
+        a.b = 'c';
+        
+        expect(Qs.parse(a)).to.deep.equal({ b: 'c' });
+        expect(Qs.parse({ a: a })).to.deep.equal({ a: { b: 'c' } });
+        done();
+    });
+
+    it('parses dates correctly', function (done) {
+
+        var now = new Date();
+        expect(Qs.parse({ a: now })).to.deep.equal({ a: now });
+        done();
+    });
+
+    it('parses regular expressions correctly', function (done) {
+
+        var re = /^test$/;
+        expect(Qs.parse({ a: re })).to.deep.equal({ a: re });
+        done();
+    });
 });