sproutcore 1.6.0.rc.1-x86-mingw32 → 1.6.0.rc.2-x86-mingw32

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

@@ -29,6 +29,9 @@ if (typeof console === 'undefined') {
   console.log = console.info = console.warn = console.error = function(){};
 }
 
+window.SC = window.SC || {} ;
+window.SproutCore = window.SproutCore || SC ;
+
 // ........................................
 // BOOTSTRAP
 //
@@ -36,7 +39,7 @@ if (typeof console === 'undefined') {
 // rest of the methods go into the mixin defined below.
 
 /**
-  @version 1.6.0.rc.1
+  @version 1.6.0.rc.2
   @namespace
 
   All SproutCore methods and functions are defined
@@ -54,10 +57,9 @@ if (typeof console === 'undefined') {
   The core Base framework is based on the jQuery API with a number of
   performance optimizations.
 */
-window.SC = window.SC || {} ;
-window.SproutCore = window.SproutCore || SC ;
+SC = window.SC; // This is dumb but necessary for jsdoc to get it right
 
-SC.VERSION = '1.6.0.rc.1';
+SC.VERSION = '1.6.0.rc.2';
 
 /**
   @private
@@ -304,7 +306,8 @@ SC.mixin(/** @scope window.SC.prototype */ {
   // GUIDS & HASHES
   //
 
-  guidKey: jQuery.expando || ("SproutCore" + ( SC.VERSION + Math.random() ).replace( /\D/g, "" )),
+  // Like jQuery.expando but without any risk of conflict
+  guidKey: "SproutCore" + ( SC.VERSION + Math.random() ).replace( /\D/g, "" ),
 
   // Used for guid generation...
   _guidPrefixes: {"number": "nu", "string": "st"},
@@ -731,6 +734,23 @@ SC.mixin(/** @scope window.SC.prototype */ {
     }
 
     return root ;
+  },
+
+  /**
+   Acts very similar to SC.objectForPropertyPath(), the only difference is
+   that it will throw an error when object can't be found.
+
+    @param {String} path the path
+    @param {Object} root optional root object.  window is used otherwise
+    @param {Integer} stopAt optional point to stop searching the path.
+    @returns {Object} the found object or throws an error.
+  */
+  requiredObjectForPropertyPath: function(path, root, stopAt) {
+    var o = SC.objectForPropertyPath(path, root, stopAt);
+    if(!o) {
+      throw path + " could not be found";
+    }
+    return o;
   }
 
 }); // end mixin

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/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/themes/ace/resources/collection/normal/list_item.css

@@ -9,9 +9,9 @@ $theme.sc-list-item-view {
 
  .disclosure {
     position: absolute;
-    left: -12px;
+    left: -6px;
     top: 50%;
-    margin-top: -6px;
+    margin-top: -8px;
     
     width: 18px;
     height: 18px;

data/lib/frameworks/sproutcore/themes/ace/resources/split/split.css

@@ -1,4 +1,4 @@
-/* TODO: when new SplitView lands, do this proper ($theme.split-divider) */
+/* TODO: when new SplitView lands, do this proper (\$theme.split-divider) */
 $theme.split-divider {
   background: transparent;
   border: 0px none;

data/lib/gen/language/Buildfile

@@ -11,7 +11,7 @@ namespace :generator do
   # name.
   task :prepare do
     long_languages = %w(english french german italian spanish japanese)
-    if language = GENERATOR.arguments[2]
+    if language = GENERATOR.arguments[1]
       if long_languages.include?(language.downcase)
         GENERATOR.language = language.downcase.capitalize
         GENERATOR.filename = language.downcase + '.lproj'

data/lib/sproutcore.rb

@@ -11,25 +11,12 @@ require 'yaml'
 
 $:.delete_if {|f| f =~ /json_pure-/ } if $:.any? {|f| f =~ /json-/ }
 
-# Ruby 1.8 Compatibility
-if (RUBY_VERSION.match(/1\.8/))
+if RUBY_VERSION <= '1.8'
   $KCODE = 'u'
   require 'jcode'
   class String ; def valid_encoding? ; true ; end ; end
 end
 
-# Ruby 1.9 Compatibility
-if (RUBY_VERSION.match(/1\.9/))
-  # Fix for Rack Ruby 1.9 incompatibility. This makes 404s render again.
-  class String
-    alias each each_line unless ''.respond_to?(:each)
-  end
-end
-
-# Makes code more readable
-YES = true
-NO = false
-
 require "sproutcore/version"
 
 module SproutCore

data/lib/sproutcore/buildfile/string_ext.rb

@@ -32,10 +32,6 @@ end # module Module
 #
 class String
   rake_extension("ext") do
-    def replace_ext(newext)
-      sub(%r(([^/\\]\.)[^./\\]*$)) { $1 + newext }
-    end
-
     # Replace the file extension with +newext+.  If there is no extenson on
     # the string, append the new extension to the end.  If the new extension
     # is not given, or is the empty string, remove any existing extension.

data/lib/sproutcore/helpers/cssmin.rb

@@ -107,32 +107,31 @@ module SC::Helpers
     # 2. Remove spaces around ;:{},
     # 3. Remove tabs
     def remove_spaces(script)
-  	  script = script.gsub(/(\s(\s)+)/, ' ')
-      script = script.gsub(/\s*;\s*/,';')
-      script = script.gsub(/\s*:\s*/,':')
-      script = script.gsub(/\s*\{\s*/,'{')
-      script = script.gsub(/\s*\}\s*/,'}')
-      script = script.gsub(/\s*,\s*/,',')
-      script.gsub("\t",'');
-  	end
-
-  	# Replace color values with their shorter equivalent
-  	#
-  	# 1. Turn rgb(,,)-colors into #-values
-  	# 2. Shorten #AABBCC down to #ABC
-  	# 3. Replace names with their shorter hex-equivalent
-  	#    * white -> #fff
-   	#    * black -> #000
-  	# 4. Replace #-values with their shorter name
-  	#    * #f00 -> red
-  	def shorten_colors(style)
-  	  # rgb(50,101,152) to #326598
+      script.gsub!(/(\s(\s)+)/, ' ')
+      script.gsub!(/\s*;\s*/,';')
+      script.gsub!(/\s*:\s*/,':')
+      script.gsub!(/\s*\{\s*/,'{')
+      script.gsub!(/\s*\}\s*/,'}')
+      script.gsub!(/\s*,\s*/,',')
+      script.gsub!("\t",'');
+      script
+    end
+    
+    # Replace color values with their shorter equivalent
+    #
+    # 1. Turn rgb(,,)-colors into #-values
+    # 2. Shorten #AABBCC down to #ABC
+    # 3. Replace names with their shorter hex-equivalent
+    #    * white -> #fff
+    #    * black -> #000
+    # 4. Replace #-values with their shorter name
+    #    * #f00 -> red
+    def shorten_colors(style)
+      # rgb(50,101,152) to #326598
       style = style.gsub(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |match|
         out = '#'
         $1.split(',').each do |num|
-          if num.to_i < 16
-            out += '0'
-          end
+          out += '0' if num.to_i < 16
           out += num.to_i.to_s(16) # convert to hex
         end
         out
@@ -146,54 +145,40 @@ module SC::Helpers
         out
       end
       # shorten several names to numbers
-      style = style.gsub(/:[\s]*white[\s]*;/, ':#fff;')
-      style = style.gsub(/:[\s]*white[\s]*\}/, ':#fff}')
-      style = style.gsub(/:[\s]*black[\s]*;/, ':#000;')
-      style = style.gsub(/:[\s]*black[\s]*\}/, ':#000}')
+      style.gsub!(/:[\s]*white[\s]*;/, ':#fff;')
+      style.gsub!(/:[\s]*white[\s]*\}/, ':#fff}')
+      style.gsub!(/:[\s]*black[\s]*;/, ':#000;')
+      style.gsub!(/:[\s]*black[\s]*\}/, ':#000}')
       # shotern several numbers to names
-      style = style.gsub(/:[\s]*#([fF]00|[fF]{2}0000);/, ':red;')
-      style = style.gsub(/:[\s]*#([fF]00|[fF]{2}0000)\}/, ':red}')
-
-  	  style
+      style.gsub!(/:[\s]*#([fF]00|[fF]{2}0000);/, ':red;')
+      style.gsub!(/:[\s]*#([fF]00|[fF]{2}0000)\}/, ':red}')
+      style
     end
 
     # Do miscellaneous compression methods on the style
     def do_misc(script)
       # Replace 0(pt,px,em,%) with 0 but only when preceded by : or a white-space
-      script = script.gsub(/([\s:]+)(0)(px|em|%|in|cm|mm|pc|pt|ex)/) do |match|
-        match.gsub(/(px|em|%|in|cm|mm|pc|pt|ex)/,'')
-      end
+      script.gsub!(/([\s:]+)(0)(px|em|%|in|cm|mm|pc|pt|ex)/) { |match| match.gsub(/(px|em|%|in|cm|mm|pc|pt|ex)/,'') }
       # Replace 0 0 0 0; with 0.
-      script = script.gsub(':0 0 0 0;', ':0;')
-      script = script.gsub(':0 0 0 0}', ':0}')
-      script = script.gsub(':0 0 0;', ':0;')
-      script = script.gsub(':0 0 0}', ':0}')
-      script = script.gsub(':0 0}', ':0}')
-      script = script.gsub(':0 0;', ':0;')
+      script.gsub!(/:(0\s){0,3}0;/, ':0;')
+      script.gsub!(/:(0\s){0,3}0\}/, ':0}')
       # Replace background-position:0; with background-position:0 0;
-      script = script.gsub('background-position:0;', 'background-position:0 0;');
-      # Replace 0.6 to .6, but only when preceded by : or a white-space
-      script = script.gsub(/[:\s]0+\.(\d+)/) do |match|
-        match.sub('0', '') # only first '0' !!
-      end
+      script.gsub!('background-position:0;', 'background-position:0 0;');
+      # Replace 0.6 to .6, but only the first 0 and only when preceded by : or a white-space
+      script.gsub!(/[:\s]0+\.(\d+)/) { |match| match.sub('0', '') }
       # Replace ;;;; with ;
-      script = script.gsub(/[;]+/, ';')
+      script.gsub!(/[;]+/, ';')
       # Replace ;} with }
-      script = script.gsub(';}', '}')
+      script.gsub!(';}', '}')
       # Replace background-color: with background:
-      script = script.gsub('background-color:', 'background:')
+      script.gsub!('background-color:', 'background:')
       # Replace font-weight:normal; with 400, bold with 700
-      script = script.gsub(/font-weight[\s]*:[\s]*normal[\s]*;/,'font-weight:400;')
-      script = script.gsub(/font-weight[\s]*:[\s]*normal[\s]*\}/,'font-weight:400}')
-      script = script.gsub(/font[\s]*:[\s]*normal[\s;\}]*/) do |match|
-        match.sub('normal', '400')
-      end
-      script = script.gsub(/font-weight[\s]*:[\s]*bold[\s]*;/,'font-weight:700;')
-      script = script.gsub(/font-weight[\s]*:[\s]*bold[\s]*\}/,'font-weight:700}')
-      script = script.gsub(/font[\s]*:[\s]*bold[\s;\}]*/) do |match|
-        match.sub('bold', '700')
-      end
-
+      script.gsub!(/font-weight[\s]*:[\s]*normal[\s]*;/,'font-weight:400;')
+      script.gsub!(/font-weight[\s]*:[\s]*normal[\s]*\}/,'font-weight:400}')
+      script.gsub!(/font[\s]*:[\s]*normal[\s;\}]*/) { |match| match.sub!('normal', '400') }
+      script.gsub!(/font-weight[\s]*:[\s]*bold[\s]*;/,'font-weight:700;')
+      script.gsub!(/font-weight[\s]*:[\s]*bold[\s]*\}/,'font-weight:700}')
+      script.gsub!(/font[\s]*:[\s]*bold[\s;\}]*/) { |match| match.sub!('bold', '700') }
       script
     end
 

data/lib/sproutcore/helpers/text_helper.rb

@@ -82,13 +82,10 @@ module SC
         # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
         # is available</i>.
         def textilize(text)
-          if text.blank?
-            ""
-          else
-            textilized = RedCloth.new(text, [ :hard_breaks ])
-            textilized.hard_breaks = true if textilized.respond_to?("hard_breaks=")
-            textilized.to_html
-          end
+          return '' if text.blank?
+          textilized = RedCloth.new(text, [ :hard_breaks ])
+          textilized.hard_breaks = true if textilized.respond_to?("hard_breaks=")
+          textilized.to_html
         end
 
         # Returns the text with all the Textile codes turned into HTML tags,
@@ -97,9 +94,9 @@ module SC
         # is available</i>.
         def textilize_without_paragraph(text)
           textiled = textilize(text)
-          if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
-          if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
-          return textiled
+          textiled = textiled[3..-1] if textiled[0..2] == '<p>'
+          textiled = textiled[0..-5] if textiled[-4..-1] == '</p>'
+          textiled
         end
       rescue LoadError
         # We can't really help what's not there
@@ -209,7 +206,8 @@ module SC
         if (cycle.nil? || cycle.values != values)
           cycle = set_cycle(name, Cycle.new(*values))
         end
-        return cycle.to_s
+
+        cycle.to_s
       end
 
       # Resets a cycle so that it starts from the first element the next time
@@ -234,7 +232,7 @@ module SC
         def to_s
           value = @values[@index].to_s
           @index = (@index + 1) % @values.size
-          return value
+          value
         end
       end
 
@@ -244,7 +242,7 @@ module SC
         # uses an instance variable of ActionView::Base.
         def get_cycle(name)
           @_cycles = Hash.new unless defined?(@_cycles)
-          return @_cycles[name]
+          @_cycles[name]
         end
 
         def set_cycle(name, cycle_object)