Merge pull request #6 from mankdev/url-with-postfix

Handling urls with postfixes

Author: cakeinpanic

index.js

@@ -1,6 +1,6 @@
 var fs = require('fs');
 var path = require('path');
-var url = require('url');
+var parseURL = require('url').parse;
 var reduceFunctionCall = require('reduce-function-call');
 var mkdirp = require('mkdirp');
 var postcss = require('postcss');
@@ -94,13 +94,35 @@ function getAsset(filePath) {
 
 }
 
+function getPostfix(url) {
+	var parsedURL = parseURL(url);
+	var postfix = '';
+
+	if (parsedURL.search) {
+		postfix += parsedURL.search;
+	}
+
+	if (parsedURL.hash) {
+		postfix += parsedURL.hash;
+	}
+
+	return postfix;
+}
+
+function getClearUrl(url) {
+	return parseURL(url).pathname;
+}
+
 function processUrlRebase(dirname, url, to, options) {
 
 	var relativeAssetsPath = '';
 	var absoluteAssetsPath = '.';
 
-	var filePath = path.resolve(dirname, url);
-	var fileName = path.basename(url);
+	var postfix = getPostfix(url);
+	var clearUrl = getClearUrl(url);
+
+	var filePath = path.resolve(dirname, clearUrl);
+	var fileName = path.basename(clearUrl);
 
 	var assetContents = getAsset(filePath);
 
@@ -130,5 +152,9 @@ function processUrlRebase(dirname, url, to, options) {
 	}
 	copyAsset(absoluteAssetsPath, assetContents);
 
+	if (postfix) {
+		relativeAssetsPath += postfix;
+	}
+
 	return composeUrl(relativeAssetsPath);
 }

package.json

@@ -27,7 +27,8 @@
     "chalk": "^1.1.0",
     "mkdirp": "^0.5.0",
     "postcss": "^4.1.0",
-    "reduce-function-call": "^1.0.1"
+    "reduce-function-call": "^1.0.1",
+    "url": "^0.10.3"
   },
   "devDependencies": {
     "rimraf": "^2.4.0",

test/expected/copy-url-postfixes.css

@@ -0,0 +1,5 @@
+body {
+	background: url(imported/another-img.jpg#iefix);
+	background: url(imported/img.jpg?some);
+	background: url(imported/some.jpg?#blabla);
+}

test/fixtures/another-assets/some.jpg

@@ -0,0 +1,5 @@
+body {
+	background: url(another-assets/another-img.jpg#iefix);
+	background: url(another-assets/one-more/img.jpg?some);
+	background: url(another-assets/some.jpg?#blabla);
+}

test/fixtures/copy-url-postfixes.css

@@ -106,3 +106,18 @@ test('duplicated images', function(t) {
 	t.end();
 
 });
+
+test('urls with postfixes', function(t) {
+	var rebaserOptions = {
+		assetsPath: 'imported',
+		relative: 'true'
+	};
+	var postcssOptions = {
+		from: 'test/fixtures/copy-url-postfixes.css',
+		to: 'test/result/copy-url-postfixes.css'
+	};
+
+	clearResults('test/result/copy-copy-with-hashes.css', 'test/result/imported');
+	compareFixtures(t, 'should proper process urls with postfixes', rebaserOptions, postcssOptions);
+	t.end();
+});