sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -22,13 +22,17 @@ SC.BENCHMARK_OBJECTS = NO;
 // definition because SC.Object is copied frequently and we want to keep the
 // number of class methods to a minimum.
 
+/** @private */
 SC._detect_base = function _detect_base(func, parent, name) {
+
   return function invoke_superclass_method() {
     var base = parent[name], args;
 
+    //@if(debug)
     if (!base) {
-      throw new Error("No '" + name + "' method was found on the superclass");
+      throw new Error("Developer Error: No '" + name + "' method was found on the superclass");
     }
+    //@endif
 
     // NOTE: It is possible to cache the base, so that the first
     // call to sc_super will avoid doing the lookup again. However,
@@ -41,7 +45,10 @@ SC._detect_base = function _detect_base(func, parent, name) {
     //else { func.base = base; }
 
     if (func.isEnhancement) {
-      args = Array.prototype.slice.call(arguments, 1);
+      // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+      // TODO: Add macro to build tools for this.
+      args = new Array(arguments.length - 1); // Array.prototype.slice.call(arguments, 1)
+      for (var i = 0, len = args.length; i < len; i++) { args[i] = arguments[i + 1]; }
     } else {
       args = arguments;
     }
@@ -65,7 +72,9 @@ SC._detect_base = function _detect_base(func, parent, name) {
   @returns {Hash} base hash
 */
 SC._object_extend = function _object_extend(base, ext, proto) {
-  if (!ext) { throw new Error("SC.Object.extend expects a non-null value.  Did you forget to 'sc_require' something?  Or were you passing a Protocol to extend() as if it were a mixin?"); }
+  //@if(debug)
+  if (!ext) { throw new Error("Developer Error: SC.Object.extend expects a non-null value.  Did you forget to 'sc_require' something?  Or were you passing a Protocol to extend() as if it were a mixin?"); }
+  //@endif
   // set _kvo_cloned for later use
   base._kvo_cloned = null;
 
@@ -120,32 +129,24 @@ SC._object_extend = function _object_extend(base, ext, proto) {
     // get the value.  use concats if defined
     value = (concats.hasOwnProperty(key) ? concats[key] : null) || ext[key];
 
-    // Possibly add to bindings.
+    // Support fooBinding syntax...
     if (key.length > 7 && key.slice(-7) === "Binding") {
       if (!clonedBindings) {
         bindings = (bindings || SC.EMPTY_ARRAY).slice();
         clonedBindings = YES;
       }
+      // If the binding key is new (not found on base), add it to the list of binding keys. (If it's on
+      // base, we assume that it's already in there. We don't check for performance reasons. If that's
+      // failing, fix the failure not the check.)
 
-      if (bindings === null) bindings = (base._bindings || SC.EMPTY_ARRAY).slice();
-      //@if(debug)
-      // Add some developer support.
-
-      // If a property binding is set on a Class and that Class is extended and
-      // the same property binding is set in the extend, two instances of the
-      // same Binding will exist on the object leading to strange behavior.
-      for (var i = bindings.length - 1; i >= 0; i--) {
-        if (bindings[i] === key) {
-          // There is already a binding for this key!
-          SC.warn("Developer Warning: '%@' was defined twice on the same class, likely because it was defined on both the parent and its subclass.  See the initial line of the following trace:".fmt(key));
-          SC.Logger.trace();
-        }
+      /* jshint eqnull:true */
+      if (base[key] == null) { // (SC.none is inlined here for performance.)
+        bindings[bindings.length] = key;
       }
-      //@endif
-      bindings[bindings.length] = key;
+    }
 
-    // Also add observers, outlets, and properties for functions...
-    } else if (value && (value instanceof Function)) {
+    // Add observers, outlets, properties and extensions for functions...
+    else if (value && (value instanceof Function)) {
 
       // add super to funcs.  Be sure not to set the base of a func to
       // itself to avoid infinite loops.
@@ -227,13 +228,16 @@ SC._object_extend = function _object_extend(base, ext, proto) {
   return base;
 };
 
-
+/** @private */
 SC._enhance = function (originalFunction, enhancement) {
   return function () {
-    var args = Array.prototype.slice.call(arguments, 0),
-        self = this;
+    // Accessing `arguments.length` is just a Number and doesn't materialize the `arguments` object, which is costly.
+    // TODO: Add macro to build tools for this.
+    var args = new Array(arguments.length + 1); // Array.prototype.slice.call(arguments)
+    for (var i = 1, len = args.length; i < len; i++) { args[i] = arguments[i - 1]; }
 
-    args.unshift(function () { return originalFunction.apply(self, arguments); });
+    var self = this;
+    args[0] = function () { return originalFunction.apply(self, arguments); }; // args.unshift(function ...
     return enhancement.apply(this, args);
   };
 };
@@ -363,39 +367,44 @@ SC.mixin(SC.Object, /** @scope SC.Object */ {
 
   // Tested in ../tests/system/object/enhance.js
   reopen: function (props) {
-    var ret;
-    ret = SC._object_extend(this.prototype, props, this.__sc_super__);
-
+    // Reopen subclasses.
     if (this.subclasses) {
-      this.subclasses.forEach(function (subclass, idx) {
-        //@if(debug)
-        // Turned Off, SC.View.reopen() makes this too obnoxious. SC.warn("Developer Warning: %@ was re-opened after subclasses were defined.  We're still registering the additions to all subclasses of %@, but it would be safer to reopen() %@ before subclassing it.".fmt(this, this, this));
-        //@endif
-        var key, value;
+      var subclass, key, value, theseProps,
+          len = this.subclasses.length, i;
+      for (i = 0; i < len; i++) {
+        theseProps = null;
+        subclass = this.subclasses[i];
         for (key in props) {
-
           // avoid copying builtin methods
           if (!props.hasOwnProperty(key)) continue;
 
-          value = props[key];
-
           // Remove properties that have already been overridden by the subclass.
           if (subclass.prototype.hasOwnProperty(key)) {
-            delete props[key];
+            if (!theseProps) {
+              theseProps = SC.clone(props);
+            }
+            delete theseProps[key];
+            continue;
           }
 
           // Remove enhancements that are only intended for the superclass's
           // function.
+          value = props[key];
           if (value && (value instanceof Function) && (value.isEnhancement)) {
-            delete props[key];
+            if (!theseProps) {
+              theseProps = SC.clone(props);
+            }
+            delete theseProps[key];
+            continue;
           }
         }
 
-        subclass.reopen(props);
-      }, this);
+        subclass.reopen(theseProps || props);
+      }
     }
 
-    return ret;
+    // Reopen this.
+    return SC._object_extend(this.prototype, props, this.__sc_super__);
   },
 
   /**
@@ -469,7 +478,7 @@ SC.mixin(SC.Object, /** @scope SC.Object */ {
   subclassOf: function (scClass) {
     if (this === scClass) return NO;
     var t = this;
-    while (t = t.superclass) if (t === scClass) return YES;
+    while ((t = t.superclass)) if (t === scClass) return YES;
     return NO;
   },
 
@@ -519,7 +528,7 @@ SC.mixin(SC.Object, /** @scope SC.Object */ {
   design: function () {
     if (this.isDesign) {
       // @if (debug)
-      SC.Logger.warn("SC.Object#design called twice for %@.".fmt(this));
+      SC.Logger.warn("Developer Warning: SC.Object.prototype.design called twice for %@.".fmt(this));
       // @endif
       return this;
     }
@@ -697,6 +706,8 @@ SC.Object.prototype = {
   },
 
   /**
+    @deprecated v1.11 - use sc_super() (with build tools) or arguments.callee.base.apply(this, arguments) instead.
+
     EXPERIMENTAL:  You can use this to invoke a superclass implementation in
     any method.  This does not work in Safari 2 or earlier.  If you need to
     target these methods, you should use one of the alternatives below:
@@ -731,8 +742,16 @@ SC.Object.prototype = {
     @returns {Object} return value from super
   */
   superclass: function () {
+    //@if(debug)
+    SC.warn("Developer Warning: SC.Object's 'superclass' instance method is deprecated and will be removed in a future version. Use `sc_super();` instead.\n\n(Note that the unrelated `superclass` class property, which contains a class's superclass, is alive and well.)");
+    //@endif
+
     var caller = arguments.callee.caller;
-    if (!caller) throw new Error("superclass cannot determine the caller method");
+
+    //@if(debug)
+    if (!caller) { throw new Error("Developer Error: superclass cannot determine the caller method: %@".fmt(this)); }
+    //@endif
+
     return caller.superclass ? caller.superclass.apply(this, arguments) : null;
   },
 
@@ -962,11 +981,11 @@ SC.findClassNames = function () {
     seen.push(object);
 
     for (var key in object) {
-      if (key == '__scope__') continue;
-      if (key == 'superclass') continue;
-      if (key == '__SC__') key = 'SC';
+      if (key === '__scope__') continue;
+      if (key === 'superclass') continue;
+      if (key === '__SC__') key = 'SC';
       if (!key.match(/^[A-Z0-9]/)) continue;
-      if (key == 'SC') {
+      if (key === 'SC') {
         if (detectedSC) continue;
         detectedSC = true;
       }
@@ -1013,7 +1032,7 @@ SC.findClassNames = function () {
   //
   window.__SC__ = SC;
   searchObject(null, window, 2);
-}
+};
 
 /**
   Same as the instance method, but lets you check instanceOf without

data/lib/frameworks/sproutcore/frameworks/runtime/system/run_loop.js

@@ -9,11 +9,11 @@ sc_require('ext/function');
 sc_require('private/observer_set');
 
 
+//@if(debug)
 // When in debug mode, users can log deferred calls (such as .invokeOnce()) by
 // setting SC.LOG_DEFERRED_CALLS.  We'll declare the variable explicitly to make
 // life easier for people who want to enter it inside consoles that auto-
 // complete.
-//@if (debug)
 if (!SC.LOG_DEFERRED_CALLS) SC.LOG_DEFERRED_CALLS = false;
 //@endif
 
@@ -60,9 +60,13 @@ SC.RunLoop = SC.Object.extend(
   */
   beginRunLoop: function () {
     this._start = new Date().getTime(); // can't use Date.now() in runtime
-    if (SC.LOG_BINDINGS || SC.LOG_OBSERVERS) {
+
+    //@if(debug)
+    if (SC.LOG_OBSERVERS) {
       SC.Logger.log("-- SC.RunLoop.beginRunLoop at %@".fmt(this._start));
     }
+    //@endif
+
     this._runLoopInProgress = YES;
     this._flushinvokeNextQueue();
     return this;
@@ -93,17 +97,21 @@ SC.RunLoop = SC.Object.extend(
     // step through all of them again.  This way any changes get flushed
     // out completely.
 
-    if (SC.LOG_BINDINGS || SC.LOG_OBSERVERS) {
+    //@if(debug)
+    if (SC.LOG_OBSERVERS) {
       SC.Logger.log("-- SC.RunLoop.endRunLoop ~ flushing application queues");
     }
+    //@endif
 
     this.flushAllPending();
 
     this._start = null;
 
-    if (SC.LOG_BINDINGS || SC.LOG_OBSERVERS) {
+    //@if(debug)
+    if (SC.LOG_OBSERVERS) {
       SC.Logger.log("-- SC.RunLoop.endRunLoop ~ End");
     }
+    //@endif
 
     SC.RunLoop.lastRunLoopEnd = Date.now();
     this._runLoopInProgress = NO;
@@ -166,7 +174,7 @@ SC.RunLoop = SC.Object.extend(
 
     var deferredCallLoggingInfo;      // Used only in debug mode
 
-    //@if (debug)
+    //@if(debug)
     // When in debug mode, SC.Object#invokeOnce() will pass in the originating
     // method, target, and stack.  That way, we'll record the interesting parts
     // rather than having most of these calls seemingly coming from
@@ -239,7 +247,7 @@ SC.RunLoop = SC.Object.extend(
 
     var deferredCallLoggingInfo;      // Used only in debug mode
 
-    //@if (debug)
+    //@if(debug)
     // When in debug mode, SC.Object#invokeOnce() will pass in the originating
     // method, target, and stack.  That way, we'll record the interesting parts
     // rather than having most of these calls seemingly coming from

data/lib/frameworks/sproutcore/frameworks/runtime/system/string.js

@@ -7,17 +7,17 @@
 
 /**
   @class
-  
+
   Implements support methods useful when working with strings in SproutCore
   applications.
 */
 SC.String = /** @scope SC.String.prototype */ {
-  
+
   /**
     This finds the value for a key in a formatting string.
-    
+
     Keys take the form:
-    
+
         key[:argument to formatter]
   */
   _scs_valueForKey: function(key, data, /* for debugging purposes: */ string) {
@@ -26,16 +26,16 @@ SC.String = /** @scope SC.String.prototype */ {
       arg = key.substr(argsplit + 1);
       key = key.substr(0, argsplit);
     }
-    
-    value = data[key];
+
+    value = data.get ? data.get(key): data[key];
     formatter = data[key + 'Formatter'];
-    
+
     // formatters are optional
     if (formatter) value = formatter(value, arg);
     else if (arg) {
       throw new Error("String.fmt was given a formatting string, but key `" + key + "` has no formatter! String: " + string);
     }
-    
+
     return value;
   },
 
@@ -46,15 +46,15 @@ SC.String = /** @scope SC.String.prototype */ {
     Indexed Parameters
     --------------------
     Indexed parameters are just arguments you pass into format. For example:
-    
+
         "%@1 %@3 %@2".fmt(1, 2, 3)
-        
+
         // -> "1 3 2"
-    
+
     If you don't supply a number, it will use them in the order you supplied. For example:
-    
+
         "%@, %@".fmt("Iskander", "Alex")
-        
+
         // -> "Iskander, Alex"
 
     Named Paramters
@@ -62,34 +62,34 @@ SC.String = /** @scope SC.String.prototype */ {
     You can use named parameters like this:
 
         "Value: %{key_name}".fmt({ key_name: "A Value" })
-        
+
         // -> "Value: A Value"
-    
+
     You can supply formatters for each field. A formatter is a method to get applied
     to the parameter:
-    
+
         Currency = function(v) { return "$" + v; };
         "Value: %{val}".fmt({ val: 12.00, valFormatter: Currency })
-        
+
         // -> $12.00
-    
+
     Formatters can also use arguments:
-    
+
         Currency = function(v, sign) { return sign + v; };
         "Value: %{val:£}".fmt({ val: 12.00, valFormatter: Currency })
-        
+
         // -> £12.00
 
     You can supply a different formatter for each named parameter. Formatters can ONLY be
     used with named parameters (not indexed parameters).
-        
+
   */
   fmt: function(string, args) {
     var i = 0, data = undefined, hasHadNamedArguments;
     if (args) {
       data = args[0];
     }
-    
+
     return string.replace(/%\{(.*?)\}/g, function(match, propertyPath) {
       hasHadNamedArguments = YES;
       if (!data) {
@@ -110,7 +110,7 @@ SC.String = /** @scope SC.String.prototype */ {
       else return "";
     });
   },
-  
+
   /**
     Splits the string into words, separated by spaces. Empty strings are
     removed from the results.

data/lib/frameworks/sproutcore/frameworks/runtime/tests/ext/number_test.js

@@ -0,0 +1,44 @@
+/*-------------------------------------------------------------------------------------------------
+ - Project:   sproutcore                                                                          -
+ - Copyright: ©2013 Matygo Educational Incorporated operating as Learndot                         -
+ - Author:    Joe Gaudet (joe@learndot.com) and contributors (see contributors.txt)               -
+ - License:   Licensed under MIT license (see license.js)                                         -
+ -------------------------------------------------------------------------------------------------*/
+/*globals module, test, start, stop, expect, ok, equals*/
+
+module("Number#ordinal");
+
+/**
+ * Admitedly not exhaustive, but tests the numbers from 1-100
+ */
+test("Properly Computes the Ordinal in english", function () {
+  var sts = [1, 21, 31, 41, 51, 61, 71, 81, 91, 101],
+    nds = [2, 22, 32, 42, 52, 62, 72, 82, 92, 102],
+    rds = [3, 23, 33, 43, 53, 63, 73, 83, 93, 103];
+  sts.forEach(function (number) {
+    equals(number.ordinal(), 'st');
+  });
+
+  nds.forEach(function (number) {
+    equals(number.ordinal(), 'nd');
+  });
+
+  rds.forEach(function (number) {
+    equals(number.ordinal(), 'rd');
+  });
+
+  var ths = [];
+  for (var i = 0; i < 100; i++) {
+    ths.push(i);
+  }
+
+  ths.removeObjects(sts);
+  ths.removeObjects(nds);
+  ths.removeObjects(rds);
+
+  ths.forEach(function (number) {
+    equals(number.ordinal(), 'th');
+  });
+
+});
+