ember-cli-assets 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d48f4e6c4be93c6be891462731344d9ae84c93a
-  data.tar.gz: ee9591a3b1e3f771b6c192e2fd40feda49d19ad3
+  metadata.gz: 5aecd513cef5b10c97a714afedd6fb816865dddd
+  data.tar.gz: 8649dfc87def28d856fd082a841bab45eb078e0e
 SHA512:
-  metadata.gz: b6964ea88ec612a1b9add47fd4866e45ac529da6c02e0b2f90fc5128773a123d3b5a03c45020541da9b7cf3bde37335a8c01fa72f058ffcaa97918f98d05e816
-  data.tar.gz: 3f482e553f643a3a031402d642f77a078137cd71e009dbc8c916eb06fcb125b3785e3971f37520872c21308ec8ce100976d06bf0936b767b01bff24076c5a34f
+  metadata.gz: 591b72bce8962bef79cd093302299c6abef2c9d4de664cb6b496aa5d71d4691b47dd539ed069f9bbf6f850ec98d51eb5ceade5f62cd148ff4fd8034e75ee83ca
+  data.tar.gz: 6958bc5dd286639ea107c26c411a91f7e819d7443cbb6c66fe47fcf28f86072ff29e8d52543feb892c256670306e1cfe796c6dcef171e92b24eb11e00c45915d

data/lib/ember/cli/assets/version.rb

@@ -1,7 +1,7 @@
 module Ember
   module CLI
     module Assets
-      VERSION = '0.0.2'
+      VERSION = '0.0.3'
     end
   end
 end

data/lib/ember/cli/assets.rb

@@ -7,7 +7,6 @@ module Ember
     autoload :Loader, 'ember/cli/loader'
     autoload :LoadInitializer, 'ember/cli/load_initializer'
     autoload :Resolver, 'ember/cli/resolver'
-    autoload :Shims, 'ember/cli/shims'
 
     module Assets
       def self.root

data/lib/ember/cli/resolver.rb

@@ -1,7 +1,7 @@
 module Ember
   module CLI
     module Resolver
-      VERSION = '0.1.12'
+      VERSION = '0.1.13'
     end
   end
 end

data/vendor/assets/ember/resolver.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 
- // Version: 0.1.12
+ // Version: 0.1.13
 
 (function() {
 /*globals define registry requirejs */
@@ -94,35 +94,6 @@ define("ember/resolver",
     };
   }
 
-  function chooseModuleName(moduleEntries, moduleName) {
-    var underscoredModuleName = Ember.String.underscore(moduleName);
-
-    if (moduleName !== underscoredModuleName && moduleEntries[moduleName] && moduleEntries[underscoredModuleName]) {
-      throw new TypeError("Ambiguous module names: `" + moduleName + "` and `" + underscoredModuleName + "`");
-    }
-
-    if (moduleEntries[moduleName]) {
-      return moduleName;
-    } else if (moduleEntries[underscoredModuleName]) {
-      return underscoredModuleName;
-    } else {
-      // workaround for dasherized partials:
-      // something/something/-something => something/something/_something
-      var partializedModuleName = moduleName.replace(/\/-([^\/]*)$/, '/_$1');
-
-      if (moduleEntries[partializedModuleName]) {
-        Ember.deprecate('Modules should not contain underscores. ' +
-                        'Attempted to lookup "'+moduleName+'" which ' +
-                        'was not found. Please rename "'+partializedModuleName+'" '+
-                        'to "'+moduleName+'" instead.', false);
-
-        return partializedModuleName;
-      } else {
-        return moduleName;
-      }
-    }
-  }
-
   function resolveOther(parsedName) {
     /*jshint validthis:true */
 
@@ -172,6 +143,13 @@ define("ember/resolver",
       if (!this.pluralizedTypes.config) {
         this.pluralizedTypes.config = 'config';
       }
+      
+      var podModulePrefix = this.namespace.podModulePrefix || '';
+      var podPath = podModulePrefix.substr(podModulePrefix.lastIndexOf('/') + 1);
+      Ember.deprecate('`podModulePrefix` is deprecated and will be removed '+
+        'from future versions of ember-cli. Please move existing pods from '+
+        '\'app/' + podPath + '/\' to \'app/\'.', !this.namespace.podModulePrefix);
+
     },
     normalize: function(fullName) {
       return this._normalizeCache[fullName] || (this._normalizeCache[fullName] = this._normalize(fullName));
@@ -270,7 +248,7 @@ define("ember/resolver",
         // allow treat all dashed and all underscored as the same thing
         // supports components with dashes and other stuff with underscores.
         if (tmpModuleName) {
-          tmpModuleName = chooseModuleName(moduleEntries, tmpModuleName);
+          tmpModuleName = self.chooseModuleName(moduleEntries, tmpModuleName);
         }
 
         if (tmpModuleName && moduleEntries[tmpModuleName]) {
@@ -291,6 +269,35 @@ define("ember/resolver",
       return moduleName;
     },
 
+    chooseModuleName: function(moduleEntries, moduleName) {
+      var underscoredModuleName = Ember.String.underscore(moduleName);
+
+      if (moduleName !== underscoredModuleName && moduleEntries[moduleName] && moduleEntries[underscoredModuleName]) {
+        throw new TypeError("Ambiguous module names: `" + moduleName + "` and `" + underscoredModuleName + "`");
+      }
+
+      if (moduleEntries[moduleName]) {
+        return moduleName;
+      } else if (moduleEntries[underscoredModuleName]) {
+        return underscoredModuleName;
+      } else {
+        // workaround for dasherized partials:
+        // something/something/-something => something/something/_something
+        var partializedModuleName = moduleName.replace(/\/-([^\/]*)$/, '/_$1');
+
+        if (moduleEntries[partializedModuleName]) {
+          Ember.deprecate('Modules should not contain underscores. ' +
+                          'Attempted to lookup "'+moduleName+'" which ' +
+                          'was not found. Please rename "'+partializedModuleName+'" '+
+                          'to "'+moduleName+'" instead.', false);
+
+          return partializedModuleName;
+        } else {
+          return moduleName;
+        }
+      }
+    },
+
     // used by Ember.DefaultResolver.prototype._logLookup
     lookupDescription: function(fullName) {
       var parsedName = this.parseName(fullName);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-assets
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler