rebased against upstream/master

Gruntfile.js

@@ -97,6 +97,12 @@ module.exports = function (grunt) {
       background: {
           background: true,
           browsers: [ grunt.option('browser') || 'PhantomJS' ]
+      },
+      watch: {
+        configFile: 'config/karma.js',
+        singleRun: false,
+        autoWatch: true,
+        autoWatchInterval: 1
       }
     },
     changelog: {

files.js

@@ -4,6 +4,7 @@ routerFiles = {
     'src/resolve.js',
     'src/templateFactory.js',
     'src/urlMatcherFactory.js',
+    'src/transition.js',
     'src/urlRouter.js',
     'src/state.js',
     'src/view.js',
@@ -16,6 +17,10 @@ routerFiles = {
     'test/testUtils.js'
   ],
   test: [
+    // 'test/stateSpec.js',
+    // 'test/resolveSpec.js',
+    // 'test/urlMatcherFactorySpec.js',
+    // 'test/urlRouterSpec.js',
     'test/*Spec.js',
     'test/compat/matchers.js'
   ],

sample/app/app.js

@@ -22,8 +22,20 @@ angular.module('uiRouterSample', [
 )
 
 .config(
-  [          '$stateProvider', '$urlRouterProvider',
-    function ($stateProvider,   $urlRouterProvider) {
+  [          '$stateProvider', '$urlRouterProvider', '$urlMatcherFactoryProvider',
+    function ($stateProvider,   $urlRouterProvider,   $urlMatcherFactoryProvider) {
+
+      $urlMatcherFactoryProvider.type('contact', ['contacts', function(contacts) {
+        return {
+          encode: function(contact) {
+            return contact.id;
+          },
+          decode: function(id) {
+            return contacts.get(id);
+          },
+          pattern: /[0-9]{1,4}/
+        };
+      }]);
 
       /////////////////////////////
       // Redirects and Otherwise //
@@ -34,8 +46,8 @@ angular.module('uiRouterSample', [
 
         // The `when` method says if the url is ever the 1st param, then redirect to the 2nd param
         // Here we are just setting up some convenience urls.
-        .when('/c?id', '/contacts/:id')
-        .when('/user/:id', '/contacts/:id')
+        // .when('/c?id', '/contacts/:id')
+        // .when('/user/:id', '/contacts/:id')
 
         // If the url is ever invalid, e.g. '/asdf', then redirect to '/' aka the home state
         .otherwise('/');

sample/app/contacts/contacts.js

@@ -5,6 +5,7 @@ angular.module('uiRouterSample.contacts', [
 .config(
   [          '$stateProvider', '$urlRouterProvider',
     function ($stateProvider,   $urlRouterProvider) {
+
       $stateProvider
         //////////////
         // Contacts //
@@ -95,7 +96,7 @@ angular.module('uiRouterSample.contacts', [
           // So its url will end up being '/contacts/{contactId:[0-9]{1,8}}'. When the
           // url becomes something like '/contacts/42' then this state becomes active
           // and the $stateParams object becomes { contactId: 42 }.
-          url: '/{contactId:[0-9]{1,4}}',
+          url: '/{contact:contact}',
 
           // If there is more than a single ui-view in the parent template, or you would
           // like to target a ui-view from even higher up the state tree, you can use the
@@ -113,7 +114,7 @@ angular.module('uiRouterSample.contacts', [
               templateUrl: 'app/contacts/contacts.detail.html',
               controller: ['$scope', '$stateParams', 'utils',
                 function (  $scope,   $stateParams,   utils) {
-                  $scope.contact = utils.findById($scope.contacts, $stateParams.contactId);
+                  $scope.contact = $stateParams.contact
                 }]
             },
 

src/common.js

@@ -142,10 +142,74 @@ function filterByKeys(keys, values) {
   var filtered = {};
 
   forEach(keys, function (name) {
-    filtered[name] = values[name];
+    if (isDefined(values[name])) filtered[name] = values[name];
   });
   return filtered;
 }
+
+// like _.indexBy
+// when you know that your index values will be unique, or you want last-one-in to win
+function indexBy(array, propName) {
+  var result = {};
+  forEach(array, function(item) {
+    result[item[propName]] = item;
+  });
+  return result;
+}
+
+// extracted from underscore.js
+// Return a copy of the object only containing the whitelisted properties.
+function pick(obj) {
+  var copy = {};
+  var keys = Array.prototype.concat.apply(Array.prototype, Array.prototype.slice.call(arguments, 1));
+  forEach(keys, function(key) {
+    if (key in obj) copy[key] = obj[key];
+  });
+  return copy;
+}
+
+// extracted from underscore.js
+// Return a copy of the object omitting the blacklisted properties.
+function omit(obj) {
+  var copy = {};
+  var keys = Array.prototype.concat.apply(Array.prototype, Array.prototype.slice.call(arguments, 1));
+  for (var key in obj) {
+    if (keys.indexOf(key) == -1) copy[key] = obj[key];
+  }
+  return copy;
+}
+
+function pluck(collection, key) {
+  var result = isArray(collection) ? [] : {};
+
+  forEach(collection, function(val, i) {
+    result[i] = isFunction(key) ? key(val) : val[key];
+  });
+  return result;
+}
+
+function map(collection, callback) {
+  var result = isArray(collection) ? [] : {};
+
+  forEach(collection, function(val, i) {
+    result[i] = callback(val, i);
+  });
+  return result;
+}
+
+function flattenPrototypeChain(obj) {
+  var objs = [];
+  do {
+    objs.push(obj);
+  } while ((obj = Object.getPrototypeOf(obj)));
+  objs.reverse();
+
+  var result = {};
+  forEach(objs, function(obj) {
+    extend(result, obj);
+  });
+  return result;
+}
 /**
  * @ngdoc overview
  * @name ui.router.util