Merge pull request #106 from stefanpenner/fix/custom-irregular-words

Fix/custom irregular words

Author: olivia

addon/lib/system/inflector.js

@@ -266,7 +266,7 @@ Inflector.prototype = {
       return word;
     }
 
-    for (rule in this.rules.irregular) {
+    for (rule in irregular) {
       if (lowercase.match(rule+"$")) {
         substitution = irregular[rule];
 
@@ -275,7 +275,7 @@ Inflector.prototype = {
           rule = capitalize(rule);
         }
 
-        return word.replace(rule, substitution);
+        return word.replace(new RegExp(rule, 'i'), substitution);
       }
     }
 

tests/unit/inflector-test.js

@@ -359,6 +359,18 @@ test('CamelCase and UpperCamelCase is preserved for irregular and uncountable si
   assert.equal(inflector.singularize('friedRice'), 'friedRice');
 });
 
+test('CamelCase custom irregular words', function(assert) {
+  var inflector = new Ember.Inflector(Ember.Inflector.defaultRules);
+  inflector.irregular('unitOfMeasure', 'unitsOfMeasure');
+  inflector.irregular('tipoDocumento', 'tiposDocumento');
+
+  assert.equal(inflector.singularize('unitsOfMeasure'), 'unitOfMeasure');
+  assert.equal(inflector.pluralize('unitOfMeasure'), 'unitsOfMeasure');
+
+  assert.equal(inflector.singularize('tiposDocumento'), 'tipoDocumento');
+  assert.equal(inflector.pluralize('tipoDocumento'), 'tiposDocumento');
+});
+
 test('Ember.Inflector.pluralize passes same test cases as ActiveSupport::Inflector#pluralize', function(assert) {
   var inflector = new Ember.Inflector(Ember.Inflector.defaultRules);