sproutcore 1.5.0.pre.4 → 1.5.0.pre.4.1

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

@@ -306,5 +306,3 @@ SC.run = function(callback, target, forceNested) {
     if(forceNested || !alreadyRunning) SC.RunLoop.end();
   }
 };
-
-SC.RunLoop.currentRunLoop = SC.RunLoop.create();

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

@@ -9,57 +9,252 @@
 // ie. setting the actual console.log = null means setting up
 // and tearing down no longer work properly.
 
-module("SC.Logger");
-
-test("addReporter", function() {
-  var reporter = {
-    log: function() { SC.Logger.set('hasBeenCalled', YES); }
+function testConsole() {
+  return {
+    log: function() { return true; },
+    alert: function() { return true; },
+    debug: function() { return true; },
+    dir: function() { return true; },
+    dirxml: function() { return true; },
+    error: function() { return true; },
+    group: function() { return true; },
+    groupEnd: function() { return true; },
+    info: function() { return true; },
+    profile: function() { return true; },
+    profileEnd: function() { return true; },
+    time: function() { return true; },
+    timeEnd: function() { return true; },
+    trace: function() { return true; },
+    warn: function() { return true; }
   };
+}
+
+module("SC.Logger", {
+  setup: function() {
+    SC.Logger.set('reporter', testConsole());
+    
+    SC.Logger.debugEnabled = true;
+    SC.Logger.format = true;
+    SC.Logger.fallBackOnLog = true;
+    SC.Logger.fallBackOnAlert = false;
+  },
+  teardown: function() {
+  }
+});
+
+
+// We'll use these a lot.
+var debugMessage    = "Test debug message",
+    infoMessage     = "Test informational message",
+    warnMessage     = "Test warning message",
+    errorMessage    = "Test error message",
+    debugGroupTitle = "Test debug group title",
+    infoGroupTitle  = "Test informational group title",
+    warnGroupTitle  = "Test warning group title",
+    errorGroupTitle = "Test error group title";
+
+var outputAll = function() {
+  // Outputs a log message for each possible level.
+  SC.Logger.debugGroup(debugGroupTitle);
+  SC.Logger.debug(debugMessage);
+  SC.Logger.debugGroupEnd();
+
+  SC.Logger.infoGroup(debugGroupTitle);
+  SC.Logger.info(infoMessage);
+  SC.Logger.infoGroupEnd();
+
+  SC.Logger.warnGroup(debugGroupTitle);
+  SC.Logger.warn(warnMessage);
+  SC.Logger.warnGroupEnd();
+
+  SC.Logger.errorGroup(debugGroupTitle);
+  SC.Logger.error(errorMessage);
+  SC.Logger.errorGroupEnd();
+};
+    
+
+
+test("exists", function() {
+  equals(SC.Logger.get('exists'), true, "Reporter does exist check");
+  
+  SC.Logger.set('reporter', null);
+  equals(SC.Logger.get('exists'), false, "Reporter does not exist check");
+});
+
+test("profile", function() {
+  equals(SC.Logger.profile(), true, "profile() function is defined");
   
-  SC.Logger.set('hasBeenCalled', NO);
-  SC.Logger.addReporter(reporter);
-  SC.Logger.log();
+  SC.Logger.get('reporter').profile = null;
+  equals(SC.Logger.profile(), false, "profile() function is null");
+});
+
+test("profileEnd", function() {
+  equals(SC.Logger.profileEnd(), true, "profileEnd() function is defined");
   
-  ok(SC.Logger.get('reporters').indexOf(reporter) > -1, "Reporter was added to reporters array");
-  ok(SC.Logger.get('hasBeenCalled'), "Function as called when invoked on SC.Logger");
-  delete SC.Logger.hasBeenCalled;
+  SC.Logger.get('reporter').profileEnd = null;
+  equals(SC.Logger.profileEnd(), false, "profileEnd() function is null");
 });
 
-test("clearReporters", function() {
-  var reporter = {
-    log: function() { SC.Logger.set('hasBeenCalled', YES); }
-  };
+test("time", function() {
+  equals(SC.Logger.time('mytime'), true, "time() function is defined");
   
-  SC.Logger.set('hasBeenCalled', NO);
-  SC.Logger.addReporter(reporter);
+  SC.Logger.get('reporter').time = null;
+  equals(SC.Logger.time('mytime'), false, "time() function is null");
+});
+
+test("timeEnd", function() {
+  equals(SC.Logger.timeEnd('mytime'), true, "timeEnd() function is defined");
   
-  ok(SC.Logger.get('reporters').indexOf(reporter) > -1, "precond - Reporter was added to reporters array");
+  SC.Logger.get('reporter').timeEnd = null;
+  equals(SC.Logger.timeEnd('mytime'), false, "timeEnd() function is null");
+});
+
+test("trace", function() {
+  equals(SC.Logger.trace(), true, "trace() function is defined");
   
-  SC.Logger.clearReporters(YES);
+  SC.Logger.get('reporter').trace = null;
+  equals(SC.Logger.trace(), false, "trace() function is null");
+});
+
+test("_argumentsToString", function() {
+  equals(SC.Logger._argumentsToString.apply(SC.Logger, ["test", "test2"]), "test" + SC.LOGGER_LOG_DELIMITER + "test2", "Formatting using default delimiter");
   
-  ok(SC.Logger.get('reporters').indexOf(reporter) === -1, "Reporter was removed from reporters array");
+  SC.LOGGER_LOG_DELIMITER = "|";
+  equals(SC.Logger._argumentsToString.apply(SC.Logger, ["test", "test2"]), "test|test2", "Formatting using custom delimiter");
+});
+
+
+// ..........................................................
+// LOG LEVELS
+//
+// Since we can't really test whether or not things are output to the console,
+// we'll do all of our log level testing based on the log recording mechanism.
+//
+// In case anybody else has recorded a log message, all of these tests will
+// start out by clearing the recorded log messages array.
+
+test("Ensure that log levels function properly:  none", function() {
+  SC.Logger.set('recordedLogMessages', null);
+
+  SC.Logger.set('logRecordingLevel', SC.LOGGER_LEVEL_NONE);
+  outputAll();
+
+  // If it was null before, it should be still be null, since no messages
+  // should have been logged.
+  equals(SC.Logger.get('recordedLogMessages'), null, "recordedLogMessages remains null");
+
+  // If it was an empty array before, it should still be an empty array.
+  SC.Logger.set('recordedLogMessages', []);
+  outputAll();
+  equals(SC.Logger.getPath('recordedLogMessages.length'), 0, "recordedLogMessages remains an empty array");
 });
 
-test("log", function() {
-  equals(SC.Logger.log("test"), SC.Logger, "Function is defined and returns SC.Logger");
+test("Ensure that log levels function properly:  debug", function() {
+  SC.Logger.set('recordedLogMessages', null);
+
+  SC.Logger.set('logRecordingLevel', SC.LOGGER_LEVEL_DEBUG);
+  outputAll();
+
+  // All four messages (plus group begin / end directives) should have been
+  // logged.
+  equals(SC.Logger.getPath('recordedLogMessages.length'), 12, "recordedLogMessages should have all twelve entries");
+
+  equals(SC.Logger.getPath('recordedLogMessages.1').message, debugMessage,  "recordedLogMessages[1] should be the debug message");
+  equals(SC.Logger.getPath('recordedLogMessages.4').message, infoMessage,   "recordedLogMessages[4] should be the info message");
+  equals(SC.Logger.getPath('recordedLogMessages.7').message, warnMessage,   "recordedLogMessages[7] should be the warn message");
+  equals(SC.Logger.getPath('recordedLogMessages.10').message, errorMessage, "recordedLogMessages[10] should be the error message");  
 });
 
-test("debug", function() {
-  ok(SC.Logger.debug("Debug"), SC.Logger, "Function is defined and returns SC.Logger");
+test("Ensure that log levels function properly:  info", function() {
+  SC.Logger.set('recordedLogMessages', null);
+
+  SC.Logger.set('logRecordingLevel', SC.LOGGER_LEVEL_INFO);
+  outputAll();
+
+  // Three messages (plus group begin / end directives) should have been
+  // logged.
+  equals(SC.Logger.getPath('recordedLogMessages.length'), 9, "recordedLogMessages should have nine entries");
+
+  equals(SC.Logger.getPath('recordedLogMessages.1').message, infoMessage,  "recordedLogMessages[1] should be the info message");
+  equals(SC.Logger.getPath('recordedLogMessages.4').message, warnMessage,  "recordedLogMessages[4] should be the warn message");
+  equals(SC.Logger.getPath('recordedLogMessages.7').message, errorMessage, "recordedLogMessages[7] should be the error message");
 });
 
-test("dir", function() {
-  equals(SC.Logger.dir({test:"string"}), SC.Logger, "Function is defined and returns SC.Logger");
+test("Ensure that log levels function properly:  warn", function() {
+  SC.Logger.set('recordedLogMessages', null);
+
+  SC.Logger.set('logRecordingLevel', SC.LOGGER_LEVEL_WARN);
+  outputAll();
+
+  // Two messages (plus group begin / end directives) should have been logged.
+  equals(SC.Logger.getPath('recordedLogMessages.length'), 6, "recordedLogMessages should have 6 entries");
+
+  equals(SC.Logger.getPath('recordedLogMessages.1').message, warnMessage,  "recordedLogMessages[1] should be the warn message");
+  equals(SC.Logger.getPath('recordedLogMessages.4').message, errorMessage, "recordedLogMessages[4] should be the error message");
 });
 
-test("error", function() {
-  equals(SC.Logger.error("Error"), SC.Logger, "Function is defined and returns SC.Logger");
+test("Ensure that log levels function properly:  error", function() {
+  SC.Logger.set('recordedLogMessages', null);
+
+  SC.Logger.set('logRecordingLevel', SC.LOGGER_LEVEL_ERROR);
+  outputAll();
+
+  // Only the error message (plus group begin / end directives) should have
+  // been logged.
+  equals(SC.Logger.getPath('recordedLogMessages.length'), 3, "recordedLogMessages should have three entries");
+
+  // That message should be equal to the error message.
+  equals(SC.Logger.getPath('recordedLogMessages.1').message, errorMessage, "recordedLogMessages[1] should be the error message");
 });
 
-test("info", function() {
-  equals(SC.Logger.info("Info"), SC.Logger, "Function is defined and returns SC.Logger");
+
+test("Ensure that log messages via the “will format” methods actually format", function() {
+  SC.Logger.set('recordedLogMessages', null);
+  SC.Logger.set('logRecordingLevel', SC.LOGGER_LEVEL_DEBUG);
+
+  var format   = "This message should be formatted:  %@:%@",
+      expected = format.fmt(null, 1);
+
+  SC.Logger.debug(format, null, 1);
+  SC.Logger.info(format, null, 1);
+  SC.Logger.warn(format, null, 1);
+  SC.Logger.error(format, null, 1);
+
+  equals(SC.Logger.getPath('recordedLogMessages.0').message, expected, "debug() should call String.fmt");
+  equals(SC.Logger.getPath('recordedLogMessages.1').message, expected, "info() should call String.fmt");
+  equals(SC.Logger.getPath('recordedLogMessages.2').message, expected, "warn() should call String.fmt");
+  equals(SC.Logger.getPath('recordedLogMessages.3').message, expected, "error() should call String.fmt");
 });
 
-test("warn", function() {
-  equals(SC.Logger.warn("Warn"), SC.Logger, "Function is defined and returns SC.Logger");
+test("Ensure that log messages via the “will not format” methods don’t format, but are still recorded", function() {
+  SC.Logger.set('recordedLogMessages', null);
+  SC.Logger.set('logRecordingLevel', SC.LOGGER_LEVEL_DEBUG);
+
+  var message = "This message should not be formatted:  %@:%@";
+  SC.Logger.debugWithoutFmt(message, null, 1);
+  SC.Logger.infoWithoutFmt(message, null, 1);
+  SC.Logger.warnWithoutFmt(message, null, 1);
+  SC.Logger.errorWithoutFmt(message, null, 1);
+
+  // They should still be recorded and identified as a message.
+  equals(SC.Logger.getPath('recordedLogMessages.0').message, true, "debugWithoutFmt() should still record");
+  equals(SC.Logger.getPath('recordedLogMessages.1').message, true, "infoWithoutFmt() should still record");
+  equals(SC.Logger.getPath('recordedLogMessages.2').message, true, "warnWithoutFmt() should still record");
+  equals(SC.Logger.getPath('recordedLogMessages.3').message, true, "errorWithoutFmt() should still record");
+
+  equals(SC.Logger.getPath('recordedLogMessages.0').originalArguments[0], message, "debugWithoutFmt() should not call String.fmt");
+  equals(SC.Logger.getPath('recordedLogMessages.0').originalArguments[1], null, "debugWithoutFmt() should record all the arguments (1)");
+  equals(SC.Logger.getPath('recordedLogMessages.0').originalArguments[2], 1, "debugWithoutFmt() should record all the arguments (2)");
+
+  equals(SC.Logger.getPath('recordedLogMessages.1').originalArguments[0], message, "infoWithoutFmt() should not call String.fmt");
+  equals(SC.Logger.getPath('recordedLogMessages.1').originalArguments[1], null, "infoWithoutFmt() should record all the arguments (1)");
+  equals(SC.Logger.getPath('recordedLogMessages.2').originalArguments[2], 1, "infoWithoutFmt() should record all the arguments (2)");
+
+  equals(SC.Logger.getPath('recordedLogMessages.2').originalArguments[0], message, "warnWithoutFmt() should not call String.fmt");
+  equals(SC.Logger.getPath('recordedLogMessages.2').originalArguments[1], null, "warnWithoutFmt() should record all the arguments (1)");
+  equals(SC.Logger.getPath('recordedLogMessages.2').originalArguments[2], 1, "warnWithoutFmt() should record all the arguments (2)");
+
+  equals(SC.Logger.getPath('recordedLogMessages.3').originalArguments[0], message, "errorWithoutFmt() should not call String.fmt");
+  equals(SC.Logger.getPath('recordedLogMessages.3').originalArguments[1], null, "errorWithoutFmt() should record all the arguments (1)");
+  equals(SC.Logger.getPath('recordedLogMessages.3').originalArguments[2], 1, "errorWithoutFmt() should record all the arguments (2)");
 });

data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js

@@ -142,7 +142,7 @@ SC.State = SC.Object.extend({
     }
     
     if (!SC.none(initialSubstate) && !matchedInitialSubstate) {
-      SC.Logger.error('Unable to set initial substate %@ since it did not match any of state\'s %@ substates'.fmt(initialSubstate, this));
+      SC.Logger.error("Unable to set initial substate %@ since it did not match any of state\'s %@ substates", initialSubstate, this);
     }
     
     this.set('substates', substates);
@@ -150,18 +150,18 @@ SC.State = SC.Object.extend({
     
     if (substates.length === 0) {
       if (!SC.none(initialSubstate)) {
-        SC.Logger.warn('Unable to make %@ an initial substate since state %@ has no substates'.fmt(initialSubstate, this));
+        SC.Logger.warn("Unable to make %@ an initial substate since state %@ has no substates", initialSubstate, this);
       }
     } 
     else if (substates.length > 0) {
       if (SC.none(initialSubstate) && !substatesAreConcurrent) {
         state = substates[0];
         this.set('initialSubstate', state);
-        SC.Logger.warn('state %@ has no initial substate defined. Will default to using %@ as initial substate'.fmt(this, state));
+        SC.Logger.warn("state %@ has no initial substate defined. Will default to using %@ as initial substate", this, state);
       } 
       else if (!SC.none(initialSubstate) && substatesAreConcurrent) {
         this.set('initialSubstate', null);
-        SC.Logger.warn('Can not use %@ as initial substate since substates are all concurrent for state %@'.fmt(initialSubstate, this));
+        SC.Logger.warn("Cannot use %@ as initial substate since substates are all concurrent for state %@", initialSubstate, this);
       }
     }
     
@@ -212,7 +212,7 @@ SC.State = SC.Object.extend({
         continue;
       }
       
-      SC.Logger.error("Invalid event %@ for event handler %@ in state %@".fmt(event, name, this));
+      SC.Logger.error("Invalid event %@ for event handler %@ in state %@", event, name, this);
     }
   },
   
@@ -275,7 +275,7 @@ SC.State = SC.Object.extend({
     }
     
     if (parent !== state && state !== this) {
-      SC.Logger.error('Can not generate relative path from %@ since it not a parent state of %@'.fmt(state, this));
+      SC.Logger.error("Cannot generate relative path from %@ since it not a parent state of %@", state, this);
       return null;
     }
     
@@ -306,7 +306,7 @@ SC.State = SC.Object.extend({
     }
     
     if (valueType !== SC.T_STRING) {
-      SC.Logger.error("Can not find matching subtype. value must be an object or string: %@".fmt(value));
+      SC.Logger.error("Cannot find matching subtype. value must be an object or string: %@", value);
       return null;
     }
     
@@ -332,8 +332,8 @@ SC.State = SC.Object.extend({
     if (matches[1] === "") {
       if (paths.__ki_paths__.length === 1) return paths[paths.__ki_paths__[0]];
       if (paths.__ki_paths__.length > 1) {
-        var msg = 'Can not find substate matching %@ in state %@. Ambiguous with the following: %@';
-        SC.Logger.error(msg.fmt(value, this, paths.__ki_paths__));
+        var msg = 'Cannot find substate matching %@ in state %@. Ambiguous with the following: %@';
+        SC.Logger.error(msg, value, this, paths.__ki_paths__);
       }
     } 
     
@@ -458,7 +458,7 @@ SC.State = SC.Object.extend({
     if (this.get('isCurrentState')) {
       statechart.gotoState(this);
     } else {
-       SC.Logger.error('Can not re-enter state %@ since it is not a current state in the statechart'.fmt(this));
+       SC.Logger.error("Cannot re-enter state %@ since it is not a current state in the statechart", this);
     }
   },
   
@@ -515,7 +515,7 @@ SC.State = SC.Object.extend({
     // First check if the name of the event is the same as a registered event handler. If so,
     // then do not handle the event.
     if (this._registeredEventHandlers[event]) {
-      SC.Logger.warn("state %@ can not handle event %@ since it is a registered event handler".fmt(this, event));
+      SC.Logger.warn("state %@ can not handle event %@ since it is a registered event handler", this, event);
       return NO;
     }    
     

data/lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js

@@ -948,4 +948,4 @@ SC.Async.mixin({
     return SC.Async.create({ func: func, arg1: arg1, arg2: arg2 });
   }
 
-});
+});

data/lib/frameworks/sproutcore/frameworks/testing/system/runner.js

@@ -130,6 +130,16 @@ CoreTest.Runner = {
     result.html(str);
     
     if (this.errors) CoreTest.errors=this.errors.join('');
+
+
+    // Unload the SproutCore event system so that the user can select the text
+    // of the various events.  (It is handy when looking at failed tests.)
+    if (SC  &&  SC.Event  &&  SC.Event.unload) {
+      try {
+        SC.Event.unload();
+      }
+      catch (e) {}
+    }
   },
   
   planDidRecord: function(plan, module, test, assertions, timings) {

data/lib/frameworks/sproutcore/lib/index.rhtml

@@ -35,14 +35,36 @@
 -%>    
   <%= bootstrap %>
 
-<% # 
-   # This line should appear in your head area to include the stylesheets
-   # generated by your client.  If you need to include your own
-   # stylesheets, you don't need to change it here.  Instead use the 
-   # required option in your config.
--%>
-   <%= stylesheets_for_client %>
-   <%= @content_for_page_styles %>
+    <% # 
+       # This line should appear in your head area to include the stylesheets
+       # generated by your client.  If you need to include your own
+       # stylesheets, you don't need to change it here.  Instead use the 
+       # required option in your config.
+    -%>
+
+    <script>
+      (function() { 
+        var styles = [];
+        if (window.devicePixelRatio == 2 || window.location.search.indexOf("2x") > -1) {
+          styles = <%= stylesheet_urls_for_client(nil, { :x2 => true }).to_json %>;
+        } else {
+          styles = <%= stylesheet_urls_for_client.to_json %>;
+        }
+
+        var head = document.getElementsByTagName("head")[0];
+        var len = styles.length, idx;
+        for (idx = 0; idx < len; idx++) {
+          var css   = document.createElement('link');
+          css.rel   = 'stylesheet';
+          css.type  = 'text/css';
+          css.href  = styles[idx];
+          css.media = 'screen'
+          head.appendChild(css);
+        }
+      })();
+    </script>
+
+    <%= @content_for_page_styles %>
     <script>
       SC.benchmarkPreloadEvents['headEnd'] = new Date().getTime();
     </script>

data/lib/frameworks/sproutcore/themes/ace/resources/segmented/18px/segmented.css

@@ -43,7 +43,7 @@ $theme.sc-segment-view {
   &.active {
     .left { @include slice("segmented_active.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_active.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_active.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_active.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
   
   &.active.sc-first-segment {
@@ -59,7 +59,7 @@ $theme.sc-segment-view {
   &.sel {
     .left { @include slice("segmented_selected.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_selected.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_selected.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_selected.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
 
   &.sel.sc-first-segment {
@@ -75,7 +75,7 @@ $theme.sc-segment-view {
   &.sel.active {
     .left { @include slice("segmented_selected_active.png", $left: 100, $width: 8); }
     .right { @include slice("segmented_selected_active.png", $left: 92, $width: 8); }
-    .middle { @include slice("segmented_selected_active.png", $left: 8, $width: 1); }
+    .middle { @include slice("segmented_selected_active.png", $left: 8, $width: 1, $repeat: repeat-x); }
   }
 
   &.sel.active.sc-first-segment {
@@ -88,4 +88,4 @@ $theme.sc-segment-view {
 
 }
 
-}
+}