From f970512f7acdebbed75d7958d951dc0088881999 Mon Sep 17 00:00:00 2001
From: MaxArt2501 <maxart.x@gmail.com>
Date: Wed, 11 Feb 2015 13:38:44 +0100
Subject: [PATCH] Functions now observable; more tests; closes #1

---
 changelog.md                    |   8 +
 dist/object-observe-lite.js     |  50 +++--
 dist/object-observe-lite.min.js |  18 +-
 dist/object-observe.js          |  50 +++--
 dist/object-observe.min.js      |  24 +--
 doc/index.md                    |   4 +-
 readme.md                       |  20 +-
 test/test.css                   |  30 ---
 test/tests.js                   | 317 ++++++++++++++++++++++++++++----
 9 files changed, 393 insertions(+), 128 deletions(-)
 delete mode 100644 test/test.css

diff --git a/changelog.md b/changelog.md
index ef0dba9..d664bb4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,11 @@
+## v0.2.2
+
+2015-02-11
+
+* Uses `Object.getOwnPropertyNames` instead of `Object.keys` (issue #1)
+* Functions can now be observed
+* More tests
+
 ## v0.2.1
 
 2015-01-28
diff --git a/dist/object-observe-lite.js b/dist/object-observe-lite.js
index 53f412f..87a740d 100644
--- a/dist/object-observe-lite.js
+++ b/dist/object-observe-lite.js
@@ -1,5 +1,5 @@
 /*!
- * Object.observe "lite" polyfill - v0.2.1
+ * Object.observe "lite" polyfill - v0.2.2
  * by Massimo Artizzu (MaxArt2501)
  * 
  * https://github.com/MaxArt2501/object-observe
@@ -164,18 +164,42 @@ Object.observe || (function(O, A, root) {
         } : function() { return new Map(); },
 
         /**
-         * Simple shim for Object.keys is not available
-         * Misses checks on object, don't use as a replacement of Object.keys
-         * @function getKeys
+         * Simple shim for Object.getOwnPropertyNames when is not available
+         * Misses checks on object, don't use as a replacement of Object.keys/getOwnPropertyNames
+         * @function getProps
          * @param {Object} object
          * @returns {String[]}
          */
-        getKeys = O.keys || function(object) {
-            var keys = [], prop;
+        getProps = O.getOwnPropertyNames ? (function() {
+            var func = O.getOwnPropertyNames;
+            try {
+                arguments.callee;
+            } catch (e) {
+                // Strict mode is supported
+
+                // In strict mode, we can't access to "arguments", "caller" and
+                // "callee" properties of functions. Object.getOwnPropertyNames
+                // returns [ "prototype", "length", "name" ] in Firefox; it returns
+                // "caller" and "arguments" too in Chrome and in Internet
+                // Explorer, so those values must be filtered.
+                var avoid = (func(inArray).join(" ") + " ").replace(/prototype |length |name /g, "").slice(0, -1).split(" ");
+                if (avoid.length) func = function(object) {
+                    var props = O.getOwnPropertyNames(object);
+                    if (typeof object === "function")
+                        for (var i = 0, j; i < avoid.length;)
+                            if ((j = inArray(avoid[i++], props)) > -1)
+                                props.splice(j, 1);
+
+                    return props;
+                };
+            }
+            return func;
+        })() : function(object) {
+            var props = [], prop;
             for (prop in object)
                 if (object.hasOwnProperty(prop))
-                    keys.push(prop);
-            return keys;
+                    props.push(prop);
+            return props;
         },
 
         /**
@@ -225,7 +249,7 @@ Object.observe || (function(O, A, root) {
          * @param {Object} object
          */
         createObjectData = function(object, data) {
-            var props = isNode(object) ? [] : getKeys(object),
+            var props = isNode(object) ? [] : getProps(object),
                 values = [], descs, i = 0,
                 data = {
                     handlers: createMap(),
@@ -262,7 +286,7 @@ Object.observe || (function(O, A, root) {
 
             props = data.properties.slice();
             proplen = props.length;
-            keys = getKeys(object);
+            keys = getProps(object);
 
             // Check for value additions/changes
             while (i < keys.length) {
@@ -460,7 +484,7 @@ Object.observe || (function(O, A, root) {
      * @returns {Object}               The observed object
      */
     O.observe = function observe(object, handler, acceptList) {
-        if (object === null || typeof object !== "object")
+        if (object === null || typeof object !== "object" && typeof object !== "function")
             throw new TypeError("Object.observe cannot observe non-object");
 
         if (typeof handler !== "function")
@@ -486,7 +510,7 @@ Object.observe || (function(O, A, root) {
      * @returns {Object}         The given object
      */
     O.unobserve = function unobserve(object, handler) {
-        if (object === null || typeof object !== "object")
+        if (object === null || typeof object !== "object" && typeof object !== "function")
             throw new TypeError("Object.unobserve cannot unobserve non-object");
 
         if (typeof handler !== "function")
@@ -524,7 +548,7 @@ Object.observe || (function(O, A, root) {
      * @returns {Notifier}
      */
     O.getNotifier = function getNotifier(object) {
-        if (object === null || typeof object !== "object")
+        if (object === null || typeof object !== "object" && typeof object !== "function")
             throw new TypeError("Object.getNotifier cannot getNotifier non-object");
 
         if (O.isFrozen && O.isFrozen(object)) return null;
diff --git a/dist/object-observe-lite.min.js b/dist/object-observe-lite.min.js
index f801d46..50f31d2 100644
--- a/dist/object-observe-lite.min.js
+++ b/dist/object-observe-lite.min.js
@@ -1,9 +1,9 @@
-Object.observe||function(d,x,p){var h,g,C="add update delete reconfigure setPrototype preventExtensions".split(" "),D=p.Node?function(a){return a&&a instanceof p.Node}:function(a){return a&&"object"===typeof a&&"number"===typeof a.nodeType&&"string"===typeof a.nodeName},E=x.isArray||function(a){return function(b){return"[object Array]"===a.call(b)}}(d.prototype.toString),l=x.prototype.indexOf?function(a,b,c){return b.indexOf(a,c)}:function(a,b,c){for(c=c||0;c<b.length;c++)if(b[c]===a)return c;return-1},
-r="undefined"!==typeof p.Map&&Map.prototype.forEach?function(){return new Map}:function(){var a=[],b=[];return{size:0,has:function(c){return-1<l(c,a)},get:function(c){return b[l(c,a)]},set:function(c,e){var f=l(c,a);-1===f?(a.push(c),b.push(e),this.size++):b[f]=e},"delete":function(c){c=l(c,a);-1<c&&(a.splice(c,1),b.splice(c,1),this.size--)},forEach:function(c,e){for(var f=0;f<a.length;f++)c.call(e,b[f],a[f],this)}}},y=d.keys||function(a){var b=[],c;for(c in a)a.hasOwnProperty(c)&&b.push(c);return b},
-u=p.requestAnimationFrame||p.webkitRequestAnimationFrame||function(){var a=+new Date;return function(b){return setTimeout(function(){b(+new Date-a)},17)}}(),t=function(a,b,c){if(a.handlers.size){var e,f,k,v=a.values,d=0,h,g,m,n;e=a.properties.slice();f=e.length;for(k=y(b);d<k.length;)if(g=k[d++],h=l(g,e),m=b[g],-1===h)q(b,a,{name:g,type:"add",object:b},c),a.properties.push(g),v.push(m);else if(n=v[h],e[h]=null,f--,n===m?0===n&&1/n!==1/m:n===n||m===m)q(b,a,{name:g,type:"update",object:b,oldValue:n},
-c),a.values[h]=m;for(d=e.length;f&&d--;)null!==e[d]&&(q(b,a,{name:e[d],type:"delete",object:b,oldValue:v[d]},c),a.properties.splice(d,1),a.values.splice(d,1),f--)}},z=function(){h.size&&(h.forEach(t),g.forEach(w),u(z))},w=function(a,b){a.changeRecords.length&&(b(a.changeRecords),a.changeRecords=[])},A=function(a,b){2>arguments.length&&(b=h.get(a));return b&&b.notifier||{notify:function(c){c.type;var b=h.get(a);if(b){var f={object:a},k;for(k in c)"object"!==k&&(f[k]=c[k]);q(a,b,f)}},performChange:function(c,
-b,f){if("string"!==typeof c)throw new TypeError("Invalid non-string changeType");if("function"!==typeof b)throw new TypeError("Cannot perform non-function");var k=h.get(a),d;b=b.call(f);k&&t(k,a,c);if(k&&b&&"object"===typeof b){c={object:a,type:c};for(d in b)"object"!==d&&"type"!==d&&(c[d]=b[d]);q(a,k,c)}}}},B=function(a,b,c,e){var f=g.get(c);f||g.set(c,f={observed:r(),changeRecords:[]});f.observed.set(a,{acceptList:e.slice(),data:b});b.handlers.set(c,f)},q=function(a,b,c,e){b.handlers.forEach(function(b){var d=
-b.observed.get(a).acceptList;("string"!==typeof e||-1===l(e,d))&&-1<l(c.type,d)&&b.changeRecords.push(c)})};h=r();g=r();d.observe=function(a,b,c){if(null===a||"object"!==typeof a)throw new TypeError("Object.observe cannot observe non-object");if("function"!==typeof b)throw new TypeError("Object.observe cannot deliver to non-function");if(d.isFrozen&&d.isFrozen(b))throw new TypeError("Object.observe cannot deliver to a frozen function object");E(c)||(c=C);var e=h.get(a);if(e)B(a,e,b,c);else{for(var e=
-void 0,f=D(a)?[]:y(a),k=[],g=0,e={handlers:r(),properties:f,values:k,notifier:A(a,e)};g<f.length;)k[g]=a[f[g++]];h.set(a,e);B(a,e,b,c);1===h.size&&u(z)}return a};d.unobserve=function(a,b){if(null===a||"object"!==typeof a)throw new TypeError("Object.unobserve cannot unobserve non-object");if("function"!==typeof b)throw new TypeError("Object.unobserve cannot deliver to non-function");var c=g.get(b),e;if(c&&(e=c.observed.get(a))){c.observed.forEach(function(a,b){t(a.data,b)});u(function(){w(c,b)});if(1===
-c.observed.size&&c.observed.has(a))g["delete"](b);else c.observed["delete"](a);if(1===e.data.handlers.size)h["delete"](a);else e.data.handlers["delete"](b)}return a};d.getNotifier=function(a){if(null===a||"object"!==typeof a)throw new TypeError("Object.getNotifier cannot getNotifier non-object");return d.isFrozen&&d.isFrozen(a)?null:A(a)};d.deliverChangeRecords=function(a){if("function"!==typeof a)throw new TypeError("Object.deliverChangeRecords cannot deliver to non-function");var b=g.get(a);b&&
-(b.observed.forEach(function(a,b){t(a.data,b)}),w(b,a))}}(Object,Array,this);
+Object.observe||function(d,x,p){var k,h,C="add update delete reconfigure setPrototype preventExtensions".split(" "),D=p.Node?function(a){return a&&a instanceof p.Node}:function(a){return a&&"object"===typeof a&&"number"===typeof a.nodeType&&"string"===typeof a.nodeName},E=x.isArray||function(a){return function(b){return"[object Array]"===a.call(b)}}(d.prototype.toString),l=x.prototype.indexOf?function(a,b,c){return b.indexOf(a,c)}:function(a,b,c){for(c=c||0;c<b.length;c++)if(b[c]===a)return c;return-1},
+r="undefined"!==typeof p.Map&&Map.prototype.forEach?function(){return new Map}:function(){var a=[],b=[];return{size:0,has:function(c){return-1<l(c,a)},get:function(c){return b[l(c,a)]},set:function(c,f){var e=l(c,a);-1===e?(a.push(c),b.push(f),this.size++):b[e]=f},"delete":function(c){c=l(c,a);-1<c&&(a.splice(c,1),b.splice(c,1),this.size--)},forEach:function(c,f){for(var e=0;e<a.length;e++)c.call(f,b[e],a[e],this)}}},y=d.getOwnPropertyNames?function(){var a=d.getOwnPropertyNames;try{arguments.callee}catch(b){var c=
+(a(l).join(" ")+" ").replace(/prototype |length |name /g,"").slice(0,-1).split(" ");c.length&&(a=function(a){var b=d.getOwnPropertyNames(a);if("function"===typeof a){a=0;for(var g;a<c.length;)-1<(g=l(c[a++],b))&&b.splice(g,1)}return b})}return a}():function(a){var b=[],c;for(c in a)a.hasOwnProperty(c)&&b.push(c);return b},u=p.requestAnimationFrame||p.webkitRequestAnimationFrame||function(){var a=+new Date;return function(b){return setTimeout(function(){b(+new Date-a)},17)}}(),t=function(a,b,c){if(a.handlers.size){var f,
+e,g,v=a.values,d=0,k,h,m,n;f=a.properties.slice();e=f.length;for(g=y(b);d<g.length;)if(h=g[d++],k=l(h,f),m=b[h],-1===k)q(b,a,{name:h,type:"add",object:b},c),a.properties.push(h),v.push(m);else if(n=v[k],f[k]=null,e--,n===m?0===n&&1/n!==1/m:n===n||m===m)q(b,a,{name:h,type:"update",object:b,oldValue:n},c),a.values[k]=m;for(d=f.length;e&&d--;)null!==f[d]&&(q(b,a,{name:f[d],type:"delete",object:b,oldValue:v[d]},c),a.properties.splice(d,1),a.values.splice(d,1),e--)}},z=function(){k.size&&(k.forEach(t),
+h.forEach(w),u(z))},w=function(a,b){a.changeRecords.length&&(b(a.changeRecords),a.changeRecords=[])},A=function(a,b){2>arguments.length&&(b=k.get(a));return b&&b.notifier||{notify:function(c){c.type;var b=k.get(a);if(b){var e={object:a},g;for(g in c)"object"!==g&&(e[g]=c[g]);q(a,b,e)}},performChange:function(c,b,e){if("string"!==typeof c)throw new TypeError("Invalid non-string changeType");if("function"!==typeof b)throw new TypeError("Cannot perform non-function");var g=k.get(a),d;b=b.call(e);g&&
+t(g,a,c);if(g&&b&&"object"===typeof b){c={object:a,type:c};for(d in b)"object"!==d&&"type"!==d&&(c[d]=b[d]);q(a,g,c)}}}},B=function(a,b,c,f){var e=h.get(c);e||h.set(c,e={observed:r(),changeRecords:[]});e.observed.set(a,{acceptList:f.slice(),data:b});b.handlers.set(c,e)},q=function(a,b,c,f){b.handlers.forEach(function(b){var d=b.observed.get(a).acceptList;("string"!==typeof f||-1===l(f,d))&&-1<l(c.type,d)&&b.changeRecords.push(c)})};k=r();h=r();d.observe=function(a,b,c){if(null===a||"object"!==typeof a&&
+"function"!==typeof a)throw new TypeError("Object.observe cannot observe non-object");if("function"!==typeof b)throw new TypeError("Object.observe cannot deliver to non-function");if(d.isFrozen&&d.isFrozen(b))throw new TypeError("Object.observe cannot deliver to a frozen function object");E(c)||(c=C);var f=k.get(a);if(f)B(a,f,b,c);else{for(var f=void 0,e=D(a)?[]:y(a),g=[],h=0,f={handlers:r(),properties:e,values:g,notifier:A(a,f)};h<e.length;)g[h]=a[e[h++]];k.set(a,f);B(a,f,b,c);1===k.size&&u(z)}return a};
+d.unobserve=function(a,b){if(null===a||"object"!==typeof a&&"function"!==typeof a)throw new TypeError("Object.unobserve cannot unobserve non-object");if("function"!==typeof b)throw new TypeError("Object.unobserve cannot deliver to non-function");var c=h.get(b),d;if(c&&(d=c.observed.get(a))){c.observed.forEach(function(a,b){t(a.data,b)});u(function(){w(c,b)});if(1===c.observed.size&&c.observed.has(a))h["delete"](b);else c.observed["delete"](a);if(1===d.data.handlers.size)k["delete"](a);else d.data.handlers["delete"](b)}return a};
+d.getNotifier=function(a){if(null===a||"object"!==typeof a&&"function"!==typeof a)throw new TypeError("Object.getNotifier cannot getNotifier non-object");return d.isFrozen&&d.isFrozen(a)?null:A(a)};d.deliverChangeRecords=function(a){if("function"!==typeof a)throw new TypeError("Object.deliverChangeRecords cannot deliver to non-function");var b=h.get(a);b&&(b.observed.forEach(function(a,b){t(a.data,b)}),w(b,a))}}(Object,Array,this);
diff --git a/dist/object-observe.js b/dist/object-observe.js
index 51b22f2..991849d 100644
--- a/dist/object-observe.js
+++ b/dist/object-observe.js
@@ -1,5 +1,5 @@
 /*!
- * Object.observe polyfill - v0.2.1
+ * Object.observe polyfill - v0.2.2
  * by Massimo Artizzu (MaxArt2501)
  * 
  * https://github.com/MaxArt2501/object-observe
@@ -168,18 +168,42 @@ Object.observe || (function(O, A, root) {
         } : function() { return new Map(); },
 
         /**
-         * Simple shim for Object.keys is not available
-         * Misses checks on object, don't use as a replacement of Object.keys
-         * @function getKeys
+         * Simple shim for Object.getOwnPropertyNames when is not available
+         * Misses checks on object, don't use as a replacement of Object.keys/getOwnPropertyNames
+         * @function getProps
          * @param {Object} object
          * @returns {String[]}
          */
-        getKeys = O.keys || function(object) {
-            var keys = [], prop;
+        getProps = O.getOwnPropertyNames ? (function() {
+            var func = O.getOwnPropertyNames;
+            try {
+                arguments.callee;
+            } catch (e) {
+                // Strict mode is supported
+
+                // In strict mode, we can't access to "arguments", "caller" and
+                // "callee" properties of functions. Object.getOwnPropertyNames
+                // returns [ "prototype", "length", "name" ] in Firefox; it returns
+                // "caller" and "arguments" too in Chrome and in Internet
+                // Explorer, so those values must be filtered.
+                var avoid = (func(inArray).join(" ") + " ").replace(/prototype |length |name /g, "").slice(0, -1).split(" ");
+                if (avoid.length) func = function(object) {
+                    var props = O.getOwnPropertyNames(object);
+                    if (typeof object === "function")
+                        for (var i = 0, j; i < avoid.length;)
+                            if ((j = inArray(avoid[i++], props)) > -1)
+                                props.splice(j, 1);
+
+                    return props;
+                };
+            }
+            return func;
+        })() : function(object) {
+            var props = [], prop;
             for (prop in object)
                 if (object.hasOwnProperty(prop))
-                    keys.push(prop);
-            return keys;
+                    props.push(prop);
+            return props;
         },
 
         /**
@@ -248,7 +272,7 @@ Object.observe || (function(O, A, root) {
          * @param {Object} object
          */
         createObjectData = function(object, data) {
-            var props = isNode(object) ? [] : getKeys(object),
+            var props = isNode(object) ? [] : getProps(object),
                 values = [], descs, i = 0,
                 data = {
                     handlers: createMap(),
@@ -387,7 +411,7 @@ Object.observe || (function(O, A, root) {
 
                     props = data.properties.slice();
                     proplen = props.length;
-                    keys = getKeys(object);
+                    keys = getProps(object);
 
                     if (descs) {
                         while (i < keys.length) {
@@ -623,7 +647,7 @@ Object.observe || (function(O, A, root) {
      * @returns {Object}               The observed object
      */
     O.observe = function observe(object, handler, acceptList) {
-        if (object === null || typeof object !== "object")
+        if (object === null || typeof object !== "object" && typeof object !== "function")
             throw new TypeError("Object.observe cannot observe non-object");
 
         if (typeof handler !== "function")
@@ -649,7 +673,7 @@ Object.observe || (function(O, A, root) {
      * @returns {Object}         The given object
      */
     O.unobserve = function unobserve(object, handler) {
-        if (object === null || typeof object !== "object")
+        if (object === null || typeof object !== "object" && typeof object !== "function")
             throw new TypeError("Object.unobserve cannot unobserve non-object");
 
         if (typeof handler !== "function")
@@ -687,7 +711,7 @@ Object.observe || (function(O, A, root) {
      * @returns {Notifier}
      */
     O.getNotifier = function getNotifier(object) {
-        if (object === null || typeof object !== "object")
+        if (object === null || typeof object !== "object" && typeof object !== "function")
             throw new TypeError("Object.getNotifier cannot getNotifier non-object");
 
         if (O.isFrozen && O.isFrozen(object)) return null;
diff --git a/dist/object-observe.min.js b/dist/object-observe.min.js
index be3ac0b..ab78941 100644
--- a/dist/object-observe.min.js
+++ b/dist/object-observe.min.js
@@ -1,12 +1,12 @@
-Object.observe||function(d,C,w){var k,q,H="add update delete reconfigure setPrototype preventExtensions".split(" "),I=w.Node?function(b){return b&&b instanceof w.Node}:function(b){return b&&"object"===typeof b&&"number"===typeof b.nodeType&&"string"===typeof b.nodeName},J=C.isArray||function(b){return function(c){return"[object Array]"===b.call(c)}}(d.prototype.toString),t=C.prototype.indexOf?function(b,c,a){return c.indexOf(b,a)}:function(b,c,a){for(a=a||0;a<c.length;a++)if(c[a]===b)return a;return-1},
-x="undefined"!==typeof w.Map&&Map.prototype.forEach?function(){return new Map}:function(){var b=[],c=[];return{size:0,has:function(a){return-1<t(a,b)},get:function(a){return c[t(a,b)]},set:function(a,e){var f=t(a,b);-1===f?(b.push(a),c.push(e),this.size++):c[f]=e},"delete":function(a){a=t(a,b);-1<a&&(b.splice(a,1),c.splice(a,1),this.size--)},forEach:function(a,e){for(var f=0;f<b.length;f++)a.call(e,c[f],b[f],this)}}},D=d.keys||function(b){var c=[],a;for(a in b)b.hasOwnProperty(a)&&c.push(a);return c},
-y=d.getPrototypeOf||null,v=d.defineProperties?d.getOwnPropertyDescriptor:null,A=w.requestAnimationFrame||w.webkitRequestAnimationFrame||function(){var b=+new Date;return function(c){return setTimeout(function(){c(+new Date-b)},17)}}(),z=function(){var b=v?function(a,b,f,c,h){var g=b.properties[f],d=a[g],p=b.values[f],m=b.descriptors[f];"value"in h&&(p===d?0===p&&1/p!==1/d:p===p||d===d)&&(r(a,b,{name:g,type:"update",object:a,oldValue:p},c),b.values[f]=d);!m.configurable||h.configurable&&h.writable===
-m.writable&&h.enumerable===m.enumerable&&h.get===m.get&&h.set===m.set||(r(a,b,{name:g,type:"reconfigure",object:a,oldValue:p},c),b.descriptors[f]=h)}:function(a,b,f,c){var h=b.properties[f],g=a[h],d=b.values[f];if(d===g?0===d&&1/d!==1/g:d===d||g===g)r(a,b,{name:h,type:"update",object:a,oldValue:d},c),b.values[f]=g},c=v?function(a,e,f,c,d){for(var g=e.length,k;f&&g--;)null!==e[g]&&(k=v(a,e[g]),f--,k?b(a,c,g,d,k):(r(a,c,{name:e[g],type:"delete",object:a,oldValue:c.values[g]},d),c.properties.splice(g,
-1),c.values.splice(g,1),c.descriptors.splice(g,1)))}:function(a,b,c,d,h){for(var g=b.length;c&&g--;)null!==b[g]&&(r(a,d,{name:b[g],type:"delete",object:a,oldValue:d.values[g]},h),d.properties.splice(g,1),d.values.splice(g,1),c--)};return function(a,e,f){if(a.handlers.size&&!a.frozen){var l,h,g,k=a.values,p=a.descriptors,m=0,u,n,q;if(a.extensible)if(l=a.properties.slice(),h=l.length,g=D(e),p){for(;m<g.length;)n=g[m++],u=t(n,l),q=v(e,n),-1===u?(r(e,a,{name:n,type:"add",object:e},f),a.properties.push(n),
-k.push(e[n]),p.push(q)):(l[u]=null,h--,b(e,a,u,f,q));c(e,l,h,a,f);d.isExtensible(e)||(a.extensible=!1,r(e,a,{type:"preventExtensions",object:e},f),a.frozen=d.isFrozen(e))}else{for(;m<g.length;)n=g[m++],u=t(n,l),p=e[n],-1===u?(r(e,a,{name:n,type:"add",object:e},f),a.properties.push(n),k.push(p)):(l[u]=null,h--,b(e,a,u,f));c(e,l,h,a,f)}else if(!a.frozen){for(;m<l.length;m++)n=l[m],b(e,a,m,f,v(e,n));d.isFrozen(e)&&(a.frozen=!0)}y&&(f=y(e),f!==a.proto&&(r(e,a,{type:"setPrototype",name:"__proto__",object:e,
-oldValue:a.proto}),a.proto=f))}}}(),E=function(){k.size&&(k.forEach(z),q.forEach(B),A(E))},B=function(b,c){b.changeRecords.length&&(c(b.changeRecords),b.changeRecords=[])},F=function(b,c){2>arguments.length&&(c=k.get(b));return c&&c.notifier||{notify:function(a){a.type;var e=k.get(b);if(e){var c={object:b},d;for(d in a)"object"!==d&&(c[d]=a[d]);r(b,e,c)}},performChange:function(a,c,f){if("string"!==typeof a)throw new TypeError("Invalid non-string changeType");if("function"!==typeof c)throw new TypeError("Cannot perform non-function");
-var d=k.get(b),h;c=c.call(f);d&&z(d,b,a);if(d&&c&&"object"===typeof c){a={object:b,type:a};for(h in c)"object"!==h&&"type"!==h&&(a[h]=c[h]);r(b,d,a)}}}},G=function(b,c,a,e){var d=q.get(a);d||q.set(a,d={observed:x(),changeRecords:[]});d.observed.set(b,{acceptList:e.slice(),data:c});c.handlers.set(a,d)},r=function(b,c,a,d){c.handlers.forEach(function(c){var l=c.observed.get(b).acceptList;("string"!==typeof d||-1===t(d,l))&&-1<t(a.type,l)&&c.changeRecords.push(a)})};k=x();q=x();d.observe=function(b,
-c,a){if(null===b||"object"!==typeof b)throw new TypeError("Object.observe cannot observe non-object");if("function"!==typeof c)throw new TypeError("Object.observe cannot deliver to non-function");if(d.isFrozen&&d.isFrozen(c))throw new TypeError("Object.observe cannot deliver to a frozen function object");J(a)||(a=H);var e=k.get(b);if(e)G(b,e,c,a);else{var e=void 0,f=I(b)?[]:D(b),l=[],h,g=0,e={handlers:x(),frozen:d.isFrozen?d.isFrozen(b):!1,extensible:d.isExtensible?d.isExtensible(b):!0,proto:y&&y(b),
-properties:f,values:l,notifier:F(b,e)};if(v)for(h=e.descriptors=[];g<f.length;)h[g]=v(b,f[g]),l[g]=b[f[g++]];else for(;g<f.length;)l[g]=b[f[g++]];k.set(b,e);G(b,e,c,a);1===k.size&&A(E)}return b};d.unobserve=function(b,c){if(null===b||"object"!==typeof b)throw new TypeError("Object.unobserve cannot unobserve non-object");if("function"!==typeof c)throw new TypeError("Object.unobserve cannot deliver to non-function");var a=q.get(c),d;if(a&&(d=a.observed.get(b))){a.observed.forEach(function(a,b){z(a.data,
-b)});A(function(){B(a,c)});if(1===a.observed.size&&a.observed.has(b))q["delete"](c);else a.observed["delete"](b);if(1===d.data.handlers.size)k["delete"](b);else d.data.handlers["delete"](c)}return b};d.getNotifier=function(b){if(null===b||"object"!==typeof b)throw new TypeError("Object.getNotifier cannot getNotifier non-object");return d.isFrozen&&d.isFrozen(b)?null:F(b)};d.deliverChangeRecords=function(b){if("function"!==typeof b)throw new TypeError("Object.deliverChangeRecords cannot deliver to non-function");
-var c=q.get(b);c&&(c.observed.forEach(function(a,b){z(a.data,b)}),B(c,b))}}(Object,Array,this);
+Object.observe||function(f,C,v){var k,l,H="add update delete reconfigure setPrototype preventExtensions".split(" "),I=v.Node?function(a){return a&&a instanceof v.Node}:function(a){return a&&"object"===typeof a&&"number"===typeof a.nodeType&&"string"===typeof a.nodeName},J=C.isArray||function(a){return function(c){return"[object Array]"===a.call(c)}}(f.prototype.toString),t=C.prototype.indexOf?function(a,c,b){return c.indexOf(a,b)}:function(a,c,b){for(b=b||0;b<c.length;b++)if(c[b]===a)return b;return-1},
+x="undefined"!==typeof v.Map&&Map.prototype.forEach?function(){return new Map}:function(){var a=[],c=[];return{size:0,has:function(b){return-1<t(b,a)},get:function(b){return c[t(b,a)]},set:function(b,d){var e=t(b,a);-1===e?(a.push(b),c.push(d),this.size++):c[e]=d},"delete":function(b){b=t(b,a);-1<b&&(a.splice(b,1),c.splice(b,1),this.size--)},forEach:function(b,d){for(var e=0;e<a.length;e++)b.call(d,c[e],a[e],this)}}},D=f.getOwnPropertyNames?function(){var a=f.getOwnPropertyNames;try{arguments.callee}catch(c){var b=
+(a(t).join(" ")+" ").replace(/prototype |length |name /g,"").slice(0,-1).split(" ");b.length&&(a=function(a){var e=f.getOwnPropertyNames(a);if("function"===typeof a){a=0;for(var h;a<b.length;)-1<(h=t(b[a++],e))&&e.splice(h,1)}return e})}return a}():function(a){var c=[],b;for(b in a)a.hasOwnProperty(b)&&c.push(b);return c},y=f.getPrototypeOf||null,u=f.defineProperties?f.getOwnPropertyDescriptor:null,A=v.requestAnimationFrame||v.webkitRequestAnimationFrame||function(){var a=+new Date;return function(c){return setTimeout(function(){c(+new Date-
+a)},17)}}(),z=function(){var a=u?function(b,a,e,h,c){var g=a.properties[e],f=b[g],q=a.values[e],m=a.descriptors[e];"value"in c&&(q===f?0===q&&1/q!==1/f:q===q||f===f)&&(r(b,a,{name:g,type:"update",object:b,oldValue:q},h),a.values[e]=f);!m.configurable||c.configurable&&c.writable===m.writable&&c.enumerable===m.enumerable&&c.get===m.get&&c.set===m.set||(r(b,a,{name:g,type:"reconfigure",object:b,oldValue:q},h),a.descriptors[e]=c)}:function(b,a,e,c){var f=a.properties[e],g=b[f],n=a.values[e];if(n===g?
+0===n&&1/n!==1/g:n===n||g===g)r(b,a,{name:f,type:"update",object:b,oldValue:n},c),a.values[e]=g},c=u?function(b,d,e,c,f){for(var g=d.length,n;e&&g--;)null!==d[g]&&(n=u(b,d[g]),e--,n?a(b,c,g,f,n):(r(b,c,{name:d[g],type:"delete",object:b,oldValue:c.values[g]},f),c.properties.splice(g,1),c.values.splice(g,1),c.descriptors.splice(g,1)))}:function(a,d,c,h,f){for(var g=d.length;c&&g--;)null!==d[g]&&(r(a,h,{name:d[g],type:"delete",object:a,oldValue:h.values[g]},f),h.properties.splice(g,1),h.values.splice(g,
+1),c--)};return function(b,d,e){if(b.handlers.size&&!b.frozen){var h,w,g,n=b.values,q=b.descriptors,m=0,k,p,l;if(b.extensible)if(h=b.properties.slice(),w=h.length,g=D(d),q){for(;m<g.length;)p=g[m++],k=t(p,h),l=u(d,p),-1===k?(r(d,b,{name:p,type:"add",object:d},e),b.properties.push(p),n.push(d[p]),q.push(l)):(h[k]=null,w--,a(d,b,k,e,l));c(d,h,w,b,e);f.isExtensible(d)||(b.extensible=!1,r(d,b,{type:"preventExtensions",object:d},e),b.frozen=f.isFrozen(d))}else{for(;m<g.length;)p=g[m++],k=t(p,h),q=d[p],
+-1===k?(r(d,b,{name:p,type:"add",object:d},e),b.properties.push(p),n.push(q)):(h[k]=null,w--,a(d,b,k,e));c(d,h,w,b,e)}else if(!b.frozen){for(;m<h.length;m++)p=h[m],a(d,b,m,e,u(d,p));f.isFrozen(d)&&(b.frozen=!0)}y&&(e=y(d),e!==b.proto&&(r(d,b,{type:"setPrototype",name:"__proto__",object:d,oldValue:b.proto}),b.proto=e))}}}(),E=function(){k.size&&(k.forEach(z),l.forEach(B),A(E))},B=function(a,c){a.changeRecords.length&&(c(a.changeRecords),a.changeRecords=[])},F=function(a,c){2>arguments.length&&(c=k.get(a));
+return c&&c.notifier||{notify:function(b){b.type;var c=k.get(a);if(c){var e={object:a},h;for(h in b)"object"!==h&&(e[h]=b[h]);r(a,c,e)}},performChange:function(b,c,e){if("string"!==typeof b)throw new TypeError("Invalid non-string changeType");if("function"!==typeof c)throw new TypeError("Cannot perform non-function");var h=k.get(a),f;c=c.call(e);h&&z(h,a,b);if(h&&c&&"object"===typeof c){b={object:a,type:b};for(f in c)"object"!==f&&"type"!==f&&(b[f]=c[f]);r(a,h,b)}}}},G=function(a,c,b,d){var e=l.get(b);
+e||l.set(b,e={observed:x(),changeRecords:[]});e.observed.set(a,{acceptList:d.slice(),data:c});c.handlers.set(b,e)},r=function(a,c,b,d){c.handlers.forEach(function(c){var f=c.observed.get(a).acceptList;("string"!==typeof d||-1===t(d,f))&&-1<t(b.type,f)&&c.changeRecords.push(b)})};k=x();l=x();f.observe=function(a,c,b){if(null===a||"object"!==typeof a&&"function"!==typeof a)throw new TypeError("Object.observe cannot observe non-object");if("function"!==typeof c)throw new TypeError("Object.observe cannot deliver to non-function");
+if(f.isFrozen&&f.isFrozen(c))throw new TypeError("Object.observe cannot deliver to a frozen function object");J(b)||(b=H);var d=k.get(a);if(d)G(a,d,c,b);else{var d=void 0,e=I(a)?[]:D(a),h=[],l,g=0,d={handlers:x(),frozen:f.isFrozen?f.isFrozen(a):!1,extensible:f.isExtensible?f.isExtensible(a):!0,proto:y&&y(a),properties:e,values:h,notifier:F(a,d)};if(u)for(l=d.descriptors=[];g<e.length;)l[g]=u(a,e[g]),h[g]=a[e[g++]];else for(;g<e.length;)h[g]=a[e[g++]];k.set(a,d);G(a,d,c,b);1===k.size&&A(E)}return a};
+f.unobserve=function(a,c){if(null===a||"object"!==typeof a&&"function"!==typeof a)throw new TypeError("Object.unobserve cannot unobserve non-object");if("function"!==typeof c)throw new TypeError("Object.unobserve cannot deliver to non-function");var b=l.get(c),d;if(b&&(d=b.observed.get(a))){b.observed.forEach(function(a,b){z(a.data,b)});A(function(){B(b,c)});if(1===b.observed.size&&b.observed.has(a))l["delete"](c);else b.observed["delete"](a);if(1===d.data.handlers.size)k["delete"](a);else d.data.handlers["delete"](c)}return a};
+f.getNotifier=function(a){if(null===a||"object"!==typeof a&&"function"!==typeof a)throw new TypeError("Object.getNotifier cannot getNotifier non-object");return f.isFrozen&&f.isFrozen(a)?null:F(a)};f.deliverChangeRecords=function(a){if("function"!==typeof a)throw new TypeError("Object.deliverChangeRecords cannot deliver to non-function");var c=l.get(a);c&&(c.observed.forEach(function(a,c){z(a.data,c)}),B(c,a))}}(Object,Array,this);
diff --git a/doc/index.md b/doc/index.md
index 908f397..74b9c7d 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -104,7 +104,7 @@ Keep into consideration that this shim *hasn't been developed with node.js in mi
 
 The [spec](http://arv.github.io/ecmascript-object-observe/#Array.observe) only states that `Array.observe` is just like `Object.observe` with a fixed accept list of `["add", "update", "delete", "splice"]`, and `Array.unobserve` is equivalent to `Object.unobserve`. That's fine, but where does that `"splice"` event come from?
 
-It's actually triggered by any operation on the array that *may* change the length of the array itself, like `push()` or `splice()`. These operations internally call `notifier.performChange("splice", ...)`, so one solution would be wrapping these methods in `Array.prototype` - or maybe better in the observed array itself - in a `performChange` call. Unfortunately, besides the obvious performance hit, a `"splice"` notification is triggered by this operation too:
+It's actually triggered by any operation on the array that *may* change the length of the array itself, like `push()` or `splice()`. These operations internally call `notifier.performChange("splice", ...)`, so one solution would be wrapping these methods in `Array.prototype` - or maybe better in the observed array itself - in a `performChange` call. Unfortunately, besides the obvious performance hit, this obtrusive intervention doesn't help detecting a `"splice"` change triggered by this operation:
 
 ```js
 var fibonacci = [ 0, 1, 1, 2, 3 ];
@@ -136,6 +136,8 @@ Anyway, this is what wrapping an `Array` method would look like:
 })(Array.prototype.push);
 ```
 
+If you're ok with this, you can add this kind of wrappers to your code, one for every method that triggers a `"splice"` change (namely: `push`, `pop`, `splice`, `shift` and `unshift`) and define `Array.observe`/`unobserve` as described above.
+
 ## Tests
 
 Tests are performed using [mocha](http://mochajs.org/) and assertions are made using [expect](https://github.com/Automattic/expect.js). For client side testing, these libraries are provided in the [lib](lib/) directory. Opening [index.html](test/index.html) with a browser runs the tests and displays the results.
diff --git a/readme.md b/readme.md
index 93e82f2..792c963 100644
--- a/readme.md
+++ b/readme.md
@@ -61,21 +61,17 @@ For client side usage, if you only need the "light" version of the polyfill (see
   
   Due to the nature of the shim, there's nothing that can be done about it.
 
-* When a property is created using `Object.defineProperty` and set to not enumerable, it's basically invisible to the polyfill:
+* Environments that don't support [`Object.getOwnPropertyNames`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/getOwnPropertyNames) (most notably, Internet Explorer prior to version 9) can't detect changes to non-enumerable properties:
 
   ```js
-  Object.defineProperty(object, "bar", {
-      value: "hello", enumerable: false, writable: true
-  });
-  // Nothing happens
+  var re = /some regex/g;
+  Object.observe(re, ...);
   
-  object.bar = "hi";
-  // Still nothing...
+  re.lastIndex = 10;
+  // Nothing happens...
   ```
   
-  Also, if the `enumerable` descriptor property is subsequently set to `true`, it will trigger an `"add"` event.
-  
-  There's no way to prevent this limitation.
+  There's no way to prevent this limitation. Developers that need to support those environments should be careful about observing non-plain objects.
 
 * It doesn't work correctly on DOM nodes or other *host* objects. Nodes have a lot of enumerable properties that `Object.observe` should *not* check.
 
@@ -90,7 +86,9 @@ This polyfill has been tested (and is working) in the following environments:
 * Firefox 35 stable and 37 Developer Edition
 * Internet Explorer 11
 * Internet Explorer 5, 7, 8, 9, 10 (as IE11 in emulation mode)
-* node.js 0.10.33-35
+* node.js 0.10.33-36
+
+It also does *not* overwrite the native implentation in Chrome 36+, node.js 0.11.13+ and io.js.
 
 ## License
 
diff --git a/test/test.css b/test/test.css
deleted file mode 100644
index 0617704..0000000
--- a/test/test.css
+++ /dev/null
@@ -1,30 +0,0 @@
-body { font-family: Arial, Helvetica, sans-serif; }
-.outcome-box {
-    border: 1px solid;
-    padding: .5em;
-    margin: .5em;
-    background-color: #ccc;
-}
-.outcome-header {
-    display: block;
-    font-size: 120%;
-    font-weight: bold;
-}
-.result-success {
-    background-color: #8f8;
-    color: green;
-}
-.result-fail {
-    background-color: #fbb;
-    color: #800;
-}
-.outcome-box > .outcome-normal {
-    color: gray;
-    color: rgba(0, 0, 0, .4);
-    font-style: italic;
-    border-bottom: 1px solid;
-    margin-bottom: .25em;
-}
-.outcome-success, .outcome-fail {
-    font-family: "Courier New", Courier, Monospace;
-}
\ No newline at end of file
diff --git a/test/tests.js b/test/tests.js
index 731bdd2..e7ca18f 100644
--- a/test/tests.js
+++ b/test/tests.js
@@ -80,6 +80,143 @@ describe("Object.observe", function() {
         }, 30);
     });
 
+    it("should observe plain objects", function(done) {
+        function handler(changes) {
+            try {
+                expect(tested).to.be(false);
+                expect(changes).to.have.length(1);
+                tested = true;
+            } catch (e) { done(e); }
+        }
+
+        var obj = {}, tested = false;
+        Object.observe(obj, handler);
+
+        obj.foo = 42;
+
+        Object.unobserve(obj, handler);
+
+        setTimeout(function() {
+            try {
+                expect(tested).to.be(true);
+                done();
+            } catch (e) { done(e); }
+        }, 30);
+    });
+
+    it("should observe arrays", function(done) {
+        function handler(changes) {
+            try {
+                expect(tested).to.be(false);
+                expect(changes).to.have.length(2)
+                    .and.to.looselyContain({ type: "add", name: "0", object: array })
+                    .and.to.looselyContain({ type: "update", name: "length", object: array, oldValue: 0 });
+                tested = true;
+            } catch (e) { done(e); }
+        }
+
+        var array = [], tested = false;
+        Object.observe(array, handler);
+
+        array.push(42);
+
+        Object.unobserve(array, handler);
+
+        setTimeout(function() {
+            try {
+                expect(tested).to.be(true);
+                done();
+            } catch (e) { done(e); }
+        }, 30);
+    });
+
+    it("should observe functions", function(done) {
+        function handler(changes) {
+            try {
+                expect(tested).to.be(false);
+                expect(changes).to.have.length(1)
+                expect(changes[0]).to.eql({ type: "add", name: "foo", object: observeMe });
+                tested = true;
+            } catch (e) { done(e); }
+        }
+        function observeMe() {}
+
+        var tested = false;
+        Object.observe(observeMe, handler);
+
+        observeMe.foo = "bar";
+
+        Object.unobserve(observeMe, handler);
+
+        setTimeout(function() {
+            try {
+                expect(tested).to.be(true);
+                done();
+            } catch (e) { done(e); }
+        }, 30);
+    });
+
+    it("should observe all kinds of objects, including instances of user defined classes", function(done) {
+        function handler(changes) {
+            try {
+                expect(tested).to.be(false);
+                expect(changes).to.have.length(3)
+                    .and.to.looselyContain({ type: "update", name: "message", object: error, oldValue: "Message" })
+                    .and.to.looselyContain({ type: "add", name: "TAU", object: Math })
+                    .and.to.looselyContain({ type: "add", name: "foo", object: inst });
+                tested = true;
+            } catch (e) { done(e); }
+        }
+
+        function Class() {};
+
+        var error = new Error("Message"),
+            inst = new Class(),
+            tested = false;
+
+        Object.observe(error, handler);
+        Object.observe(Math, handler);
+        Object.observe(inst, handler);
+
+        error.message = "New message";
+        Math.TAU = Math.PI * 2;
+        inst.foo = "bar";
+
+        Object.unobserve(error, handler);
+        Object.unobserve(Math, handler);
+        Object.unobserve(inst, handler);
+
+        delete Math.TAU;
+
+        setTimeout(function() {
+            try {
+                expect(tested).to.be(true);
+                done();
+            } catch (e) { done(e); }
+        }, 30);
+    });
+
+    it("should not observe any non-object", function() {
+        expect(Object.observe).to.throwError();
+        expect(Object.observe).withArgs(undefined, function() {}).to.throwError();
+        expect(Object.observe).withArgs(null, function() {}).to.throwError();
+        expect(Object.observe).withArgs(1, function() {}).to.throwError();
+        expect(Object.observe).withArgs("foo", function() {}).to.throwError();
+        expect(Object.observe).withArgs(true, function() {}).to.throwError();
+    });
+
+    it("should not observe when not given a handler function", function() {
+        expect(Object.observe).withArgs({}).to.throwError();
+        expect(Object.observe).withArgs({}, "foo").to.throwError();
+        expect(Object.observe).withArgs({}, 42).to.throwError();
+    });
+
+    if (Object.freeze) it("should not observe with a frozen handler function", function() {
+        function handler() {}
+        Object.freeze(handler);
+        expect(Object.observe).withArgs({}, handler).to.throwError();
+    });
+
     it("should deliver changes asynchronously", function(done) {
         function handler(changes) {
             try {
@@ -303,52 +440,99 @@ describe("Object.unobserve", function() {
             } catch (e) { done(e); }
         }, 30);
     });
-});
 
-describe("Object.deliverChangeRecords", function() {
-    it("should deliver changes synchronously", function(done) {
-        function updateHandler(changes) {
+    it("should unobserve one handler at time", function(done) {
+        function handler1(changes) {
             try {
-                expect(updated).to.be(false);
-                expect(added).to.be(true);
+                expect(tested).to.be(false);
                 expect(changes).to.have.length(1);
-                expect(changes[0]).to.eql({ type: "update", name: "foo", object: obj, oldValue: 0 });
-
-                updated = true;
+                expect(changes[0]).to.eql({ type: "add", name: "foo", object: obj });
+                tested = true;
             } catch (e) { done(e); }
         }
-        function addHandler(changes) {
-            try {
-                expect(updated).to.be(false);
-                expect(added).to.be(false);
-                expect(changes).to.have.length(1);
-                expect(changes[0]).to.eql({ type: "add", name: "bar", object: obj });
-
-                added = true;
-            } catch (e) { done(e); }
+        function handler2(changes) {
+            done(new Error("This shouldn't have be called"));
         }
+        var obj = { foo: "bar" },
+            tested = false;
+        Object.observe(obj, handler1, [ "add" ]);
+        Object.observe(obj, handler2, [ "update" ]);
 
-        var obj = { foo: 0 },
-            updated = false, added = false;
-        Object.observe(obj, updateHandler, [ "update" ]);
-        Object.observe(obj, addHandler, [ "add" ]);
+        delete obj.foo;
 
-        obj.foo = 42;
-        obj.bar = "Hi";
-        Object.deliverChangeRecords(addHandler);
+        Object.unobserve(obj, handler2);
+
+        obj.foo = "bar";
 
-        Object.unobserve(obj, updateHandler);
-        Object.unobserve(obj, addHandler);
+        Object.unobserve(obj, handler1);
 
         setTimeout(function() {
             try {
-                expect(updated).to.be(true);
-                expect(added).to.be(true);
+                expect(tested).to.be(true);
                 done();
             } catch (e) { done(e); }
         }, 30);
     });
 
+    it("should not throw errors on any non-observed object", function() {
+        Object.unobserve({}, function() {});
+    });
+
+    it("should not throw errors on a not previously used handler", function() {
+        var obj = {},
+            handler = function() {};
+        Object.observe(obj, handler);
+        Object.unobserve(obj, function() {});
+        Object.unobserve(obj, handler);
+    });
+
+    it("should not unobserve any non-object", function() {
+        expect(Object.unobserve).withArgs(null, function() {}).to.throwError();
+        expect(Object.unobserve).withArgs(undefined, function() {}).to.throwError();
+        expect(Object.unobserve).withArgs(42, function() {}).to.throwError();
+        expect(Object.unobserve).withArgs("foo", function() {}).to.throwError();
+        expect(Object.unobserve).withArgs(NaN, function() {}).to.throwError();
+        expect(Object.unobserve).withArgs(true, function() {}).to.throwError();
+    });
+
+    it("should not unobserve when not given a handler function", function() {
+        expect(Object.unobserve).withArgs({}).to.throwError();
+        expect(Object.unobserve).withArgs({}, "foo").to.throwError();
+        expect(Object.unobserve).withArgs({}, 42).to.throwError();
+    });
+});
+
+describe("Object.deliverChangeRecords", function() {
+    it("should not deliver to non-functions", function() {
+        expect(Object.deliverChangeRecords).to.throwError();
+        expect(Object.deliverChangeRecords).withArgs(undefined).to.throwError();
+        expect(Object.deliverChangeRecords).withArgs(null).to.throwError();
+        expect(Object.deliverChangeRecords).withArgs(1).to.throwError();
+        expect(Object.deliverChangeRecords).withArgs("foo").to.throwError();
+        expect(Object.deliverChangeRecords).withArgs(true).to.throwError();
+    });
+
+    it("should deliver changes synchronously", function(done) {
+        function handler(changes) {
+            try {
+                expect(tested).to.be(false);
+                expect(changes).to.have.length(1);
+                expect(changes[0]).to.eql({ type: "add", name: "foo", object: obj });
+                tested = true;
+            } catch (e) { done(e); }
+        }
+
+        var obj = {}, tested = false;
+        Object.observe(obj, handler);
+
+        obj.foo = 42;
+        Object.deliverChangeRecords(handler);
+        expect(tested).to.be(true);
+
+        Object.unobserve(obj, handler);
+        done();
+    });
+
     it("should deliver changes to an observer for multiple objects", function(done) {
         function handler(changes) {
             try {
@@ -382,9 +566,27 @@ describe("Object.deliverChangeRecords", function() {
 });
 
 describe("Object.getNotifier", function() {
-    it("should deliver custom notifications", function(done) {
+    it("should provide a notifier for objects", function() {
+        var obj = { },
+            notifier = Object.getNotifier(obj);
+        expect(notifier).to.be.an("object");
+        expect(notifier.notify).to.be.a("function");
+        expect(notifier.performChange).to.be.a("function");
+    });
+
+    it("should not provide a notifier for non-objects", function() {
+        expect(Object.getNotifier).to.throwError();
+        expect(Object.getNotifier).withArgs(undefined).to.throwError();
+        expect(Object.getNotifier).withArgs(null).to.throwError();
+        expect(Object.getNotifier).withArgs(1).to.throwError();
+        expect(Object.getNotifier).withArgs("foo").to.throwError();
+        expect(Object.getNotifier).withArgs(true).to.throwError();
+    });
+
+    it("should deliver custom notifications asynchronously", function(done) {
         function handler(changes) {
             try {
+                expect(async).to.be(true);
                 expect(tested).to.be(false);
                 expect(changes).to.have.length(1)
                 expect(changes[0]).to.eql({ type: "test", object: obj, message: "Hello" });
@@ -392,17 +594,13 @@ describe("Object.getNotifier", function() {
             } catch (e) { done(e); }
         }
 
-        var obj = { },
-            tested = false,
-            notifier;
-        Object.observe(obj, handler, [ "test" ]);
+        var obj = {},
+            tested = false, async = false;
 
-        notifier = Object.getNotifier(obj);
-        expect(notifier).to.be.an("object");
-        expect(notifier.notify).to.be.a("function");
-        expect(notifier.performChange).to.be.a("function");
+        Object.observe(obj, handler, [ "test" ]);
 
-        notifier.notify({ type: "test", message: "Hello" });
+        Object.getNotifier(obj).notify({ type: "test", message: "Hello" });
+        async = true;
 
         Object.unobserve(obj, handler);
 
@@ -474,6 +672,47 @@ describe("Object.getNotifier", function() {
             } catch (e) { done(e); }
         }, 30);
     });
+
+    it("should perform custom changes synchronously", function() {
+        var obj = {};
+
+        Object.getNotifier(obj).performChange("test", function() {
+            obj.foo = "bar";
+        });
+
+        expect(obj.foo).to.be("bar");
+    });
+
+    it("should deliver notifications asynchronously after performing custom changes", function(done) {
+        function handler(changes) {
+            try {
+                expect(async).to.be(true);
+                expect(tested).to.be(false);
+                expect(changes).to.have.length(1);
+                expect(changes[0]).to.eql({ type: "test", object: obj });
+                tested = true;
+            } catch (e) { done(e); }
+        }
+
+        var obj = { foo: 0 },
+            tested = false, async = false;
+        Object.observe(obj, handler, [ "test" ]);
+
+        Object.getNotifier(obj).performChange("test", function() {
+            obj.foo = "bar";
+            return {};
+        });
+        async = true;
+
+        Object.unobserve(obj, handler);
+
+        setTimeout(function() {
+            try {
+                expect(tested).to.be(true);
+                done();
+            } catch (e) { done(e); }
+        }, 30);
+    });
 });
 
 });
\ No newline at end of file