Merge pull request #58 from stefanpenner/cache

add normalization caching.
ember-cli · Jul 18, 2014 · a8e90ab · a8e90ab
2 parents 6f43191 + 65da62e
commit a8e90ab
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 5 deletions.
diff --git a/dist/ember-resolver-spade.js b/dist/ember-resolver-spade.js
diff --git a/dist/ember-resolver.js b/dist/ember-resolver.js
@@ -28,7 +28,7 @@ define("ember/resolver",
    *     output. The loader's _moduleEntries is consulted so that classes can be
    *     resolved directly via the module loader, without needing a manual
    *     `import`.
-   *  2) is able provide injections to classes that implement `extend`
+   *  2) is able to provide injections to classes that implement `extend`
    *     (as is typical with Ember).
    */
 
@@ -44,6 +44,13 @@ define("ember/resolver",
     };
   }
 
+  function makeDictionary() {
+    var cache = Object.create(null);
+    cache['_dict'] = null;
+    delete cache['_dict'];
+    return cache;
+  }
+
   var underscore = Ember.String.underscore;
   var classify = Ember.String.classify;
   var get = Ember.get;
@@ -137,7 +144,14 @@ define("ember/resolver",
     shouldWrapInClassFactory: function(module, parsedName){
       return false;
     },
+    init: function() {
+      this._super();
+      this._normalizeCache = makeDictionary();
+    },
     normalize: function(fullName) {
+      return this._normalizeCache[fullName] || (this._normalizeCache = this._normalize(fullName));
+    },
+    _normalize: function(fullName) {
       // replace `.` with `/` in order to make nested controllers work in the following cases
       // 1. `needs: ['posts/post']`
       // 2. `{{render "posts/post"}}`

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
@@ -28,7 +28,7 @@ define("ember/resolver",
    *     output. The loader's _moduleEntries is consulted so that classes can be
    *     resolved directly via the module loader, without needing a manual
    *     `import`.
-   *  2) is able provide injections to classes that implement `extend`
+   *  2) is able to provide injections to classes that implement `extend`
    *     (as is typical with Ember).
    */
 
@@ -44,6 +44,13 @@ define("ember/resolver",
     };
   }
 
+  function makeDictionary() {
+    var cache = Object.create(null);
+    cache['_dict'] = null;
+    delete cache['_dict'];
+    return cache;
+  }
+
   var underscore = Ember.String.underscore;
   var classify = Ember.String.classify;
   var get = Ember.get;
@@ -137,7 +144,14 @@ define("ember/resolver",
     shouldWrapInClassFactory: function(module, parsedName){
       return false;
     },
+    init: function() {
+      this._super();
+      this._normalizeCache = makeDictionary();
+    },
     normalize: function(fullName) {
+      return this._normalizeCache[fullName] || (this._normalizeCache = this._normalize(fullName));
+    },
+    _normalize: function(fullName) {
       // replace `.` with `/` in order to make nested controllers work in the following cases
       // 1. `needs: ['posts/post']`
       // 2. `{{render "posts/post"}}`

diff --git a/dist/modules/ember-resolver.js b/dist/modules/ember-resolver.js
@@ -18,7 +18,7 @@ define("ember/resolver",
    *     output. The loader's _moduleEntries is consulted so that classes can be
    *     resolved directly via the module loader, without needing a manual
    *     `import`.
-   *  2) is able provide injections to classes that implement `extend`
+   *  2) is able to provide injections to classes that implement `extend`
    *     (as is typical with Ember).
    */
 
@@ -34,6 +34,13 @@ define("ember/resolver",
     };
   }
 
+  function makeDictionary() {
+    var cache = Object.create(null);
+    cache['_dict'] = null;
+    delete cache['_dict'];
+    return cache;
+  }
+
   var underscore = Ember.String.underscore;
   var classify = Ember.String.classify;
   var get = Ember.get;
@@ -127,7 +134,14 @@ define("ember/resolver",
     shouldWrapInClassFactory: function(module, parsedName){
       return false;
     },
+    init: function() {
+      this._super();
+      this._normalizeCache = makeDictionary();
+    },
     normalize: function(fullName) {
+      return this._normalizeCache[fullName] || (this._normalizeCache = this._normalize(fullName));
+    },
+    _normalize: function(fullName) {
       // replace `.` with `/` in order to make nested controllers work in the following cases
       // 1. `needs: ['posts/post']`
       // 2. `{{render "posts/post"}}`

diff --git a/packages/ember-resolver/lib/core.js b/packages/ember-resolver/lib/core.js
@@ -33,6 +33,13 @@ define("ember/resolver",
     };
   }
 
+  function makeDictionary() {
+    var cache = Object.create(null);
+    cache['_dict'] = null;
+    delete cache['_dict'];
+    return cache;
+  }
+
   var underscore = Ember.String.underscore;
   var classify = Ember.String.classify;
   var get = Ember.get;
@@ -126,7 +133,14 @@ define("ember/resolver",
     shouldWrapInClassFactory: function(module, parsedName){
       return false;
     },
+    init: function() {
+      this._super();
+      this._normalizeCache = makeDictionary();
+    },
     normalize: function(fullName) {
+      return this._normalizeCache[fullName] || (this._normalizeCache = this._normalize(fullName));
+    },
+    _normalize: function(fullName) {
       // replace `.` with `/` in order to make nested controllers work in the following cases
       // 1. `needs: ['posts/post']`
       // 2. `{{render "posts/post"}}`