Remove createOutputObject, return Resource as-is

Author: s0ph1e

lib/scraper.js

@@ -128,8 +128,8 @@ Scraper.prototype.prepare = function prepare () {
 
 Scraper.prototype.load = function load () {
 	var self = this;
-	return Promise.map(self.originalResources, function loadPage (po) {
-		return self.loadResource(po).then(utils.createOutputObject);
+	return Promise.map(self.originalResources, function loadResource (resource) {
+		return self.loadResource(resource);
 	});
 };
 

test/functional/base-test.js

@@ -3,6 +3,7 @@ var nock = require('nock');
 var fs = require('fs-extra');
 var cheerio = require('cheerio');
 var scraper = require('../../index');
+var Resource = require('../../lib/resource');
 
 var testDirname = __dirname + '/.base';
 var mockDirname = __dirname + '/mocks/base';
@@ -68,16 +69,19 @@ describe('Functional base', function() {
 			result.should.be.instanceOf(Array).and.have.length(3);
 
 			result[0].should.have.properties({ url: 'http://example.com/', filename: 'index.html' });
-			result[0].should.have.properties('assets');
-			result[0].assets.should.be.instanceOf(Array).and.have.length(4);
+			result[0].should.have.properties('children');
+			result[0].children.should.be.instanceOf(Array).and.have.length(4);
+			result[0].children[0].should.be.instanceOf(Resource);
 
 			result[1].should.have.properties({ url: 'http://example.com/about', filename: 'about.html' });
-			result[1].should.have.properties('assets');
-			result[1].assets.should.be.instanceOf(Array).and.have.length(4);
+			result[1].should.have.properties('children');
+			result[1].children.should.be.instanceOf(Array).and.have.length(4);
+			result[1].children[0].should.be.instanceOf(Resource);
 
 			result[2].should.have.properties({ url: 'http://blog.example.com/', filename: 'blog.html' }); // url after redirect
-			result[2].should.have.properties('assets');
-			result[2].assets.should.be.instanceOf(Array).and.have.length(1);
+			result[2].should.have.properties('children');
+			result[2].children.should.be.instanceOf(Array).and.have.length(1);
+			result[2].children[0].should.be.instanceOf(Resource);
 
 			// should create directory and subdirectories
 			fs.existsSync(testDirname).should.be.eql(true);

test/unit/scraper-test.js

@@ -210,7 +210,7 @@ describe('Scraper', function () {
 			}).catch(done);
 		});
 
-		it('should return array of objects with url, filename and assets', function(done) {
+		it('should return array of objects with url, filename and childre', function(done) {
 			nock('http://first-url.com').get('/').reply(200, 'OK');
 			nock('http://second-url.com').get('/').reply(500);
 
@@ -225,8 +225,8 @@ describe('Scraper', function () {
 			s.prepare().bind(s).then(s.load).then(function(res) {
 				res.should.be.instanceOf(Array);
 				res.should.have.length(2);
-				res[0].should.have.properties(['url', 'filename', 'assets']);
-				res[1].should.have.properties(['url', 'filename', 'assets']);
+				res[0].should.be.instanceOf(Resource).and.have.properties(['url', 'filename', 'children']);
+				res[1].should.be.instanceOf(Resource).and.have.properties(['url', 'filename', 'children']);
 				done();
 			}).catch(done);
 		});

test/unit/utils-test.js

@@ -83,41 +83,4 @@ describe('Common utils', function () {
 			utils.getRelativePath('css/1.css', 'css/2.css').should.be.equal('2.css');
 		});
 	});
-
-	describe('#createOutputObject', function () {
-		it('should create output object recursively', function() {
-			var root = new Resource('http://google.com', 'google.html');
-			root.createChild('http://child-one.com', 'child.html');
-			root.createChild('http://child-two.com', 'child2.html');
-
-			var expected = {
-				url: 'http://google.com',
-				filename: 'google.html',
-				assets: [{
-					url: 'http://child-one.com',
-					filename: 'child.html',
-					assets: []
-				}, {
-					url: 'http://child-two.com',
-					filename: 'child2.html',
-					assets: []
-				}]
-			};
-
-			var result = utils.createOutputObject(root);
-			result.should.eql(expected);
-		});
-
-		it('should not fail on referential loop', function() {
-			var root = new Resource('http://example.com', 'index.html');
-			var child1 = root.createChild('http://child-one.com', 'child1.html');
-			var child2 = root.createChild('http://child-two.com', 'child2.html');
-			// create referential loop
-			var rootCopy = child1.createChild('http://example.com');
-			child1.updateChild(rootCopy, root);
-
-			var result = utils.createOutputObject(root);
-			result.should.be.not.empty();
-		});
-	});
 });