Refactor checking resource type

Author: s0ph1e

lib/file-handlers/html.js

@@ -1,7 +1,6 @@
 var cheerio = require('cheerio');
 var Promise = require('bluebird');
 var utils = require('../utils');
-var types = require('../config/resource-types');
 
 function loadHtml (context, resource) {
 	var sources = context.getHtmlSources();
@@ -57,7 +56,7 @@ function loadResources (context, resource, source) {
 				var relativePath = utils.getRelativePath(filename, loadedResource.getFilename());
 				var hash = utils.getHashFromUrl(attr);
 
-				if (hash && loadedResource.getType() === types.html) {
+				if (hash && loadedResource.isHtml()) {
 					relativePath = relativePath.concat(hash);
 				}
 

lib/resource.js

@@ -74,20 +74,28 @@ Resource.prototype.setHtmlData = function setHtmlData (data) {
 
 Resource.prototype.getType = function getType () {
 	var ext = path.extname(this.filename);
-	var parentType = this.parent && this.parent.getType();
+	var parent = this.parent;
 	var hasHtmlData = !!this.htmlData;
 
 	switch (true) {
-		case ext == '.html' || ext == '.htm':
+		case ext === '.html' || ext === '.htm':
 			return types.html;
-		case ext == '.css':
-		case !ext && parentType == types.css:
+		case ext === '.css':
+		case !ext && parent && parent.isCss():
 			return types.css;
-		case !ext && parentType == types.html && hasHtmlData:
+		case !ext && parent && parent.isHtml() && hasHtmlData:
 			return getTypeByHtmlData(this.htmlData);
 		default:
 			return types.other;
 	}
 };
 
+Resource.prototype.isHtml = function isHtml () {
+	return this.getType() === types.html;
+};
+
+Resource.prototype.isCss = function isCss () {
+	return this.getType() === types.css;
+};
+
 module.exports = Resource;

lib/scraper.js

@@ -9,7 +9,6 @@ var path = require('path');
 var _ = require('underscore');
 
 var defaults = require('./config/defaults');
-var types = require('./config/resource-types');
 var recursiveSources = require('./config/recursive-sources');
 var utils = require('./utils.js');
 var request = require('./request');
@@ -84,14 +83,13 @@ Scraper.prototype.getDirectoryByExtension = function getDirectoryByExtension (ex
 
 Scraper.prototype.getResourceHandler = function getHandler (resource) {
 	var self = this;
-	var type = resource.getType();
 	var depth = resource.getDepth();
 	var depthGreaterThanMax = self.options.maxDepth && depth >= self.options.maxDepth;
 
 	switch (true) {
 		case depthGreaterThanMax: return _.noop;
-		case type == types.css: return loadCss;
-		case type == types.html: return loadHtmlAndCss;
+		case resource.isCss(): return loadCss;
+		case resource.isHtml(): return loadHtmlAndCss;
 		default: return _.noop;
 	}
 };