Updated parser and fixed main image parsing

Fixes dijs#53

Author: dijs

.gitignore

@@ -3,4 +3,5 @@ node_modules/
 dist/
 coverage/
 npm-debug.log
-yarn.lock
+yarn.lock
+package-lock.json

package.json

@@ -25,8 +25,8 @@
   },
   "main": "./dist/wiki.js",
   "dependencies": {
-    "isomorphic-fetch": "^2.2.1",
-    "infobox-parser": "^1.0.4"
+    "infobox-parser": "^2.0.0",
+    "isomorphic-fetch": "^2.2.1"
   },
   "devDependencies": {
     "babel": "^6.23.0",

src/page.js

@@ -2,11 +2,6 @@ import { aggregatePagination, pagination, api } from './util';
 import infoboxParser from 'infobox-parser';
 import {parseCoordinates} from './coordinates';
 
-const byNamedImage = searchName => image => {
-	const [, name] = image.title.split(':');
-	return name === searchName;
-};
-
 /**
  * WikiPage
  * @namespace WikiPage
@@ -103,6 +98,7 @@ export default function wikiPage(rawPageInfo, apiOptions) {
 					info.bildname ||
 					info.imagen ||
 					info.Immagine;
+					
 				// Handle case where no info box exists
 				if (!mainImageName) {
 					return rawInfo().then(text => {
@@ -114,7 +110,7 @@ export default function wikiPage(rawPageInfo, apiOptions) {
 							: undefined;
 					});
 				}
-				const image = images.find(byNamedImage(mainImageName));
+				const image = images.find(({ title }) => title.indexOf(mainImageName) !== -1);
 				return image.imageinfo.length > 0
 					? image.imageinfo[0].url
 					: undefined;

test/integration.js

@@ -41,7 +41,7 @@ describe('Dublin page integration', () => {
 
     return dublin.info().then((info) => {
       info.name.should.equal('Dublin');
-      info.gdp.should.equal('US$ 90.1 billion');
+      info.gdp.should.equal('American dollar 90.1 billion');
       info.populationTotal.should.equal(553165)
     });
   });

test/real.js

@@ -33,4 +33,15 @@ describe('Live tests', () => {
         });
       });
   });
+  it('should parse main image properly', function(done) {
+    this.timeout(5000);
+    wiki()
+      .page('FC Copenhagen')
+      .then(page => {
+        page.mainImage().then(mainImage => {
+          mainImage.should.equal('https://upload.wikimedia.org/wikipedia/en/9/93/FC_K%C3%B8benhavn.svg');
+          done();
+        });
+      });
+  });
 });