diff --git a/src/extractor/custom/extractor.test.js b/src/extractor/custom/extractor.test.js index 2bf8e5d5..d624aeb6 100644 --- a/src/extractor/custom/extractor.test.js +++ b/src/extractor/custom/extractor.test.js @@ -21,6 +21,5 @@ describe('CustomExtractor', () => { } = CustomExtractor.extract(NYMagExtractor, url, html, $) assert.equal(title, 'Trump Claims He Discussed $25K Donation With Florida Attorney General, But Not Trump University Investigation') - console.log(leadImageUrl) }) }) diff --git a/src/extractor/get-extractor.js b/src/extractor/get-extractor.js index 5bc25838..5ce7e7a8 100644 --- a/src/extractor/get-extractor.js +++ b/src/extractor/get-extractor.js @@ -7,8 +7,5 @@ export default function getExtractor(url) { const parsedUrl = URL.parse(url) const { hostname } = parsedUrl - return { - ...GenericExtractor, - ...Extractors[hostname] - } + return Extractors[hostname] || GenericExtractor } diff --git a/src/index.js b/src/index.js index e661db42..536ad048 100644 --- a/src/index.js +++ b/src/index.js @@ -1,14 +1,16 @@ import fs from 'fs' import Resource from './resource' -import GenericExtractor from './extractor/generic' +import getExtractor from './extractor/get-extractor' +import RootExtractor from './extractor/custom/extractor' import fetchResource from './resource/utils/fetch-resource' const Iris = { parse: async function(url, html) { const $ = await Resource.create(url, html) - const result = GenericExtractor.parse(url, null, $) + const Extractor = getExtractor(url) + const result = RootExtractor.extract(Extractor, url, html, $) return result } }