Skip to content

Find partial to get partial #413

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

Merged
merged 6 commits into from
Aug 11, 2016
Merged

Find partial to get partial #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c76464b
console.error instead of throw, to prevent misleading messages
e2tha-e Jul 29, 2016
a98808a
getPartial exposed as getPartial instead of findPartial
e2tha-e Jul 29, 2016
d1129d3
pattern_assembler.findPartial renamed pattern_assembler.getPartial
e2tha-e Jul 29, 2016
e3e88dd
passing unit tests
e2tha-e Jul 29, 2016
ca77a45
using relPath in getPartial instead of string concat
e2tha-e Jul 29, 2016
b29a5b1
eslinted
e2tha-e Jul 29, 2016
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
6 changes: 3 additions & 3 deletions core/lib/lineage_hunter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var lineage_hunter = function () {
if (matches !== null) {
matches.forEach(function (match) {
//get the ancestorPattern
var ancestorPattern = pattern_assembler.findPartial(pattern.findPartial(match), patternlab);
var ancestorPattern = pattern_assembler.getPartial(pattern.findPartial(match), patternlab);

if (ancestorPattern && pattern.lineageIndex.indexOf(ancestorPattern.patternPartial) === -1) {
//add it since it didnt exist
Expand Down Expand Up @@ -83,7 +83,7 @@ var lineage_hunter = function () {

//find all lineage - patterns being consumed by this one
for (var h = 0; h < pattern.lineageIndex.length; h++) {
var lineagePattern = pattern_assembler.findPartial(pattern.lineageIndex[h], patternlab);
var lineagePattern = pattern_assembler.getPartial(pattern.lineageIndex[h], patternlab);
setPatternState('fromFuture', lineagePattern, pattern);
}
}
Expand All @@ -93,7 +93,7 @@ var lineage_hunter = function () {
//find all reverse lineage - that is, patterns consuming this one
for (var j = 0; j < pattern.lineageRIndex.length; j++) {

var lineageRPattern = pattern_assembler.findPartial(pattern.lineageRIndex[j], patternlab);
var lineageRPattern = pattern_assembler.getPartial(pattern.lineageRIndex[j], patternlab);

//only set patternState if pattern.patternState "is less than" the lineageRPattern.patternstate
//or if lineageRPattern.patternstate (the consuming pattern) does not have a state
Expand Down
2 changes: 1 addition & 1 deletion core/lib/list_item_hunter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var list_item_hunter = function () {

//get the partial
var partialName = foundPartials[j].match(/([\w\-\.\/~]+)/g)[0];
var partialPattern = pattern_assembler.findPartial(partialName, patternlab);
var partialPattern = pattern_assembler.getPartial(partialName, patternlab);

//create a copy of the partial so as to not pollute it after the get_pattern_by_key call.
var cleanPartialPattern;
Expand Down
2 changes: 1 addition & 1 deletion core/lib/parameter_hunter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ var parameter_hunter = function () {
pattern.parameteredPartials.forEach(function (pMatch) {
//find the partial's name and retrieve it
var partialName = pMatch.match(/([\w\-\.\/~]+)/g)[0];
var partialPattern = pattern_assembler.findPartial(partialName, patternlab);
var partialPattern = pattern_assembler.getPartial(partialName, patternlab);

//if we retrieved a pattern we should make sure that its extendedTemplate is reset. looks to fix #190
partialPattern.extendedTemplate = partialPattern.template;
Expand Down
7 changes: 4 additions & 3 deletions core/lib/pattern_assembler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ var pattern_assembler = function () {
//else look by verbose syntax
for (var i = 0; i < patternlab.patterns.length; i++) {
switch (partialName) {
case patternlab.patterns[i].relPath:
case patternlab.patterns[i].subdir + '/' + patternlab.patterns[i].fileName:
case patternlab.patterns[i].subdir + '/' + patternlab.patterns[i].fileName + '.mustache':
return patternlab.patterns[i];
}
}
Expand All @@ -45,7 +45,8 @@ var pattern_assembler = function () {
return patternlab.patterns[i];
}
}
throw 'Could not find pattern with partial ' + partialName;
console.error('Could not find pattern with partial ' + partialName);
return undefined;
}

function buildListItems(container) {
Expand Down Expand Up @@ -483,7 +484,7 @@ var pattern_assembler = function () {
process_pattern_recursive: function (file, patternlab, additionalData) {
processPatternRecursive(file, patternlab, additionalData);
},
findPartial: function (partial, patternlab) {
getPartial: function (partial, patternlab) {
return getPartial(partial, patternlab);
},
combine_listItems: function (patternlab) {
Expand Down
8 changes: 4 additions & 4 deletions test/lineage_hunter_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ exports['lineage hunter '] = {
lineage_hunter.cascade_pattern_states(pl);

//assert
var consumerPatternReturned = pattern_assembler.findPartial('test-foo', pl);
var consumerPatternReturned = pattern_assembler.getPartial('test-foo', pl);
test.equals(consumerPatternReturned.patternState, 'inreview');
test.done();
},
Expand Down Expand Up @@ -206,7 +206,7 @@ exports['lineage hunter '] = {
lineage_hunter.cascade_pattern_states(pl);

//assert
var consumerPatternReturned = pattern_assembler.findPartial('test-foo', pl);
var consumerPatternReturned = pattern_assembler.getPartial('test-foo', pl);
test.equals(consumerPatternReturned.lineage[0].lineageState, 'inreview');
test.done();
},
Expand All @@ -233,7 +233,7 @@ exports['lineage hunter '] = {
lineage_hunter.cascade_pattern_states(pl);

//assert
var consumedPatternReturned = pattern_assembler.findPartial('test-bar', pl);
var consumedPatternReturned = pattern_assembler.getPartial('test-bar', pl);
test.equals(consumedPatternReturned.lineageR[0].lineageState, 'inreview');

test.done();
Expand Down Expand Up @@ -261,7 +261,7 @@ exports['lineage hunter '] = {
lineage_hunter.cascade_pattern_states(pl);

//assert
var consumerPatternReturned = pattern_assembler.findPartial('test-foo', pl);
var consumerPatternReturned = pattern_assembler.getPartial('test-foo', pl);
test.equals(consumerPatternReturned.lineage.length, 1);
test.equals(consumerPatternReturned.lineage[0].lineageState, 'inreview');
test.equals(consumerPatternReturned.patternState, 'inreview');
Expand Down
2 changes: 2 additions & 0 deletions test/parameter_hunter_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//setup current pattern from what we would have during execution
function currentPatternClosure() {
return {
"relPath": "02-organisms/02-comments/01-sticky-comment.mustache",
"fileName": "01-sticky-comment",
"subdir": "02-organisms/02-comments",
"name": "02-organisms-02-comments-01-sticky-comment",
Expand All @@ -28,6 +29,7 @@
return {
patterns: [
{
"relPath": "01-molecules/06-components/02-single-comment.mustache",
"fileName": "02-single-comment",
"subdir": "01-molecules/06-components",
"name": "01-molecules-06-components-02-single-comment",
Expand Down
4 changes: 2 additions & 2 deletions test/pattern_assembler_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
});

//act
var result = pattern_assembler.findPartial('character-han', patternlab);
var result = pattern_assembler.getPartial('character-han', patternlab);
//assert
test.equals(result, patternlab.patterns[0]);
test.done();
Expand All @@ -441,7 +441,7 @@
});

//act
var result = pattern_assembler.findPartial('molecules-primary-nav', patternlab);
var result = pattern_assembler.getPartial('molecules-primary-nav', patternlab);
//assert
test.equals(result, patternlab.patterns[1]);
test.done();
Expand Down