Fix linking regex and clean up logic (#22)

Author: gnestor

src/index.js

@@ -40,32 +40,24 @@ function ansiToInlineStyle(text) {
 function linkifyBundle(bundle) {
   return {
     ...bundle,
-    content: bundle.content.split(' ').reduce(
-      (result, word) => {
-        // If word is a URL
-        if (/[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/.test(word)) {
-          return [
-            ...result, 
-            ' ',
-            React.createElement('a', { 
-              href: word ,
+    content: bundle.content.split(' ').reduce((result, word, index) => [
+      ...result,
+      // Unless word is the first, prepend a space
+      index === 0 ? '' : ' ',
+      // If word is a URL, return an <a> element
+      /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/.test(word)
+        ? React.createElement(
+            'a',
+            {
+              key: index,
+              href: word,
               target: '_blank'
-            }, `${word}`) 
-          ];
-        }
-        const lastWord = result.pop();
-        if (lastWord) {
-          // If lastWord is a `<a>` element
-          if (lastWord.type) return [...result, lastWord, ' ', word];
-          // If not, combine lastWord and word into single string
-          return [...result, [lastWord, word].join(' ')];
-        }
-        // If there is no lastWord because word is the first
-        return [...result, word];
-      }, 
-      []
-    )
-  }
+            },
+            `${word}`
+          )
+        : word
+    ], [])
+  };
 }
 
 function inlineBundleToReact(bundle, key) {

test/index-spec.js

@@ -40,4 +40,16 @@ describe('Ansi', () => {
     expect(el.text()).to.equal('this is a link: https://nteract.io/');
     expect(el.html()).to.equal('<code><span>this is a link: <a href="https://nteract.io/" target="_blank">https://nteract.io/</a></span></code>');
   });
+  
+  it('can distinguish URL-ish text', () => {
+    const el = enzyme.shallow(React.createElement(Ansi, {linkify: true}, '<transport.model.TransportInfo'));
+    expect(el).to.not.be.null;
+    expect(el.text()).to.equal('<transport.model.TransportInfo');
+  });
+  
+  it('can distinguish URL-ish text', () => {
+    const el = enzyme.shallow(React.createElement(Ansi, {linkify: true}, "<module 'something' from '/usr/local/lib/python2.7/dist-packages/something/__init__.pyc'>"));
+    expect(el).to.not.be.null;
+    expect(el.text()).to.equal("<module 'something' from '/usr/local/lib/python2.7/dist-packages/something/__init__.pyc'>");
+  });
 });