Update dist/.

ember-cli · Oct 9, 2014 · 1620d18 · 1620d18
1 parent facf201
commit 1620d18
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 6 deletions.
diff --git a/dist/ember-resolver-spade.js b/dist/ember-resolver-spade.js
diff --git a/dist/ember-resolver-tests.js b/dist/ember-resolver-tests.js
diff --git a/dist/ember-resolver.js b/dist/ember-resolver.js
@@ -140,6 +140,7 @@ define("ember/resolver",
   var Resolver = Ember.DefaultResolver.extend({
     resolveOther: resolveOther,
     resolveTemplate: resolveOther,
+    pluralizedTypes: null,
 
     makeToString: function(factory, fullName) {
       return '' + this.namespace.modulePrefix + '@' + fullName + ':';
@@ -151,6 +152,12 @@ define("ember/resolver",
     init: function() {
       this._super();
       this._normalizeCache = makeDictionary();
+
+      this.pluralizedTypes = this.pluralizedTypes || makeDictionary();
+
+      if (!this.pluralizedTypes.config) {
+        this.pluralizedTypes.config = 'config';
+      }
     },
     normalize: function(fullName) {
       return this._normalizeCache[fullName] || (this._normalizeCache[fullName] = this._normalize(fullName));
@@ -168,6 +175,10 @@ define("ember/resolver",
       }
     },
 
+    pluralize: function(type) {
+      return this.pluralizedTypes[type] || (this.pluralizedTypes[type] = type + 's');
+    },
+
     podBasedLookupWithPrefix: function(podPrefix, parsedName) {
       var fullNameWithoutType = parsedName.fullNameWithoutType;
 
@@ -203,7 +214,7 @@ define("ember/resolver",
     },
 
     defaultModuleName: function(parsedName) {
-      return this.prefix(parsedName) + '/' +  parsedName.type + 's/' + parsedName.fullNameWithoutType;
+      return this.prefix(parsedName) + '/' +  this.pluralize(parsedName.type) + '/' + parsedName.fullNameWithoutType;
     },
 
     prefix: function(parsedName) {

diff --git a/dist/ember-resolver.min.js b/dist/ember-resolver.min.js
diff --git a/dist/ember-resolver.prod.js b/dist/ember-resolver.prod.js
@@ -140,6 +140,7 @@ define("ember/resolver",
   var Resolver = Ember.DefaultResolver.extend({
     resolveOther: resolveOther,
     resolveTemplate: resolveOther,
+    pluralizedTypes: null,
 
     makeToString: function(factory, fullName) {
       return '' + this.namespace.modulePrefix + '@' + fullName + ':';
@@ -151,6 +152,12 @@ define("ember/resolver",
     init: function() {
       this._super();
       this._normalizeCache = makeDictionary();
+
+      this.pluralizedTypes = this.pluralizedTypes || makeDictionary();
+
+      if (!this.pluralizedTypes.config) {
+        this.pluralizedTypes.config = 'config';
+      }
     },
     normalize: function(fullName) {
       return this._normalizeCache[fullName] || (this._normalizeCache[fullName] = this._normalize(fullName));
@@ -168,6 +175,10 @@ define("ember/resolver",
       }
     },
 
+    pluralize: function(type) {
+      return this.pluralizedTypes[type] || (this.pluralizedTypes[type] = type + 's');
+    },
+
     podBasedLookupWithPrefix: function(podPrefix, parsedName) {
       var fullNameWithoutType = parsedName.fullNameWithoutType;
 
@@ -203,7 +214,7 @@ define("ember/resolver",
     },
 
     defaultModuleName: function(parsedName) {
-      return this.prefix(parsedName) + '/' +  parsedName.type + 's/' + parsedName.fullNameWithoutType;
+      return this.prefix(parsedName) + '/' +  this.pluralize(parsedName.type) + '/' + parsedName.fullNameWithoutType;
     },
 
     prefix: function(parsedName) {

diff --git a/dist/modules/ember-resolver-tests.js b/dist/modules/ember-resolver-tests.js
@@ -425,5 +425,65 @@ test("will not lookup non component templates in components/", function() {
   resolver.resolve('template:foo-bar');
 });
 
+module("custom pluralization", {
+  teardown: resetRegistry
+});
+
+test("will use the pluralization specified for a given type", function() {
+  expect(1);
+
+  setupResolver({
+    namespace: {
+      modulePrefix: 'appkit'
+    },
+
+    pluralizedTypes: {
+      'sheep': 'sheep',
+      'octipus': 'octipii'
+    }
+  });
+
+  define('appkit/sheep/baaaaaa', [], function(){
+    ok(true, 'custom pluralization used');
+    return 'whatever';
+  });
+
+  resolver.resolve('sheep:baaaaaa');
+});
+
+test("will pluralize 'config' as 'config' by default", function() {
+  expect(1);
+
+  setupResolver();
+
+  define('appkit/config/environment', [], function(){
+    ok(true, 'config/environment is found');
+    return 'whatever';
+  });
+
+  resolver.resolve('config:environment');
+});
+
+test("'config' can be overridden", function() {
+  expect(1);
+
+  setupResolver({
+    namespace: {
+      modulePrefix: 'appkit'
+    },
+
+    pluralizedTypes: {
+      'config': 'super-duper-config'
+    }
+  });
+
+  define('appkit/super-duper-config/environment', [], function(){
+    ok(true, 'super-duper-config/environment is found');
+    return 'whatever';
+  });
+
+  resolver.resolve('config:environment');
+});
+
 })();
 
diff --git a/dist/modules/ember-resolver.js b/dist/modules/ember-resolver.js
@@ -130,6 +130,7 @@ define("ember/resolver",
   var Resolver = Ember.DefaultResolver.extend({
     resolveOther: resolveOther,
     resolveTemplate: resolveOther,
+    pluralizedTypes: null,
 
     makeToString: function(factory, fullName) {
       return '' + this.namespace.modulePrefix + '@' + fullName + ':';
@@ -141,6 +142,12 @@ define("ember/resolver",
     init: function() {
       this._super();
       this._normalizeCache = makeDictionary();
+
+      this.pluralizedTypes = this.pluralizedTypes || makeDictionary();
+
+      if (!this.pluralizedTypes.config) {
+        this.pluralizedTypes.config = 'config';
+      }
     },
     normalize: function(fullName) {
       return this._normalizeCache[fullName] || (this._normalizeCache[fullName] = this._normalize(fullName));
@@ -158,6 +165,10 @@ define("ember/resolver",
       }
     },
 
+    pluralize: function(type) {
+      return this.pluralizedTypes[type] || (this.pluralizedTypes[type] = type + 's');
+    },
+
     podBasedLookupWithPrefix: function(podPrefix, parsedName) {
       var fullNameWithoutType = parsedName.fullNameWithoutType;
 
@@ -193,7 +204,7 @@ define("ember/resolver",
     },
 
     defaultModuleName: function(parsedName) {
-      return this.prefix(parsedName) + '/' +  parsedName.type + 's/' + parsedName.fullNameWithoutType;
+      return this.prefix(parsedName) + '/' +  this.pluralize(parsedName.type) + '/' + parsedName.fullNameWithoutType;
     },
 
     prefix: function(parsedName) {