sproutcore 1.10.2 → 1.10.3.1

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

@@ -459,6 +459,73 @@ test("toObject.value should be NO if either source is NO", function () {
   equals(toObject.get('boundLocalValue'), NO, 'Local bound value on NO/YES');
 });
 
+test("remote paths work when binding is defined on a class", function() {
+  // This tests the solution to a bug which was hooking all instances of a class's `and` binding
+  // up through the same internal object, which would be destroyed the first time any instance
+  // was destroyed.
+
+  var ToObject = SC.Object.extend({
+    value: null,
+    valueBinding: SC.Binding.and('SC.testControllerA.value', 'SC.testControllerB.value')
+  });
+
+  var toObject1, toObject2;
+  SC.run(function() {
+    toObject1 = ToObject.create();
+    toObject2 = ToObject.create();
+  });
+
+  ok(!toObject1.get('value') && !toObject2.get('value'), "PRELIM: instances' initial values are correct.");
+
+  SC.run(function() {
+    SC.testControllerA.set('value', YES);
+    SC.testControllerB.set('value', YES);
+  });
+
+  ok(toObject1.get('value') && toObject2.get('value'), "PRELIM: instances' values update correctly.");
+
+  SC.run(function() {
+    toObject1.destroy();
+    SC.testControllerB.set('value', NO);
+  });
+
+  ok(!toObject2.get('value'), "Second instance updates correctly after first instance is destroyed.");
+
+  // Cleanup.
+  toObject2.destroy();
+
+});
+
+test("local paths work when binding is defined on a class", function() {
+  // This tests the solution to a bug which was hooking all instances of a class's `and` binding
+  // up through the same internal object, which would cause multiple instances to cross-polinate.
+
+  var ToObject = SC.Object.extend({
+    localValue1: NO,
+    localValue2: NO,
+    value: NO,
+    valueBinding: SC.Binding.and('.localValue1', '.localValue2')
+  });
+  var toObject1, toObject2;
+  SC.run(function() {
+    toObject1 = ToObject.create();
+    toObject2 = ToObject.create();
+  });
+
+  ok(!toObject1.get('value') && !toObject2.get('value'), "PRELIM: instances' initial values are correct.");
+
+  SC.run(function() {
+    toObject1.set('localValue1', YES).set('localValue2', YES);
+  });
+
+  ok(toObject1.get('value'), "First instance updates correctly when its own values are changed.");
+  ok(!toObject2.get('value'), "Second instance does not update when first instance's values are changed.");
+
+  // Cleanup.
+  toObject1.destroy();
+  toObject2.destroy();
+
+});
 
 module("OR binding", {
 
@@ -523,6 +590,73 @@ test("toObject.value should be second value if first is falsy", function () {
 
 });
 
+test("remote paths work when binding is defined on a class", function() {
+  // This tests the solution to a bug which was hooking all instances of a class's `or` binding
+  // up through the same internal object, which would be destroyed the first time any instance
+  // was destroyed.
+
+  var ToObject = SC.Object.extend({
+    value: null,
+    valueBinding: SC.Binding.or('SC.testControllerA.value', 'SC.testControllerB.value')
+  });
+
+  var toObject1, toObject2;
+  SC.run(function() {
+    toObject1 = ToObject.create();
+    toObject2 = ToObject.create();
+  });
+
+  ok(!toObject1.get('value') && !toObject2.get('value'), "PRELIM: instances' initial values are correct.");
+
+  SC.run(function() {
+    SC.testControllerB.set('value', YES);
+  });
+
+  ok(toObject1.get('value') && toObject2.get('value'), "PRELIM: instances' values update correctly.");
+
+  SC.run(function() {
+    toObject1.destroy();
+    SC.testControllerB.set('value', NO);
+  });
+
+  ok(!toObject2.get('value'), "Second instance updates correctly after first instance is destroyed.");
+
+  // Cleanup.
+  toObject2.destroy();
+
+});
+
+test("local paths work when binding is defined on a class", function() {
+  // This tests the solution to a bug which was hooking all instances of a class's `or` binding
+  // up through the same internal object, which would cause multiple instances to cross-polinate.
+
+  var ToObject = SC.Object.extend({
+    localValue1: NO,
+    localValue2: NO,
+    value: NO,
+    valueBinding: SC.Binding.or('.localValue1', '.localValue2')
+  });
+  var toObject1, toObject2;
+  SC.run(function() {
+    toObject1 = ToObject.create();
+    toObject2 = ToObject.create();
+  });
+
+  ok(!toObject1.get('value') && !toObject2.get('value'), "PRELIM: instances' initial values are correct.");
+
+  SC.run(function() {
+    toObject1.set('localValue1', YES);
+  });
+
+  ok(toObject1.get('value'), "First instance updates correctly when its own values are changed.");
+  ok(!toObject2.get('value'), "Second instance does not update when first instance's values are changed.");
+
+  // Cleanup.
+  toObject1.destroy();
+  toObject2.destroy();
+
+});
+
 module("Binding with '[]'", {
   setup: function () {
     fromObject = SC.Object.create({ value: [] });

data/lib/sproutcore.rb

@@ -144,7 +144,7 @@ module SproutCore
   def self.js_jar
     @js_jar ||= begin
       yui_root = File.expand_path("../../vendor/sproutcore", __FILE__)
-      File.join(yui_root, 'lib/yuicompressor-2.4.6.jar')
+      File.join(yui_root, 'lib/yuicompressor-2.4.8.jar')
     end
   end
 

data/lib/sproutcore/models/manifest.rb

@@ -88,12 +88,18 @@ module SC
             :config => self.target.config,
             :project => self.target.project
         end
+
+        # Information indicating where the built app can be found. This is useful
+        # when manually uploading builds, to ensure we have the newest build.
+        if target[:target_type] == :app
+          SC.logger.info "Built #{target[:target_name]} to #{target[:build_root]}/#{target[:build_number]}"
+        end
       end
       return self
     end
 
     def built?; @is_built; end
-    
+
     #
     # Resets this manifest, and all same-variation manifests the target depends on.
     # This is useful when building: it clears the entries and frees up memory so
@@ -102,20 +108,20 @@ module SC
     def reset!
       return if @is_resetting
       @is_resetting = true
-      
+
       targets = target.expand_required_targets({ :theme => true }) + [target]
       entries = targets.map do |t|
         t.manifest_for(variation).reset!
       end
-      
+
       targets = target.modules({ :debug => false, :test => false, :theme => true }).each do |t|
         t.manifest_for(variation).reset!
       end
-      
+
       reset_entries!
-      
+
       @is_resetting = false
-      
+
       return self
     end
 

data/lib/sproutcore/rack/builder.rb

@@ -182,7 +182,6 @@ module SC
       # Reloads the project if reloading is enabled.  At maximum this will
       # reload the project every 5 seconds.
       def reload_project!
-
         monitor_project!
 
         # don't reload if no project or is disabled
@@ -205,21 +204,18 @@ module SC
           @should_monitor = true
           @project_root = @project.project_root
 
-          # collect initial info on project
-          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) }
-
-          @project_file_count = files.size
-          @project_mtime = files.map { |x| File.mtime(x).to_i }.max
+          # Set to an array of regular expressions matching ignored paths.
+          # Listen already ignores several directories at the root of the project (including tmp).
+          # Ignore all .git directories. Listen only ignores the project root .git directory by default.
+          ignored_paths = [/.*\/.git\//]
 
           begin
             require 'listen'
-            @listener = Listen.to(@project_root, ignore: tmp_path) do |modified, added, removed|
+            @listener = Listen.to(@project_root, ignore: ignored_paths) do |modified, added, removed|
               SC.logger.info "Detected project change.  Will rebuild manifest."
+              SC.logger.debug "  modified absolute path: #{modified}"
+              SC.logger.debug "  added absolute path: #{added}"
+              SC.logger.debug "  removed absolute path: #{removed}"
               @project_did_change = true
             end
             @listener.start
@@ -227,6 +223,18 @@ module SC
             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."
+
+            # collect initial info on project
+            files = Dir.glob(@project_root / '**' / '*')
+            # follow 1-level of symlinks
+            files += Dir.glob(@project_root / '**' / '*' / '**' / '*')
+
+            files.reject! { |f| f =~ tmp_path }
+            files.reject! { |f| File.directory?(f) }
+
+            @project_file_count = files.size
+            @project_mtime = files.map { |x| File.mtime(x).to_i }.max
+
             Thread.new do
               while @should_monitor
                 check_for_updates

data/lib/sproutcore/tools.rb

@@ -349,10 +349,10 @@ module SC
         targets = find_targets(*targets) # get targets
 
         # log output
-        SC.logger.info "Building targets: #{targets.map { |t| t.target_name } * ","}"
+        SC.logger << "Building targets: #{targets.map { |t| t.target_name } * ","}\n"
 
         languages = find_languages(*targets) # get languages
-        SC.logger.info "Building languages: #{ languages * "," }"
+        SC.logger << "Building languages: #{ languages * "," }\n"
 
         index = 1
         count = targets.length * languages.length
@@ -416,7 +416,7 @@ module SC
             end
 
             dst = Pathname.new(entry.build_path).relative_path_from(target_build_root)
-            info "  #{entry.filename} -> #{dst}"
+            debug "  #{entry.filename} -> #{dst}"
             entry.build!
           end
         end

data/lib/sproutcore/tools/build.rb

@@ -13,15 +13,15 @@ $to_html5_manifest_networks = []
 
 module SC
   class Tools
-    
+
     desc "build [TARGET..]", "Builds one or more targets"
-    
+
     # Standard manifest options.  Used by build tool as well.
     method_option :languages, :type => :string,
       :desc => "The languages to build."
-      
+
     method_option :symlink, :default => false
-    
+
     method_option :buildroot, :type => :string,
       :desc => "The path to build to."
     method_option :stageroot, :type => :string,
@@ -34,8 +34,8 @@ module SC
       :desc => "The identifier(s) for the build."
     method_option :include_required, :default => false, :aliases => '-r',
       :desc => "Deprecated. All builds build dependencies."
-      
-    
+
+
     method_option :entries, :type => :string
     method_option :whitelist, :type => :string,
       :desc => "The whitelist to use when building. By default, Whitelist (if present)"
@@ -66,17 +66,17 @@ module SC
       if options[:entries]
         entry_filters = options[:entries].split(',')
       end
-      
-      # We want Chance to clear files like sprites immediately after they're asked for, 
+
+      # We want Chance to clear files like sprites immediately after they're asked for,
       # because we'll only need them once during a build.
       Chance.clear_files_immediately
-      
+
       # Get the manifests to build
       manifests = build_manifests(*targets) do |manifest|
         # This is our own logic to prevent processing a manifest twice
         next if manifest[:built_by_builder]
         manifest[:built_by_builder] = true
-        
+
         # get entries.  If "entries" option was specified, use to filter
         # filename.  Must match end of filename.
         entries = manifest.entries
@@ -93,34 +93,34 @@ module SC
 
         # if there are entries to build, log and build
         build_entries_for_manifest manifest, options.allow_commented_js
-        
+
         # Build dependencies
         target = manifest.target
         required = target.expand_required_targets :theme => true,
           :debug => target.config.load_debug,
           :tests => target.config.load_tests,
- 
+
           # Modules are not 'required' technically, as they may be loaded
           # lazily. However, we want to know all targets that should be built,
           # so we'll include modules as well.
           :modules => true
 
-        
-        required.each {|t| 
+
+        required.each {|t|
           m = t.manifest_for(manifest.variation)
-          
-          
+
+
           # And, yes, the same as above. We're just building entries for all required targets.
           # We're also going to mark them as fully-built so they don't get built again.
           next if m[:built_by_builder]
           m[:built_by_builder] = true
           m.build!
-          
+
           build_entries_for_manifest m, options.allow_commented_js
-          
-          
+
+
         }
-        
+
         # Clean up
         manifest.reset!
         Chance::ChanceFactory.clear_instances
@@ -142,9 +142,9 @@ module SC
       seconds = t2-t1
       minutes = seconds/60
       seconds = seconds%60
-      puts 'Build time '+minutes.floor.to_s+ ' minutes '+seconds.floor.to_s+' secs'
+      puts 'Build time: '+minutes.floor.to_s+ ' minutes '+seconds.floor.to_s+' secs'
     end
-    
+
   end
 
 end

data/sproutcore.gemspec

@@ -26,17 +26,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'compass', '~> 0.11'
   s.add_dependency 'chunky_png', '~> 1.2'
 
-  # We need to add two eventmachine dependencies so that `thin` (eventmachine >= 0.12.6) and `em-http-request` (eventmachine ~> 1.0.0.beta.4) don't cause bundler to throw a dependency exception.
-  s.add_dependency 'eventmachine', '>= 0.12.6'
   s.add_dependency 'eventmachine', '~> 1.0'
-
-  s.add_dependency 'em-http-request', '~> 1.0'
+  s.add_dependency 'em-http-request', '= 1.1.1'
 
   if is_jruby
     s.add_dependency 'mongrel', '~> 1.1'
   else
     s.add_dependency 'thin', '~> 1.2'
-    s.add_dependency 'listen', '~> 2.0'
+    s.add_dependency 'listen', '~> 2.7'
   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.2
+  version: 1.10.3.1
 platform: ruby
 authors:
 - Strobe, Inc., Apple Inc. and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -136,20 +136,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.6
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +154,16 @@ dependencies:
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: gemcutter
   requirement: !ruby/object:Gem::Requirement
@@ -856,7 +842,7 @@ files:
 - vendor/sproutcore/lib/args4j-2.0.12.jar
 - vendor/sproutcore/lib/htmlcompressor-0.9.3.jar
 - vendor/sproutcore/lib/yuicompressor-2.4.2.jar
-- vendor/sproutcore/lib/yuicompressor-2.4.6.jar
+- vendor/sproutcore/lib/yuicompressor-2.4.8.jar
 - lib/frameworks/sproutcore/apps/greenhouse/beautify.js
 - lib/frameworks/sproutcore/apps/greenhouse/Buildfile
 - lib/frameworks/sproutcore/apps/greenhouse/controllers/design.js
@@ -1888,6 +1874,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/user_defaults.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/pointInElement.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/range.js
+- lib/frameworks/sproutcore/frameworks/foundation/tests/transitions/view_transitions_test.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/credit_card.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/date.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/not_empty.js