Optionally accepting cheerio input when processing images

processData.js

@@ -3,6 +3,7 @@
 var fs = require('fs')
 var path = require('path')
 var slug = require('slug')
+var cheerio = require('cheerio')
 var frontMatter = require('front-matter')
 var dateParser = require('fs-date-parser')
 var Readable = require('stream').Readable
@@ -77,7 +78,7 @@ function postCompiler (callback, err, compilerContext) {
     return require('excerpt-html')(excerptBase, options)
   }
   if (data.html && options.images) {
-    return require('./processImages')(data.html, options.linkIt, function (ignoreError, result) {
+    return require('./processImages')(cheerio.load(data.html), options.images, function (ignoreError, result) {
       data.html = result.html
       data.images = result.images
       callback(null, data)

processImages.js

@@ -1,7 +1,7 @@
 'use strict'
 
-var cheerio = require('cheerio')
 var path = require('path')
+var cheerio = require('cheerio')
 
 function isFeatured (data) {
   return data.classes && data.classes.indexOf('featured') !== -1
@@ -53,7 +53,7 @@ function addToImageList (options, image, images) {
     src = image.attribs[attrib]
   }
   var simpleSrc = typeof src === 'string' ? getSimpleSrc(options.cwd || '.', src) : null
-  var id = image.attribs['data-id'] || src || selector
+  var id = image.attribs['data-id'] || image.attribs.id || src || selector
   var data = getImageDataById(images, id)
   if (!data) {
     images.push({
@@ -77,19 +77,21 @@ function modifyAttribute (node, modifier, attrib) {
   }
 }
 
-module.exports = function processImages (html, options, callback) {
+module.exports = function processImages ($, options, callback) {
   if (arguments.length < 3) {
     callback = options
     options = null
   }
-  if (!options) {
+  if (!options || options === true) {
     options = {}
   }
   if (!options.srcAttribs) {
     options.srcAttribs = ['data-src', 'src']
   }
-  var $ = cheerio.load(html)
   var images = []
+  if (typeof $ === 'string') {
+    $ = cheerio.load($)
+  }
   $('img').each(function (nr, image) {
     if (options.convertUrl) {
       options.srcAttribs.forEach(