Merge pull request #357 from jamesramsay/fix-http-links

James · web-flow · commit a71abb48cc24 · 2017-02-14T16:56:21.000-05:00
Fix: http link detection
diff --git a/README.md b/README.md
@@ -304,7 +304,7 @@ __Returns__
 
 __Examples__
 
-```
+```javascript
 import { trancludeFile, resolveHttpUrl, resolveLocalUrl, resolveString } from 'hercule';
 
 function myResolver(url, source) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hercule",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.2",
   "description": "Markdown, API Blueprint and string transclusion",
   "main": "./lib/hercule",
   "scripts": {
diff --git a/src/resolver.js b/src/resolver.js
@@ -7,7 +7,7 @@ import through2 from 'through2';
 
 export function resolveHttpUrl(url) {
   // TODO: handle relative link in
-  const isHttpUrl = /https?:\/\//;
+  const isHttpUrl = /^https?:\/\//;
   if (!isHttpUrl.test(url)) return null;
 
   const content = got.stream(url);
diff --git a/test/fixtures/references/_expect.md b/test/fixtures/references/_expect.md
@@ -3,3 +3,5 @@
 ## Add venues [/venues]
 
 venues
+
+http://example.com/
diff --git a/test/fixtures/references/_expect.md.map b/test/fixtures/references/_expect.md.map
diff --git a/test/fixtures/references/index.md b/test/fixtures/references/index.md
@@ -1 +1 @@
-:[Venues](venues.md resource:"venues")
+:[Venues](venues.md resource:"venues" homepage:"http://example.com/")
diff --git a/test/fixtures/references/venues.md b/test/fixtures/references/venues.md
@@ -3,3 +3,5 @@
 ## Add venues [/venues]
 
 :[POST](post.md attributes:"Venue" description:"A great location")
+
+:[Homepage URL](homepage)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hercule",`
`3`		`- "version": "4.0.0-beta.1",`
	`3`	`+ "version": "4.0.0-beta.2",`
`4`	`4`	`"description": "Markdown, API Blueprint and string transclusion",`
`5`	`5`	`"main": "./lib/hercule",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-:[Venues](venues.md resource:"venues")`
	`1`	`+:[Venues](venues.md resource:"venues" homepage:"http://example.com/")`