[FEATURE services] Initial feature

features.json

@@ -8,7 +8,8 @@
     "ember-runtime-test-friendly-promises": true,
     "ember-routing-add-model-option": true,
     "ember-routing-linkto-target-attribute": null,
-    "ember-routing-will-change-hooks": null
+    "ember-routing-will-change-hooks": null,
+    "services": null
   },
   "debugStatements": [
     "Ember.warn",

packages_es6/ember-application/lib/ext/controller.js

@@ -60,6 +60,29 @@ var defaultControllersComputedProperty = computed(function() {
   };
 });
 
+if (Ember.FEATURES.isEnabled('services')) {
+  var defaultServicesComputedProperty = computed(function() {
+    var controller = this;
+
+    return {
+      container: get(controller, 'container'),
+      unknownProperty: function(serviceName) {
+        var service = this.container.lookup('service:' + serviceName);
+
+        if (!service) {
+          var errorMessage = "The " + serviceName + " service was accessed from the " + inspect(controller) + " controller, but no service with that name was found.";
+          throw new ReferenceError(errorMessage);
+        }
+
+        return service;
+      },
+      setUnknownProperty: function (key, value) {
+        throw new Error("You cannot overwrite the value of `services." + key + "` of " + inspect(controller));
+      }
+    };
+  });
+}
+
 /**
   @class ControllerMixin
   @namespace Ember
@@ -166,7 +189,24 @@ ControllerMixin.reopen({
     @property {Object} controllers
     @default null
   */
-  controllers: defaultControllersComputedProperty
+  controllers: defaultControllersComputedProperty,
+
+  /**
+   Stores instances of services available for this controller to use.
+   Controllers have access to all services defined in the application.
+   Services provide model information to routes and controllers.
+
+   ```javascript
+   App.NearbyTweetsController = Ember.ArrayController.extend({
+     currentLatitude: function() {
+       return this.get('services.geolocation.location.latitude');
+     }.property('services.geolocation.location')
+   });
+   ```
+
+   @property {Object} services
+ */
+  services: defaultServicesComputedProperty
 });
 
 export default ControllerMixin;

packages_es6/ember-application/lib/ext/route.js

@@ -0,0 +1,59 @@
+/**
+@module ember
+@submodule ember-application
+*/
+
+import Ember from "ember-metal/core"; // Ember.assert
+import Route from "ember-routing/system/route";
+
+import { get } from "ember-metal/property_get";
+import { set } from "ember-metal/property_set";
+import { inspect } from "ember-metal/utils";
+import { computed } from "ember-metal/computed";
+
+if (Ember.FEATURES.isEnabled('services')) {
+  var defaultServicesComputedProperty = computed(function() {
+    var route = this;
+
+    return {
+      container: get(route, 'container'),
+      unknownProperty: function(serviceName) {
+        var service = this.container.lookup('service:' + serviceName);
+
+        if (!service) {
+          var errorMessage = "The " + serviceName + " service was accessed from the " + inspect(route) + " route, but no service with that name was found.";
+          throw new ReferenceError(errorMessage);
+        }
+
+        return service;
+      },
+      setUnknownProperty: function (key, value) {
+        throw new Error("You cannot overwrite the value of `services." + key + "` of " + inspect(route));
+      }
+    };
+  });
+
+  Route.reopen({
+    /**
+     Stores instances of services available for this route to use.
+     Routes have access to all services defined in the application.
+     Services provide model information to routes and controllers.
+
+     ```javascript
+     App.NearbyTweetsRoute = Ember.Route.extend({
+       model: function() {
+         var geolocation = this.get('services.geolocation'),
+             twitter = this.get('services.twitter');
+
+         return geolocation.currentLocation().then(function(lat, lng) {
+           return twitter.findNearbyTweets(lat, lng);
+         };
+       }
+     });
+     ```
+
+     @property {Object} services
+   */
+    services: defaultServicesComputedProperty
+  });
+}

packages_es6/ember-application/tests/system/controller_test.js

@@ -1,6 +1,7 @@
 /*jshint newcap:false */
 
 import { Controller } from "ember-runtime/controllers/controller";
+import Service from "ember-runtime/system/service";
 import "ember-application/ext/controller";
 
 import Container from "ember-runtime/system/container";
@@ -153,3 +154,38 @@ test("can unit test controllers with `needs` dependencies by stubbing their `con
   equal(broController.get('foo'), 5, "`needs` dependencies can be stubbed");
 });
 
+if (Ember.FEATURES.isEnabled('services')) {
+  test("controllers have access to services", function() {
+    expect(2);
+
+    var container = new Container();
+
+    container.register('controller:post', Controller.extend());
+    container.register('service:geolocation', Service.extend());
+
+    var postController = container.lookup('controller:post'),
+        geolocationService = container.lookup('service:geolocation');
+
+    equal(geolocationService, postController.get('services.geolocation'), "registered service is available");
+
+    raises(function() {
+      postController.get('services.nonexistent');
+    }, ReferenceError, "accessing a non-existent service raises an error");
+  });
+
+  test("can unit test controllers with services dependencies by stubbing their `services` property", function() {
+    expect(1);
+
+    var BrotherController = Controller.extend({
+      foo: computed.alias('services.sister.foo')
+    });
+
+    var broController = BrotherController.create({
+      services: {
+        sister: { foo: 5 }
+      }
+    });
+
+    equal(broController.get('foo'), 5, "services can be stubbed");
+});
+}

packages_es6/ember-application/tests/system/route_test.js

@@ -0,0 +1,44 @@
+import "ember-application/ext/route";
+
+import Route from "ember-routing/system/route";
+import Service from "ember-runtime/system/service";
+
+import Container from "ember-runtime/system/container";
+
+import { computed } from "ember-metal/computed";
+
+if (Ember.FEATURES.isEnabled('services')) {
+  test("routes have access to services", function() {
+    expect(2);
+
+    var container = new Container();
+
+    container.register('route:post', Route.extend());
+    container.register('service:geolocation', Service.extend());
+
+    var postRoute = container.lookup('route:post'),
+        geolocationService = container.lookup('service:geolocation');
+
+    equal(geolocationService, postRoute.get('services.geolocation'), "registered service is available");
+
+    raises(function() {
+      postRoute.get('services.nonexistent');
+    }, ReferenceError, "accessing a non-existent service raises an error");
+  });
+
+  test("can unit test routes with services dependencies by stubbing their `services` property", function() {
+    expect(1);
+
+    var BrotherRoute = Route.extend({
+      foo: computed.alias('services.sister.foo')
+    });
+
+    var broRoute = BrotherRoute.create({
+      services: {
+        sister: { foo: 5 }
+      }
+    });
+
+    equal(broRoute.get('foo'), 5, "services can be stubbed");
+  });
+}

packages_es6/ember-runtime/lib/main.js

@@ -76,6 +76,8 @@ import {
   ControllerMixin
 } from "ember-runtime/controllers/controller";
 
+import Service from "ember-runtime/system/service";
+
 import RSVP from "ember-runtime/ext/rsvp";     // just for side effect of extending Ember.RSVP
 import "ember-runtime/ext/string";   // just for side effect of extending String.prototype
 import "ember-runtime/ext/function"; // just for side effect of extending Function.prototype
@@ -158,6 +160,10 @@ Ember.ObjectController = ObjectController;
 Ember.Controller = Controller;
 Ember.ControllerMixin = ControllerMixin;
 
+if (Ember.FEATURES.isEnabled('services')) {
+  Ember.Service = Service;
+}
+
 Ember.RSVP = RSVP;
 // END EXPORTS
 

packages_es6/ember-runtime/lib/system/service.js

@@ -0,0 +1,9 @@
+import Object from "ember-runtime/system/object";
+
+var Service;
+
+if (Ember.FEATURES.isEnabled('services')) {
+  Service = Object.extend();
+}
+
+export default Service;