Skip to content

Force a single link to an array if requested #8

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
chadkouse wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Force a single link to an array if requested #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e206c3
allow forcing a link to be an array
chadkouse Mar 28, 2014
d7682ed
allow forcing a link to be an array
chadkouse Mar 28, 2014
c70809d
allow mulpitle links to be passed in at once. cleanup
chadkouse Mar 28, 2014
c2745fa
remove cruft
chadkouse Apr 3, 2014
6267fa9
remove unused line
chadkouse Apr 3, 2014
cbe88b8
formatting
chadkouse Apr 3, 2014
12194f5
tightening it all up
chadkouse Apr 3, 2014
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
20 changes: 13 additions & 7 deletions hal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,19 @@
* @see Link
*/
Resource.prototype.link = function (link) {
if (arguments.length > 1) {
link = Link(arguments[0], arguments[1]);
}

this._links[link.rel] = linkGroupPlus(this._links[link.rel], link);

return this;
var self = this;
var rel = arguments.length > 1 ? arguments[0] : link.rel;
var links = arguments.length > 1 ?
Array.isArray(arguments[1]) ?
arguments[1].map(function (h) {
return Link(rel, h)
}) :
Link(rel, arguments[1])
: link;
Copy link
Owner

@jpbochi jpbochi Apr 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two ternaries in the same expression are hard to follow.

Copy link
Owner

@jpbochi jpbochi Apr 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe something like var links = (arguments.length === 1) ? link : extractLinks.apply(this, arguments);

and extractLinks would always receive two arguments. A relation and an href (or array of hrefs).


this._links[rel] = linkGroupPlus(this._links[rel], links);

return this;
};

function linkGroupPlus(group, newLink) {
Expand Down
19 changes: 19 additions & 0 deletions test/hal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,25 @@ describe('HAL', function () {
expect(_.pluck(res._links.admin, 'href')).to.deep.equal(['/user/john', '/user/jane']);
expect(_.pluck(res._links.admin, 'rel')).to.deep.equal(['admin', 'admin']);
});
it('should force a single link to be an array', function() {
var res = new hal.Resource({});
res.link('admin', ['/user/john']);
console.log(res._links);

expect(res._links).to.have.property('admin');
expect(res._links.admin).to.be.an('Array');
expect(_.pluck(res._links.admin, 'href')).to.deep.equal(['/user/john']);
expect(_.pluck(res._links.admin, 'rel')).to.deep.equal(['admin']);
});
it('should add two links with the same rel in one line', function() {
var res = new hal.Resource({});
res.link('admin', ['/user/john','/user/jane']);

expect(res._links).to.have.property('admin');
expect(res._links.admin).to.be.an('Array');
expect(_.pluck(res._links.admin, 'href')).to.deep.equal(['/user/john', '/user/jane']);
expect(_.pluck(res._links.admin, 'rel')).to.deep.equal(['admin', 'admin']);
});
it('should embed resource', function () {
var res = new hal.Resource({}, 'href');
var sub = new hal.Resource({}, 'href2');
Expand Down