sproutcore 1.6.0.beta.3-java → 1.6.0-java

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

@@ -28,9 +28,6 @@ sc_require('mixins/copyable');
         // uses a backing SC.Array object to return each index
         set.forEach(function(object) { .. })
 
-        // returns the index
-        set.forEachIndex(function(index) { ... });
-
         // returns ranges
         set.forEachRange(function(start, length) { .. });
 

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

@@ -132,7 +132,7 @@ SC.LOGGER_LEVEL_NONE  = 'none';
   functions, such as defining groups.
 
   The FireFox plugin Firebug was used as a function reference. Please see
-  {@link <a href="http://getfirebug.com/logging.html">Firebug Logging Reference</a>}
+  [Firebug Logging Reference](http://getfirebug.com/logging.html)
   for further information.
 
   @author Colin Campbell
@@ -258,7 +258,7 @@ SC.Logger = SC.Object.create(
     If this property is set to YES, it will set 'logOutputLevel' to
     SC.LOGGER_LEVEL_DEBUG.  Otherwise, it will have no effect.
 
-    @deprecated
+    @deprecated Set the log level instead.
     @property: {Boolean}
   */
   debugEnabled: NO,
@@ -710,7 +710,7 @@ SC.Logger = SC.Object.create(
         type         = entry.type;
 
         if (includeTimestamps) {
-          timestampStr = timestampFormat.fmt(entry.timestamp.utcFormat());
+          timestampStr = timestampFormat.fmt(entry.timestamp.toUTCString());
         }
 
         // Is this a message or a group directive?
@@ -797,7 +797,7 @@ SC.Logger = SC.Object.create(
         type  = entry.type;
 
         // First determine the prefix.
-        prefix = timestampFormat.fmt(entry.timestamp.utcFormat());
+        prefix = timestampFormat.fmt(entry.timestamp.toUTCString());
         prefix += prefixMapping[type] || "";
 
         // Is this a message or a group directive?

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

@@ -456,9 +456,9 @@ SC.mixin(SC.Object, /** @scope SC.Object */ {
   */
   design: function() {
     if (this.isDesign) {
-      //@ if (debug)
+      // @if (debug)
       SC.Logger.warn("SC.Object#design called twice for %@.".fmt(this));
-      //@ endif
+      // @endif
       return this;
     }
 
@@ -555,7 +555,7 @@ SC.Object.prototype = {
     Although the default init() method returns the receiver, the return
     value is ignored.
 
-    
+
   */
   init: function() {
     this.initObservable();
@@ -729,7 +729,7 @@ SC.Object.prototype = {
     method is called automatically for view classes but may be used for any
     object.
 
-    
+
   */
   awake: function() {
     var outlets = this.outlets,

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

@@ -56,7 +56,7 @@ SC.RangeObserver = /** @scope SC.RangeObserver.prototype */{
     ret.source = source;
     ret.indexes = indexSet ? indexSet.frozenCopy() : null;
     ret.target = target;
-    ret.method = method;
+    ret.method = (typeof method === 'string') ? target[method] : method;
     ret.context = context ;
     ret.isDeep  = isDeep || false ;
     ret.beginObserving();

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

@@ -291,12 +291,12 @@ SC.run = function(callback, target, forceNested) {
       if (callback) callback.call(target);
       if(forceNested || !alreadyRunning) SC.RunLoop.end();
     } catch (e) {
-      SC.ExceptionHandler.handleException(e);
+      var handled = SC.ExceptionHandler.handleException(e);
 
-      // Now that we've handled the exception, throw it again so the browser
+      // If the exception was not handled, throw it again so the browser
       // can deal with it (and potentially use it for debugging).
       // (We don't throw it in IE because the user will see two errors)
-      if (!SC.browser.msie) {
+      if (!handled && !SC.browser.msie) {
         throw e;
       }
     }

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

@@ -32,7 +32,7 @@ sc_require('mixins/copyable');
 
   Whether or not property observing is enabled, sets offer very powerful
   notifications of items being added and removed, through the
-  `#js:addSetObserver` and `#js:removeSetObserver` methods; this can be
+  `:addSetObserver` and `:removeSetObserver` methods; this can be
   very useful, for instance, for filtering or mapping sets.
 
   Note that SC.Set is a primitive object, like an array.  It does implement
@@ -49,18 +49,17 @@ sc_require('mixins/copyable');
   Finally, you can pass in an existing set and the set will be copied.  You
   can also create a copy of a set by calling SC.Set#clone().
 
-      #js
-      // creates a new empty set
-      var foundNames = SC.Set.create();
+        // creates a new empty set
+        var foundNames = SC.Set.create();
 
-      // creates a set with four names in it.
-      var names = SC.Set.create(["Charles", "Tom", "Juan", "Alex"]) ; // :P
+        // creates a set with four names in it.
+        var names = SC.Set.create(["Charles", "Tom", "Juan", "Alex"]) ; // :P
 
-      // creates a copy of the names set.
-      var namesCopy = SC.Set.create(names);
+        // creates a copy of the names set.
+        var namesCopy = SC.Set.create(names);
 
-      // same as above.
-      var anotherNamesCopy = names.clone();
+        // same as above.
+        var anotherNamesCopy = names.clone();
 
   Adding/Removing Objects
   -----------------------
@@ -91,8 +90,8 @@ sc_require('mixins/copyable');
 
   Observing changes
   -----------------
-  When using `#js:SC.Set` (rather than `#js:SC.CoreSet`), you can observe the
-  `#js:"[]"` property to be alerted whenever the content changes.
+  When using `:SC.Set` (rather than `:SC.CoreSet`), you can observe the
+  `:"[]"` property to be alerted whenever the content changes.
 
   This is often unhelpful. If you are filtering sets of objects, for instance,
   it is very inefficient to re-filter all of the items each time the set changes.
@@ -100,10 +99,10 @@ sc_require('mixins/copyable');
   was changed on the original set. The same issue applies to merging sets,
   as well.
 
-  `#js:SC.Set` and `#js:SC.CoreSet` both offer another method of being observed:
-  `#js:addSetObserver` and `#js:removeSetObserver`. These take a single parameter:
-  an object which implements `#js:didAddItem(set, item)` and
-  `#js:didRemoveItem(set, item)`.
+  `:SC.Set` and `:SC.CoreSet` both offer another method of being observed:
+  `:addSetObserver` and `:removeSetObserver`. These take a single parameter:
+  an object which implements `:didAddItem(set, item)` and
+  `:didRemoveItem(set, item)`.
 
   Whenever an item is added or removed from the set, all objects in the set
   (a SC.CoreSet, actually) of observing objects will be alerted appropriately.

data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/itemType.js

@@ -10,7 +10,8 @@ test("SC.typeOf", function() {
 	var a = null,
 	    arr = [1,2,3],
 	    obj = {},
-      object = SC.Object.create({ method: function() {} })
+      object = SC.Object.create({ method: function() {} }),
+      E = SC.Error.extend();
 
   equals(SC.T_UNDEFINED,  SC.typeOf(undefined),         "item of type undefined");
   equals(SC.T_NULL,       SC.typeOf(a),                 "item of type null");
@@ -20,6 +21,9 @@ test("SC.typeOf", function() {
 	equals(SC.T_FUNCTION,   SC.typeOf(object.method),     "item of type function") ;
 	equals(SC.T_CLASS,      SC.typeOf(SC.Object),         "item of type class");
   equals(SC.T_ERROR,      SC.typeOf(SC.Error.create()), "item of type error");
+  equals(SC.T_OBJECT,     SC.typeOf(SC.Object.create({ isError: YES })), "sc object with isError property should be of type object");
+  equals(SC.T_ERROR,      SC.typeOf(E.create()),         "item of type error");
+  equals(SC.T_HASH,       SC.typeOf({ isObject: YES }),  "hash object with isObject property should be of type hash");
 });
 
 test("SC.none", function() {
@@ -71,7 +75,7 @@ test("SC.isArray" ,function(){
   equals( SC.isArray(fn),       false, "function() {}" );
 
   if (window.document) {
-    var nodelist      = document.getElementsByTagName("body")
+    var nodelist      = document.getElementsByTagName("body");
     equals( SC.isArray(nodelist), true, "NodeList" );
   }
 });

data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/objectForPropertyPath.js

@@ -9,17 +9,22 @@
 // ========================================================================
 /*globals module test ok same equals expects */
 
-// An ObjectController will make a content object or an array of content objects 
+// An ObjectController will make a content object or an array of content objects
 module("SC.objectForPropertyPath") ;
 
 test("should be able to resolve an object on the window", function() {
   var myLocal = (window.myGlobal = { test: 'this '}) ;
-  
+
   same(myLocal, { test: 'this '}) ;
   same(window.myGlobal, { test: 'this '}) ;
-  
+
   // verify we can resolve our binding path
   same(SC.objectForPropertyPath('myGlobal'), { test: 'this '}) ;
-  
-  window.myGlobal =null ;
+
+  window.myGlobal = null;
+});
+
+test("should return undefined if object can't be found", function() {
+  var result = SC.objectForPropertyPath("notExistingObject");
+  same(result, undefined);
 });

data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/requiredObjectForPropertyPath.js

@@ -0,0 +1,29 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+// ========================================================================
+// SC.requiredObjectForPropertyPath Tests
+// ========================================================================
+/*globals module test ok same equals expects */
+
+module("SC.requiredObjectForPropertyPath") ;
+
+test("should be able to resolve an object on the window", function() {
+  var myLocal = (window.myGlobal = { test: 'this '}) ;
+
+  same(myLocal, { test: 'this '}) ;
+  same(window.myGlobal, { test: 'this '}) ;
+
+  // verify we can resolve our binding path
+  same(SC.requiredObjectForPropertyPath('myGlobal'), { test: 'this '}) ;
+
+  window.myGlobal = null;
+});
+
+test("should throw error when object can't be found", function() {
+  should_throw(function(){ SC.requiredObjectForPropertyPath('notExistingObject'); },
+                  Error, "notExistingObject could not be found");
+});

data/lib/frameworks/sproutcore/frameworks/runtime/tests/private/observer_queue.js

@@ -0,0 +1,98 @@
+// ==========================================================================
+// Project:   SproutCore Costello - Property Observing Library
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2010 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+var callCount, obj;
+
+module("SC.Observers.isObservingSuspended", {
+  setup: function() {
+    callCount = 0;
+
+    obj = SC.Object.create({
+      foo: "bar",
+
+      fooDidChange: function() {
+        callCount++;
+      }.observes('foo')
+    });
+  }
+});
+
+test("suspending observers stops notification", function() {
+  SC.Observers.suspendPropertyObserving();
+  SC.Observers.suspendPropertyObserving();
+  obj.set("foo");
+  equals(callCount, 0, 'should not notify observer while suspended');
+
+  SC.Observers.resumePropertyObserving();
+  equals(callCount, 0, 'should not notify observer while still suspended');
+
+  SC.Observers.resumePropertyObserving();
+  equals(callCount, 1, 'should notify observer when resumed');
+
+});
+
+// ..........................................................
+// SPECIAL CASES
+//
+
+// this test verifies a specific bug in the SC.Observing.propertyDidChange method.
+test("suspended notifications should work when nesting property change groups", function() {
+
+  SC.Observers.suspendPropertyObserving();
+  obj.beginPropertyChanges();
+  obj.set("foo");
+  equals(callCount, 0, 'should not notify observer while suspended');
+
+  obj.endPropertyChanges();
+  equals(callCount, 0, 'should not notify observer while suspended');
+
+  SC.Observers.resumePropertyObserving();
+  equals(callCount, 1, 'should notify observer when resumed');
+});
+
+
+module("SC.Observers.addObserver");
+
+test("Object not yet instantiated", function() {
+  var garage, car, observer;
+
+  garage = SC.Object.create({
+    car: SC.Object.extend({
+      make: null
+    })
+  });
+
+  car = garage.get('car');
+
+  observer = SC.Object.create({
+    callCount: 0,
+    makeDidChange: function() {
+      this.callCount += 1;
+    }
+  });
+
+  ok(car.isClass, "The car object is not yet an instance, it's a class for now.");
+
+  // 1. SC.Observers.addObserver should queue the class, waiting for it to be an instance
+  SC.Observers.addObserver('car.make', observer, 'makeDidChange', garage);
+  ok(SC.Observers.queue.some(function(el) { return el[1] === observer; }), "The observer should have been queued because the car object is a class, not an instance.");
+
+  // 2. A call to SC.Observers.flush should leave the class in the queue because it's not yet an instance
+  SC.Observers.flush(garage);
+  ok(SC.Observers.queue.some(function(el) { return el[1] === observer; }), "The observer should still be in the queue.");
+
+  // 3. After we instantiate the class, a call to SC.Observers.flush shoud remove the object from the queue...
+  car = garage.car = car.create({ make: 'Renault' });
+  SC.Observers.flush(garage);
+  ok(!SC.Observers.queue.some(function(el) { return el[1] === observer; }), "The observer should have been removed from the queue.");
+
+  // 4. ...and the observer should work
+  car.set('make', 'Ferrari');
+  equals(observer.callCount, 1, "The observer should have been alled once.");
+});
+
+

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

@@ -194,3 +194,33 @@ test("enhance still works if there is no base method to enhance", function() {
 
   ok(enhanced.weirdName(), "enhanced function runs with no errors");
 });
+
+test("should invalidate a computed property added to a subclass via reopen() that depends on a key defined in original");
+
+// Enable the following once we fix this
+/*
+test("should invalidate a computed property added to a subclass via reopen() that depends on a key defined in original", function() {
+  var MyClass = SC.Object.extend({ property: function() { }.property() });
+  var MySubclass = MyClass.extend({ anotherProperty: function() { }.property() });
+
+  var observerCalled = 0;
+
+  MyClass.reopen({
+    yetAnotherProperty: function() {
+      return "Yet Another Property";
+    }.property('property')
+  });
+
+  var mySubclass = MySubclass.create();
+  mySubclass.addObserver('yetAnothesProperty', function() {
+    observerCalled++;
+  });
+
+  SC.run(function() {
+    mySubclass.set('property', "foo");
+  });
+
+  equals(observerCalled, 1, "fires observer once");
+});
+*/
+

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/create.js

@@ -57,3 +57,20 @@ test("does not observe object properties if isDeep is NO", function() {
   }
   equals(observer.callCount, 0, 'range observer should not fire');
 });
+
+test("SC.RangeObserver.create should accept methods specified as strings", function() {
+  var myArray = [ SC.Object.create({ prop: 0 })],
+      rangeObserverCount = 0,
+      observer = SC.Object.create({
+        rangeObserverDidFire: function(source, object, key, index) {
+          ++rangeObserverCount;
+        }
+      }),
+      rangeObserver = SC.RangeObserver.create( myArray, SC.IndexSet.create(0, 1),
+                                               observer, 'rangeObserverDidFire',
+                                               null, true /* isDeep */);
+
+  equals(rangeObserverCount, 0, "Range observer hasn't fired yet");
+  myArray[0].incrementProperty('prop');
+  equals(rangeObserverCount, 1, "Range observer should fire on property change");
+});

data/lib/frameworks/sproutcore/frameworks/statechart/debug/monitor.js

@@ -1,6 +1,7 @@
 // ==========================================================================
 // Project:   SC.Statechart - A Statechart Framework for SproutCore
 // Copyright: ©2010, 2011 Michael Cohen, and contributors.
+//            Portions @2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -29,13 +30,13 @@ SC.StatechartMonitor = SC.Object.extend({
   
   pushEnteredState: function(state) {
     this.propertyWillChange('length');
-    this.sequence.push({ entered: state });
+    this.sequence.push({ action: 'entered', state: state });
     this.propertyDidChange('length'); 
   },
   
   pushExitedState: function(state) {
     this.propertyWillChange('length');
-    this.sequence.push({ exited: state });
+    this.sequence.push({ action: 'exited', state: state });
     this.propertyDidChange('length');
   },
   
@@ -73,12 +74,7 @@ SC.StatechartMonitor = SC.Object.extend({
     len = this.sequence.length;
     for (i = 0; i < len; i += 1) {
       item = this.sequence[i];
-      if (item.exited) {
-        seq += "exited %@".fmt(item.exited.get('fullPath'));
-      } 
-      else if (item.entered) {
-        seq += "entered %@".fmt(item.entered.get('fullPath'));
-      } 
+      seq += "%@ %@".fmt(item.action, item.state.get('fullPath'));
       if (i < len - 1) seq += ", ";
     }
 
@@ -87,69 +83,4 @@ SC.StatechartMonitor = SC.Object.extend({
     return seq;
   }
   
-});
-
-SC.StatechartSequenceMatcher = SC.Object.extend({
-  
-  statechartMonitor: null,
-  
-  position: 0,
-  
-  match: YES,
-  
-  begin: function() {
-    this.position = -1;
-    this.match = YES;
-    return this;
-  },
-  
-  end: function() {
-    return this.match;
-  },
-  
-  entered: function() {
-    return this._doCheck('entered', arguments);
-  },
-  
-  exited: function() {
-    return this._doCheck('exited', arguments);
-  },
-  
-  _doCheck: function(event, args) {
-    var i = 0,
-        len = args.length,
-        seqItem = null,
-        arg = null,
-        seq = this.statechartMonitor.sequence;
-        
-    for (; i < len; i += 1) {
-      this.position += 1;
-  
-      if (this.position >= seq.length) {
-        this.match = NO;
-        return this;
-      }
-      
-      seqItem = seq[this.position];
-      if (!seqItem[event]) {
-        this.match = NO;
-        return this;
-      }
-      
-      arg = args[i];
-      if (SC.typeOf(arg) === SC.T_OBJECT) {
-        if (seqItem[event] !== arg) {
-          this.match = NO;
-          return this;
-        }
-      } 
-      else if (seqItem[event].get('name') !== arg) {
-        this.match = NO;
-        return this;
-      }
-    }
-  
-    return this;
-  }
-  
 });