Fix exceptions in path.extname for node v6, close #70 (#71)

* Fix exceptions in path.extname for node v6, close #70

Author: s0ph1e

lib/filename-generators/by-site-structure.js

@@ -1,14 +1,15 @@
 var url = require('url');
 var path = require('path');
+var utils = require('../utils');
 
 module.exports = function generateFilename (resource, options) {
 	var urlObject = url.parse(resource.getUrl());
-	var extension = path.extname(urlObject.pathname);
-	if(resource.isHtml() && !extension){
+	var extension = utils.getFilenameExtension(urlObject.pathname);
+	if (resource.isHtml() && !extension) {
 		var fileName = options.defaultFilename + (urlObject.search || '');
 		return getSafeAbsoluteFilename(path.join(urlObject.pathname || '/', fileName));
 	}
-	else{
+	else {
 		return getSafeAbsoluteFilename(urlObject.pathname);
 	}
 };

lib/filename-generators/by-type.js

@@ -7,7 +7,7 @@ module.exports = function generateFilename (resource, options, loadedResources)
 	var occupiedFilenames = getOccupiedFilenames(loadedResources, options);
 
 	var filename = getFilenameForResource(resource, options);
-	var extension = path.extname(filename);
+	var extension = utils.getFilenameExtension(filename);
 	var directory = getDirectoryByExtension(extension, options);
 
 	var currentFilename = path.join(directory, filename);
@@ -27,7 +27,7 @@ function getFilenameForResource (resource, options) {
 	var filename = preferredFilename || urlFilename || options.defaultFilename;
 
 	var resourceType = resource.getType();
-	var extension = path.extname(filename);
+	var extension = utils.getFilenameExtension(filename);
 
 	if (!extension && defaultExtensions[resourceType]) {
 		extension = defaultExtensions[resourceType];

lib/resource.js

@@ -1,5 +1,5 @@
 var _ = require('lodash');
-var path = require('path');
+var utils = require('./utils');
 var types = require('./config/resource-types');
 var typesByHtmlData = require('./config/resource-types-by-tag');
 
@@ -97,7 +97,7 @@ Resource.prototype.setHtmlData = function setHtmlData (data) {
 };
 
 Resource.prototype.getType = function getType () {
-	var ext = path.extname(this.filename);
+	var ext = utils.getFilenameExtension(this.filename);
 	var parent = this.parent;
 	var hasHtmlData = !_.isEmpty(this.htmlData);
 

lib/utils.js

@@ -41,12 +41,17 @@ function waitAllFulfilled (promises) {
 	}));
 }
 
+function getFilenameExtension (filename) {
+	return (typeof filename === 'string') ? path.extname(filename) : null;
+}
+
 module.exports = {
 	isUrl: isUrl,
 	getUrl: getUrl,
 	getUnixPath: getUnixPath,
 	getRelativePath: getRelativePath,
 	getFilenameFromUrl: getFilenameFromUrl,
+	getFilenameExtension: getFilenameExtension,
 	getHashFromUrl: getHashFromUrl,
 	waitAllFulfilled: waitAllFulfilled
 };