Make Object.keys ES5 compliant.

prototypejs · Feb 22, 2010 · 7eeee4f · 7eeee4f
1 parent 038a298
commit 7eeee4f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+* Make Object.keys ES5 compliant. (Tobie Langel)
+
 * Make Prototype's JSON implementation EcmaScript 5 compliant. [#453 state:resolved] (Tobie Langel)
 
 * Also detect embedded (UIWebView) mobile Safari. (Thomas Fuchs)

diff --git a/src/lang/object.js b/src/lang/object.js
@@ -11,10 +11,30 @@
 (function() {
 
   var _toString = Object.prototype.toString,
+      NULL_TYPE = 'Null',
+      UNDEFINED_TYPE = 'Undefined',
+      BOOLEAN_TYPE = 'Boolean',
+      NUMBER_TYPE = 'Number',
+      STRING_TYPE = 'String',
+      OBJECT_TYPE = 'Object',
       NATIVE_JSON_STRINGIFY_SUPPORT = window.JSON &&
         typeof JSON.stringify === 'function' &&
         JSON.stringify(0) === '0' &&
         typeof JSON.stringify(Prototype.K) === 'undefined';
+
+  function Type(o) {
+    switch(o) {
+      case null: return NULL_TYPE;
+      case (void 0): return UNDEFINED_TYPE;
+    }
+    var type = typeof o;
+    switch(type) {
+      case 'boolean': return BOOLEAN_TYPE;
+      case 'number':  return NUMBER_TYPE;
+      case 'string':  return STRING_TYPE;
+    }
+    return OBJECT_TYPE;
+  }
 
   /**
    *  Object.extend(destination, source) -> Object
@@ -170,9 +190,13 @@
    *  normalize the order of the object keys.
   **/
   function keys(object) {
+    if (Type(object) !== OBJECT_TYPE) { throw new TypeError(); }
     var results = [];
-    for (var property in object)
-      results.push(property);
+    for (var property in object) {
+      if (object.hasOwnProperty(property)) {
+        results.push(property);
+      }
+    }
     return results;
   }
 
@@ -315,7 +339,7 @@
     toJSON:        NATIVE_JSON_STRINGIFY_SUPPORT ? stringify : toJSON,
     toQueryString: toQueryString,
     toHTML:        toHTML,
-    keys:          keys,
+    keys:          Object.keys || keys,
     values:        values,
     clone:         clone,
     isElement:     isElement,

diff --git a/test/unit/object_test.js b/test/unit/object_test.js
@@ -23,6 +23,15 @@ new Test.Unit.Runner({
     this.assertHashEqual({foo: 'foo'}, clone,
       "Optimizing Object.clone perf using prototyping doesn't allow properties to be deleted.");
   },
+
+  testObjectKeys: function() {
+    this.assertEnumEqual([], Object.keys({}));
+    this.assertEnumEqual(['bar', 'foo'], Object.keys({foo: 'foo', bar: 'bar'}).sort());
+    function Foo() { this.bar = 'bar'; }
+    Foo.prototype.foo = 'foo';
+    this.assertEnumEqual(['bar'], Object.keys(new Foo()));
+    this.assertRaise('TypeError', function(){ Object.keys() });
+  },
 
   testObjectInspect: function() {
     this.assertEqual('undefined', Object.inspect());