Fixed some bugs on Windows

Author: JamesMessinger

dist/ref-parser.js

@@ -1664,13 +1664,15 @@ exports.doCallback = function doCallback(callback, err, params) {
 (function (process){
 'use strict';
 
-var protocolPattern = /^[a-z0-9.+-]+:\/\//i;
+var isWindows           = /^win/.test(process.platform),
+    forwardSlashPattern = /\//g,
+    protocolPattern     = /^[a-z0-9.+-]+:\/\//i;
 
 // RegExp patterns to URL-encode special characters in local filesystem paths
 var urlEncodePatterns = [
   /\?/g, '%3F',
   /\#/g, '%23',
-  /^win/.test(process.platform) ? /\\/g : /\//, '/'
+  isWindows ? /\\/g : /\//, '/'
 ];
 
 // RegExp patterns to URL-decode special characters for local filesystem paths
@@ -1730,6 +1732,9 @@ exports.urlToLocalPath = function urlToLocalPath(url) {
   for (var i = 0; i < urlDecodePatterns.length; i += 2) {
     url = url.replace(urlDecodePatterns[i], urlDecodePatterns[i + 1]);
   }
+  if (isWindows) {
+    url = url.replace(forwardSlashPattern, '\\');
+  }
   return url;
 };
 

dist/ref-parser.js.map

@@ -1,12 +1,14 @@
 'use strict';
 
-var protocolPattern = /^[a-z0-9.+-]+:\/\//i;
+var isWindows           = /^win/.test(process.platform),
+    forwardSlashPattern = /\//g,
+    protocolPattern     = /^[a-z0-9.+-]+:\/\//i;
 
 // RegExp patterns to URL-encode special characters in local filesystem paths
 var urlEncodePatterns = [
   /\?/g, '%3F',
   /\#/g, '%23',
-  /^win/.test(process.platform) ? /\\/g : /\//, '/'
+  isWindows ? /\\/g : /\//, '/'
 ];
 
 // RegExp patterns to URL-decode special characters for local filesystem paths
@@ -66,6 +68,9 @@ exports.urlToLocalPath = function urlToLocalPath(url) {
   for (var i = 0; i < urlDecodePatterns.length; i += 2) {
     url = url.replace(urlDecodePatterns[i], urlDecodePatterns[i + 1]);
   }
+  if (isWindows) {
+    url = url.replace(forwardSlashPattern, '\\');
+  }
   return url;
 };
 

dist/ref-parser.min.js

@@ -73,7 +73,7 @@
           var values = $refs.values();
           expect(values).to.have.keys(expectedFiles);
           expectedFiles.forEach(function(file, i) {
-            var actual = convertNodeBuffersToPOJOs(values[file]);
+            var actual = helper.convertNodeBuffersToPOJOs(values[file]);
             var expected = expectedValues[i];
             expect(actual).to.deep.equal(expected, file);
           });
@@ -87,7 +87,7 @@
   /**
    * Converts Buffer objects to POJOs, so they can be compared using Chai
    */
-  function convertNodeBuffersToPOJOs(value) {
+  helper.convertNodeBuffersToPOJOs = function convertNodeBuffersToPOJOs(value) {
     if (value && value.constructor && value.constructor.name === 'Buffer') {
       // Convert Buffers to POJOs for comparison
       value = value.toJSON();

dist/ref-parser.min.js.map

@@ -34,11 +34,16 @@
    */
   path.abs = function(file) {
     if (userAgent.isNode) {
-      return _path.join(_testsDir, file || '/');
+      file = _path.join(_testsDir, file || '/');
     }
     else {
-      return _testsDir + encodeFile(file);
+      file = _testsDir + encodeFile(file);
     }
+    if (/^[A-Z]\:[\\\/]/.test(file)) {
+      // lowercase the drive letter on Windows, for string comparison purposes
+      file = file[0].toLowerCase() + file.substr(1);
+    }
+    return file;
   };
 
   /**

lib/util/path.js

@@ -49,8 +49,8 @@ describe('Schema with $refs to unknown file types', function() {
       .then(function(schema) {
         expect(schema).to.equal(parser.schema);
 
-        // Serialize the schema, to convert the Buffers into POJOs
-        schema = JSON.parse(JSON.stringify(schema));
+        schema.definitions.html = helper.convertNodeBuffersToPOJOs(schema.definitions.html);
+        schema.definitions.binary = helper.convertNodeBuffersToPOJOs(schema.definitions.binary);
         expect(schema).to.deep.equal(helper.dereferenced.unknown);
 
         done();
@@ -66,8 +66,8 @@ describe('Schema with $refs to unknown file types', function() {
       .then(function(schema) {
         expect(schema).to.equal(parser.schema);
 
-        // Serialize the schema, to convert the Buffers into POJOs
-        schema = JSON.parse(JSON.stringify(schema));
+        schema.definitions.html = helper.convertNodeBuffersToPOJOs(schema.definitions.html);
+        schema.definitions.binary = helper.convertNodeBuffersToPOJOs(schema.definitions.binary);
         expect(schema).to.deep.equal(helper.dereferenced.unknown);
 
         done();