Merge branch 'master' of github.com:mikegerwitz/easejs

lib/util.js

@@ -80,6 +80,8 @@ exports.secureFallback = function( val )
     }
 
     secure_fallback = !!val;
+    exports.defineSecureProp = getDefineSecureProp();
+
     return exports;
 };
 
@@ -96,32 +98,7 @@ exports.secureFallback = function( val )
  *
  * @return  {undefined}
  */
-exports.defineSecureProp = function( obj, prop, value )
+exports.defineSecureProp = getDefineSecureProp();
-{
-    if ( secure_fallback )
-    {
-        obj[ prop ] = value;
-    }
-    else
-    {
-        try
-        {
-            Object.defineProperty( obj, prop,
-            {
-                value: value,
-
-                enumerable:   false,
-                writable:     false,
-                configurable: false,
-            });
-        }
-        catch ( e )
-        {
-            // if there's an error (ehem, IE8), fall back
-            obj[ prop ] = value;
-        }
-    }
-}
 
 
 /**
@@ -479,3 +456,51 @@ exports.arrayShrink = function( items )
     return arr_new;
 }
 
+
+/**
+ * Appropriately returns defineSecureProp implementation to avoid check on each
+ * invocation
+ *
+ * @return  {function( Object, string, * )}
+ */
+function getDefineSecureProp()
+{
+    // falls back to simply defining a normal property
+    var fallback = function( obj, prop, value )
+    {
+        obj[ prop ] = value;
+    };
+
+    if ( secure_fallback )
+    {
+        return fallback;
+    }
+    else
+    {
+        // uses ECMAScript 5's Object.defineProperty() method
+        return function( obj, prop, value )
+        {
+            try
+            {
+                Object.defineProperty( obj, prop,
+                {
+                    value: value,
+
+                    enumerable:   false,
+                    writable:     false,
+                    configurable: false,
+                });
+            }
+            catch ( e )
+            {
+                // let's not have this happen again, as repeatedly throwing
+                // exceptions will do nothing but slow down the system
+                exports.secureFallback( true );
+
+                // if there's an error (ehem, IE8), fall back
+                fallback( obj, prop, value );
+            }
+        };
+    }
+}
+

test/common.js

@@ -22,5 +22,25 @@
  * @package test
  */
 
-require.paths.unshift( __dirname + '/../lib' );
+/**
+ * Library path
+ * @type  {string}
+ */
+exports.PATH_LIB = require( 'path' ).normalize( __dirname + '/../lib' );
+
+
+/**
+ * Returns requested module from the library path
+ *
+ * This method abstracts require() implementation so that the tests may be more
+ * easily implemented elsewhere (e.g. client-side)
+ *
+ * @param  {string}  module  module id
+ *
+ * @return  {Object}  module exports
+ */
+exports.require = function( module )
+{
+    return require( exports.PATH_LIB + '/' + module );
+}
 

test/test-class-abstract.js

@@ -22,12 +22,11 @@
  * @package test
  */
 
-require( './common' );
+var common = require( './common' ),
-
+    assert         = require( 'assert' ),
-var assert         = require( 'assert' ),
+    Class          = common.require( 'class' ),
-    Class          = require( '../lib/class' ),
+    abstractMethod = common.require( 'class' ).abstractMethod,
-    abstractMethod = require( '../lib/class' ).abstractMethod,
+    util           = common.require( 'util' );
-    util           = require( '../lib/util' );
 
 // not abstract
 var Foo = Class.extend( {} );

test/test-class-constructor.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    Class  = common.require( 'class' );
-    Class  = require( 'class' );
 
 // these two variables are declared outside of the class to ensure that they
 // will still be set even if the context of the constructor is wrong

test/test-class-extend.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    Class  = common.require( 'class' );
-    Class  = require( 'class' );
 
 var foo_props = {
         one: 1,

test/test-class-gettersetter.js

@@ -28,10 +28,9 @@ if ( Object.prototype.__defineGetter__ === undefined )
     return;
 }
 
-require( './common' );
+var common = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    Class  = common.require( 'class' );
-    Class  = require( 'class' );
 
 
 var Foo = Class.extend(

test/test-class-parent.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    Class  = common.require( 'class' );
-    Class  = require( 'class' );
 
 var Foo = Class.extend(
 {

test/test-class.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    Class  = common.require( 'class' );
-    Class  = require( 'class' );
 
 
 assert.ok(

test/test-combine.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common  = require( './common' ),
-
+    assert  = require( 'assert' ),
-var assert  = require( 'assert' ),
+    Class   = common.require( 'class' ),
-    Class   = require( 'class' ),
     Script  = process.binding( 'evals' ).Script,
     sandbox = {};
 

test/test-index.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    Class  = common.require( 'class' ),
-    Class  = require( 'class' ),
     index  = require( '../' );
 
 

test/test-interface-extend.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common         = require( './common' ),
-
+    assert         = require( 'assert' ),
-var assert         = require( 'assert' ),
+    Interface      = common.require( 'interface' ),
-    Interface      = require( 'interface' ),
     abstractMethod = Interface.abstractMethod;
 
 

test/test-interface.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common         = require( './common' ),
-
+    assert         = require( 'assert' ),
-var assert         = require( 'assert' ),
+    Interface      = common.require( 'interface' ),
-    Interface      = require( 'interface' ),
     abstractMethod = Interface.abstractMethod;
 
 var FooType = Interface.extend();

test/test-util-clone.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    util   = common.require( 'util' );
-    util   = require( '../lib/util' );
 
 var arr = [ 1, 2, 3 ],
     obj = { a: 1, b: 2 };

test/test-util-define-secure-prop.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    util   = common.require( 'util' );
-    util   = require( '../lib/util' );
 
 var obj = {},
     val = 'bar';

test/test-util-prop-copy.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common   = require( './common' ),
-
+    assert   = require( 'assert' ),
-var assert   = require( 'assert' ),
+    propCopy = common.require( 'util' ).propCopy;
-    propCopy = require( '../lib/util' ).propCopy;
 
 var props = {
     one: 1,

test/test-util-prop-parse.js

@@ -22,10 +22,9 @@
  * @package test
  */
 
-require( './common' );
+var common   = require( './common' ),
-
+    assert = require( 'assert' ),
-var assert = require( 'assert' ),
+    util   = common.require( 'util' );
-    util   = require( '../lib/util' );
 
 var data = {
     // scalars (properties)