Merge branch 'master' into master

Author: e-oj

README.md

@@ -6,7 +6,7 @@
 [og]: <http://ogp.me/>
 [twitter]: <https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/markup>
 
-Grabity looks through [Open Graph](http://ogp.me/) and [Twitter Cards](https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/markup) markup to get Information about a link. Its functions will return as much data as they can from the markup. If no [og] or [twitter] tags are found, the returned objects will be empty.
+Grabity looks through [Open Graph](http://ogp.me/) and [Twitter Cards](https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/markup) markup to get Information about a link. Its functions will return as much data as they can from the markup. If no [og] or [twitter] tags are found, it will default to the content of the <title> tag and meta description, and if either the title tag or meta description is missing, the returned property will be empty.
 
 ## Getting Started:
 ```

lib/grabity.js

@@ -18,13 +18,13 @@ exports.grabIt = async (url) => {
   if(!url) throw new Error("Missing url!");
 
   try{
-    let {og, twitter, favicon} = await utils.grabInfo(url);
+    let {og, twitter, favicon, defaults} = await utils.grabInfo(url);
     let props = ["title", "description", "image"];
     let res = {};
     let val;
 
     for(let prop of props){
-      val = og[prop] || twitter[prop];
+      val = og[prop] || twitter[prop] || defaults[prop];
 
       if(val) res[prop] = val;
     }

test/tests.js

@@ -25,7 +25,7 @@ describe("grabity", () => {
   });
 
   describe("#grab", () => {
-    it("should return all 'twitter:' and 'og:' tags, as well as favicon", async () => {
+    it("should return all 'twitter:' and 'og:' tags, favicon, default title tag and meta description", async () => {
       let it = await grabity.grab(URL);
       let keys = Object.keys(tags);
 

test_setup/tags.js

@@ -12,4 +12,7 @@ exports["twitter:card"] = "summary";
 exports["twitter:site"] = "@flickr";
 exports["twitter:title"] = "Small Island Developing States Photo Submission";
 exports["twitter:description"] = "View the album on Flickr.";
-exports["twitter:image"] = "https://farm6.staticflickr.com/5510/14338202952_93595258ff_z.jpg";
+exports["twitter:image"] = "https://farm6.staticflickr.com/5510/14338202952_93595258ff_z.jpg";
+
+exports["title"] = "YE OLDE TEST FILE";
+exports["description"] = "This is a meta description";

test_setup/test.html

@@ -15,6 +15,8 @@
     <meta name="twitter:description" content="View the album on Flickr." />
     <meta name="twitter:image" content="https://farm6.staticflickr.com/5510/14338202952_93595258ff_z.jpg" />
 
+    <meta name="description" content="This is a meta description" />
+
     <link rel="icon" href="https://assets-cdn.github.com/favicon.ico">
 
 </head>

utils/index.js

@@ -24,12 +24,23 @@ virtualConsole.sendTo(console, {omitJSDOMErrors: true});
 exports.grabInfo = async (url) => {
   let og = {};
   let twitter = {};
+  let defaults = {};
 
   try{
     let dom = await JSDOM.fromURL(url, {virtualConsole});
     let doc = dom.window.document;
     let metaEls = doc.getElementsByTagName("meta");
     let linkEls = doc.getElementsByTagName("link");
+    let titleTag = doc.getElementsByTagName("title");
+    let metaDescTag = doc.querySelector("meta[name='description']");
+
+    if(titleTag.length){
+      defaults.title = titleTag[0].textContent;
+    }
+
+    if(metaDescTag){
+      defaults.description = metaDescTag.content;
+    }
 
     for(let meta of metaEls){
       filterInfo(meta, OG_PROP, og);
@@ -38,7 +49,7 @@ exports.grabInfo = async (url) => {
 
     let favicon = findFavicon(linkEls);
 
-    return {og, twitter, favicon};
+    return {og, twitter, favicon, defaults};
   }
   catch(err){
     throw err;
@@ -61,12 +72,22 @@ exports.grabAll = async (url) => {
     let doc = dom.window.document;
     let metaEls = doc.getElementsByTagName("meta");
     let linkEls = doc.getElementsByTagName("link");
+    let titleTag = doc.getElementsByTagName("title");
+    let metaDescTag = doc.querySelector("meta[name='description']");
+
+    if(titleTag.length){
+      res.title = titleTag[0].textContent;
+    }
+
+    if(metaDescTag){
+      res.description = metaDescTag.content;
+    }
 
     for(let meta of metaEls){
       filterAll(meta, "og:", res);
       filterAll(meta, "twitter:", res);
     }
-
+    
     res.favicon = findFavicon(linkEls);
 
     return res;