Moves URL rebasing & rewriting into lib/urls.

After all those are not image-related anymore.

diff --git a/History.md b/History.md
index 8915d28..92fbe54 100644 (file)
--- a/History.md
+++ b/History.md
@@ -2,6 +2,7 @@
 ==================
 
 * Cleans up url rebase code getting rid of unnecessary state.
+* Moves URL rebasing & rewriting into lib/urls.
 * Fixed issue [#436](https://github.com/jakubpawlowicz/clean-css/issues/436) - refactors URI rewriting.
 
 [3.2.2 / 2015-04-21](https://github.com/jakubpawlowicz/clean-css/compare/v3.2.1...v3.2.2)

diff --git a/lib/clean.js b/lib/clean.js
index 9c410cb..794e684 100644 (file)
--- a/lib/clean.js
+++ b/lib/clean.js
@@ -6,7 +6,7 @@
  */
 
 var ImportInliner = require('./imports/inliner');
-var rebaseUrls = require('./images/rebase-urls');
+var rebaseUrls = require('./urls/rebase');
 var SelectorsOptimizer = require('./selectors/optimizer');
 
 var simpleStringify = require('./stringifier/simple');

diff --git a/lib/imports/inliner.js b/lib/imports/inliner.js
index 8f774b9..762ace7 100644 (file)
--- a/lib/imports/inliner.js
+++ b/lib/imports/inliner.js
@@ -4,7 +4,7 @@ var http = require('http');
 var https = require('https');
 var url = require('url');
 
-var rewriteUrls = require('../images/rewrite-urls');
+var rewriteUrls = require('../urls/rewrite');
 var Splitter = require('../utils/splitter.js');
 var override = require('../utils/object.js').override;
 

diff --git a/lib/images/rebase-urls.js b/lib/urls/rebase.js
similarity index 94%
rename from lib/images/rebase-urls.js
rename to lib/urls/rebase.js
index f585e4b..04346b1 100644 (file)
--- a/lib/images/rebase-urls.js
+++ b/lib/urls/rebase.js
@@ -1,6 +1,6 @@
 var path = require('path');
 
-var rewriteUrls = require('./rewrite-urls');
+var rewriteUrls = require('./rewrite');
 
 function rebaseUrls(data, context) {
   var rebaseOpts = {

diff --git a/lib/images/rewrite-urls.js b/lib/urls/rewrite.js
similarity index 100%
rename from lib/images/rewrite-urls.js
rename to lib/urls/rewrite.js

diff --git a/lib/utils/source-reader.js b/lib/utils/source-reader.js
index 89a2406..267a069 100644 (file)
--- a/lib/utils/source-reader.js
+++ b/lib/utils/source-reader.js
@@ -1,5 +1,5 @@
 var path = require('path');
-var rewriteUrls = require('../images/rewrite-urls');
+var rewriteUrls = require('../urls/rewrite');
 
 var REMOTE_RESOURCE = /^(https?:)?\/\//;