sproutcore 1.4.3-java → 1.4.4-java

data/CHANGELOG

@@ -1,3 +1,9 @@
+*SproutCore 1.4.4 (November 12, 2010)*
+
+* Support for custom mime-types
+* Pass in SC.build_mode to the app
+
+
 *SproutCore 1.4.3 (October 19, 2010)*
 
 * Better handling of Proxy Redirect
@@ -17,6 +23,7 @@
 * Fixed redundancy in sc-init description
 * Fixes to allow uppercase files to be found by sc_require.
 
+
 *SproutCore 1.4.1 (September 21, 2010)*
 
 * Fixed string escaping issue in call to YUI Compressor [PDW]

data/VERSION.yml

@@ -1,7 +1,4 @@
 --- 
 :major: 1
 :minor: 4
-:patch: 3
-:digest: e038ba5746bb757cd0ff2391828c5f03496fbb64
-:dist: 
-  frameworks/sproutcore: 7174adeb47aa0930c95ddae79e2c9cf042fded45
+:patch: 4

data/lib/Buildfile

@@ -93,7 +93,10 @@ mode :all do
     # causes the default index.html file to add an overflow:hidden statement
     # to the body tag.  This is usually preferred since it makes drag and drop
     # look nicer
-    :hide_body_overflow => true
+    :hide_body_overflow => true,
+
+    # A hash of additional MIME types, i.e. { '.m4a' => 'audio/mp4a-latm' }
+    :mime_types => {}
 
 end
 

data/lib/frameworks/sproutcore/CHANGELOG

@@ -1,3 +1,24 @@
+*SproutCore 1.4.4 (November 12, 2010)*
+
+* Fix SC.platform.touch for Chrome 9
+* Better docs for setIfChanged
+* Minor documentation fix
+* Minor cleanup to SC.platform
+* Added support for Chrome Frame with :chrome_frame flag in Buildfile
+* Can now parse '1/1/01 1:1:1'-formatted date times. Thanks timgaleckas.
+* Remove unused code in SC.Store#removeDataHash
+* Removed deep flag for clone method
+* Replaced some instances of true with YES
+* Datastore makes deep copies of data hashes instead of shallow copies
+* Added support for making deep copies of an object into SC.copy and into SC.Copyable.copy
+* SC.clone makes deep copies of objects of type SC.T_HASH
+* Removed unnecessary variable declaration and method invokation in writeAttribute
+* Fixed an incorrect statement in the SC.CollectionContent inline documentation.
+* Fixed typo in SC.Animatable fixes
+* Added safety check for SC.Touch.allowDefault
+* Animatable should check that transitions exist before using special case
+* Typos prevent accelerating anything with a right or bottom even if it also has a top/height or left/width
+
 *SproutCore 1.4.3 (October 19, 2010)*
 
 * Send a warning to the console when using SC.RecordArray#indexOf or SC.RecordArray#lastIndexOf and providing an object that is

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

@@ -379,13 +379,16 @@ SC.Animatable = {
 
       var nT = newStyle['top'],
           nB = newStyle['bottom'],
+          nH = newStyle['height'],
           nL = newStyle['left'],
-          nR = newStyle['right'];
+          nR = newStyle['right'],
+          nW = newStyle['width'];
 
       // NOTE: This needs to match exactly the conditions in layoutStyles
       if (
-        (SC.empty(nT) || (!SC.isPercentage(nT) && SC.empty(nB))) &&
-        (SC.empty(nL) || (!SC.isPercentage(nL) && SC.empty(nR)))
+        (SC.empty(nT) || (!SC.isPercentage(nT) && !SC.empty(nH))) &&
+        (SC.empty(nL) || (!SC.isPercentage(nL) && !SC.empty(nW))) &&
+        (this.transitions && (this.transitions['top'] || this.transitions['left']))
       ) {
         specialTransform = YES;
         this._useSpecialCaseTransform = YES;

data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js

@@ -196,7 +196,7 @@ SC.Record = SC.Object.extend(
         storeKey = this.storeKey,
         ret      = store.readDataHash(storeKey);
     
-    if (ret) ret = SC.clone(ret);
+    if (ret) ret = SC.clone(ret, YES);
 
     return ret;
   }.property(),
@@ -341,7 +341,6 @@ SC.Record = SC.Object.extend(
   writeAttribute: function(key, value, ignoreDidChange) {
     var store    = this.get('store'), 
         storeKey = this.storeKey,
-        status   = store.peekStatus(storeKey),
         attrs;
     
     attrs = store.readEditableDataHash(storeKey);

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

@@ -288,7 +288,7 @@ SC.NestedStore = SC.Store.extend(
     }
     
     if (pstore && editState === SC.Store.EDITABLE) {
-      this.dataHashes[storeKey] = SC.clone(pstore.dataHashes[storeKey]);
+      this.dataHashes[storeKey] = SC.clone(pstore.dataHashes[storeKey], YES);
       if (!editables) editables = this.editables = [];
       editables[storeKey] = 1 ; // mark as editable
       

data/lib/frameworks/sproutcore/frameworks/datastore/system/store.js

@@ -326,7 +326,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     if (!editables) editables = this.editables = [];
     if (!editables[storeKey]) {
       editables[storeKey] = 1 ; // use number to store as dense array
-      ret = this.dataHashes[storeKey] = SC.clone(ret);
+      ret = this.dataHashes[storeKey] = SC.clone(ret, YES);
     }
     return ret;
   },
@@ -408,12 +408,9 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     @returns {SC.Store} reciever
   */
   removeDataHash: function(storeKey, status) {
-    var rev ;
-    
      // don't use delete -- that will allow parent dataHash to come through
     this.dataHashes[storeKey] = null;  
     this.statuses[storeKey] = status || SC.Record.EMPTY;
-    rev = this.revisions[storeKey] = this.revisions[storeKey]; // copy ref
     
     // hash is gone and therefore no longer editable
     var editables = this.editables;

data/lib/frameworks/sproutcore/frameworks/foundation/mixins/collection_content.js

@@ -35,8 +35,7 @@ SC.LEAF_NODE = 0x0020;
   or enabled state.
   
   You can apply this mixin to a class that you set as a delegate or to the
-  object you set as content.  SC.ArrayControllers automatically implement
-  this mixin.
+  object you set as content.
   
   @since SproutCore 1.0
 */

data/lib/frameworks/sproutcore/frameworks/foundation/system/datetime.js

@@ -104,15 +104,21 @@ SC.Scanner = SC.Object.extend(
   /**
     Reads some characters from the string and interprets it as an integer.
     
-    @param {integer} len the amount of characters to read
+    @param {integer} min_len the minimum amount of characters to read
+    @param {integer} max_len optionally the maximum amount of characters to read (defaults to the minimum)
     @throws {SC.SCANNER_INT_ERROR} if asked to read non numeric characters
     @returns {integer} the scanned integer
   */
-  scanInt: function(len) {
-    var str = this.scan(len);
-    var re = new RegExp("\\d{"+len+"}");
-    if (!str.match(re)) throw SC.SCANNER_INT_ERROR;
-    return parseInt(str, 10);
+  scanInt: function(min_len, max_len) {
+    if (max_len === undefined) max_len = min_len;
+    var str = this.scan(max_len);
+    var re = new RegExp("^\\d{" + min_len + "," + max_len + "}");
+    var match = str.match(re);
+    if (!match) throw SC.SCANNER_INT_ERROR;
+    if (match[0].length < max_len) {
+      this.scanLocation += match[0].length - max_len;
+    }
+    return parseInt(match[0], 10);
   },
   
   /**
@@ -908,14 +914,14 @@ SC.DateTime.mixin(SC.Comparable,
           case 'b': opts.month = scanner.scanArray(this.abbreviatedMonthNames) + 1; break;
           case 'B': opts.month = scanner.scanArray(this.monthNames) + 1; break;
           case 'c': throw "%c is not implemented";
-          case 'd': opts.day = scanner.scanInt(2); break;
-          case 'H': opts.hour = scanner.scanInt(2); break;
-          case 'I': opts.hour = scanner.scanInt(2); break;
+          case 'd': opts.day = scanner.scanInt(1, 2); break;
+          case 'H': opts.hour = scanner.scanInt(1, 2); break;
+          case 'I': opts.hour = scanner.scanInt(1, 2); break;
           case 'j': throw "%j is not implemented";
-          case 'm': opts.month = scanner.scanInt(2); break;
-          case 'M': opts.minute = scanner.scanInt(2); break;
+          case 'm': opts.month = scanner.scanInt(1, 2); break;
+          case 'M': opts.minute = scanner.scanInt(1, 2); break;
           case 'p': opts.meridian = scanner.scanArray(['AM', 'PM']); break;
-          case 'S': opts.second = scanner.scanInt(2); break;
+          case 'S': opts.second = scanner.scanInt(1, 2); break;
           case 'U': throw "%U is not implemented";
           case 'W': throw "%W is not implemented";
           case 'w': throw "%w is not implemented";

data/lib/frameworks/sproutcore/frameworks/foundation/system/platform.js

@@ -23,7 +23,7 @@ SC.platform = {
 
     @property {Boolean}
   */
-  touch: ('createTouch' in document),
+  touch: ('createTouch' in document) && !navigator.userAgent.match('Chrome/9'), // Ugly hack for Chrome 9 issue
   
   bounceOnScroll: (/iPhone|iPad|iPod/).test(navigator.platform),
   pinchToZoom: (/iPhone|iPad|iPod/).test(navigator.platform),
@@ -58,7 +58,8 @@ SC.platform = {
     screen on an iPhone OS-based device, this property will be true.
     @property {Boolean}
   */
-  standalone: navigator.standalone,
+  standalone: !!navigator.standalone,
+
 
   /**
     Prefix for browser specific CSS attributes. Calculated later.

data/lib/frameworks/sproutcore/frameworks/foundation/system/request.js

@@ -10,7 +10,7 @@ sc_require('system/response');
 /**
   @class
   
-  Implements support for Ajax requests using XHR, JSON-P and other prototcols.
+  Implements support for Ajax requests using XHR and other prototcols.
   
   SC.Request is much like an inverted version of the request/response objects
   you receive when implementing HTTP servers.  

data/lib/frameworks/sproutcore/frameworks/foundation/system/root_responder.js

@@ -1981,7 +1981,7 @@ SC.Touch.prototype = {
     the hasCustomEventHandling property to YES but does not cancel the event.
   */
   allowDefault: function() {
-    this.event.hasCustomEventHandling = YES ;
+    if (this.event) this.event.hasCustomEventHandling = YES ;
   },
 
   /**

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/datetime.js

@@ -20,18 +20,24 @@ module("SC.DateTime", {
   }
 });
 
-function timeShouldBeEqualToHash(t, h) {
+function timeShouldBeEqualToHash(t, h, message) {
   if (h === undefined) h = options;
   if (h.timezone === undefined) h.timezone = SC.DateTime.timezone;
+  if (message === undefined) message = "%@ of time should be equal to hash";
   
-  equals(t.get('year'), h.year , 'year');
-  equals(t.get('month'), h.month, 'month');
-  equals(t.get('day'), h.day, 'day');
-  equals(t.get('hour'), h.hour, 'hour');
-  equals(t.get('minute'), h.minute, 'minute');
-  equals(t.get('second'), h.second, 'second');
-  equals(t.get('millisecond'), h.millisecond, 'millisecond');
-  equals(t.get('timezone'), h.timezone, 'timezone');
+  if (t === null) {
+    ok(false, 'Time should not be null');
+    return;
+  }
+    
+  equals(t.get('year'), h.year , message.fmt('year'));
+  equals(t.get('month'), h.month, message.fmt('month'));
+  equals(t.get('day'), h.day, message.fmt('day'));
+  equals(t.get('hour'), h.hour, message.fmt('hour'));
+  equals(t.get('minute'), h.minute, message.fmt('minute'));
+  equals(t.get('second'), h.second, message.fmt('second'));
+  equals(t.get('millisecond'), h.millisecond, message.fmt('millisecond'));
+  equals(t.get('timezone'), h.timezone, message.fmt('timezone'));
 }
 
 function formatTimezone(offset) {
@@ -278,6 +284,21 @@ test('parse', function() {
   ok(
     SC.DateTime.parse('Tue 08 May 1985 01:00:22 AM', '%a %d %b %Y %H:%M:%S %p')
     === null, '1985-05-08 is not a tuesday');
+  ok(
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null &&
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null &&
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null &&
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null &&
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null &&
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null &&
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null &&
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null &&
+    SC.DateTime.parse('07/01/20201 18:33:22 %a Z', '%d/%m/%Y %H:%M:%S %%a %Z') === null
+    , 'Should be able to fail to parse multiple times');
+  timeShouldBeEqualToHash(
+    SC.DateTime.parse('1/1/01 0:0:0', '%m/%d/%y %H:%M:%S'),
+    { year: 2001, month: 1, day: 1, hour: 0, minute: 0, second: 0, millisecond: 0 },
+    'Should be able to have single digit for month, day, hour, minute, second');
   timeShouldBeEqualToHash(
     SC.DateTime.parse('70-01-01 00:00:00', '%y-%m-%d %H:%M:%S'),
     { year: 2070, month: 1, day: 1, hour: 0, minute: 0, second: 0, millisecond: 0 }); 

data/lib/frameworks/sproutcore/frameworks/foundation/views/view.js

@@ -2499,7 +2499,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     if (!SC.none(lL)) {
       if(SC.isPercentage(lL)) {
         ret.left = (lL*100)+"%";  //percentage left
-      } else if (hasAcceleratedLayer && SC.empty(lR)) {
+      } else if (hasAcceleratedLayer && !SC.empty(lW)) {
         translateLeft = Math.floor(lL);
         ret.left = 0;
       } else {
@@ -2581,7 +2581,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
     if (!SC.none(lT)) {
       if(SC.isPercentage(lT)) {
         ret.top = (lT*100)+"%";
-      } else if (hasAcceleratedLayer && SC.empty(lB)) {
+      } else if (hasAcceleratedLayer && !SC.empty(lH)) {
         translateTop = Math.floor(lT);
         ret.top = 0;
       } else {

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

@@ -528,7 +528,6 @@ SC.mixin(/** @scope SC */ {
   
   // ..........................................................
   // OBJECT MANAGEMENT
-  // 
   
   /** 
     Empty function.  Useful for some operations. 
@@ -597,29 +596,32 @@ SC.mixin(/** @scope SC */ {
     will simply call that method and return the result.
 
     @param object {Object} the object to clone
+    @param deep {Boolean} if true, a deep copy of the object is made
     @returns {Object} the cloned object
   */
-  copy: function(object) {
-    var ret = object ;
-    
+  copy: function(object, deep) {
+    var ret = object, idx ;
+
     // fast path
-    if (object && object.isCopyable) return object.copy();
-    
+    if (object) {
+      if (object.isCopyable) return object.copy(deep);
+      if (object.clone && SC.typeOf(object.clone) === SC.T_FUNCTION) return object.clone();
+    }
+
     switch (SC.typeOf(object)) {
     case SC.T_ARRAY:
-      if (object.clone && SC.typeOf(object.clone) === SC.T_FUNCTION) {
-        ret = object.clone() ;
-      } else ret = object.slice() ;
+      ret = object.slice() ;
+      if (deep) {
+        idx = ret.length;
+        while (idx--) ret[idx] = SC.copy(ret[idx], true);
+      }
       break ;
 
     case SC.T_HASH:
     case SC.T_OBJECT:
-      if (object.clone && SC.typeOf(object.clone) === SC.T_FUNCTION) {
-        ret = object.clone() ;
-      } else {
-        ret = {} ;
-        for(var key in object) ret[key] = object[key] ;
-      }
+      ret = {};
+      for (var key in object) ret[key] = deep ? SC.copy(object[key], true) : object[key];
+      break ;
     }
 
     return ret ;

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

@@ -31,10 +31,11 @@ SC.Copyable = {
   /**
     Override to return a copy of the receiver.  Default implementation raises
     an exception.
-    
+
+    @param deep {Boolean} if true, a deep copy of the object should be made
     @returns {Object} copy of receiver
   */
-  copy: function() {
+  copy: function(deep) {
     throw "%@.copy() is not implemented";
   },
   
@@ -61,4 +62,11 @@ SC.Copyable = {
 
 // Make Array copyable
 SC.mixin(Array.prototype, SC.Copyable);
-Array.prototype.copy = Array.prototype.slice;
+Array.prototype.copy = function(deep) {
+	var ret = this.slice(), idx;
+	if (deep) {
+      idx = ret.length;
+	  while (idx--) ret[idx] = SC.copy(ret[idx], true);
+	}
+	return ret;
+}

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

@@ -1149,7 +1149,11 @@ SC.Observable = {
     Sets the property only if the passed value is different from the
     current value.  Depending on how expensive a get() is on this property,
     this may be more efficient.
-    
+
+    NOTE: By default, the set() method will not set the value unless it has
+    changed. However, this check can skipped by setting .property().indempotent(NO)
+    setIfChanged() may be useful in this case.
+
     @param key {String} the key to change
     @param value {Object} the value to change
     @returns {SC.Observable}

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

@@ -61,7 +61,31 @@ test("should return a cloned array ", function() {
 	var resultArray = object.clone(arrayA);
     equals(resultArray[0], arrayA[0], 'check first array item');
     equals(resultArray[1], arrayA[1], 'check first array item');
-		
+});
+
+test("should return a deeply cloned arrays", function() {
+  var original  = [{value: 'value1'}, SC.Object.create({value: 'value2'})] ;
+  var cloned = SC.clone(original, true);
+  original[0].value = 'bogus';
+  equals(cloned[0].value, 'value1');
+  original[1].set('value', 'bogus');
+  equals(cloned[1].get('value'), 'value2');
+});
+
+test("should return shallow clones of hashes", function() {
+  var original = { foo: 'bar', nested: { key: 'value'}} ;
+  var cloned = SC.clone(original) ;
+  same(original, cloned);
+  cloned.nested.key = 'another value' ;
+  equals(original.nested.key, 'another value') ;
+});
+
+test("should return deep clones of hashes", function() {
+  var original = { foo: 'bar', nested: { key: 'value'}} ;
+  var cloned = SC.clone(original, true) ;
+  same(original, cloned);
+  cloned.nested.key = 'another value' ;
+  equals(original.nested.key, 'value') ;
 });
 
 test("should use copy() if isCopyable", function() {

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

@@ -12,7 +12,7 @@
 <html<% unless @content_for_html5_manifest.blank? %> manifest="app.manifest"<% end %>>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=8<%= config.chrome_frame ? ',chrome=1' : '' %>" />
     <meta http-equiv="Content-Script-Type" content="text/javascript" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="<%= config.status_bar_style || 'default' %>" />

data/lib/sproutcore/helpers/static_helper.rb

@@ -135,6 +135,8 @@ module SC
           end
         end
 
+        ret << %(<script type="text/javascript">SC.buildMode = "#{SC.build_mode}";</script>)
+
         return ret * "\n"
       end
 

data/lib/sproutcore/rack/builder.rb

@@ -149,7 +149,7 @@ module SC
         headers = {
           #"Last-Modified"  => File.mtime(build_path).httpdate,
           #"Etag"           => File.mtime(build_path).to_i.to_s,
-          "Content-Type"   => mime_type(build_path),
+          "Content-Type"   => mime_type(build_path, target.config[:mime_types]),
           "Content-Length" => file_size.to_s,
           "Expires"        => (cacheable ? (Time.now + ONE_YEAR) : Time.now).httpdate
         }
@@ -324,7 +324,7 @@ module SC
 
       # Returns the mime type.  Basically this is the Rack mime mapper with
       # a few bug fixes.
-      def mime_type(build_path)
+      def mime_type(build_path, custom = {})
         ext = File.extname(build_path)
 
         case ext
@@ -333,7 +333,7 @@ module SC
         when '.ttf'
           'font/ttf'
         else
-          ::Rack::Mime.mime_type(ext, 'text/plain')
+          custom[ext] || ::Rack::Mime.mime_type(ext, 'text/plain')
         end
 
       end

data/sproutcore.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'json_pure', "~> 1.4.6"
   s.add_dependency 'extlib', "~> 0.9.15"
   s.add_dependency 'erubis', "~> 2.6.6"
-  s.add_dependency 'thor', '~> 0.14.1'
+  s.add_dependency 'thor', '~> 0.14.3'
 
   if is_jruby
     s.add_dependency 'mongrel', '~> 1.1.5'
   else
     s.add_dependency 'thin', '~> 1.2.7'
+    s.add_dependency 'eventmachine', '>= 0.12.10' # Thin requires wrong version
   end
 
   s.add_development_dependency 'gemcutter', "~> 0.6.0"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 4
-    - 3
-  version: 1.4.3
+    - 4
+  version: 1.4.4
 platform: java
 authors: 
   - Strobe, Inc., Sprout Systems, Inc.  Apple Inc. and contributors
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -07:00
+date: 2010-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -83,8 +83,8 @@ dependencies:
             segments: 
               - 0
               - 14
-              - 1
-            version: 0.14.1
+              - 3
+            version: 0.14.3
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency