WIP: fix object / multiple viewValue computation

Author: jeffbcross

src/ng/directive/select.js

@@ -399,16 +399,22 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                 optionGroup = optionGroupsCache[groupIndex];
 
                 for(index = 1, length = optionGroup.length; index < length; index++) {
-                  //Have to use attr because element[0].selected returns false when multiple selected
-                  if ((optionElement = optionGroup[index].element).attr('selected')) {
+                  if ((optionElement = optionGroup[index].element)[0].selected) {
                     key = optionElement.val();
                     if (keyName) locals[keyName] = key;
                     if (selectAsFn) {
                       var collectionWithValueName = {};
                       collectionWithValueName[valueName] = collection[key];
-                      for (i = 0; i < collection.length; i++) {
-                        locals[valueName] = collection[i];
-                        if (selectAsFn(scope, locals) == selectAsFn(scope, collectionWithValueName)) break;
+                      collectionWithValueName[keyName] = key;
+
+                      for (i in collection) {
+                        if (collection.hasOwnProperty(i)) {
+                          locals[valueName] = collection[i];
+                          locals[keyName] = i;
+                          if (selectAsFn(scope, locals) ==
+                              selectAsFn(scope, collectionWithValueName)) break;
+                        }
+
                       }
                     } else if (trackFn) {
                       for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
@@ -418,7 +424,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
                     } else {
                       locals[valueName] = collection[key];
                     }
-                    value.push(valueFn(scope, locals));
+                    value.push((selectAsFn || valueFn)(scope, locals));
                   }
                 }
               }

test/ng/directive/selectSpec.js

@@ -591,7 +591,7 @@ describe('select', function() {
     });
 
 
-    iit('should bind to scope value through selectAs expression while tracking object via track by', function() {
+    it('should bind to scope value through selectAs expression while tracking object via track by', function() {
       createSelect({
         'ng-model': 'selected',
         'ng-options': 'item.id as item.name for item in values track by item.id'