Tests passing in 1.13.3

Author: simonexmachina

Brocfile.js

@@ -1,5 +1,14 @@
 # Changelog
 
+## v4.0
+
+- The `notify` property is no longer injected into routes and controllers by default. You should now 
+  use `notify: Ember.inject.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 
+  a Promise, they return a `Message` instance
+
+
 ## v3.0
 
 v3.0 uses a component + helper architecture that removes several hacks in previous versions.
@@ -9,4 +18,4 @@ v3.0 uses a component + helper architecture that removes several hacks in previo
 - ember-cli is now required for v3.0. Projects that don't use ember-cli will need to stay on the v2.0 branch
 - You now need to add `{{ember-notify}}` to one of your templates, usually in `application.hbs`
 - Bootstrap styling is now selected using the `messageStyle` property on the component: `{{ember-notify messageStyle='bootstrap'}}`
-- If you're using `message.send('close')`, this will need to be changed to `message.set('visible', false)` 
+- If you were using `message.send('close')`, this will need to be changed to `message.set('visible', false)` 

CHANGELOG.md

@@ -41,15 +41,13 @@ Or you can control when each message is closed:
 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 programmatically.
+message.set('visible', false); // and you can hide messages programatically.
 ```
 
-The Notify methods (`info`, `success`, `warning`, `alert` and `error`) all return a Promise for an instance of `Message`. You can use this object to change the `message` property, or to programatically hide the message by setting `visible` to `false`.
-
 You can specify raw HTML:
 
 ```js
-Notify.info({raw: '<div class="my-div">Hooray!</div>'});
+Notify.info({html: '<div class="my-div">Hooray!</div>'});
 ```
 
 Rounded corners, if that's your thing:

README.md

@@ -16,7 +16,7 @@ export default Ember.Component.extend({
   init: function() {
     this._super();
     this.set('messages', Ember.A());
-    this.set('source.target', this);
+    this.get('source').setTarget(this);
 
     var style = this.get('messageStyle'), theme;
     switch (style) {
@@ -37,7 +37,7 @@ export default Ember.Component.extend({
     this.set('theme', theme);
   },
   willDestroyElement: function() {
-    this.set('source.target', null);
+    this.get('source').setTarget(null);
   },
   show: function(message) {
     if (this.get('isDestroyed')) return;
@@ -67,15 +67,15 @@ export var FoundationTheme = Theme.extend({
 export var BootstrapTheme = Theme.extend({
   classNamesFor(message) {
     var type = message.get('type');
-    var classNames = ['alert', type];
-    if (type === 'alert' || type === 'error') classNames.push('danger');
+    if (type === 'alert' || type === 'error') type = 'danger';
+    var classNames = ['alert', `alert-${type}`];
     return classNames.join(' ');
   }
 });
 
 export var RefillsTheme = Theme.extend({
-  typeCss: Ember.computed('type', function() {
-    var type = this.get('message.type');
+  classNamesFor(message) {
+    var type = message.get('type');
     var typeMapping = {
       success: 'success',
       alert: 'error',
@@ -84,5 +84,5 @@ export var RefillsTheme = Theme.extend({
       warning: 'alert'
     };
     return 'flash-' + typeMapping[type];
-  })
+  }
 });

addon/components/ember-notify.js

@@ -17,6 +17,11 @@ export default Ember.Component.extend({
 
   init: function() {
     this._super();
+    // indicate that the message is now being displayed
+    if (this.get('message.visible') === undefined) {
+      // should really be in didInsertElement but Glimmer doesn't allow this
+      this.set('message.visible', true);
+    }
     this.run = Runner.create({
       // disable all the scheduling in tests
       disabled: Ember.testing && !Notify.testing
@@ -48,9 +53,8 @@ export default Ember.Component.extend({
 
   actions: {
     close: function() {
-      if (!this.get('message.visible')) {
-        return;
-      }
+      if (this.get('message.closed')) return;
+      this.set('message.closed', true);
       this.set('message.visible', false);
       var removeAfter = this.get('message.removeAfter') || this.constructor.removeAfter;
       if (removeAfter) {
@@ -60,10 +64,10 @@ export default Ember.Component.extend({
         remove();
       }
       function remove() {
-        /* debug */ return;
         var parentView = this.get('parentView');
-        if (this.get('isDestroyed') || !parentView) return;
+        if (this.get('isDestroyed') || !parentView || !parentView.get('messages')) return;
         parentView.get('messages').removeObject(this.get('message'));
+        this.set('message.visible', null);
       }
     }
   }

addon/components/ember-notify/message.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import computed from 'ember-new-computed';
+import Message from './message';
 
 function aliasToShow(type) {
   return function(message, options) {
@@ -15,93 +15,46 @@ var Notify = Ember.Service.extend({
   alert: aliasToShow('alert'),
   error: aliasToShow('error'),
 
-  init: function() {
+  init() {
     this.pending = [];
   },
 
-  show: function(type, message, options) {
-    if (typeof message === 'object') {
-      options = message;
-      message = null;
+  show(type, text, options) {
+    if (typeof text === 'object') {
+      options = text;
+      text = null;
     }
-    message = Ember.merge({
-      message: message,
+    var message = Message.create(Ember.merge({
+      text: text,
       type: type
-    }, options);
+    }, options));
     var target = this.get('target');
-    var promise;
     if (target) {
-      var messageObj = target.show(message);
-      promise = Ember.RSVP.resolve(messageObj);
+      target.show(message);
     }
     else {
-      promise = new Ember.RSVP.Promise(resolve => this.pending.push({
-        message: message,
-        resolve: resolve
-      }));
+      this.pending.push(message);
     }
-    return MessagePromise.create({
-      message: message,
-      promise: promise
-    });
-  },
-
-  create: function(component) {
-    return Notify.create({
-      target: component
-    });
+    return message;
   },
 
-  showPending: Ember.observer('target', function() {
-    var target = this.get('target');
+  setTarget(target) {
+    this.set('target', target);
     if (target) {
-      this.pending.map(function(pending) {
-        var messageObj = target.show(pending.message);
-        pending.resolve(messageObj);
-      });
+      this.pending.map(message => target.show(message));
       this.pending = [];
     }
-  })
+  }
 
 }).reopenClass({
   // set to true to disable testing optimizations that are enabled when Ember.testing is true
   testing: false
 });
 
-export default Notify.extend({
-  property: function() {
+export default Notify.reopenClass({
+  property() {
     return Ember.computed(function() {
       return Notify.create();
     });
-  },
-  create: function() {
-    return Notify.create();
-  },
-  target: computed({
-    get() {
-      return this._target;
-    },
-    set(key, val) {
-      Ember.assert("Only one {{ember-notify}} should be used without a source property. " +
-        "If you want more than one then use {{ember-notify source=someProperty}}",
-        !this._primary || this._primary.get('isDestroyed')
-      );
-      this._target = val;
-      return this._target;
-    }
-  })
-
-});
-
-var MessagePromise = Ember.ObjectProxy.extend(Ember.PromiseProxyMixin, {
-  set: function(key, val) {
-    // if the message hasn't been displayed then set the value on the message hash
-    if (!this.get('content')) {
-      this.message[key] = val;
-      return this;
-    }
-    else {
-      return this._super(key, val);
-    }
   }
 });

addon/index.js

@@ -1,10 +1,10 @@
 import Ember from 'ember';
 
 export default Ember.Object.extend({
-  message: null,
-  raw: '',
+  text: null,
+  html: '',
   type: 'info',
   closeAfter: undefined,
-  visible: true,
+  visible: undefined,
   classNames: []
 });

addon/message.js

@@ -1,3 +1,4 @@
 {{#each messages as |message|}}
-  {{ember-notify/message message=message theme=theme closeAfter=closeAfter class='ember-notify clearfix'}}
+  {{ember-notify/message
+      message=message theme=theme closeAfter=closeAfter class='ember-notify clearfix'}}
 {{/each}}

addon/templates/components/ember-notify.hbs

@@ -1,2 +1,2 @@
 <a {{action 'close'}} class='close'>&times;</a>
-<span class='message'>{{message.message}}{{{message.raw}}}</span>
+<span class='message'>{{message.text}}{{{message.html}}}</span>

addon/templates/components/ember-notify/message.hbs

@@ -1,15 +1,13 @@
 {
   "name": "ember-notify",
   "dependencies": {
-    "ember": "components/ember#beta",
+    "ember": "1.13.3",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-mocha": "~0.4.0",
+    "ember-mocha": "~0.8.0",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
     "ember-resolver": "~0.1.18",
-    "jquery": "^1.11.1"
-  },
-  "resolutions": {
-    "ember": "beta"
+    "jquery": "^1.11.1",
+    "loader.js": "ember-cli/loader.js#3.2.0"
   }
 }

bower.json

@@ -1,17 +1,7 @@
-/* global require, module */
-var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+/* jshint node: true */
+var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberApp(defaults, {
-    // Add options here
-  });
-
-  /*
-    This build file specifes the options for the dummy test app of this
-    addon, located in `/tests/dummy`
-    This build file does *not* influence how the addon or the app using it
-    behave. You most likely want to be modifying `./index.js` or app's build file
-  */
-
+  var app = new EmberAddon(defaults, {});
   return app.toTree();
 };

ember-cli-build.js

@@ -19,20 +19,19 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "1.13.1",
+    "ember-cli": "1.13.6",
     "ember-cli-app-version": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
     "ember-cli-htmlbars-inline-precompile": "^0.1.1",
     "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-mocha": "^0.4.0",
+    "ember-cli-mocha": "0.9.1",
     "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",
     "ember-devtools": "^3.2.0",
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-new-computed": "1.0.0",
     "ember-try": "0.0.6",
     "object-assign": "^2.0.0"
   },