embeds - npm Package Compare versions

Comparing version 1.4.2 to 1.4.3

dist/types/instagram/parse.js

@@ -70,3 +70,3 @@ 'use strict';
 
-var regexp = /https?:\/\/instagram\.com\/p\/([A-Za-z0-9_-]+)\/embed/;
+var regexp = /https?:\/\/(www.)?instagram\.com\/p\/([A-Za-z0-9_-]+)\/embed/;
 
@@ -84,3 +84,3 @@ function testInstagramIframe(elm) {
 
-  var id = match[1];
+  var id = match[2];
 
@@ -87,0 +87,0 @@ return { type: type, text: '', url: 'https://instagram.com/p/' + id, id: id };

dist/types/twitter.js

@@ -6,3 +6,3 @@ 'use strict';
 });
-exports.render = exports.parse = undefined;
+exports.render = exports.renderUser = exports.parse = undefined;
 
@@ -82,2 +82,6 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 
+var renderUser = exports.renderUser = function renderUser(user) {
+  return user && user.name && user.slug ? '— ' + user.name + ' (@' + user.slug + ') ' : '';
+};
+
 var render = exports.render = function render(_ref3) {
@@ -97,3 +101,3 @@ var text = _ref3.text;
     ),
-    '— ' + user.name + ' (@' + user.slug + ') ',
+    renderUser(user),
     (0, _deku.element)(
@@ -100,0 +104,0 @@ 'a',

lib/types/instagram/parse.js

@@ -59,3 +59,3 @@ import last from 'lodash.last';
 
-const regexp = /https?:\/\/instagram\.com\/p\/([A-Za-z0-9_-]+)\/embed/;
+const regexp = /https?:\/\/(www.)?instagram\.com\/p\/([A-Za-z0-9_-]+)\/embed/;
 
@@ -73,3 +73,3 @@ function testInstagramIframe (elm) {
 
-  const id = match[1];
+  const id = match[2];
 
@@ -76,0 +76,0 @@ return {type, text: '', url: `https://instagram.com/p/${id}`, id};

lib/types/twitter.js

@@ -52,7 +52,12 @@ import find from 'lodash.find';
 
+export const renderUser = user =>
+  user && user.name && user.slug
+  ? `— ${user.name} (@${user.slug}) `
+  : '';
+
 export const render = ({text, url, date, user, id}) =>
   <blockquote class='twitter-tweet' lang='en'>
     <p lang='en' dir='ltr'>{renderText(text)}</p>
-    {`&mdash; ${user.name} (@${user.slug}) `}
+    {renderUser(user)}
     <a href={url}>{date}</a>
   </blockquote>;

package.json

 {
   "name": "embeds",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Parse & render embeds",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

test/fixtures/index.js

@@ -9,3 +9,4 @@ import {readFileSync} from 'fs';
   facebookVideo: readFileSync(`${__dirname}/facebook-video.html`, 'utf8').trim(),
-  facebookEmbedCode: readFileSync(`${__dirname}/facebook-embed-code.html`, 'utf8').trim()
+  facebookEmbedCode: readFileSync(`${__dirname}/facebook-embed-code.html`, 'utf8').trim(),
+  tweetNoUser: readFileSync(`${__dirname}/tweet-no-user.html`, 'utf8').trim()
 };

test/html-parse-test.js

@@ -266,2 +266,14 @@ import test from 'ava';
 
+test('parse() instagram www iframe', t => {
+  const input = `<iframe src="http://www.instagram.com/p/fdx1CSuEPV/embed"></iframe>`;
+  const actual = parse(input);
+  const expected = {
+    type: 'instagram',
+    text: '',
+    id: 'fdx1CSuEPV',
+    url: 'https://instagram.com/p/fdx1CSuEPV'
+  };
+  t.deepEqual(actual, expected);
+});
+
 test('parse() instagram - with caption', t => {
@@ -268,0 +280,0 @@ const input = fixtures.instagramCaption;

test/render-test.js

@@ -109,2 +109,59 @@ import test from 'ava';
 
+test('render() tweet with no user slug', t => {
+  const input = {
+    type: 'twitter',
+    text: [
+      {content: 'GIF vs. JIF… This ', href: null},
+      {content: 'pic.twitter.com/qFAHWgdbL6', href: 'https://t.co/qFAHWgdbL6'}
+    ],
+    url: 'https://twitter.com/MattNavarra/status/684690494841028608',
+    date: 'January 6, 2016',
+    user: {
+      slug: null,
+      name: 'Matt (foo) Navarra'
+    },
+    id: '684690494841028608'
+  };
+  const actual = render(input);
+  const expected = fixtures.tweetNoUser;
+  t.is(actual, expected);
+});
+
+test('render() tweet with no user name', t => {
+  const input = {
+    type: 'twitter',
+    text: [
+      {content: 'GIF vs. JIF… This ', href: null},
+      {content: 'pic.twitter.com/qFAHWgdbL6', href: 'https://t.co/qFAHWgdbL6'}
+    ],
+    url: 'https://twitter.com/MattNavarra/status/684690494841028608',
+    date: 'January 6, 2016',
+    user: {
+      slug: 'MattNavarra',
+      name: null
+    },
+    id: '684690494841028608'
+  };
+  const actual = render(input);
+  const expected = fixtures.tweetNoUser;
+  t.is(actual, expected);
+});
+
+test('render() tweet with no user', t => {
+  const input = {
+    type: 'twitter',
+    text: [
+      {content: 'GIF vs. JIF… This ', href: null},
+      {content: 'pic.twitter.com/qFAHWgdbL6', href: 'https://t.co/qFAHWgdbL6'}
+    ],
+    url: 'https://twitter.com/MattNavarra/status/684690494841028608',
+    date: 'January 6, 2016',
+    user: null,
+    id: '684690494841028608'
+  };
+  const actual = render(input);
+  const expected = fixtures.tweetNoUser;
+  t.is(actual, expected);
+});
+
 test('render() instagram - with caption', t => {
@@ -111,0 +168,0 @@ const input = {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

102428

increased by2.5%

Number of package files

54

increased by1.89%

Lines of code

2525

increased by2.98%

No dependency changes