diff --git a/core/lib/lineage_hunter.js b/core/lib/lineage_hunter.js index 2c5fb0112..e74e4a6c9 100644 --- a/core/lib/lineage_hunter.js +++ b/core/lib/lineage_hunter.js @@ -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 @@ -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); } } @@ -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 diff --git a/core/lib/list_item_hunter.js b/core/lib/list_item_hunter.js index 35c077f5d..be55f35c5 100644 --- a/core/lib/list_item_hunter.js +++ b/core/lib/list_item_hunter.js @@ -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; diff --git a/core/lib/parameter_hunter.js b/core/lib/parameter_hunter.js index b2b9832e2..6f2d50f1e 100644 --- a/core/lib/parameter_hunter.js +++ b/core/lib/parameter_hunter.js @@ -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; diff --git a/core/lib/pattern_assembler.js b/core/lib/pattern_assembler.js index 8fc82ab78..a62777edf 100644 --- a/core/lib/pattern_assembler.js +++ b/core/lib/pattern_assembler.js @@ -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) { @@ -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) { @@ -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); diff --git a/test/lineage_hunter_tests.js b/test/lineage_hunter_tests.js index f689d049b..dac3f3f97 100644 --- a/test/lineage_hunter_tests.js +++ b/test/lineage_hunter_tests.js @@ -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(); }, @@ -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(); }, @@ -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(); @@ -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'); diff --git a/test/pattern_assembler_tests.js b/test/pattern_assembler_tests.js index b0fa5e4a0..0e6842fea 100644 --- a/test/pattern_assembler_tests.js +++ b/test/pattern_assembler_tests.js @@ -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); @@ -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); @@ -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(); @@ -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();