Moves all reading-related modules to `reader` folder.

Why:

* Grouping it together for clarity sake.

diff --git a/lib/clean.js b/lib/clean.js
index 7d634d0..9c6ac07 100644 (file)
--- a/lib/clean.js
+++ b/lib/clean.js
@@ -13,8 +13,8 @@ var Validator = require('./properties/validator');
 var override = require('./utils/override');
 var DEFAULT_TIMEOUT = 5000;
 
-var inputSourceMapTracker = require('./utils/input-source-map-tracker');
-var readSources = require('./utils/read-sources');
+var inputSourceMapTracker = require('./reader/input-source-map-tracker');
+var readSources = require('./reader/read-sources');
 var basicOptimize = require('./optimizer/basic');
 var advancedOptimize = require('./optimizer/advanced');
 var simpleStringify = require('./stringifier/simple');

diff --git a/lib/utils/apply-source-maps.js b/lib/reader/apply-source-maps.js
similarity index 97%
rename from lib/utils/apply-source-maps.js
rename to lib/reader/apply-source-maps.js
index e565d89..c65f371 100644 (file)
--- a/lib/utils/apply-source-maps.js
+++ b/lib/reader/apply-source-maps.js
@@ -2,14 +2,14 @@ var fs = require('fs');
 var path = require('path');
 
 var isAllowedResource = require('./is-allowed-resource');
-var isDataUriResource = require('./is-data-uri-resource');
-var isRemoteResource = require('./is-remote-resource');
 var loadRemoteResource = require('./load-remote-resource');
 var matchDataUri = require('./match-data-uri');
 var rebaseLocalMap = require('./rebase-local-map');
 var rebaseRemoteMap = require('./rebase-remote-map');
 
 var Token = require('../tokenizer/token');
+var isDataUriResource = require('../utils/is-data-uri-resource');
+var isRemoteResource = require('../utils/is-remote-resource');
 
 var MAP_MARKER_PATTERN = /^\/\*# sourceMappingURL=(\S+) \*\/$/;
 
@@ -107,7 +107,7 @@ function extractInputSourceMapFrom(sourceMapComment, applyContext, whenSourceMap
       }
     });
   } else {
-    // at this point `uri` is already rebased, see read-sources.js#rebaseSourceMapComment
+    // at this point `uri` is already rebased, see lib/reader/rebase.js#rebaseSourceMapComment
     // it is rebased to be consistent with rebasing other URIs
     // however here we need to resolve it back to read it from disk
     rebasedToCurrentPath = path.resolve(applyContext.rebaseTo, uri);

diff --git a/lib/utils/extract-import-url-and-media.js b/lib/reader/extract-import-url-and-media.js
similarity index 100%
rename from lib/utils/extract-import-url-and-media.js
rename to lib/reader/extract-import-url-and-media.js

diff --git a/lib/utils/input-source-map-tracker.js b/lib/reader/input-source-map-tracker.js
similarity index 100%
rename from lib/utils/input-source-map-tracker.js
rename to lib/reader/input-source-map-tracker.js

diff --git a/lib/utils/is-allowed-resource.js b/lib/reader/is-allowed-resource.js
similarity index 94%
rename from lib/utils/is-allowed-resource.js
rename to lib/reader/is-allowed-resource.js
index d279719..e7d0b06 100644 (file)
--- a/lib/utils/is-allowed-resource.js
+++ b/lib/reader/is-allowed-resource.js
@@ -1,6 +1,6 @@
 var url = require('url');
 
-var hasProtocol = require('./has-protocol');
+var hasProtocol = require('../utils/has-protocol');
 
 var HTTP_PROTOCOL = 'http:';
 

diff --git a/lib/utils/load-original-sources.js b/lib/reader/load-original-sources.js
similarity index 98%
rename from lib/utils/load-original-sources.js
rename to lib/reader/load-original-sources.js
index ba66199..dba1e54 100644 (file)
--- a/lib/utils/load-original-sources.js
+++ b/lib/reader/load-original-sources.js
@@ -2,9 +2,10 @@ var fs = require('fs');
 var path = require('path');
 
 var isAllowedResource = require('./is-allowed-resource');
-var isRemoteResource = require('./is-remote-resource');
 var loadRemoteResource = require('./load-remote-resource');
 
+var isRemoteResource = require('../utils/is-remote-resource');
+
 function loadOriginalSources(context, callback) {
   var loadContext = {
     callback: callback,

diff --git a/lib/utils/load-remote-resource.js b/lib/reader/load-remote-resource.js
similarity index 88%
rename from lib/utils/load-remote-resource.js
rename to lib/reader/load-remote-resource.js
index 9760574..371a20a 100644 (file)
--- a/lib/utils/load-remote-resource.js
+++ b/lib/reader/load-remote-resource.js
@@ -2,10 +2,10 @@ var http = require('http');
 var https = require('https');
 var url = require('url');
 
-var hasProtocol = require('./has-protocol');
-var isHttpResource = require('./is-http-resource');
-var isHttpsResource = require('./is-https-resource');
-var override = require('./override');
+var hasProtocol = require('../utils/has-protocol');
+var isHttpResource = require('../utils/is-http-resource');
+var isHttpsResource = require('../utils/is-https-resource');
+var override = require('../utils/override');
 
 var HTTP_PROTOCOL = 'http:';
 

diff --git a/lib/utils/match-data-uri.js b/lib/reader/match-data-uri.js
similarity index 100%
rename from lib/utils/match-data-uri.js
rename to lib/reader/match-data-uri.js

diff --git a/lib/utils/read-sources.js b/lib/reader/read-sources.js
similarity index 98%
rename from lib/utils/read-sources.js
rename to lib/reader/read-sources.js
index 10c4f9d..0531079 100644 (file)
--- a/lib/utils/read-sources.js
+++ b/lib/reader/read-sources.js
@@ -3,10 +3,7 @@ var path = require('path');
 
 var applySourceMaps = require('./apply-source-maps');
 var extractImportUrlAndMedia = require('./extract-import-url-and-media');
-var isAbsoluteResource = require('./is-absolute-resource');
 var isAllowedResource = require('./is-allowed-resource');
-var isImport = require('./is-import');
-var isRemoteResource = require('./is-remote-resource');
 var loadOriginalSources = require('./load-original-sources');
 var loadRemoteResource = require('./load-remote-resource');
 var rebase = require('./rebase');
@@ -16,6 +13,9 @@ var restoreImport = require('./restore-import');
 
 var tokenize = require('../tokenizer/tokenize');
 var Token = require('../tokenizer/token');
+var isAbsoluteResource = require('../utils/is-absolute-resource');
+var isImport = require('../utils/is-import');
+var isRemoteResource = require('../utils/is-remote-resource');
 
 var UNKNOWN_SOURCE = 'unknown-source';
 

diff --git a/lib/utils/rebase-local-map.js b/lib/reader/rebase-local-map.js
similarity index 100%
rename from lib/utils/rebase-local-map.js
rename to lib/reader/rebase-local-map.js

diff --git a/lib/utils/rebase-remote-map.js b/lib/reader/rebase-remote-map.js
similarity index 100%
rename from lib/utils/rebase-remote-map.js
rename to lib/reader/rebase-remote-map.js

diff --git a/lib/utils/rebase.js b/lib/reader/rebase.js
similarity index 96%
rename from lib/utils/rebase.js
rename to lib/reader/rebase.js
index 7848797..3f4bdd3 100644 (file)
--- a/lib/utils/rebase.js
+++ b/lib/reader/rebase.js
@@ -1,9 +1,9 @@
 var extractImportUrlAndMedia = require('./extract-import-url-and-media');
-var isImport = require('./is-import');
 var restoreImport = require('./restore-import');
+var rewriteUrl = require('./rewrite-url');
 
-var rewriteUrl = require('../urls/rewrite');
 var Token = require('../tokenizer/token');
+var isImport = require('../utils/is-import');
 
 var SOURCE_MAP_COMMENT_PATTERN = /^\/\*# sourceMappingURL=(\S+) \*\/$/;
 

diff --git a/lib/utils/restore-import.js b/lib/reader/restore-import.js
similarity index 100%
rename from lib/utils/restore-import.js
rename to lib/reader/restore-import.js

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

diff --git a/test/optimizer/extract-properties-test.js b/test/optimizer/extract-properties-test.js
index 75fa125..c07c940 100644 (file)
--- a/test/optimizer/extract-properties-test.js
+++ b/test/optimizer/extract-properties-test.js
@@ -1,7 +1,7 @@
 var vows = require('vows');
 var assert = require('assert');
 var tokenize = require('../../lib/tokenizer/tokenize');
-var inputSourceMapTracker = require('../../lib/utils/input-source-map-tracker');
+var inputSourceMapTracker = require('../../lib/reader/input-source-map-tracker');
 var extractProperties = require('../../lib/optimizer/extract-properties');
 
 function _tokenize(source) {

diff --git a/test/optimizer/reorderable-test.js b/test/optimizer/reorderable-test.js
index ff5ad9b..8b7a8e5 100644 (file)
--- a/test/optimizer/reorderable-test.js
+++ b/test/optimizer/reorderable-test.js
@@ -2,7 +2,7 @@ var vows = require('vows');
 var assert = require('assert');
 
 var tokenize = require('../../lib/tokenizer/tokenize');
-var inputSourceMapTracker = require('../../lib/utils/input-source-map-tracker');
+var inputSourceMapTracker = require('../../lib/reader/input-source-map-tracker');
 var extractProperties = require('../../lib/optimizer/extract-properties');
 var canReorder = require('../../lib/optimizer/reorderable').canReorder;
 var canReorderSingle = require('../../lib/optimizer/reorderable').canReorderSingle;

diff --git a/test/properties/longhand-overriding-test.js b/test/properties/longhand-overriding-test.js
index a13ada4..b0bb346 100644 (file)
--- a/test/properties/longhand-overriding-test.js
+++ b/test/properties/longhand-overriding-test.js
@@ -4,7 +4,7 @@ var assert = require('assert');
 var optimize = require('../../lib/properties/optimizer');
 
 var tokenize = require('../../lib/tokenizer/tokenize');
-var inputSourceMapTracker = require('../../lib/utils/input-source-map-tracker');
+var inputSourceMapTracker = require('../../lib/reader/input-source-map-tracker');
 var compatibility = require('../../lib/utils/compatibility');
 var Validator = require('../../lib/properties/validator');
 

diff --git a/test/properties/optimizer-test.js b/test/properties/optimizer-test.js
index 05425a7..d8bc5a1 100644 (file)
--- a/test/properties/optimizer-test.js
+++ b/test/properties/optimizer-test.js
@@ -4,7 +4,7 @@ var assert = require('assert');
 var optimize = require('../../lib/properties/optimizer');
 
 var tokenize = require('../../lib/tokenizer/tokenize');
-var inputSourceMapTracker = require('../../lib/utils/input-source-map-tracker');
+var inputSourceMapTracker = require('../../lib/reader/input-source-map-tracker');
 var compatibility = require('../../lib/utils/compatibility');
 var Validator = require('../../lib/properties/validator');
 

diff --git a/test/properties/override-compacting-test.js b/test/properties/override-compacting-test.js
index a43c790..4cb428a 100644 (file)
--- a/test/properties/override-compacting-test.js
+++ b/test/properties/override-compacting-test.js
@@ -4,7 +4,7 @@ var assert = require('assert');
 var optimize = require('../../lib/properties/optimizer');
 
 var tokenize = require('../../lib/tokenizer/tokenize');
-var inputSourceMapTracker = require('../../lib/utils/input-source-map-tracker');
+var inputSourceMapTracker = require('../../lib/reader/input-source-map-tracker');
 var compatibility = require('../../lib/utils/compatibility');
 var Validator = require('../../lib/properties/validator');
 

diff --git a/test/properties/shorthand-compacting-test.js b/test/properties/shorthand-compacting-test.js
index 9980303..e7af811 100644 (file)
--- a/test/properties/shorthand-compacting-test.js
+++ b/test/properties/shorthand-compacting-test.js
@@ -4,7 +4,7 @@ var assert = require('assert');
 var optimize = require('../../lib/properties/optimizer');
 
 var tokenize = require('../../lib/tokenizer/tokenize');
-var inputSourceMapTracker = require('../../lib/utils/input-source-map-tracker');
+var inputSourceMapTracker = require('../../lib/reader/input-source-map-tracker');
 var compatibility = require('../../lib/utils/compatibility');
 var Validator = require('../../lib/properties/validator');
 

diff --git a/test/tokenizer/tokenize-test.js b/test/tokenizer/tokenize-test.js
index 379a464..0f726c2 100644 (file)
--- a/test/tokenizer/tokenize-test.js
+++ b/test/tokenizer/tokenize-test.js
@@ -1,7 +1,7 @@
 var vows = require('vows');
 var assert = require('assert');
 var tokenize = require('../../lib/tokenizer/tokenize');
-var inputSourceMapTracker = require('../../lib/utils/input-source-map-tracker');
+var inputSourceMapTracker = require('../../lib/reader/input-source-map-tracker');
 
 var fs = require('fs');
 var path = require('path');