Skip to content

Fix #11 - add support for objects passed to link #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linkesch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #11 - add support for objects passed to link #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions lib/__tests__/dom.basic.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ describe('DocumentMeta - DOM basic', () => {
stylesheet: [
'http://domain.tld/css/vendor.css',
'http://domain.tld/css/styles.css'
],
alternate: [
{ href: '/alternate/us', hreflang: 'en-us' },
{ href: '/alternate/gb', hreflang: 'en-gb' }
]
}
}
Expand Down Expand Up @@ -58,11 +62,18 @@ describe('DocumentMeta - DOM basic', () => {
});

it('should render normal link tags, eg. <link rel="..." href="...">', () => {
Object.keys( DOC_META.link.rel ).reduce(( rel ) => {
Object.keys( DOC_META.link.rel ).forEach(( rel ) => {
const values = Array.isArray(DOC_META.link.rel[rel]) ? DOC_META.link.rel[rel] : [ DOC_META.link.rel[rel] ];
const elements = getElements( `link[rel=${ rel }]` );
elements.forEach(( element, idx ) => {
assert.strictEqual( element.getAttribute('content'), values[idx], `<link rel="${ rel }" ... /> has not been rendered correctly` );
Object.keys(elements).forEach(( idx ) => {
const element = elements[idx];
if (typeof values[idx] === 'string') {
assert.strictEqual( element.getAttribute('href'), values[idx], `<link rel="${ rel }" ... /> has not been rendered correctly` );
} else {
Object.keys(values[idx]).forEach(( attr ) => {
assert.strictEqual( element.getAttribute(attr), values[idx][attr], `<link rel="${ rel }" ${ attr }="..." ... /> has not been rendered correctly` );
});
}
});
});
});
Expand Down
30 changes: 23 additions & 7 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,22 @@ function parseTags ( tagName, props = {} ) {
if (value === null ) {
return;
}
tags.push({
tagName,
[ groupKey ]: key,
[ contentKey ]: value
});
if (typeof value === 'string') {
tags.push({
tagName,
[ groupKey ]: key,
[ contentKey ]: value
});
} else {
const attrs = {
tagName,
[ groupKey ]: key
};
Object.keys( value ).forEach(( attr) => {
attrs[attr] = value[attr];
});
tags.push(attrs);
}
});
});
});
Expand Down Expand Up @@ -141,7 +152,7 @@ function render ( meta = {}, opts ) {
let i = 0;
const tags = [];

function renderTag ( entry ) {
function renderTag ( entry ) {
const { tagName, ...attr } = entry;

if ( tagName === 'meta' ) {
Expand Down Expand Up @@ -191,7 +202,12 @@ const DocumentMeta = React.createClass({
React.PropTypes.objectOf(
React.PropTypes.oneOfType([
React.PropTypes.string,
React.PropTypes.arrayOf(React.PropTypes.string)
React.PropTypes.arrayOf(
React.PropTypes.oneOfType([
React.PropTypes.string,
React.PropTypes.objectOf(React.PropTypes.string)
])
)
])
)
),
Expand Down