Update docs

Author: simonexmachina

.travis.yml

@@ -10,10 +10,10 @@ cache:
     - node_modules
 
 env:
-  - EMBER_TRY_SCENARIO=default
+#  - EMBER_TRY_SCENARIO=default
   - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
+#  - EMBER_TRY_SCENARIO=ember-beta
+#  - EMBER_TRY_SCENARIO=ember-canary
 
 matrix:
   fast_finish: true

CHANGELOG.md

@@ -4,8 +4,10 @@
 
 - The `notify` property is no longer injected into routes and controllers by default. You should now 
   use `notify: Ember.inject.service()`
+- The `Notify` helper exported from the `ember-notify` package can no longer be used to send messages - 
+  you need to use the service
 - The property names have changed from `message` and `raw` to `text` and `html`
-- The `Notify.*` helper methods (`info`, `success`, `warning`, `alert` and `error`) no longer return 
+- The `info`, `success`, `warning`, `alert` and `error` methods no longer return 
   a Promise, they return a `Message` instance
 
 

README.md

@@ -12,21 +12,25 @@ The CSS animations are inspired by CSS from [alertify.js](http://fabien-d.github
 
 ## Usage
 
-1. Add `{{ember-notify}}` to one of your templates, usually in `application.hbs`.
-2. Use `this.notify` in routes or controllers to display messages: 
+1. Add `{{ember-notify}}` to one of your templates, usually in `application.hbs`
+2. Inject the `notify` service
+3. Display messages using the `info`, `success`, `warning`, `alert` and `error` methods
+ 
+### Examples
 
 ```js
-this.notify.info('Hello there!');
-this.notify.alert('This is an alert.');
-this.notify.success('It worked.');
-this.notify.warning('Hmmn, that didn\'t work out.');
-```
-
-If you're not in a route or a controller you can use the `Notify` helper: 
-
-```js
-import Notify from 'ember-notify';
-Notify.info('Peace.');
+import {
+  Component,
+  inject
+} from 'ember';
+export default Component.extend({
+  notify: inject.service('notify'),
+  actions: {
+    sayHello() {
+      this.get('notify').info('Hello there!');
+    }
+  }
+});
 ```
 
 By default the notifications close after 2.5 seconds, although you can control this in your template:
@@ -38,40 +42,44 @@ By default the notifications close after 2.5 seconds, although you can control t
 Or you can control when each message is closed:
 
 ```js
-var message = Notify.alert('You can control how long it\'s displayed', {
+var notify = this.get('notify');
+var message = notify.alert('You can control how long it\'s displayed', {
   closeAfter: 10000 // or set to null to disable auto-hiding
 });
-message.set('visible', false); // and you can hide messages programatically.
+```
+
+...and you can hide messages programatically:
+
+```js
+message.set('visible', false);
 ```
 
 You can specify raw HTML:
 
 ```js
-Notify.info({html: '<div class="my-div">Hooray!</div>'});
+notify.info({html: '<div class="my-div">Hooray!</div>'});
 ```
 
 Rounded corners, if that's your thing:
 
 ```js
-Notify.alert('This one\'s got rounded corners.', {
+notify.alert('This one\'s got rounded corners.', {
   radius: true
 });
 ```
 
 ### Multiple Containers
 
 If you want to have separate notifications and control where they're inserted into the DOM you can 
-have multiple `{{ember-notify}}` components, but only one of them can be accessed using the `Notify` helper. The others you will need to provide a `source` property.
-
-Secondary containers should be used as follows:
+have multiple `{{ember-notify}}` components, but only one of them can be accessed using the injected service.
+The others you will need to provide a `source` property, so secondary containers should be used as follows:
 
 ```hbs
 {{ember-notify source=someProperty}} 
 ```
 
 ```js
-// in your controller
-export default Ember.Controller.extend({
+export default Ember.Component.extend({
   someProperty: Notify.property(), // or this.set('someProperty', Notify.create())
   actions: {
     clicked: function() {
@@ -83,7 +91,7 @@ export default Ember.Controller.extend({
 
 ## Installation
 
-This module is an ember-cli addon, so all you need to do is:
+This module is an ember-cli addon, so installation is easy as pie.
 
 ```sh
 npm install ember-notify --save-dev

config/ember-try.js

@@ -1,9 +1,6 @@
+/* jshint node:true */
 module.exports = {
   scenarios: [
-    //{
-    //  name: 'default',
-    //  dependencies: { }
-    //},
     {
       name: 'ember-release',
       dependencies: {
@@ -13,23 +10,23 @@ module.exports = {
         'ember': 'release'
       }
     },
-    //{
-    //  name: 'ember-beta',
-    //  dependencies: {
-    //    'ember': 'components/ember#beta'
-    //  },
-    //  resolutions: {
-    //    'ember': 'beta'
-    //  }
-    //},
-    //{
-    //  name: 'ember-canary',
-    //  dependencies: {
-    //    'ember': 'components/ember#canary'
-    //  },
-    //  resolutions: {
-    //    'ember': 'canary'
-    //  }
-    //}
+    {
+      name: 'ember-beta',
+      dependencies: {
+        'ember': 'components/ember#beta'
+      },
+      resolutions: {
+        'ember': 'beta'
+      }
+    },
+    {
+      name: 'ember-canary',
+      dependencies: {
+        'ember': 'components/ember#canary'
+      },
+      resolutions: {
+        'ember': 'canary'
+      }
+    }
   ]
 };