Skip to content

[#407] name change findPartial function #421

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

Closed
stevemartin wants to merge 1 commit into from
Closed

[#407] name change findPartial function #421

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
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
8 changes: 4 additions & 4 deletions core/lib/pattern_assembler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var markdown_parser = new mp();
var pattern_assembler = function () {
// HELPER FUNCTIONS

function getPartial(partialName, patternlab) {
function getPartialPattern(partialName, patternlab) {
//look for exact partial matches
for (var i = 0; i < patternlab.patterns.length; i++) {
if (patternlab.patterns[i].patternPartial === partialName) {
Expand Down Expand Up @@ -397,7 +397,7 @@ var pattern_assembler = function () {
processPatternRecursive(partialPath, patternlab);

//complete assembly of extended template
var partialPattern = getPartial(partial, patternlab);
var partialPattern = getPartialPattern(partial, patternlab);

//if partial has style modifier data, replace the styleModifier value
if (currentPattern.stylePartials && currentPattern.stylePartials.length > 0) {
Expand Down Expand Up @@ -483,8 +483,8 @@ var pattern_assembler = function () {
process_pattern_recursive: function (file, patternlab, additionalData) {
processPatternRecursive(file, patternlab, additionalData);
},
findPartial: function (partial, patternlab) {
return getPartial(partial, patternlab);
getPartial: function (partial, patternlab) {
return getPartialPattern(partial, patternlab);
},
combine_listItems: function (patternlab) {
buildListItems(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
10 changes: 5 additions & 5 deletions test/pattern_assembler_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
var mixedPattern = new Pattern('00-test/07-mixed-params.mustache');
mixedPattern.template = fs.readFileSync(patterns_dir + '/00-test/07-mixed-params.mustache', 'utf8');
mixedPattern.stylePartials = pattern_assembler.find_pattern_partials_with_style_modifiers(mixedPattern);
mixedPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(mixedPattern);
mixedPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(mixedPattern);

pattern_assembler.addPattern(atomPattern, pl);
pattern_assembler.addPattern(mixedPattern, pl);
Expand Down Expand Up @@ -285,12 +285,12 @@
var atomPattern = new Pattern('00-test/03-styled-atom.mustache');
atomPattern.template = fs.readFileSync(patterns_dir + '/00-test/03-styled-atom.mustache', 'utf8');
atomPattern.stylePartials = pattern_assembler.find_pattern_partials_with_style_modifiers(atomPattern);
atomPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(atomPattern);
atomPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(atomPattern);

var bookendPattern = new Pattern('00-test/08-bookend-params.mustache');
bookendPattern.template = fs.readFileSync(patterns_dir + '/00-test/08-bookend-params.mustache', 'utf8');
bookendPattern.stylePartials = pattern_assembler.find_pattern_partials_with_style_modifiers(bookendPattern);
bookendPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(bookendPattern);
bookendPattern.parameteredPartials = pattern_assembler.find_pattern_partials_with_parameters(bookendPattern);

pattern_assembler.addPattern(atomPattern, pl);
pattern_assembler.addPattern(bookendPattern, pl);
Expand Down 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