Deprecate Ember.Inflector, Ember.String.singularize() and Ember.String.pluralize()

README.md

@@ -10,20 +10,17 @@ ember install ember-inflector
 
 ## Usage
 
-All methods are always available from `Ember.Inflector`, but in Ember CLI, you can always `import` instead:
+All methods are always available from the `ember-inflector` module:
 
 ```javascript
 import Inflector from 'ember-inflector';
-import {singularize, pluralize} from 'ember-inflector';
+import { singularize, pluralize } from 'ember-inflector';
 
 Inflector.inflector.singularize("tacos"); // taco
 Inflector.inflector.pluralize("taco"); // tacos
 
 singularize("tacos"); // taco
 pluralize("taco"); // tacos
-
-// or if not using Ember CLI/ES6
-Ember.Inflector.inflector.pluralize("taco"); // tacos
 ```
 
 ### Template Helpers

addon/index.js

@@ -7,10 +7,39 @@ import {
 } from "./lib/system";
 
 Inflector.defaultRules = defaultRules;
-Ember.Inflector        = Inflector;
 
-Ember.String.pluralize   = pluralize;
-Ember.String.singularize = singularize;
+Object.defineProperty(Ember, 'Inflector', {
+  get() {
+    Ember.deprecate(`Ember.Inflector is deprecated. Please explicitly: import Inflector from 'ember-inflector';`, false, {
+      id: 'ember-inflector.globals',
+      until: '3.0.0',
+    });
+
+    return Inflector;
+  },
+});
+
+Object.defineProperty(Ember.String, 'singularize', {
+  get() {
+    Ember.deprecate(`Ember.String.singularize() is deprecated. Please explicitly: import { singularize } from 'ember-inflector';`, false, {
+      id: 'ember-inflector.globals',
+      until: '3.0.0',
+    });
+
+    return singularize;
+  },
+});
+
+Object.defineProperty(Ember.String, 'pluralize', {
+  get() {
+    Ember.deprecate(`Ember.String.pluralize() is deprecated. Please explicitly: import { pluralize } from 'ember-inflector';`, false, {
+      id: 'ember-inflector.globals',
+      until: '3.0.0',
+    });
+
+    return pluralize;
+  },
+});
 
 import "./lib/ext/string";
 

addon/lib/ext/string.js

@@ -11,17 +11,35 @@ if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
     @method pluralize
     @for String
   */
-  String.prototype.pluralize = function() {
-    return pluralize(this);
-  };
+  Object.defineProperty(String.prototype, 'pluralize', {
+    get() {
+      Ember.deprecate(`String.prototype.pluralize() is deprecated. Please explicitly: import { pluralize } from 'ember-inflector';`, false, {
+        id: 'ember-inflector.globals',
+        until: '3.0.0',
+      });
+
+      return function() {
+        return pluralize(this);
+      };
+    },
+  });
 
   /**
     See {{#crossLink "Ember.String/singularize"}}{{/crossLink}}
 
     @method singularize
     @for String
   */
-  String.prototype.singularize = function() {
-    return singularize(this);
-  };
+  Object.defineProperty(String.prototype, 'singularize', {
+    get() {
+      Ember.deprecate(`String.prototype.singularize() is deprecated. Please explicitly: import { singularize } from 'ember-inflector';`, false, {
+        id: 'ember-inflector.globals',
+        until: '3.0.0',
+      });
+
+      return function() {
+        return singularize(this);
+      };
+    },
+  });
 }