sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/media/views/video.js

@@ -34,7 +34,7 @@ SC.VideoView = SC.View.extend(
 
   /**
     Video view className.
-    @property {String}
+    @type String
   */
   classNames: 'sc-video-view',
 
@@ -42,13 +42,13 @@ SC.VideoView = SC.View.extend(
     Properties that trigger a re render of the view. If the value changes, it
     means that the video url changed.
 
-    @property {Array}
+    @type Array
   */
   displayProperties: ['value', 'shouldAutoResize'],
 
   /**
     Reference to the video object once is created.
-    @property {Object}
+    @type Object
   */
 
   videoObject:null,
@@ -57,14 +57,14 @@ SC.VideoView = SC.View.extend(
     Array containing the technologies and the order to load them depending
     availability
 
-    @property {Array}
+    @type Array
   */
   degradeList: ['html5','quicktime', 'flash'],
 
   /**
      Current time in secs
-     
-     @property {Number}
+
+     @type Number
    */
   currentTime : function(key, value) {
     if (!SC.empty(value) && this._currentTime != value) {
@@ -77,66 +77,66 @@ SC.VideoView = SC.View.extend(
 
   /**
      Current time in secs
-     
-     @property {Number}
+
+     @type Number
      @private
    */
   _currentTime : 0,
-  
-  /** 
+
+  /**
     Duration in secs
-    @property {Number}
+    @type Number
   */
   duration: 0, //video duration in secs
 
   /**
     Volume. The value should be between 0 and 1
-    @property {Number}
+    @type Number
   */
   volume:0, //volume value from 0 to 1
 
   /**
     Tells you if the video is paused or not.
-    @property {Boolean}
+    @type Boolean
   */
   paused: YES, //is the video paused
 
   /**
     Tells you if the video is loaded.
-    @property {Boolean}
+    @type Boolean
   */
 
   loaded: NO, //has the video loaded
 
   /**
     Indicates if the video has reached the end
-    @property {Boolean}
+    @type Boolean
   */
 
   ended: NO, //did the video finished playing
 
   /**
     Indicates if the video is ready to be played.
-    @property {Boolean}
+    @type Boolean
   */
 
   canPlay: NO, //can the video be played
 
   /**
     Width of the video in pixels.
-    @property {Number}
+    @type Number
   */
   videoWidth:0,
 
   /**
     Width of the video in pixels.
-    @property {Number}
+    @type Number
   */
   videoHeight:0,
 
   /**
     Flag to enable captions if available.
-    @property {Boolean}
+    @type Boolean
   */
   captionsEnabled: NO,
 
@@ -146,7 +146,7 @@ SC.VideoView = SC.View.extend(
 
   /**
     Formatted currentTime. (00:00)
-    @property {String}
+    @type String
   */
   time: function(){
     var currentTime=this.get('currentTime'),
@@ -526,7 +526,7 @@ SC.VideoView = SC.View.extend(
   }.observes('paused'),
 
   /**
-    Called when currentTime changes. Notifies the different technologies 
+    Called when currentTime changes. Notifies the different technologies
     then new currentTime.
 
     @returns {void}
@@ -543,8 +543,8 @@ SC.VideoView = SC.View.extend(
       vid.setTime(this.get('currentTime'));
     }
   },
-  
-  /** 
+
+  /**
     Set the volume of the video.
 
     @returns {void}
@@ -664,7 +664,7 @@ SC.VideoView = SC.View.extend(
 
 });
 
-/** 
+/**
   Hash to store references to the different flash videos.
 */
 SC.VideoView.flashViews={};

data/lib/frameworks/sproutcore/frameworks/qunit/test/test.js

@@ -231,13 +231,13 @@ test("raises",function() {
 	
 	raises(
 		function() {
-			throw "error"
+			throw new Error("error")
 		}
 	);
 	
 	raises(
 		function() {
-			throw "error"
+			throw new Error("error")
 		},
 		'raises with just a message, no expected'
 	);

data/lib/frameworks/sproutcore/frameworks/routing/system/routes.js

@@ -135,10 +135,10 @@ SC.routes = SC.Object.create(
         separator, parts, i, len, crumbs, key;
 
     separator = (route.indexOf('?') < 0 && route.indexOf('&') >= 0) ? '&' : '?';
-    
+
     parts = route.split(separator);
     route = parts.shift();
-    
+
     params = this.deparam(parts.join('&'), coerce || false);
 
     // overlay any parameter passed in obj
@@ -147,7 +147,7 @@ SC.routes = SC.Object.create(
         params[key] = '' + obj[key];
       }
     }
-    
+
     params.params = separator + $.param(params);
     params.route = route;
 
@@ -348,7 +348,7 @@ SC.routes = SC.Object.create(
 
      - 'users/:action/:id'
      - ':controller/show/:id'
-     - ':controller/ *url' (ignore the space, because of jslint)
+     - ':controller/*url'
 
     @param {String} route the route to be registered
     @param {Object} target the object on which the method will be called, or
@@ -358,7 +358,7 @@ SC.routes = SC.Object.create(
   */
   add: function(route, target, method) {
     if (!this._didSetup) {
-      this.invokeLast(this.ping);
+      this.invokeNext(this.ping);
     }
 
     if (method === undefined && SC.typeOf(target) === SC.T_FUNCTION) {
@@ -405,24 +405,35 @@ SC.routes = SC.Object.create(
       }
     }
   },
-  
+
   /**
     Function to create an object out of a urlencoded param string.
-    
+
     @param {String} string the parameter string
     @param {Boolean} coerce coerce the values? (Default NO)
   */
   deparam: function(string, coerce) {
     var obj = {},
-        coerce_types = { 'true': !0, 'false': !1, 'null': null },
-        params = string.replace(/\+/g, ' ').split('&'),
-        len = params.length, idx, param, key, val, cur, i, keys, keys_last,
-        dec = decodeURIComponent, toString = Object.prototype.toString;
-  
+      coerce_types = { 'true': !0, 'false': !1, 'null': null },
+      params, len, idx, param, key, val, cur, i, keys, keys_last,
+      dec = decodeURIComponent, toString = Object.prototype.toString;
+
+    // This allows any URL-like string to also be objectified
+    if (string.indexOf('?') >= 0) {
+      string = string.split('?')[1];
+      if (string.indexOf('#') >= 0) {
+        string = string.split('#')[0];
+      }
+    } else if (string.indexOf('#') >= 0) {
+      string = string.split('#')[1];
+    }
+
+    params = string.replace(/\+/g, ' ').split('&');
+    len = params.length;
     for (idx = 0; idx < len; ++idx) {
       param = params[idx].split('='), key = dec(param[0]), cur = obj,
-      keys = key.split(']['), keys_last = key.length - 1;
-      
+        keys = key.split(']['), keys_last = key.length - 1;
+
       if (/\[/.test(keys[0]) && /\]$/.test(keys[keys_last])) {
         keys[keys_last] = keys[keys_last].replace(/\]$/, '');
         keys = keys.shift().split('[').concat(keys);
@@ -431,20 +442,20 @@ SC.routes = SC.Object.create(
 
       if (param.length === 2) {
         val = dec(param[1]);
-        
+
         if (coerce) {
           val = val && !isNaN(val)              ? +val              // gotta be a number
-              : val === 'undefined'             ? undefined
-              : coerce_types[val] !== undefined ? coerce_types[val]
-              : val;
+            : val === 'undefined'             ? undefined
+            : coerce_types[val] !== undefined ? coerce_types[val]
+            : val;
         }
 
         if (keys_last) {
           for (i = 0; i < keys_last; ++i) {
             key = keys[i] === '' ? cur.length : keys[i];
             cur = cur[key] = i < keys_last
-                ? cur[key] || (keys[i + 1] && isNaN(keys[i + 1]) ? {} : [])
-                : val;
+              ? cur[key] || (keys[i + 1] && isNaN(keys[i + 1]) ? {} : [])
+              : val;
           }
         } else {
           if (toString.apply(obj[key]) === '[object Array]') obj[key].push(val);
@@ -454,7 +465,7 @@ SC.routes = SC.Object.create(
       } else if (key) {
         obj[key] = coerce ? undefined : '';
       }
-    }  
+    }
     return obj;
   },
 

data/lib/frameworks/sproutcore/frameworks/routing/tests/system/routes.js

@@ -20,7 +20,7 @@ test('Setup', function() {
 });
 
 module('SC.routes setup', {
-  
+
   setup: function() {
     router = SC.Object.create({
       route: function() {
@@ -31,11 +31,13 @@ module('SC.routes setup', {
       SC.routes.add('foo', router, router.route);
     });
   }
-  
+
 });
 
 test('Setup', function() {
-  equals(SC.routes._didSetup, YES, 'SC.routes should have been setup');
+  SC.run(function() {
+    equals(SC.routes._didSetup, YES, 'SC.routes should have been setup');
+  });
 });
 
 test('Initial route', function() {
@@ -43,7 +45,7 @@ test('Initial route', function() {
 });
 
 module('SC.routes._Route', {
-  
+
   setup: function() {
     router = SC.Object.create({
       route: function() {
@@ -51,7 +53,7 @@ module('SC.routes._Route', {
       }
     });
   }
-  
+
 });
 
 test('Route tree', function() {
@@ -61,73 +63,73 @@ test('Route tree', function() {
       abe = ['a', 'b', ':e'],
       as = ['a', '*foo'],
       a, b, c, d, e, s, p;
-  
+
   r.add(abc, router, router.route);
   r.add(abd, router, router.route);
   r.add(abe, router, router.route);
   r.add(as, router, router.route);
-  
+
   a = r.staticRoutes['a'];
   ok(a, 'There should be a staticRoutes tree for a');
   ok(!a.target, 'A node should not have a target');
   ok(!a.method, 'A node should not have a method');
-  
+
   b = a.staticRoutes['b'];
   ok(b, 'There should be a staticRoutes tree for b');
   ok(!b.target, 'A node should not have a target');
   ok(!b.method, 'A node should not have a method');
-  
+
   c = b.staticRoutes['c'];
   ok(c, 'There should be a staticRoutes tree for c');
   equals(c.target, router, 'A leaf should have a target');
   equals(c.method, router.route, 'A leaf should have a method');
-  
+
   d = b.staticRoutes['d'];
   ok(d, 'There should be a staticRoutes tree for d');
   equals(d.target, router, 'A leaf should have a target');
   equals(d.method, router.route, 'A leaf should have a method');
-  
+
   e = b.dynamicRoutes['e'];
   ok(e, 'There should be a dynamicRoutes tree for e');
   equals(d.target, router, 'A leaf should have a target');
   equals(d.method, router.route, 'A leaf should have a method');
-  
+
   s = a.wildcardRoutes['foo'];
   ok(s, 'There should be a wildcardRoutes tree for a');
-  
+
   equals(r.routeForParts(['a'], {}), null, 'routeForParts should return null for non existent routes');
   equals(r.routeForParts(['a', 'b'], {}), null, 'routeForParts should return null for non existent routes');
   equals(r.routeForParts(abc, {}), c, 'routeForParts should return the correct route for a/b/c');
-  
+
   equals(r.routeForParts(abd, {}), d, 'routeForParts should return the correct route for a/b/d');
-  
+
   abe[2] = 'foo';
   p = {};
   equals(r.routeForParts(abe, p), e, 'routeForParts should return the correct route for a/b/:e');
   equals(p['e'], 'foo', 'routeForParts should return the params for a/b/:e');
-  
+
   p = {};
   equals(r.routeForParts(['a', 'double', 'double', 'toil', 'and', 'trouble'], p), s, 'routeForParts should return the correct route for a/*foo');
   equals(p.foo, 'double/double/toil/and/trouble', 'routeForParts should return the params for a/*foo');
 });
 
 module('SC.routes location', {
-  
+
   teardown: function() {
     SC.routes.set('location', null);
   }
-  
+
 });
 
 var routeWorks = function(route, name) {
   SC.routes.set('location', route);
   equals(SC.routes.get('location'), route, name + ' route has been set');
-  
+
   setTimeout(function() {
     equals(SC.routes.get('location'), route, name + ' route is still the same');
     start();
   }, 300);
-  
+
   stop();
 };
 
@@ -149,7 +151,7 @@ test('Already escaped route', function() {
 });
 
 module('SC.routes defined routes', {
-  
+
   setup: function() {
     router = SC.Object.create({
       params: null,
@@ -162,11 +164,11 @@ module('SC.routes defined routes', {
       }
     });
   },
-  
+
   teardown: function() {
     SC.routes.set('location', null);
   }
-  
+
 });
 
 test('setting location triggers function when only passed function', function() {
@@ -184,7 +186,7 @@ test('setting location simply triggers route', function() {
   SC.routes.add("foo", router, "triggerRoute");
   SC.routes.set('location', 'bar');
   ok(!router.triggered, "Router not triggered with nonexistent route.");
-  
+
   SC.routes.set('location', 'foo');
   ok(router.triggered, "Router triggered.");
 });
@@ -194,7 +196,7 @@ test('calling trigger() triggers current location (again)', function() {
   SC.routes.set('location', 'foo');
   ok(router.triggered, "Router triggered first time.");
   router.triggered = NO;
-  
+
   SC.routes.trigger();
   ok(router.triggered, "Router triggered (again).");
 });
@@ -202,12 +204,12 @@ test('calling trigger() triggers current location (again)', function() {
 test('A mix of static, dynamic and wildcard route', function() {
   var didObserve = false,
       timer;
-  
+
   timer = setTimeout(function() {
     ok(false, 'Route change was not notified within 2 seconds');
     window.start();
   }, 2000);
-  
+
   router.addObserver('params', function() {
     if (!didObserve) {
       didObserve = true;
@@ -216,22 +218,22 @@ test('A mix of static, dynamic and wildcard route', function() {
       window.start();
     }
   });
-  
+
   SC.routes.add('foo/:controller/:action/bar/:id/*witches', router, router.route);
   SC.routes.set('location', 'foo/users/éàçù߀/bar/5/double/double/toil/and/trouble');
-  
+
   stop();
 });
 
 test('Route with parameters defined in a string', function() {
   var didObserve = false,
       timer;
-  
+
   timer = setTimeout(function() {
     ok(false, 'Route change was not notified within 2 seconds');
     window.start();
   }, 2000);
-  
+
   router.addObserver('params', function() {
     if (!didObserve) {
       didObserve = true;
@@ -240,22 +242,22 @@ test('Route with parameters defined in a string', function() {
       window.start();
     }
   });
-  
+
   SC.routes.add('*url', router, router.route);
   SC.routes.set('location', '?cuisine=french&party=4');
-  
+
   stop();
 });
 
 test('Route with parameters defined in a hash', function() {
   var didObserve = false,
       timer;
-  
+
   timer = setTimeout(function() {
     ok(false, 'Route change was not notified within 2 seconds');
     window.start();
   }, 2000);
-  
+
   router.addObserver('params', function() {
     if (!didObserve) {
       didObserve = true;
@@ -264,22 +266,22 @@ test('Route with parameters defined in a hash', function() {
       window.start();
     }
   });
-  
+
   SC.routes.add('*url', router, router.route);
   SC.routes.set('location', { cuisine: 'french', party: '4' });
-  
+
   stop();
 });
 
 test('A mix of everything', function() {
   var didObserve = false,
       timer;
-  
+
   timer = setTimeout(function() {
     ok(false, 'Route change was not notified within 2 seconds');
     window.start();
   }, 2000);
-  
+
   router.addObserver('params', function() {
     if (!didObserve) {
       didObserve = true;
@@ -288,15 +290,15 @@ test('A mix of everything', function() {
       window.start();
     }
   });
-  
+
   SC.routes.add('foo/:controller/:action/bar/:id/*witches', router, router.route);
   SC.routes.set('location', 'foo/users/éàçù߀/bar/5/double/double/toil/and/trouble?cuisine=french&party=4');
-  
+
   stop();
 });
 
 module('SC.routes location observing', {
-  
+
   setup: function() {
     router = SC.Object.create({
       hasBeenNotified: NO,
@@ -305,16 +307,16 @@ module('SC.routes location observing', {
       }
     });
   },
-  
+
   teardown: function() {
     SC.routes.set('location', null);
   }
-  
+
 });
 
 test('Location change', function() {
   var timer;
-  
+
   if (!SC.routes.get('usesHistory')) {
     timer = setTimeout(function() {
       ok(false, 'Route change was not notified within 2 seconds');
@@ -340,27 +342,27 @@ test('_extractParametersAndRoute with ? syntax', function() {
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5?format=h264' }),
        { route: 'videos/5', params:'?format=h264', format: 'h264' },
        'route parameters should be correctly extracted');
-  
+
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5?format=h264&size=small' }),
        { route: 'videos/5', params:'?format=h264&size=small', format: 'h264', size: 'small' },
        'route parameters should be correctly extracted');
-       
+
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5?format=h264&size=small', format: 'ogg' }),
        { route: 'videos/5', params:'?format=ogg&size=small', format: 'ogg', size: 'small' },
        'route parameters should be extracted and overwritten');
-       
+
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5', format: 'h264', size: 'small' }),
        { route: 'videos/5', params:'?format=h264&size=small', format: 'h264', size: 'small' },
        'route should be well formatted with the given parameters');
-       
+
   same(SC.routes._extractParametersAndRoute({ format: 'h264', size: 'small' }),
        { route: '', params:'?format=h264&size=small', format: 'h264', size: 'small' },
        'route should be well formatted with the given parameters even if there is no initial route');
-      
+
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5?format=h264&size=small&url=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DG0k3kHtyoqc%26feature%3Dg-logo%26context%3DG21d2678FOAAAAAAABAA' }),
        { route: 'videos/5', params:'?format=h264&size=small&url=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DG0k3kHtyoqc%26feature%3Dg-logo%26context%3DG21d2678FOAAAAAAABAA', format: 'h264', size: 'small', url: 'http://www.youtube.com/watch?v=G0k3kHtyoqc&feature=g-logo&context=G21d2678FOAAAAAAABAA' },
        'route paramters should be extracted and urldecoded');
-      
+
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5?format=h264&size=small&url=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DG0k3kHtyoqc%26feature%3Dg-logo%26context%3DG21d2678FOAAAAAAABAA&videoLength=1120&macVersion=true' }, true),
        { route: 'videos/5', params:'?format=h264&size=small&url=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DG0k3kHtyoqc%26feature%3Dg-logo%26context%3DG21d2678FOAAAAAAABAA&videoLength=1120&macVersion=true', format: 'h264', size: 'small', url: 'http://www.youtube.com/watch?v=G0k3kHtyoqc&feature=g-logo&context=G21d2678FOAAAAAAABAA', videoLength: 1120, macVersion: true },
        'route paramters should be extracted, urldecoded and coerced');
@@ -370,12 +372,29 @@ test('_extractParametersAndRoute with & syntax', function() {
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5&format=h264' }),
        { route: 'videos/5', params:'&format=h264', format: 'h264' },
        'route parameters should be correctly extracted');
-       
+
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5&format=h264&size=small' }),
        { route: 'videos/5', params:'&format=h264&size=small', format: 'h264', size: 'small' },
        'route parameters should be correctly extracted');
-       
+
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5&format=h264&size=small', format: 'ogg' }),
        { route: 'videos/5', params:'&format=ogg&size=small', format: 'ogg', size: 'small' },
        'route parameters should be extracted and overwritten');
 });
+
+module('deparam');
+
+test('deparam outputs object from string', function() {
+  same(SC.routes.deparam('http://test.fakeurl.com/dir/foo.html?query=test&numItems=5#home', true),
+    { query: 'test', numItems: 5 },
+    'deparam with properly query string first url-like string, coerce true');
+  same(SC.routes.deparam('http://test.fakeurl.com/dir/foo.html#home?query=test&numItems=5', true),
+    { query: 'test', numItems: 5 },
+    'deparam with hash location first url-like string, coerce true');
+  same(SC.routes.deparam('foo.html?query=test&numItems=5#home', true),
+    { query: 'test', numItems: 5 },
+    'deparam with relative location url-like string, coerce true');
+  same(SC.routes.deparam('query=test&numItems=5&size=small', true),
+    { query: 'test', numItems: 5, size: 'small' },
+    'deparam works with params only string');
+});