Refactor url

Author: Kikobeats

src/rules/url.js

@@ -1,5 +1,10 @@
+'use strict'
 
-let isUrl = require('is-url')
+const normalizeUrl = require('normalize-url')
+const isString = require('lodash.isstring')
+const urlRegex = require('url-regex')
+
+const isUrl = value => urlRegex().test(value)
 
 /**
  * Wrap a rule with validation and formatting logic.
@@ -8,26 +13,26 @@ let isUrl = require('is-url')
  * @return {Function} wrapped
  */
 
-function wrap(rule) {
-  return ($) => {
-    let value = rule($)
-    if (typeof value != 'string') return
+const wrap = rule => $ => {
+  let value = rule($)
+  if (!isString(value)) return
 
-    // make sure it's a url
-    value = value.trim()
-    if (!isUrl(value)) return
+  // make sure it's a url
+  value = value.trim()
+  if (!isUrl(value)) return
 
-    return value
-  }
+  return normalizeUrl(value, {
+    stripWWW: false
+  })
 }
 
 /**
  * Rules.
  */
 
 module.exports = [
-  wrap(($) => $('meta[property="og:url"]').attr('content')),
-  wrap(($) => $('meta[name="twitter:url"]').attr('content')),
-  wrap(($) => $('link[rel="canonical"]').attr('href')),
-  wrap(($, url) => url),
+  wrap($ => $('meta[property="og:url"]').attr('content')),
+  wrap($ => $('meta[name="twitter:url"]').attr('content')),
+  wrap($ => $('link[rel="canonical"]').attr('href')),
+  wrap(($, url) => url)
 ]

test/fixtures/cnet/output.json

@@ -5,5 +5,5 @@
   "image": "https://cnet3.cbsistatic.com/hub/i/r/2016/05/23/ee9a228a-d1d9-40b3-b401-4ba0e07e2fce/thumbnail/670x503/90dc7a2315faa0f311e2e8f43e578847/pebblecore3.jpg",
   "publisher": "CNET",
   "title": "Pebble 2, Pebble Time 2, Pebble Core: Pebble's fitness hat trick adds heart rate, GPS, Spotify, and 3G",
-  "url": "http://www.cnet.com/news/pebble-2-pebble-time-2-pebble-core-announced-coming-this-year-and-2017/"
+  "url": "http://www.cnet.com/news/pebble-2-pebble-time-2-pebble-core-announced-coming-this-year-and-2017"
 }

test/fixtures/forbes/output.json

@@ -5,5 +5,5 @@
   "image": "http://blogs-images.forbes.com/georgeanders/files/2015/09/HackerRank-1940x827.jpg",
   "publisher": "Forbes",
   "title": "Facebook Veteran Grady Burnett Joins HackerRank As COO",
-  "url": "http://www.forbes.com/sites/georgeanders/2015/09/30/facebook-veteran-grady-burnett-joins-hackerrank-as-coo/"
+  "url": "http://www.forbes.com/sites/georgeanders/2015/09/30/facebook-veteran-grady-burnett-joins-hackerrank-as-coo"
 }

test/fixtures/fortune/output.json

@@ -5,5 +5,5 @@
   "image": "https://fortunedotcom.files.wordpress.com/2015/09/gettyimages-1852881881.jpg?crop=1&h=570&w=820",
   "publisher": "Fortune",
   "title": "Why your next job search may involve solving online puzzles",
-  "url": "http://fortune.com/2015/10/05/hackerrank-recruiting-tool/"
+  "url": "http://fortune.com/2015/10/05/hackerrank-recruiting-tool"
 }

test/fixtures/geek-time/output.json

@@ -5,5 +5,5 @@
   "image": "http://i0.wp.com/www.geektime.com/wp-content/uploads/2016/04/image001-e1461245271861.jpg?fit=750,501",
   "publisher": "Geektime",
   "title": "Fraud solutions Forter secures payment of $32M in Series C",
-  "url": "http://www.geektime.com/2016/04/21/fraud-solutions-forter-secures-payment-of-32m-in-series-c/"
+  "url": "http://www.geektime.com/2016/04/21/fraud-solutions-forter-secures-payment-of-32m-in-series-c"
 }

test/fixtures/jewish-business-news/output.json

@@ -5,5 +5,5 @@
   "image": "http://jewishbusinessnews.com/wp-content/uploads/2016/01/Shlomi-Ben-Haim-JFrog-Co-Founder-and-CEO-Source-JFrog-e1453326404147.jpg",
   "publisher": "Jewish Business News",
   "title": "Israeli startup JFrog raises $50 million in C round",
-  "url": "http://jewishbusinessnews.com/2016/01/20/israeli-startup-jfrog-raises-50-million-in-c-round/"
+  "url": "http://jewishbusinessnews.com/2016/01/20/israeli-startup-jfrog-raises-50-million-in-c-round"
 }

test/fixtures/mac-rumors/output.json

@@ -5,5 +5,5 @@
   "image": "http://cdn.macrumors.com/article-new/2016/05/amazonecho2-250x362.jpg?retina",
   "publisher": "MacRumors",
   "title": "Apple Working on Amazon Echo Competitor, Opening Siri Up to Developers",
-  "url": "http://www.macrumors.com/2016/05/24/apple-siri-sdk-amazon-echo-competitor/"
+  "url": "http://www.macrumors.com/2016/05/24/apple-siri-sdk-amazon-echo-competitor"
 }

test/fixtures/mashable/output.json

@@ -5,5 +5,5 @@
   "image": "http://i.amz.mshcdn.com/jw9czJj9h-4ClVBegbu982-Zmb8=/1200x627/2015%2F05%2F13%2Fc6%2Frevenue_ana.65b72.jpg",
   "publisher": "Mashable",
   "title": "The sales cycle on steroids: 3 ways analytics power up revenue",
-  "url": "http://mashable.com/2015/05/13/analytics-power-up-revenue/"
+  "url": "http://mashable.com/2015/05/13/analytics-power-up-revenue"
 }

test/fixtures/segment-academy/output.json

@@ -5,5 +5,5 @@
   "image": "https://www.segment.com/academy",
   "publisher": "Segment",
   "title": "When to Track on the Client vs. Server",
-  "url": "https://www.segment.com/academy/collecting-data/when-to-track-on-the-client-vs-server/"
+  "url": "https://www.segment.com/academy/collecting-data/when-to-track-on-the-client-vs-server"
 }

test/fixtures/silicon-angle/output.json

@@ -5,5 +5,5 @@
   "image": "http://siliconangle.com/files/2016/02/collab-800x432.png",
   "publisher": "SiliconANGLE",
   "title": "CircleCI receives $18 million in Series B funding round with Scale Venture Partners",
-  "url": "http://siliconangle.com/blog/2016/05/16/circleci-receives-18-million-in-series-b-funding-round-with-scale-venture-partners/"
+  "url": "http://siliconangle.com/blog/2016/05/16/circleci-receives-18-million-in-series-b-funding-round-with-scale-venture-partners"
 }