sproutcore 1.10.1 → 1.10.2

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

@@ -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.10.1';
+SC.VERSION = '1.10.2';
 
 /**
   @private
@@ -680,7 +680,7 @@ SC.mixin(/** @scope window.SC.prototype */ {
       if (SC.typeOf(v) === SC.T_FUNCTION) v = "function () { ... }";
       ret.push(key + ": " + v);
     }
-    return "{" + ret.join(" , ") + "}";
+    return "{ " + ret.join(", ") + " }";
   },
 
   /**

data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js

@@ -1280,6 +1280,13 @@ SC.Observable = /** @scope SC.Observable.prototype */{
   bind: function (toKey, target, method) {
     var binding, pathType;
 
+    //@if(debug)
+    // Developer support.
+    if (!target) {
+      throw new Error("Developer Error: Attempt to bind key `%@` to null or undefined target".fmt(toKey));
+    }
+    //@endif
+
     // normalize...
     if (method !== undefined) target = [target, method];
 

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

@@ -471,6 +471,9 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     // Mark it destroyed.
     this.isDestroyed = YES;
 
+    // Destroy the logic gate, if any. (See and & or methods.)
+    if (this._logicGate) this._logicGate.destroy();
+
     // Disconnect the binding.
     this.disconnect();
 
@@ -770,6 +773,10 @@ SC.Binding = /** @scope SC.Binding.prototype */{
       if (tuple) {
         this._toTarget = tuple[0];
         this._toPropertyKey = tuple[1];
+        // Hook up _logicGate if needed (see and & or methods).
+        if (this._logicGate) {
+          this._logicGate.set('localObject', this._toTarget);
+        }
       }
     }
   },
@@ -989,10 +996,20 @@ SC.Binding = /** @scope SC.Binding.prototype */{
   */
   and: function (pathA, pathB) {
 
+    // If either path is local, append the localObject path to it.
+    if (pathA.indexOf('*') === 0 || pathA.indexOf('.') === 0) {
+      pathA = '*localObject.' + pathA.slice(1);
+    }
+    if (pathB.indexOf('*') === 0 || pathB.indexOf('.') === 0) {
+      pathB = '*localObject.' + pathB.slice(1);
+    }
+
     // create an object to do the logical computation
     var gate = SC.Object.create({
-      valueABinding: pathA,
-      valueBBinding: pathB,
+      localObject: null,
+
+      valueABinding: SC.Binding.oneWay(pathA),
+      valueBBinding: SC.Binding.oneWay(pathB),
 
       and: function () {
         return (this.get('valueA') && this.get('valueB'));
@@ -1000,7 +1017,9 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     });
 
     // add a transform that depends on the result of that computation.
-    return this.from('and', gate).oneWay();
+    var ret = this.from('and', gate).oneWay();
+    ret._logicGate = gate;
+    return ret;
   },
 
   /**
@@ -1014,9 +1033,18 @@ SC.Binding = /** @scope SC.Binding.prototype */{
     @param {String} pathB The second part of the conditional
   */
   or: function (pathA, pathB) {
+    // If either path is local, append the localObject path to it.
+    if (pathA.indexOf('*') === 0 || pathA.indexOf('.') === 0) {
+      pathA = '*localObject.' + pathA.slice(1);
+    }
+    if (pathB.indexOf('*') === 0 || pathB.indexOf('.') === 0) {
+      pathB = '*localObject.' + pathB.slice(1);
+    }
 
     // create an object to the logical computation
     var gate = SC.Object.create({
+      localObject: null,
+      
       valueABinding: pathA,
       valueBBinding: pathB,
 
@@ -1025,7 +1053,9 @@ SC.Binding = /** @scope SC.Binding.prototype */{
       }.property('valueA', 'valueB').cacheable()
     });
 
-    return this.from('or', gate).oneWay();
+    var ret = this.from('or', gate).oneWay();
+    ret._logicGate = gate;
+    return ret;
   },
 
   /**

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

@@ -623,8 +623,6 @@ SC.Object.prototype = {
 
     Although the default init() method returns the receiver, the return
     value is ignored.
-
-
   */
   init: function () {
     this.initObservable();

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

@@ -376,7 +376,11 @@ module("AND binding", {
 
     toObject = SC.Object.create({
       value: null,
-      valueBinding: SC.Binding.and('SC.testControllerA.value', 'SC.testControllerB.value')
+      valueBinding: SC.Binding.and('SC.testControllerA.value', 'SC.testControllerB.value'),
+      localValue1: NO,
+      localValue2: NO,
+      boundLocalValue: NO,
+      boundLocalValueBinding: SC.Binding.and('.localValue1', '.localValue2')
     });
   },
 
@@ -387,14 +391,22 @@ module("AND binding", {
 
 });
 
-test("toObject.value should be YES if both sources are YES", function () {
+test("bound value should be YES if both sources are YES", function () {
   SC.RunLoop.begin();
   SC.testControllerA.set('value', YES);
   SC.testControllerB.set('value', YES);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), YES);
+  equals(toObject.get('value'), YES, 'Bound value');
+
+  SC.RunLoop.begin();
+  toObject.set('localValue1', YES);
+  toObject.set('localValue2', YES);
+  SC.RunLoop.end();
+
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('boundLocalValue'), YES, 'Local bound value');
 });
 
 test("toObject.value should be NO if either source is NO", function () {
@@ -404,7 +416,7 @@ test("toObject.value should be NO if either source is NO", function () {
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), NO);
+  equals(toObject.get('value'), NO, 'Bound value on YES/NO');
 
   SC.RunLoop.begin();
   SC.testControllerA.set('value', YES);
@@ -412,7 +424,7 @@ test("toObject.value should be NO if either source is NO", function () {
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), YES);
+  equals(toObject.get('value'), YES, 'Bound value on YES/YES');
 
   SC.RunLoop.begin();
   SC.testControllerA.set('value', NO);
@@ -420,9 +432,34 @@ test("toObject.value should be NO if either source is NO", function () {
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), NO);
+  equals(toObject.get('value'), NO, 'Bound value on NO/YES');
+
+  SC.RunLoop.begin();
+  toObject.set('localValue1', YES);
+  toObject.set('localValue2', NO);
+  SC.RunLoop.end();
+
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('boundLocalValue'), NO, 'Local bound value on YES/NO');
+
+  SC.RunLoop.begin();
+  toObject.set('localValue1', YES);
+  toObject.set('localValue2', YES);
+  SC.RunLoop.end();
+
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('boundLocalValue'), YES, 'Local bound value on YES/YES');
+
+  SC.RunLoop.begin();
+  toObject.set('localValue1', NO);
+  toObject.set('localValue2', YES);
+  SC.RunLoop.end();
+
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('boundLocalValue'), NO, 'Local bound value on NO/YES');
 });
 
+
 module("OR binding", {
 
   setup: function () {
@@ -433,7 +470,11 @@ module("OR binding", {
 
     toObject = SC.Object.create({
       value: null,
-      valueBinding: SC.Binding.or('SC.testControllerA.value', 'SC.testControllerB.value')
+      valueBinding: SC.Binding.or('SC.testControllerA.value', 'SC.testControllerB.value'),
+      localValue1: NO,
+      localValue2: NO,
+      boundLocalValue: NO,
+      boundLocalValueBinding: SC.Binding.or('.localValue1', '.localValue2')
     });
   },
 
@@ -451,7 +492,16 @@ test("toObject.value should be first value if first value is truthy", function (
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), 'first value');
+  equals(toObject.get('value'), 'first value', 'Bound value on truthy first value');
+
+  SC.RunLoop.begin();
+  toObject.set('localValue1', 'first value');
+  toObject.set('localValue2', 'second value');
+  SC.RunLoop.end();
+
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('boundLocalValue'), 'first value', 'Locally bound value on truthy first value');
+
 });
 
 test("toObject.value should be second value if first is falsy", function () {
@@ -461,7 +511,16 @@ test("toObject.value should be second value if first is falsy", function () {
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), 'second value');
+  equals(toObject.get('value'), 'second value', 'Bound value on falsy first value');
+
+  SC.RunLoop.begin();
+  toObject.set('localValue1', NO);
+  toObject.set('localValue2', 'second value');
+  SC.RunLoop.end();
+
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('boundLocalValue'), 'second value', 'Locally bound value on falsy first value');
+
 });
 
 module("Binding with '[]'", {

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

@@ -166,7 +166,8 @@ CoreTest.Runner = {
     // of the various events.  (It is handy when looking at failed tests.)
     if (SC  &&  SC.Event  &&  SC.Event.unload) {
       try {
-        SC.Event.unload();
+        var responder = SC.RootResponder.responder;
+        SC.Event.remove(document, 'selectstart', responder, responder.selectstart);
       }
       catch (e) {}
     }

data/lib/sproutcore/rack/builder.rb

@@ -216,38 +216,58 @@ module SC
           @project_file_count = files.size
           @project_mtime = files.map { |x| File.mtime(x).to_i }.max
 
-          Thread.new do
-            while @should_monitor
-
-              # only need to start scanning again 2 seconds after the last
-              # request was serviced.
-              reload_delay = (Time.now - @last_reload_time)
-              if reload_delay > 2
-                files = Dir.glob(@project_root / '**' / '*')
-                # follow 1-level of symlinks
-                files += Dir.glob(@project_root / '**' / '*' / '**' / '*')
-                tmp_path = /^#{Regexp.escape(@project_root / 'tmp')}/
-                files.reject! { |f| f =~ tmp_path }
-                files.reject! { |f| File.directory?(f) }
-
-                cur_file_count = files.size
-                cur_mtime = files.map { |x| File.mtime(x).to_i }.max
-
-                if (@project_file_count != cur_file_count) || (@project_mtime != cur_mtime)
-                  SC.logger.info "Detected project change.  Will rebuild manifest"
-                  @project_did_change = true
-                  @project_file_count = cur_file_count
-                  @project_mtime = cur_mtime
-                end
+          begin
+            require 'listen'
+            @listener = Listen.to(@project_root, ignore: tmp_path) do |modified, added, removed|
+              SC.logger.info "Detected project change.  Will rebuild manifest."
+              @project_did_change = true
+            end
+            @listener.start
+          rescue LoadError => e
+            puts $:.inspect
+            puts e.message
+            SC.logger.warn "The 'listen' gem was not found in your gem repository.  Falling back to polling for filesystem changes, which is much more CPU intensive.  You should run 'gem install listen' to fix this."
+            Thread.new do
+              while @should_monitor
+                check_for_updates
+
+                # Add a slight delay.
+                sleep 2
               end
-
-              sleep(2)
             end
           end
         end
       end
 
+      def check_for_updates
+        # only need to start scanning again 2 seconds after the last
+        # request was serviced.
+        reload_delay = (Time.now - @last_reload_time)
+        if reload_delay > 2
+          files = Dir.glob(@project_root / '**' / '*')
+          # follow 1-level of symlinks
+          files += Dir.glob(@project_root / '**' / '*' / '**' / '*')
+          tmp_path = /^#{Regexp.escape(@project_root / 'tmp')}/
+          files.reject! { |f| f =~ tmp_path }
+          files.reject! { |f| File.directory?(f) }
+
+          cur_file_count = files.size
+          cur_mtime = files.map { |x| File.mtime(x).to_i }.max
+
+          if (@project_file_count != cur_file_count) || (@project_mtime != cur_mtime)
+            SC.logger.info "Detected project change.  Will rebuild manifest"
+            @project_did_change = true
+            @project_file_count = cur_file_count
+            @project_mtime = cur_mtime
+          end
+        end
+      end
+
       def stop_monitor!
+        if @listener
+          @listener.stop
+          @listener = nil
+        end
         @should_monitor = false
       end
 

data/sproutcore.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     s.add_dependency 'mongrel', '~> 1.1'
   else
     s.add_dependency 'thin', '~> 1.2'
+    s.add_dependency 'listen', '~> 2.0'
   end
 
   s.add_development_dependency 'gemcutter', "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sproutcore
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Strobe, Inc., Apple Inc. and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -192,6 +192,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
@@ -1845,6 +1859,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/debug/control_test_pane/ui.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/delegates/inline_text_field/inline_text_field.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/integration/creating_views.js
+- lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/auto_mixin_tests.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/auto_resize_test.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_display.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_value_support/content.js