Merge pull request #1585 from klaaspieter/consistent-boolean-naming

Rename empty to isEmpty and none to isNone

packages/ember-handlebars/lib/helpers/binding.js

@@ -204,7 +204,7 @@ EmberHandlebars.registerHelper('bind', function(property, options) {
   }
 
   return bind.call(context, property, options, false, function(result) {
-    return !Ember.none(result);
+    return !Ember.isNone(result);
   });
 });
 
@@ -275,7 +275,7 @@ EmberHandlebars.registerHelper('with', function(context, options) {
     }
 
     return bind.call(this, path, options, true, function(result) {
-      return !Ember.none(result);
+      return !Ember.isNone(result);
     });
   } else {
     Ember.assert("You must pass exactly one argument to the with helper", arguments.length === 2);

packages/ember-routing/lib/routable.js

@@ -336,7 +336,7 @@ Ember.Routable = Ember.Mixin.create({
   serialize: function(manager, context) {
     var modelClass, routeMatcher, namespace, param, id;
 
-    if (Ember.empty(context)) { return ''; }
+    if (Ember.isEmpty(context)) { return ''; }
 
     if (modelClass = this.modelClassFor(get(manager, 'namespace'))) {
       param = paramForClass(modelClass);

packages/ember-runtime/lib/core.js

@@ -88,48 +88,50 @@ Ember.typeOf = function(item) {
   confusing.
 
   ```javascript
-  Ember.none();              // true
-  Ember.none(null);          // true
-  Ember.none(undefined);     // true
-  Ember.none('');            // false
-  Ember.none([]);            // false
-  Ember.none(function(){});  // false
+  Ember.isNone();              // true
+  Ember.isNone(null);          // true
+  Ember.isNone(undefined);     // true
+  Ember.isNone('');            // false
+  Ember.isNone([]);            // false
+  Ember.isNone(function(){});  // false
   ```
 
-  @method none
+  @method isNone
   @for Ember
   @param {Object} obj Value to test
   @return {Boolean}
 */
-Ember.none = function(obj) {
+Ember.isNone = function(obj) {
   return obj === null || obj === undefined;
 };
+Ember.none = Ember.deprecateFunc("Ember.none is deprecated. Please use Ember.isNone instead.", Ember.isNone);
 
 /**
   Verifies that a value is `null` or an empty string, empty array,
   or empty function.
 
-  Constrains the rules on `Ember.none` by returning false for empty
+  Constrains the rules on `Ember.isNone` by returning false for empty
   string and empty arrays.
 
   ```javascript
-  Ember.empty();                // true
-  Ember.empty(null);            // true
-  Ember.empty(undefined);       // true
-  Ember.empty('');              // true
-  Ember.empty([]);              // true
-  Ember.empty('Adam Hawkins');  // false
-  Ember.empty([0,1,2]);         // false
+  Ember.isEmpty();                // true
+  Ember.isEmpty(null);            // true
+  Ember.isEmpty(undefined);       // true
+  Ember.isEmpty('');              // true
+  Ember.isEmpty([]);              // true
+  Ember.isEmpty('Adam Hawkins');  // false
+  Ember.isEmpty([0,1,2]);         // false
   ```
 
-  @method empty
+  @method isEmpty
   @for Ember
   @param {Object} obj Value to test
   @return {Boolean}
 */
-Ember.empty = function(obj) {
+Ember.isEmpty = function(obj) {
   return obj === null || obj === undefined || (obj.length === 0 && typeof obj !== 'function') || (typeof obj === 'object' && Ember.get(obj, 'length') === 0);
 };
+Ember.empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", Ember.isEmpty) ;
 
 /**
  This will compare two javascript values of possibly different types.

packages/ember-runtime/lib/system/set.js

@@ -9,7 +9,7 @@ require('ember-runtime/mixins/freezable');
 @submodule ember-runtime
 */
 
-var get = Ember.get, set = Ember.set, guidFor = Ember.guidFor, none = Ember.none;
+var get = Ember.get, set = Ember.set, guidFor = Ember.guidFor, none = Ember.isNone;
 
 /**
   An unordered collection of objects.

packages/ember-runtime/tests/core/isEmpty_test.js

@@ -0,0 +1,20 @@
+module("Ember.isEmpty");
+
+test("Ember.isEmpty", function() {
+  var string = "string", fn = function() {},
+      object = {length: 0},
+      arrayProxy = Ember.ArrayProxy.create({ content: Ember.A([]) });
+
+  equal(true,  Ember.isEmpty(null),      "for null");
+  equal(true,  Ember.isEmpty(undefined), "for undefined");
+  equal(true,  Ember.isEmpty(""),        "for an empty String");
+  equal(false, Ember.isEmpty(true),      "for true");
+  equal(false, Ember.isEmpty(false),     "for false");
+  equal(false, Ember.isEmpty(string),    "for a String");
+  equal(false, Ember.isEmpty(fn),        "for a Function");
+  equal(false, Ember.isEmpty(0),         "for 0");
+  equal(true,  Ember.isEmpty([]),        "for an empty Array");
+  equal(false, Ember.isEmpty({}),        "for an empty Object");
+  equal(true,  Ember.isEmpty(object),     "for an Object that has zero 'length'");
+  equal(true,  Ember.isEmpty(arrayProxy), "for an ArrayProxy that has empty content");
+});

packages/ember-runtime/tests/core/isNone_test.js

@@ -0,0 +1,16 @@
+module("Ember.isNone");
+
+test("Ember.isNone", function() {
+  var string = "string", fn = function() {};
+
+  equal(true,  Ember.isNone(null),      "for null");
+  equal(true,  Ember.isNone(undefined), "for undefined");
+  equal(false, Ember.isNone(""),        "for an empty String");
+  equal(false, Ember.isNone(true),      "for true");
+  equal(false, Ember.isNone(false),     "for false");
+  equal(false, Ember.isNone(string),    "for a String");
+  equal(false, Ember.isNone(fn),        "for a Function");
+  equal(false, Ember.isNone(0),         "for 0");
+  equal(false, Ember.isNone([]),        "for an empty Array");
+  equal(false, Ember.isNone({}),        "for an empty Object");
+});

packages/ember-runtime/tests/legacy_1x/system/set_test.js

@@ -290,7 +290,7 @@ module("Ember.Set.pop + Ember.Set.copy", {
 test("the pop() should remove an arbitrary object from the set", function() {
   var oldLength = set.length ;
   var obj = set.pop();
-  ok(!Ember.none(obj), 'pops up an item');
+  ok(!Ember.isNone(obj), 'pops up an item');
   equal(set.length, oldLength-1, 'length shorter by 1');
 });
 

packages/ember-states/lib/state_manager.js

@@ -830,7 +830,7 @@ Ember.StateManager = Ember.State.extend({
 
   transitionTo: function(path, context) {
     // XXX When is transitionTo called with no path
-    if (Ember.empty(path)) { return; }
+    if (Ember.isEmpty(path)) { return; }
 
     // The ES6 signature of this function is `path, ...contexts`
     var contexts = context ? Array.prototype.slice.call(arguments, 1) : [],