From c27aba4354c69c4a67fab587a59a8079cc9edc91 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 3 Nov 2011 21:14:04 -0700
Subject: refactor(api): remove type augmentation

BREAK:
  - remove angular.[Object/Array/String/Function]
  - in templates [].$filter(predicate) and friends need to change to [] | filter:predicate
---
 docs/src/templates/docs.js         |   9 +-
 docs/src/templates/index.html      |   4 +-
 example/personalLog/personalLog.js |  10 +-
 src/Angular.js                     |   7 +
 src/apis.js                        | 464 -------------------------------------
 src/jqLite.js                      |   2 +-
 src/service/parse.js               |  27 +--
 src/service/scope.js               |   8 +-
 src/widget/select.js               |  11 +-
 test/ApiSpecs.js                   |  87 -------
 test/matchers.js                   |   2 +-
 11 files changed, 35 insertions(+), 596 deletions(-)

diff --git a/docs/src/templates/docs.js b/docs/src/templates/docs.js
index 2693da64..0c8d787a 100644
--- a/docs/src/templates/docs.js
+++ b/docs/src/templates/docs.js
@@ -1,11 +1,12 @@
-DocsController.$inject = ['$location', '$window', '$cookies'];
-function DocsController($location, $window, $cookies) {
+DocsController.$inject = ['$location', '$window', '$cookies', '$filter'];
+function DocsController($location, $window, $cookies, $filter) {
   window.$root = this.$root;
 
   var scope = this,
       OFFLINE_COOKIE_NAME = 'ng-offline',
       DOCS_PATH = /^\/(api)|(guide)|(cookbook)|(misc)|(tutorial)/,
-      INDEX_PATH = /^(\/|\/index[^\.]*.html)$/;
+      INDEX_PATH = /^(\/|\/index[^\.]*.html)$/,
+      filter = $filter('filter');
 
   scope.$location = $location;
   scope.versionNumber = angular.version.full;
@@ -25,7 +26,7 @@ function DocsController($location, $window, $cookies) {
       var parts = path.split('/');
       scope.sectionId = parts[1];
       scope.partialId = parts[2] || 'index';
-      scope.pages = angular.Array.filter(NG_PAGES, {section: scope.sectionId});
+      scope.pages = filter(NG_PAGES, {section: scope.sectionId});
 
       var i = scope.pages.length;
       while (i--) {
diff --git a/docs/src/templates/index.html b/docs/src/templates/index.html
index 49036309..6c8c5011 100644
--- a/docs/src/templates/index.html
+++ b/docs/src/templates/index.html
@@ -27,7 +27,7 @@
                       type: 'text/css'});
       addTag('script', {src: 'syntaxhighlighter/syntaxhighlighter-combined.js'}, sync);
       if (jQuery) addTag('script', {src: 'jquery.min.js'});
-      addTag('script', {src: angularPath, 'ng:autobind':''}, sync);
+      addTag('script', {src: angularPath, 'ng:autobind':'', 'ng:modules':'ngdocs'}, sync);
       addTag('script', {src: 'docs-combined.js'}, sync);
       addTag('script', {src: 'docs-keywords.js'}, sync);
 
@@ -103,7 +103,7 @@
              tabindex="1" accesskey="s">
 
       <ul id="content-list" ng:class="sectionId" ng:cloak>
-        <li ng:repeat="page in pages.$filter(search)" ng:class="getClass(page)">
+        <li ng:repeat="page in pages | filter:search" ng:class="getClass(page)">
           <a href="{{getUrl(page)}}" ng:class="selectedPartial(page)"
              ng:bind="page.shortName"
              tabindex="2"></a>
diff --git a/example/personalLog/personalLog.js b/example/personalLog/personalLog.js
index acaf371e..7be233cb 100644
--- a/example/personalLog/personalLog.js
+++ b/example/personalLog/personalLog.js
@@ -54,7 +54,13 @@ function LogCtrl($cookieStore) {
    * @param {object} log The log to remove.
    */
   this.rmLog = function(log) {
-    angular.Array.remove(logs, log);
+    for ( var i = 0; i < logs.length; i++) {
+      if (log === logs[i]) {
+        logs.splice(i, 1);
+        break;
+      }
+    }
+
     $cookieStore.put(LOGS, logs);
   };
 
@@ -73,4 +79,4 @@ LogCtrl.$inject = ['$cookieStore'];
 
 //export
 example.personalLog.LogCtrl = LogCtrl;
-})();
\ No newline at end of file
+})();
diff --git a/src/Angular.js b/src/Angular.js
index 17aa2d4a..fcb13881 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -560,6 +560,13 @@ function indexOf(array, obj) {
   return -1;
 }
 
+function arrayRemove(array, value) {
+    var index = indexOf(array, value);
+    if (index >=0)
+      array.splice(index, 1);
+    return value;
+  }
+
 function isLeafNode (node) {
   if (node) {
     switch (node.nodeName) {
diff --git a/src/apis.js b/src/apis.js
index 269dc9a1..08120c99 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -1,453 +1,5 @@
 'use strict';
 
-var angularGlobal = {
-  'typeOf':function(obj){
-    if (obj === null) return $null;
-    var type = typeof obj;
-    if (type == $object) {
-      if (obj instanceof Array) return $array;
-      if (isDate(obj)) return $date;
-      if (obj.nodeType == 1) return 'element';
-    }
-    return type;
-  }
-};
-
-
-/**
- * @ngdoc overview
- * @name angular.Object
- * @function
- *
- * @description
- * A namespace for utility functions used to work with JavaScript objects. These functions are
- * exposed in two ways:
- *
- * * __Angular expressions:__ Functions are bound to all objects and augment the Object type.
- * The names of these methods are prefixed with the '$' character in order to minimize naming
- * collisions. To call a method, invoke the function without the first argument, for example,
- * `myObject.$foo(param2)`.
- *
- * * __JavaScript code:__ Functions don't augment the Object type and must be invoked as functions
- * of `angular.Object` as `angular.Object.foo(myObject, param2)`.
- *
- *   * {@link angular.Object.copy angular.Object.copy()} - Creates a deep copy of the source
- *     parameter.
- *   * {@link angular.Object.equals angular.Object.equals()} - Determines if two objects or values
- *     are equivalent.
- *   * {@link angular.Object.size angular.Object.size()} - Determines the number of elements in
- *     strings, arrays, and objects.
- */
-var angularCollection = {
-  'copy': copy,
-  'size': size,
-  'equals': equals
-};
-var angularObject = {
-  'extend': extend
-};
-
-/**
- * @ngdoc overview
- * @name angular.Array
- *
- * @description
- * A namespace for utility functions for the manipulation of JavaScript Array objects.
- *
- * These functions are exposed in two ways:
- *
- * * __Angular expressions:__ Functions are bound to the Array objects and augment the Array type
- * as array methods. The names of these methods are prefixed with the `$` character to minimize
- * naming collisions. To call a method, invoke myArrayObject.$foo(params).
- *
- *     Because Array type is a subtype of the Object type, all angular.Object functions augment
- *     the Array type in Angular expressions as well.
- *
- * * __JavaScript code:__ Functions do nor augment the Array type and must be invoked as functions
- * of `angular.Array` as `angular.Array.foo(myArrayObject, params)`.
- *
- * The following APIs are built in to the Angular Array object:
- *
- * * {@link angular.Array.add angular.Array.add()} - Optionally adds a new element to an array.
- * * {@link angular.Array.count angular.Array.count()} - Determines the number of elements in an
- *                                                       array.
- * * {@link angular.Array.filter angular.Array.filter()} - Returns the subset of elements specified
- *                                                         in the filter as a new array.
- * * {@link angular.Array.indexOf angular.Array.indexOf()} - Determines the index of an array
- *                                                           value.
- * * {@link angular.Array.limitTo angular.Array.limitTo()} - Creates a sub-array of an existing
- *                                                           array.
- * * {@link angular.Array.orderBy angular.Array.orderBy()} - Orders array elements.
- * * {@link angular.Array.remove angular.Array.remove()} - Removes array elements.
- * * {@link angular.Array.sum angular.Array.sum()} - Sums the numbers in an array.
- */
-var angularArray = {
-
-
-  /**
-   * @ngdoc function
-   * @name angular.Array.indexOf
-   * @function
-   *
-   * @description
-   * Determines the index of a `value` in an `array`.
-   *
-   * Note: This function is used to augment the `Array` type in Angular expressions. See
-   * {@link angular.Array} for more information about Angular arrays.
-   *
-   * @param {Array} array Array to search.
-   * @param {*} value Value to search for.
-   * @returns {number} The position of the element in `array`. The position is 0-based.
-   * If the value cannot be found, `-1` is returned.
-   *
-   * @example
-      <doc:example>
-        <doc:source>
-         <script>
-           function Ctrl() {
-             this.books = ['Moby Dick', 'Great Gatsby', 'Romeo and Juliet'];
-             this.bookName = 'Romeo and Juliet';
-           }
-         </script>
-         <div ng:controller="Ctrl">
-           <input ng:model='bookName'> <br>
-           Index of '{{bookName}}' in the list {{books}} is <em>{{books.$indexOf(bookName)}}</em>.
-         </div>
-        </doc:source>
-        <doc:scenario>
-         it('should correctly calculate the initial index', function() {
-           expect(binding('books.$indexOf(bookName)')).toBe('2');
-         });
-
-         it('should recalculate', function() {
-           input('bookName').enter('foo');
-           expect(binding('books.$indexOf(bookName)')).toBe('-1');
-
-           input('bookName').enter('Moby Dick');
-           expect(binding('books.$indexOf(bookName)')).toBe('0');
-         });
-        </doc:scenario>
-      </doc:example>
-   */
-  'indexOf': indexOf,
-
-
-  /**
-   * @ngdoc function
-   * @name angular.Array.sum
-   * @function
-   *
-   * @description
-   * The `sum` function calculates the sum of all numbers in an `array`. If an `expression` is
-   * supplied, `sum` evaluates each element in the `array` with the expression and then returns
-   * the sum of the calculated values.
-   *
-   * Note: This function is used to augment the `Array` type in Angular expressions. See
-   * {@link angular.Array} for more info about Angular arrays.
-   *
-   * @param {Array} array The source array.
-   * @param {(string|function())=} expression Angular expression or a function to be evaluated for
-   *  each element in `array`. The array element becomes the `this` during the evaluation.
-   * @returns {number} Sum of items in the array.
-   *
-   * @example
-      <doc:example>
-       <doc:source>
-        <script>
-          function Ctrl() {
-            this.invoice = {
-              items:[ {
-                   qty:10,
-                   description:'gadget',
-                   cost:9.95
-                 }
-              ]
-            };
-          }
-        </script>
-        <table class="invoice" ng:controller="Ctrl">
-         <tr><th>Qty</th><th>Description</th><th>Cost</th><th>Total</th><th></th></tr>
-         <tr ng:repeat="item in invoice.items">
-           <td><input type="integer" ng:model="item.qty" size="4" required></td>
-           <td><input type="text" ng:model="item.description"></td>
-           <td><input type="number" ng:model="item.cost" required size="6"></td>
-           <td>{{item.qty * item.cost | currency}}</td>
-           <td>[<a href ng:click="invoice.items.$remove(item)">X</a>]</td>
-         </tr>
-         <tr>
-           <td><a href ng:click="invoice.items.$add({qty:1, cost:0})">add item</a></td>
-           <td></td>
-           <td>Total:</td>
-           <td>{{invoice.items.$sum('qty*cost') | currency}}</td>
-         </tr>
-        </table>
-       </doc:source>
-       <doc:scenario>
-         //TODO: these specs are lame because I had to work around issues #164 and #167
-         it('should initialize and calculate the totals', function() {
-           expect(repeater('table.invoice tr', 'item in invoice.items').count()).toBe(3);
-           expect(repeater('table.invoice tr', 'item in invoice.items').row(1)).
-             toEqual(['$99.50']);
-           expect(binding("invoice.items.$sum('qty*cost')")).toBe('$99.50');
-           expect(binding("invoice.items.$sum('qty*cost')")).toBe('$99.50');
-         });
-
-         it('should add an entry and recalculate', function() {
-           element('.doc-example-live a:contains("add item")').click();
-           using('.doc-example-live tr:nth-child(3)').input('item.qty').enter('20');
-           using('.doc-example-live tr:nth-child(3)').input('item.cost').enter('100');
-
-           expect(repeater('table.invoice tr', 'item in invoice.items').row(2)).
-             toEqual(['$2,000.00']);
-           expect(binding("invoice.items.$sum('qty*cost')")).toBe('$2,099.50');
-         });
-       </doc:scenario>
-      </doc:example>
-   */
-  'sum':function(array, expression) {
-    var fn = angularFunction.compile(expression);
-    var sum = 0;
-    for (var i = 0; i < array.length; i++) {
-      var value = 1 * fn(array[i]);
-      if (!isNaN(value)){
-        sum += value;
-      }
-    }
-    return sum;
-  },
-
-
-  /**
-   * @ngdoc function
-   * @name angular.Array.remove
-   * @function
-   *
-   * @description
-   * Modifies `array` by removing an element from it. The element will be looked up using the
-   * {@link angular.Array.indexOf indexOf} function on the `array` and only the first instance of
-   * the element will be removed.
-   *
-   * Note: This function is used to augment the `Array` type in Angular expressions. See
-   * {@link angular.Array} for more information about Angular arrays.
-   *
-   * @param {Array} array Array from which an element should be removed.
-   * @param {*} value Element to be removed.
-   * @returns {*} The removed element.
-   *
-   * @example
-     <doc:example>
-       <doc:source>
-         <ul ng:init="tasks=['Learn Angular', 'Read Documentation',
-                             'Check out demos', 'Build cool applications']">
-           <li ng:repeat="task in tasks">
-             {{task}} [<a href="" ng:click="tasks.$remove(task)">X</a>]
-           </li>
-         </ul>
-         <hr/>
-         tasks = {{tasks}}
-       </doc:source>
-       <doc:scenario>
-         it('should initialize the task list with for tasks', function() {
-           expect(repeater('.doc-example-live ul li', 'task in tasks').count()).toBe(4);
-           expect(repeater('.doc-example-live ul li', 'task in tasks').column('task')).
-             toEqual(['Learn Angular', 'Read Documentation', 'Check out demos',
-                      'Build cool applications']);
-         });
-
-         it('should initialize the task list with for tasks', function() {
-           element('.doc-example-live ul li a:contains("X"):first').click();
-           expect(repeater('.doc-example-live ul li', 'task in tasks').count()).toBe(3);
-
-           element('.doc-example-live ul li a:contains("X"):last').click();
-           expect(repeater('.doc-example-live ul li', 'task in tasks').count()).toBe(2);
-
-           expect(repeater('.doc-example-live ul li', 'task in tasks').column('task')).
-             toEqual(['Read Documentation', 'Check out demos']);
-         });
-       </doc:scenario>
-     </doc:example>
-   */
-  'remove':function(array, value) {
-    var index = indexOf(array, value);
-    if (index >=0)
-      array.splice(index, 1);
-    return value;
-  },
-
-
-
-  /**
-   * @ngdoc function
-   * @name angular.Array.add
-   * @function
-   *
-   * @description
-   * The `add` function in Angualar is similar to JavaScript's `Array#push` method in that it
-   * appends a new element to an array. Angular's function differs from the JavaScript method in
-   * that specifying a value for the function is optional and the default for the function is an
-   * empty object.
-   *
-   * Note: This function is used to augment the `Array` type in Angular expressions. See
-   * {@link angular.Array} for more information about Angular arrays.
-   *
-   * @param {Array} array The array to be expanded.
-   * @param {*=} [value={}] The value to be appended.
-   * @returns {Array} The expanded array.
-   *
-   * @TODO simplify the example.
-   *
-   * @example
-   * This example shows how you can use the `$add` method to populate an initially empty array
-   * with objects created from user input.
-     <doc:example>
-       <doc:source>
-         <script>
-           function Ctrl() {
-             this.people = [];
-           }
-         </script>
-         <div ng:controller="Ctrl">
-           [<a href="" ng:click="people.$add()">add empty</a>]
-           [<a href="" ng:click="people.$add({name:'John', sex:'male'})">add 'John'</a>]
-           [<a href="" ng:click="people.$add({name:'Mary', sex:'female'})">add 'Mary'</a>]
-
-           <ul>
-             <li ng:repeat="person in people">
-               <input ng:model="person.name">
-               <select ng:model="person.sex">
-                 <option value="">--chose one--</option>
-                 <option>male</option>
-                 <option>female</option>
-               </select>
-               [<a href="" ng:click="people.$remove(person)">X</a>]
-             </li>
-           </ul>
-           <pre>people = {{people}}</pre>
-         </div>
-       </doc:source>
-       <doc:scenario>
-         beforeEach(function() {
-            expect(binding('people')).toBe('people = []');
-         });
-
-         it('should create an empty record when "add empty" is clicked', function() {
-           element('.doc-example-live a:contains("add empty")').click();
-           expect(binding('people')).toBe('people = [{\n  }]');
-         });
-
-         it('should create a "John" record when "add \'John\'" is clicked', function() {
-           element('.doc-example-live a:contains("add \'John\'")').click();
-           expect(binding('people')).toBe('people = [{\n  "name":"John",\n  "sex":"male"}]');
-         });
-
-         it('should create a "Mary" record when "add \'Mary\'" is clicked', function() {
-           element('.doc-example-live a:contains("add \'Mary\'")').click();
-           expect(binding('people')).toBe('people = [{\n  "name":"Mary",\n  "sex":"female"}]');
-         });
-
-         it('should delete a record when "X" is clicked', function() {
-            element('.doc-example-live a:contains("add empty")').click();
-            element('.doc-example-live li a:contains("X"):first').click();
-            expect(binding('people')).toBe('people = []');
-         });
-       </doc:scenario>
-     </doc:example>
-   */
-  'add':function(array, value) {
-    array.push(isUndefined(value)? {} : value);
-    return array;
-  },
-
-
-  /**
-   * @ngdoc function
-   * @name angular.Array.count
-   * @function
-   *
-   * @description
-   * Determines the number of elements in an array. Provides an option for counting only those
-   * elements for which a specified `condition` evaluates to `true`.
-   *
-   * Note: This function is used to augment the `Array` type in Angular expressions. See
-   * {@link angular.Array} for more information about Angular arrays.
-   *
-   * @param {Array} array The array containing the elements to be counted.
-   * @param {(function()|string)=} condition A function to be evaluated or
-   *     an Angular expression to be compiled and evaluated. The element being
-   *     iterated over is exposed to the `condition` as `this`.
-   * @returns {number} Number of elements in the array. If a `condition` is specified, returns
-   * the number of elements whose `condition` evaluates to `true`.
-   *
-   * @example
-     <doc:example>
-       <doc:source>
-         <pre ng:init="items = [{name:'knife', points:1},
-                                {name:'fork', points:3},
-                                {name:'spoon', points:1}]"></pre>
-         <ul>
-           <li ng:repeat="item in items">
-              {{item.name}}: points=
-              <input type="text" ng:model="item.points"/> <!-- id="item{{$index}} -->
-           </li>
-         </ul>
-         <p>Number of items which have one point: <em>{{ items.$count('points==1') }}</em></p>
-         <p>Number of items which have more than one point:
-         <em>{{items.$count('points&gt;1')}}</em></p>
-       </doc:source>
-       <doc:scenario>
-         it('should calculate counts', function() {
-           expect(binding('items.$count(\'points==1\')')).toEqual('2');
-           expect(binding('items.$count(\'points>1\')')).toEqual('1');
-         });
-
-         it('should recalculate when updated', function() {
-           using('.doc-example-live li:first-child').input('item.points').enter('23');
-           expect(binding('items.$count(\'points==1\')')).toEqual('1');
-           expect(binding('items.$count(\'points>1\')')).toEqual('2');
-         });
-       </doc:scenario>
-     </doc:example>
-   */
-  'count':function(array, condition) {
-    if (!condition) return array.length;
-    var fn = angularFunction.compile(condition), count = 0;
-    forEach(array, function(value){
-      if (fn(value)) {
-        count ++;
-      }
-    });
-    return count;
-  }
-};
-
-
-var angularString = {
-  'quote':function(string) {
-    return '"' + string.replace(/\\/g, '\\\\').
-                        replace(/"/g, '\\"').
-                        replace(/\n/g, '\\n').
-                        replace(/\f/g, '\\f').
-                        replace(/\r/g, '\\r').
-                        replace(/\t/g, '\\t').
-                        replace(/\v/g, '\\v') +
-             '"';
-  }
-};
-
-var angularDate = {
-  };
-
-var angularFunction = {
-  'compile': function(expression) {
-    if (isFunction(expression)){
-      return expression;
-    } else if (expression){
-      return expressionCompile(expression);
-    } else {
-     return identity;
-   }
-  }
-};
 
 /**
  * Computes a hash of an 'obj'.
@@ -543,19 +95,3 @@ HashQueueMap.prototype = {
     }
   }
 };
-
-function defineApi(dst, chain){
-  angular[dst] = angular[dst] || {};
-  forEach(chain, function(parent){
-    extend(angular[dst], parent);
-  });
-}
-defineApi('Global', [angularGlobal]);
-defineApi('Collection', [angularGlobal, angularCollection]);
-defineApi('Array', [angularGlobal, angularCollection, angularArray]);
-defineApi('Object', [angularGlobal, angularCollection, angularObject]);
-defineApi('String', [angularGlobal, angularString]);
-defineApi('Date', [angularGlobal, angularDate]);
-//IE bug
-angular.Date.toString = angularDate.toString;
-defineApi('Function', [angularGlobal, angularCollection, angularFunction]);
diff --git a/src/jqLite.js b/src/jqLite.js
index 3ed0888a..ec0d327e 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -523,7 +523,7 @@ forEach({
         removeEventListenerFn(element, type, bind[type]);
         delete bind[type];
       } else {
-        angularArray.remove(bind[type].fns, fn);
+        arrayRemove(bind[type].fns, fn);
       }
     }
   },
diff --git a/src/service/parse.js b/src/service/parse.js
index 36f6b715..432929b5 100644
--- a/src/service/parse.js
+++ b/src/service/parse.js
@@ -637,6 +637,7 @@ function setter(obj, path, setValue) {
  * @param {boolean=true} bindFnToScope
  * @returns value as accesbile by path
  */
+//TODO(misko): this function needs to be removed
 function getter(obj, path, bindFnToScope) {
   if (!path) return obj;
   var keys = path.split('.');
@@ -649,14 +650,6 @@ function getter(obj, path, bindFnToScope) {
     if (obj) {
       obj = (lastInstance = obj)[key];
     }
-    if (isUndefined(obj)  && key.charAt(0) == '$') {
-      var type = angularGlobal.typeOf(lastInstance);
-      type = angular[type.charAt(0).toUpperCase()+type.substring(1)];
-      var fn = type ? type[[key.substring(1)]] : _undefined;
-      if (fn) {
-        return obj = bind(lastInstance, fn, lastInstance);
-      }
-    }
   }
   if (!bindFnToScope && isFunction(obj)) {
     return bind(lastInstance, obj);
@@ -691,16 +684,6 @@ function getterFn(path) {
               ' fn.$unboundFn=s;\n' +
               ' s=fn;\n' +
             '}\n';
-    if (key.charAt(1) == '$') {
-      // special code for super-imposed functions
-      var name = key.substr(2);
-      code += 'if(!s) {\n' +
-              ' t = angular.Global.typeOf(l);\n' +
-              ' fn = (angular[t.charAt(0).toUpperCase() + t.substring(1)]||{})["' + name + '"];\n' +
-              ' if (fn) ' +
-                 's = function(){ return fn.apply(l, [l].concat(Array.prototype.slice.call(arguments, 0))); };\n' +
-              '}\n';
-    }
   });
   code += 'return s;';
   fn = Function('s', code);
@@ -729,14 +712,8 @@ function $ParseProvider() {
   }];
 }
 
-function noFilters(){
-  throw Error('Filters not supported!');
-}
 
 // This is a special access for JSON parser which bypasses the injector
 var parseJson = function(json) {
-  return parser(json, true, noFilters);
+  return parser(json, true);
 };
-
-// TODO(misko): temporary hack, until we get rid of the type augmentation
-var expressionCompile = new $ParseProvider().$get[1](noFilters);
diff --git a/src/service/scope.js b/src/service/scope.js
index ade2d82e..2f3efbd0 100644
--- a/src/service/scope.js
+++ b/src/service/scope.js
@@ -241,7 +241,7 @@ function $RootScopeProvider(){
         array.unshift(watcher);
 
         return function() {
-          angularArray.remove(array, watcher);
+          arrayRemove(array, watcher);
         };
       },
 
@@ -528,7 +528,7 @@ function $RootScopeProvider(){
         namedListeners.push(listener);
 
         return function() {
-          angularArray.remove(namedListeners, listener);
+          arrayRemove(namedListeners, listener);
         };
       },
 
@@ -641,9 +641,7 @@ function $RootScopeProvider(){
     return scope;
 
     function compileToFn(exp, name) {
-      var fn = isString(exp)
-        ? expressionCompile(exp)
-        : exp;
+      var fn = $parse(exp);
       assertArgFn(fn, name);
       return fn;
     }
diff --git a/src/widget/select.js b/src/widget/select.js
index c70b5ded..e66d4cba 100644
--- a/src/widget/select.js
+++ b/src/widget/select.js
@@ -131,7 +131,8 @@ angularWidget('select', function(element){
   this.directives(true);
   this.descend(true);
   return element.attr('ng:model') &&
-      ['$formFactory', '$compile', '$element', function($formFactory, $compile, selectElement){
+               ['$formFactory', '$compile', '$parse', '$element',
+        function($formFactory,   $compile,   $parse,   selectElement){
     var modelScope = this,
         match,
         form = $formFactory.forElement(selectElement),
@@ -224,12 +225,12 @@ angularWidget('select', function(element){
       }
 
       var widgetScope = this,
-          displayFn = expressionCompile(match[2] || match[1]),
+          displayFn = $parse(match[2] || match[1]),
           valueName = match[4] || match[6],
           keyName = match[5],
-          groupByFn = expressionCompile(match[3] || ''),
-          valueFn = expressionCompile(match[2] ? match[1] : valueName),
-          valuesFn = expressionCompile(match[7]),
+          groupByFn = $parse(match[3] || ''),
+          valueFn = $parse(match[2] ? match[1] : valueName),
+          valuesFn = $parse(match[7]),
           // we can't just jqLite('<option>') since jqLite is not smart enough
           // to create it in <select> and IE barfs otherwise.
           optionTemplate = jqLite(document.createElement('option')),
diff --git a/test/ApiSpecs.js b/test/ApiSpecs.js
index 0fa26e09..a0833fba 100644
--- a/test/ApiSpecs.js
+++ b/test/ApiSpecs.js
@@ -37,92 +37,5 @@ describe('api', function() {
       expect(map[hashKey('key')]).toEqual(undefined);
     });
   });
-
-
-  describe('Object', function() {
-    it('should return type of', function() {
-      assertEquals("undefined", angular.Object.typeOf(undefined));
-      assertEquals("null", angular.Object.typeOf(null));
-      assertEquals("object", angular.Collection.typeOf({}));
-      assertEquals("array", angular.Array.typeOf([]));
-      assertEquals("string", angular.Object.typeOf(""));
-      assertEquals("date", angular.Object.typeOf(new Date()));
-      assertEquals("element", angular.Object.typeOf(document.body));
-      assertEquals('function', angular.Object.typeOf(function() {}));
-    });
-
-    it('should extend object', function() {
-      assertEquals({a:1, b:2}, angular.Object.extend({a:1}, {b:2}));
-    });
-  });
-
-
-  it('should return size', function() {
-    assertEquals(0, angular.Collection.size({}));
-    assertEquals(1, angular.Collection.size({a:"b"}));
-    assertEquals(0, angular.Object.size({}));
-    assertEquals(1, angular.Array.size([0]));
-  });
-
-
-  describe('Array', function() {
-
-    describe('sum', function() {
-      it('should sum', function() {
-        assertEquals(3, angular.Array.sum([{a:"1"}, {a:"2"}], 'a'));
-      });
-
-      it('should sum containing NaN', function() {
-        assertEquals(1, angular.Array.sum([{a:1}, {a:Number.NaN}], 'a'));
-        assertEquals(1, angular.Array.sum([{a:1}, {a:Number.NaN}], function($) {return $.a;}));
-      });
-    });
-
-
-    it('should find indexOf', function() {
-      assertEquals(angular.Array.indexOf(['a'], 'a'), 0);
-      assertEquals(angular.Array.indexOf(['a', 'b'], 'a'), 0);
-      assertEquals(angular.Array.indexOf(['b', 'a'], 'a'), 1);
-      assertEquals(angular.Array.indexOf(['b', 'b'],'x'), -1);
-    });
-
-    it('should remove item from array', function() {
-      var items = ['a', 'b', 'c'];
-      assertEquals(angular.Array.remove(items, 'q'), 'q');
-      assertEquals(items.length, 3);
-
-      assertEquals(angular.Array.remove(items, 'b'), 'b');
-      assertEquals(items.length, 2);
-
-      assertEquals(angular.Array.remove(items, 'a'), 'a');
-      assertEquals(items.length, 1);
-
-      assertEquals(angular.Array.remove(items, 'c'), 'c');
-      assertEquals(items.length, 0);
-
-      assertEquals(angular.Array.remove(items, 'q'), 'q');
-      assertEquals(items.length, 0);
-    });
-
-
-
-    it('add', function() {
-      var add = angular.Array.add;
-      assertJsonEquals([{}, "a"], add(add([]),"a"));
-    });
-
-    it('count', function() {
-      var array = [{name:'a'},{name:'b'},{name:''}];
-      var obj = {};
-
-      assertEquals(3, angular.Array.count(array));
-      assertEquals(2, angular.Array.count(array, 'name'));
-      assertEquals(1, angular.Array.count(array, 'name=="a"'));
-    });
-
-
-
-  });
-
 });
 
diff --git a/test/matchers.js b/test/matchers.js
index fe5792a9..9923bd7e 100644
--- a/test/matchers.js
+++ b/test/matchers.js
@@ -83,7 +83,7 @@ beforeEach(function() {
 
 
     toBeOneOf: function() {
-      return angular.Array.indexOf(arguments, this.actual) !== -1;
+      return indexOf(arguments, this.actual) !== -1;
     }
   });
 });
-- 
cgit v1.2.3