grunt-filerev-replace - npm Package Compare versions

Comparing version 0.1.3 to 0.1.4

package.json

 {
   "name": "grunt-filerev-replace",
   "description": "Replace references to grunt-filerev files.",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "homepage": "https://github.com/solidusjs/grunt-filerev-replace",
@@ -6,0 +6,0 @@ "author": {

tasks/filerev_replace.js

@@ -15,3 +15,3 @@ /*
 var STARTING_DELIMITER = '(\\\\?\'|\\\\?"|\\\\?\\()';
-var ALLOWED_PATH_CHARS = '[^\'"\\(\\)\\?#]*?'; // Lazy, in order not to eat the optional starting character of ENDING_DELIMITER
+var ALLOWED_PATH_CHARS = '([^\'"\\(\\)\\?#]*?)'; // Lazy, in order not to eat the optional starting character of ENDING_DELIMITER
 var ENDING_DELIMITER   = '(\\\\?\'|\\\\?"|\\\\?\\)|\\?|#)';
@@ -33,5 +33,5 @@
     var assets = {};
-    for( var path in grunt.filerev.summary ){
-      var src = file_path_to_web_path( path, assets_root );
-      var dest = file_path_to_web_path( grunt.filerev.summary[path], assets_root );
+    for( var filerev_path in grunt.filerev.summary ){
+      var src = file_path_to_web_path( filerev_path, assets_root );
+      var dest = path.basename( grunt.filerev.summary[filerev_path] );
       var regexp = asset_path_regexp( src );
@@ -52,4 +52,6 @@ assets[src] = { dest: dest, regexp: regexp };
     return new RegExp( STARTING_DELIMITER + // p1
-                       '(' + ALLOWED_PATH_CHARS + escape_for_regexp( path.basename( asset_path ) ) + ALLOWED_PATH_CHARS + ')' + // p2
-                       ENDING_DELIMITER, // p3
+                       ALLOWED_PATH_CHARS + // p2
+                       '(' + escape_for_regexp( path.basename( asset_path ) ) + ')' + // p3
+                       ALLOWED_PATH_CHARS + // p4
+                       ENDING_DELIMITER, // p5
                        'ig' );
@@ -66,8 +68,8 @@ }
 
-    var replace_string = function( match, p1, p2, p3 ) {
-      var asset_path = absolute_asset_path( p2, view_src, views_root );
+    var replace_string = function( match, p1, p2, p3, p4, p5 ) {
+      var asset_path = absolute_asset_path( p2 + p3 + p4, view_src, views_root );
 
       if( grunt.file.arePathsEquivalent( asset_path.toLowerCase(), asset_src.toLowerCase() ) ) {
         changed = true;
-        return p1 + asset_dest + p3;
+        return p1 + p2 + asset_dest + p4 + p5;
       } else {
@@ -95,3 +97,3 @@ return match;
     var asset_path = string.trim();
-    if( asset_path[0] != '/' && asset_path[0] != '\\' ) {
+    if( asset_path[0] !== '/' && asset_path[0] !== '\\' ) {
       asset_path = path.join( path.dirname( view_src ), asset_path );
@@ -98,0 +100,0 @@ asset_path = file_path_to_web_path( asset_path, views_root );

test/expected/assets/compiled/scripts.js

@@ -5,5 +5,5 @@ // Absolute path
 // Relative path
-var path = '/images/ajax-loader.4e26f87c.gif';
-var path = '/images/ajax-loader.4e26f87c.gif';
-var path = '/images/ajax-loader.4e26f87c.gif';
+var path = '/oops/../images/ajax-loader.4e26f87c.gif';
+var path = '../images/ajax-loader.4e26f87c.gif';
+var path = '../oops/../images/oops/../ajax-loader.4e26f87c.gif';
 
@@ -20,3 +20,3 @@ // Delimiters
 // Case insensitive
-var path = '/images/ajax-loader.4e26f87c.gif';
+var path = '/IMAGES/ajax-loader.4e26f87c.gif';
 
@@ -23,0 +23,0 @@ // With query string and anchor

No alert changes

Improved metrics

Total package byte prevSize

22423

increased by0.92%

Lines of code

294

increased by0.68%

No dependency changes