Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
May 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/filename-generators/by-site-structure.js
Original file line number Diff line number Diff line change
@@ -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);
}
};
Expand Down
4 changes: 2 additions & 2 deletions lib/filename-generators/by-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions lib/resource.js
Original file line number Diff line number Diff line change
@@ -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');

Expand Down Expand Up @@ -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);

Expand Down
5 changes: 5 additions & 0 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
};