Refactor.

This commit is contained in:
Alexandre Gigliotti
2015-12-01 09:50:47 -08:00
parent 3881565a28
commit b3d479224e
4 changed files with 157 additions and 173 deletions

View File

@@ -6,7 +6,6 @@ const path = require('path');
const R = require('ramda');
const forEachIndexed = R.addIndex(R.forEach);
const resolve = R.curry((a,b) => path.resolve(a,b));
/**
* Inline sourced image files
@@ -17,11 +16,8 @@ const resolve = R.curry((a,b) => path.resolve(a,b));
* Filename used to resolve relative sources being inlined
*/
const inlineImg = co.wrap(function * ($, filename) {
var files;
const basedir = path.dirname(filename);
const getAttr = R.curry((attr, element) => $(element).attr(attr));
const setAttr = R.curry((attr, element, value) => $(element).attr(attr, value));
const getFilename = R.pipe(getAttr('src'), resolve(basedir));
var files;
try {
const images = $('img')
.filter((index, element) => {
@@ -29,13 +25,12 @@ const inlineImg = co.wrap(function * ($, filename) {
return isLocalPath(source) && !isTemplateExpression(source);
})
.toArray();
const getFilename = element => path.resolve(basedir, $(element).attr('src'));
const filenames = R.map(getFilename, images);
files = R.uniq(filenames);
const uris = yield R.map(datauri, filenames);
forEachIndexed((image, index) => setAttr('src', image, uris[index]), images);
const replaceImageSource = (image, index) => $(image).attr('src', uris[index]);
forEachIndexed(replaceImageSource, images);
return { $, files };
}
catch (error) {