almond-rails 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f55f1ba755c38ee3ce5a527b6856bfff42d12cb6
-  data.tar.gz: 1a5cef44f135b24ad1bac704c012e6c270e4f9a4
+  metadata.gz: bc94a7377ee1035b0427a566f335cd5d3d2c15f2
+  data.tar.gz: '0482dadb859bcb79202b68f3fb671f7d26adb091'
 SHA512:
-  metadata.gz: ab931fae84cd6e37bad12a1b402e660b03e23085483bebb88ad6246b96987e43ee709804884c4d0f96b6add0635efd250f2f37874135e5e1ef0dfe686103820e
-  data.tar.gz: cca49bcfdddb7b3faf010283e920117801c43db99268ddaf335605c0f52065400d57c20ed98e66134a3555b0ff0b00b39c5d099b9d3f11b1ada726ee54fffef6
+  metadata.gz: 0602ac69a89534c23ad7d5cc4191a859201a91fd663b33c639d95349fca87070dec17970ca419cb507b870f2df38343c3bd2e1ed1fe3dc99e478e4625c9cbc49
+  data.tar.gz: 9b86986f606bb3923cab56a857d6c7804fdffa7cdc510516bb57c897e25e25f31919703d7f77aab32d1df23f84a6d029c136cc0648b36012973b359d991eb410

data/lib/almond_rails/version.rb

@@ -1,3 +1,3 @@
 module AlmondRails
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/vendor/assets/javascripts/almond.js

@@ -1,5 +1,5 @@
 /**
- * @license almond 0.3.2 Copyright jQuery Foundation and other contributors.
+ * @license almond 0.3.3 Copyright jQuery Foundation and other contributors.
  * Released under MIT license, http://github.com/requirejs/almond/LICENSE
  */
 //Going sloppy to avoid 'use strict' string cost, but strict practices should
@@ -195,32 +195,39 @@ var requirejs, require, define;
         return [prefix, name];
     }
 
+    //Creates a parts array for a relName where first part is plugin ID,
+    //second part is resource ID. Assumes relName has already been normalized.
+    function makeRelParts(relName) {
+        return relName ? splitPrefix(relName) : [];
+    }
+
     /**
      * Makes a name map, normalizing the name, and using a plugin
      * for normalization if necessary. Grabs a ref to plugin
      * too, as an optimization.
      */
-    makeMap = function (name, relName) {
+    makeMap = function (name, relParts) {
         var plugin,
             parts = splitPrefix(name),
-            prefix = parts[0];
+            prefix = parts[0],
+            relResourceName = relParts[1];
 
         name = parts[1];
 
         if (prefix) {
-            prefix = normalize(prefix, relName);
+            prefix = normalize(prefix, relResourceName);
             plugin = callDep(prefix);
         }
 
         //Normalize according
         if (prefix) {
             if (plugin && plugin.normalize) {
-                name = plugin.normalize(name, makeNormalize(relName));
+                name = plugin.normalize(name, makeNormalize(relResourceName));
             } else {
-                name = normalize(name, relName);
+                name = normalize(name, relResourceName);
             }
         } else {
-            name = normalize(name, relName);
+            name = normalize(name, relResourceName);
             parts = splitPrefix(name);
             prefix = parts[0];
             name = parts[1];
@@ -267,13 +274,14 @@ var requirejs, require, define;
     };
 
     main = function (name, deps, callback, relName) {
-        var cjsModule, depName, ret, map, i,
+        var cjsModule, depName, ret, map, i, relParts,
             args = [],
             callbackType = typeof callback,
             usingExports;
 
         //Use name if no relName
         relName = relName || name;
+        relParts = makeRelParts(relName);
 
         //Call the callback to define the module, if necessary.
         if (callbackType === 'undefined' || callbackType === 'function') {
@@ -282,7 +290,7 @@ var requirejs, require, define;
             //Default to [require, exports, module] if no deps
             deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
             for (i = 0; i < deps.length; i += 1) {
-                map = makeMap(deps[i], relName);
+                map = makeMap(deps[i], relParts);
                 depName = map.f;
 
                 //Fast path CommonJS standard dependencies.
@@ -338,7 +346,7 @@ var requirejs, require, define;
             //deps arg is the module name, and second arg (if passed)
             //is just the relName.
             //Normalize module name, if it contains . or ..
-            return callDep(makeMap(deps, callback).f);
+            return callDep(makeMap(deps, makeRelParts(callback)).f);
         } else if (!deps.splice) {
             //deps is a config object, not an array.
             config = deps;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Almond.js packaged as a Rails engine