sproutcore 1.9.0 → 1.9.1

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/commitChanges.js

@@ -3,7 +3,7 @@
 // Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*globals module ok equals same test MyApp */
+/*globals module, ok, equals, same, test */
 
 // NOTE: The test below are based on the Data Hashes state chart.  This models
 // the "commit" event in the NestedStore portion of the diagram.
@@ -14,29 +14,29 @@ module("SC.NestedStore#commitChanges", {
     SC.RunLoop.begin();
 
     parent = SC.Store.create();
-    
+
     json = {
       string: "string",
       number: 23,
       bool:   YES
     };
     args = [];
-    
+
     storeKey = SC.Store.generateStoreKey();
 
     store = parent.chain(); // create nested store
     child = store.chain();  // test multiple levels deep
-    
+
     // override commitChangesFromNestedStore() so we can ensure it is called
     // save call history for later evaluation
     parent.commitChangesFromNestedStore =
     child.commitChangesFromNestedStore =
     store.commitChangesFromNestedStore = function(store, changes, force) {
-      args.push({ 
-        target: this, 
-        store: store, 
-        changes: changes, 
-        force: force 
+      args.push({
+        target: this,
+        store: store,
+        changes: changes,
+        force: force
       });
     };
 
@@ -52,12 +52,12 @@ function testStateTransition(shouldIncludeStoreKey, shouldCallParent) {
 
   // attempt to commit
   equals(store.commitChanges(), store, 'should return receiver');
-  
+
   // verify result
   equals(store.storeKeyEditState(storeKey), SC.Store.INHERITED, 'data edit state');
 
   if (shouldCallParent === NO) {
-    ok(!args || args.length===0, 'should not call commitChangesFromNestedStore');    
+    ok(!args || args.length===0, 'should not call commitChangesFromNestedStore');
   } else {
     equals(args.length, 1, 'should have called commitChangesFromNestedStore');
 
@@ -73,7 +73,7 @@ function testStateTransition(shouldIncludeStoreKey, shouldCallParent) {
       ok(!didInclude, 'passed set of changes should NOT include storeKey');
     }
   }
-  
+
   equals(store.get('hasChanges'), NO, 'hasChanges should be cleared');
   ok(!store.chainedChanges || store.chainedChanges.length===0, 'should have empty chainedChanges set');
 }
@@ -82,7 +82,7 @@ test("state = INHERITED", function() {
 
   // write in some data to parent
   parent.writeDataHash(storeKey, json);
-  
+
   // check preconditions
   equals(store.storeKeyEditState(storeKey), SC.Store.INHERITED, 'precond - data edit state');
 
@@ -91,12 +91,12 @@ test("state = INHERITED", function() {
 
 
 test("state = LOCKED", function() {
-  
+
   // write in some data to parent
   parent.writeDataHash(storeKey, json);
   parent.editables = null ; // manually force to lock state
   store.readDataHash(storeKey);
-  
+
   // check preconditions
   equals(store.storeKeyEditState(storeKey), SC.Store.LOCKED, 'precond - data edit state');
   ok(!store.chainedChanges || !store.chainedChanges.contains(storeKey), 'locked record should not be in chainedChanges set');
@@ -105,11 +105,11 @@ test("state = LOCKED", function() {
 });
 
 test("state = EDITABLE", function() {
-  
+
   // write in some data to parent
   store.writeDataHash(storeKey, json);
   store.dataHashDidChange(storeKey);
-  
+
   // check preconditions
   equals(store.storeKeyEditState(storeKey), SC.Store.EDITABLE, 'precond - data edit state');
   ok(store.chainedChanges  && store.chainedChanges.contains(storeKey), 'editable record should be in chainedChanges set');
@@ -125,49 +125,150 @@ test("state = EDITABLE", function() {
 test("commiting a changed record should immediately notify outstanding records in parent store", function() {
 
   var Rec = SC.Record.extend({
-    
+
     fooCnt: 0,
     fooDidChange: function() { this.fooCnt++; }.observes('foo'),
-    
+
     statusCnt: 0,
     statusDidChange: function() { this.statusCnt++; }.observes('status'),
-    
+
     reset: function() { this.fooCnt = this.statusCnt = 0; },
-    
+
     equals: function(fooCnt, statusCnt, str) {
       if (!str) str = '' ;
       equals(this.get('fooCnt'), fooCnt, str + ':fooCnt');
       equals(this.get('statusCnt'), statusCnt, str + ':statusCnt');
     }
-    
+
   });
 
   SC.RunLoop.begin();
-    
+
   var store = SC.Store.create();
   var prec  = store.createRecord(Rec, { foo: "bar", guid: 1 });
-  
+
   var child = store.chain();
   var crec  = child.find(Rec, prec.get('id'));
-  
+
   // check assumptions
   ok(!!crec, 'prerec - should find child record');
   equals(crec.get('foo'), 'bar', 'prerec - child record should have foo');
-  
+
   // modify child record - should not modify parent
   prec.reset();
   crec.set('foo', 'baz');
   equals(prec.get('foo'), 'bar', 'should not modify parent before commit');
   prec.equals(0,0, 'before commitChanges');
-  
+
   // commit changes - note: still inside runloop
   child.commitChanges();
   equals(prec.get('foo'), 'baz', 'should push data to parent');
   prec.equals(1,1, 'after commitChanges'); // should notify immediately
-  
+
   SC.RunLoop.end();
-  
+
   // should not notify again after runloop - nothing to do
   prec.equals(1,1,'after runloop ends - should not notify again');
-  
+
+});
+
+
+test("Changes to relationships should propagate to the parent store.", function() {
+
+  var MyApp = window.MyApp = SC.Object.create({
+    store: SC.Store.create()
+  });
+
+  MyApp.Rec = SC.Record.extend({
+    relatedChild: SC.Record.toOne('MyApp.RelatedRec', {
+      inverse: 'relatedParent'
+    }),
+
+    relatedChildren: SC.Record.toMany('MyApp.RelatedRecs', {
+      inverse: 'relatedParent'
+    })
+  });
+
+  MyApp.RelatedRec = SC.Record.extend({
+    relatedParent: SC.Record.toOne('MyApp.Rec', {
+      inverse: 'relatedChild',
+      isMaster: NO
+    })
+  });
+
+  MyApp.RelatedRecs = SC.Record.extend({
+    relatedParent: SC.Record.toOne('MyApp.Rec', {
+      inverse: 'relatedChildren',
+      isMaster: NO
+    })
+  });
+
+  SC.RunLoop.begin();
+
+  MyApp.store.loadRecord(MyApp.RelatedRec, { guid: 2, relatedParent: 1});
+  MyApp.store.loadRecord(MyApp.RelatedRecs, { guid: 3, relatedParent: 1 });
+  MyApp.store.loadRecord(MyApp.RelatedRecs, { guid: 4, relatedParent: 1 });
+  MyApp.store.loadRecord(MyApp.Rec, { guid: 1, relatedChild: 2, relatedChildren: [3,4] });
+
+  var primaryRec = MyApp.store.find(MyApp.Rec, 1);
+  var primaryRelatedRec  = MyApp.store.find(MyApp.RelatedRec, 2);
+  var primaryRelatedRecs1  = MyApp.store.find(MyApp.RelatedRecs, 3);
+  var primaryRelatedRecs2  = MyApp.store.find(MyApp.RelatedRecs, 4);
+
+  var nestedStore = MyApp.store.chain();
+  var nestedRec = nestedStore.find(MyApp.Rec, primaryRec.get('id'));
+  var nestedRelatedRec = nestedStore.find(MyApp.RelatedRec, primaryRelatedRec.get('id'));
+  var nestedRelatedRecs1 = nestedStore.find(MyApp.RelatedRecs, primaryRelatedRecs1.get('id'));
+  var nestedRelatedRecs2 = nestedStore.find(MyApp.RelatedRecs, primaryRelatedRecs2.get('id'));
+
+  // check assumptions
+  ok(!!nestedRec, 'Prior to nested changes should find primaryRec in nested store');
+  ok(!!nestedRelatedRec, 'Prior to nested changes should find nestedRelatedRec in nested store');
+  ok(!!nestedRelatedRecs1, 'Prior to nested changes should find nestedRelatedRecs1 in nested store');
+  ok(!!nestedRelatedRecs2, 'Prior to nested changes should find nestedRelatedRecs2 in nested store');
+  equals(primaryRec.get('relatedChild'), primaryRelatedRec, 'Prior to changes primaryRec relatedChild should be');
+  equals(primaryRelatedRec.get('relatedParent'), primaryRec, 'Prior to changes primaryRelatedRec relatedParent should be');
+  equals(primaryRelatedRecs1.get('relatedParent'), primaryRec, 'Prior to changes primaryRelatedRecs1 relatedParent should be');
+  equals(primaryRelatedRecs2.get('relatedParent'), primaryRec, 'Prior to changes primaryRelatedRecs2 relatedParent should be');
+  equals(primaryRec.get('status'), SC.Record.READY_CLEAN, 'Prior to changes primaryRec status should be READY_CLEAN');
+  equals(primaryRelatedRec.get('status'), SC.Record.READY_CLEAN, 'Prior to changes primaryRelatedRec status should be READY_CLEAN');
+  equals(primaryRelatedRecs1.get('status'), SC.Record.READY_CLEAN, 'Prior to changes primaryRelatedRecs1 status should be READY_CLEAN');
+  equals(primaryRelatedRecs2.get('status'), SC.Record.READY_CLEAN, 'Prior to changes primaryRelatedRecs2 status should be READY_CLEAN');
+
+  nestedRec.set('relatedChild', null);
+  nestedRelatedRecs2.set('relatedParent', null);
+  nestedRec.get('relatedChildren').popObject();
+
+  // Modifying nested store record relationships should not modify primary store record relationships
+  equals(primaryRec.get('relatedChild'), primaryRelatedRec, 'After nested changes primaryRec relatedChild should be');
+  equals(primaryRelatedRec.get('relatedParent'), primaryRec, 'After nested changes primaryRelatedRec relatedParent should be');
+  equals(primaryRelatedRecs1.get('relatedParent'), primaryRec, 'After nested changes primaryRelatedRecs1 relatedParent should be');
+  equals(primaryRelatedRecs2.get('relatedParent'), primaryRec, 'After nested changes primaryRelatedRecs2 relatedParent should be');
+  equals(primaryRec.get('status'), SC.Record.READY_CLEAN, 'After nested changes primaryRec status should be READY_CLEAN');
+  equals(primaryRelatedRec.get('status'), SC.Record.READY_CLEAN, 'After nested changes primaryRelatedRec status should be READY_CLEAN');
+  equals(primaryRelatedRecs1.get('status'), SC.Record.READY_CLEAN, 'After nested changes primaryRelatedRecs1 status should be READY_CLEAN');
+  equals(primaryRelatedRecs2.get('status'), SC.Record.READY_CLEAN, 'After nested changes primaryRelatedRecs2 status should be READY_CLEAN');
+  equals(nestedRec.get('relatedChild'), null, 'After nested changes nestedRec relatedChild should be');
+  equals(nestedRelatedRec.get('relatedParent'), null, 'After nested changes nestedRelatedRec relatedParent should be');
+  equals(nestedRelatedRecs1.get('relatedParent'), null, 'After nested changes nestedRelatedRecs1 relatedParent should be');
+  equals(nestedRelatedRecs2.get('relatedParent'), null, 'After nested changes nestedRelatedRecs2 relatedParent should be');
+  equals(nestedRec.get('status'), SC.Record.READY_DIRTY, 'After nested changes relatedChild status should be READY_DIRTY');
+  equals(nestedRelatedRec.get('status'), SC.Record.READY_CLEAN, 'After nested changes nestedRelatedRec status should be READY_CLEAN');
+  equals(nestedRelatedRecs1.get('status'), SC.Record.READY_CLEAN, 'After nested changes nestedRelatedRecs1 status should be READY_CLEAN');
+  equals(nestedRelatedRecs2.get('status'), SC.Record.READY_CLEAN, 'After nested changes nestedRelatedRecs2 status should be READY_CLEAN');
+
+  // commit changes - note: still inside runloop
+  nestedStore.commitChanges();
+  equals(primaryRec.get('relatedChild'), null, 'After commit changes primaryRec relatedChild should be');
+  equals(primaryRelatedRec.get('relatedParent'), null, 'After commit changes primaryRelatedRec relatedParent should be');
+  equals(primaryRelatedRecs1.get('relatedParent'), null, 'After commit changes primaryRelatedRecs1 relatedParent should be');
+  equals(primaryRelatedRecs2.get('relatedParent'), null, 'After commit changes primaryRelatedRecs2 relatedParent should be');
+  equals(primaryRec.get('status'), SC.Record.READY_DIRTY, 'After commit changes primaryRec status should be READY_DIRTY');
+  equals(primaryRelatedRec.get('status'), SC.Record.READY_CLEAN, 'After commit changes primaryRelatedRec status should be READY_CLEAN');
+  equals(primaryRelatedRecs1.get('status'), SC.Record.READY_CLEAN, 'After commit changes primaryRelatedRecs1 status should be READY_CLEAN');
+  equals(primaryRelatedRecs2.get('status'), SC.Record.READY_CLEAN, 'After commit changes primaryRelatedRecs2 status should be READY_CLEAN');
+
+  SC.RunLoop.end();
+
+  delete window.MyApp;
 });

data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js

@@ -650,6 +650,7 @@ SC.MenuPane = SC.PickerPane.extend(
   createMenuItemViews: function() {
     var views = [], items = this.get('displayItems'),
         exampleView = this.get('exampleView'), item, itemView, view,
+        exampleViewKey, itemExampleView,
         height, heightKey, separatorKey, defaultHeight, separatorHeight,
         menuHeight, menuHeightPadding, keyEquivalentKey, keyEquivalent,
         keyArray, idx, layerIdKey, propertiesHash,

data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/string_measurement.js

@@ -39,7 +39,8 @@ SC.mixin( /** @scope SC */ {
     // quickly.
     var keys = ['maxHeight', 'maxWidth', 'minHeight', 'minWidth', 'centerY',
                 'centerX', 'width', 'height', 'bottom', 'right', 'top',
-                'left'],
+                'left', 'zIndex', 'opacity', 'border', 'borderLeft',
+                'borderRight', 'borderTop', 'borderBottom'],
         keyValues = [], key,
         i = keys.length;
     while (--i >= 0) {
@@ -231,7 +232,7 @@ SC.mixin( /** @scope SC */ {
       width: element.clientWidth + padding,
       height: element.clientHeight
     };
-    
+
     // Firefox seems to be 1 px short at times, especially with non english characters.
     if (SC.browser.isMozilla) {
       result.width += 1;

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

@@ -39,7 +39,7 @@ window.SproutCore = window.SproutCore || SC ;
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.9.0
+  @version 1.9.1
   @namespace
 
   All SproutCore methods and functions are defined
@@ -59,7 +59,7 @@ window.SproutCore = window.SproutCore || SC ;
 */
 SC = window.SC; // This is dumb but necessary for jsdoc to get it right
 
-SC.VERSION = '1.9.0';
+SC.VERSION = '1.9.1';
 
 /**
   @private

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

@@ -45,13 +45,17 @@ SC.String = /** @scope SC.String.prototype */ {
 
     Indexed Parameters
     --------------------
-    Indexed parameters are just arguments you pass into format.
-
-    For example, if you call fmt("%@1 %3 %2", 1, 2, 3), you'll get "1 3 2" as output.
+    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 instance:
+    If you don't supply a number, it will use them in the order you supplied. For example:
     
-        "abc".fmt("%@, %@", "Iskander", "Alex")  would return "Iskander, Alex".
+        "%@, %@".fmt("Iskander", "Alex")
+        
+        // -> "Iskander, Alex"
 
     Named Paramters
     --------------------

data/lib/sproutcore/helpers/minifier.rb

@@ -90,7 +90,6 @@ module SC::Helpers
 
       if html_paths.length > 0
         command = %{java -jar "#{SC.html_jar}" "#{html_paths.join '" "'}" 2>&1}
-        puts "Executing #{command}"
         output = `#{command}`
 
         SC.logger.info output
@@ -106,7 +105,6 @@ module SC::Helpers
       if js_paths.length > 0
         js_paths.each {|p|
           command = %{java -Xmx512m -XX:MaxPermSize=256m -jar "#{SC.js_jar}" -o "#{p}" "#{p}" 2>&1}
-          puts "Executing #{command}"
           output = `#{command}`
 
           SC.logger.info output

data/lib/sproutcore/rack/filesystem.rb

@@ -72,10 +72,9 @@ module SC
 
         #Missing:
         #need a way to rename/move files and folders
-
         case action
         when nil #sends the contents of the file
-          send_file(path)
+          send_file(path, env)
         when 'list' #returns folder structure
           list_files(path)
         when 'save' #doesn't do anything useful
@@ -139,10 +138,10 @@ module SC
         end
       end
 
-      def send_file(original_path)
+      def send_file(original_path, env)
         with_sanitized_path(original_path) do |sanitized_path|
           with_readable_path(sanitized_path) do |readable_path|
-            send_file_response(readable_path)
+            send_file_response(readable_path, env)
           end
         end
       end
@@ -236,7 +235,7 @@ module SC
         yield tempfile.path
       end
 
-      def send_file_response(path)
+      def send_file_response(path, env)
         if size = File.size?(path)
           # use Rack::File so streaming works and for max compatibility with
           # other handlers
@@ -244,6 +243,7 @@ module SC
           # the server supports it
           body = ::Rack::File::new(root_dir)
           body.path = path
+          body.serving(env)
           body
         else
           # file does not provide size info via stat, so we have to read it

metadata

@@ -2,7 +2,7 @@
 name: sproutcore
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors: 
 - Strobe, Inc., Apple Inc. and contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-30 00:00:00 Z
+date: 2012-12-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -1034,6 +1034,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/convertLayouts.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/createChildViews.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/createLayer.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/destroy.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/destroyLayer.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/didAppendToDocument.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/findLayerInParentLayer.js