@@ -259,6 +259,21 @@ test_when_getting_the_block_names_from_some_markup_that_contains_a_two_named_blo assert: [(names at: 2) = 'again' ]. ) +test_when_getting_the_start_and_end_index_for_a_block_from_some_markup_it_should_return_the_valid_start_and_end_position_in_that_markup = ( + | view markup indices expectedStart expectedEnd blockInnerText | + view:: ValueView platform: p parent: nil. + blockInnerText:: '?foo!'. + markup:: '<% block test %>', blockInnerText, '<% endblock %>'. + + expectedStart:: markup indexOf: $?. + expectedEnd:: markup indexOf: $!. + indices:: view getIndicesForBlockNamed: 'test' from: markup. + + should: [indices size = 2]. + should: [(indices at: 1) = expectedStart]. + should: [(indices at: 2) = expectedEnd]. +) + test_when_merging_two_sets_of_markup_and_the_child_markup_specifies_a_block_that_is_defined_in_the_parent_markup_it_should_override_the_parents_block_in_the_merged_markup = ( | childMarkup parentMarkup finalMarkup | assert: [true = false]. SaberTests.ns2 @@ -49,7 +49,9 @@ defineRawMarkup: block = ( ) getBlockFrom: markup named: blockName = ( - ^ '' + | indices | + indices:: getIndicesForBlockNamed: blockName from: markup. + ^ markup copyFrom: (indices at: 1) to: (indices at: 2). ) getCharactersInStream: stream upTo: char = ( @@ -68,6 +70,13 @@ getGetModelValueKeyFrom: aStream = ( ^ getCharactersInStream: aStream upTo: $}. ) +getIndicesForBlockNamed: blockName from: markup = ( + | start end | + start:: 0. + end:: 0. + ^ { start. end. } +) + integrate: childMarkup model: aModel = ( | finalMarkup integratedMarkup thisMarkup | thisMarkup:: resolveMarkup: content withModel: aModel. @@ -79,22 +88,31 @@ integrate: childMarkup model: aModel = ( ^ finalMarkup ) -lookForBlockNameIn: text toAddTo: names = ( +lookForBlockNameIn: text = ( | blockName blockOpener blockClose | blockName:: nil. blockOpener:: (text asLowercase findString: 'block ' startingAt: 1) = 1. blockOpener ifTrue: [blockName:: text copyFrom: 7 to: text size] - ifFalse: [(text asLowercase findString: 'endblock' startingAt: 1) = 1 + ifFalse: [(textIsEndBlock: text) ifFalse: [(Error new messageText: 'invalid block: "',text,'"') signal]]. + ^ blockName. +) + +lookForBlockNameIn: text toAddTo: names = ( + | blockName | + blockName:: lookForBlockNameIn: text. blockName = nil ifFalse: [names add: blockName] ) merge: childMarkup into: parentMarkup = ( - | finalMarkup blockTexts childBlock| + | finalMarkup blockTexts childBlock childBlockNames | + childBlockNames:: blockNamesFrom: childMarkup. finalMarkup:: parentMarkup. (blockNamesFrom: parentMarkup) do: [ :blockName | - childBlock:: getBlockFrom: childMarkup named: blockName. - finalMarkup:: childBlock = nil ifFalse: [ replaceBlocksNamed: blockName in: finalMarkup with: childBlock]. + (childBlockNames contains: [ :i | i = blockName ]) ifTrue: [ + childBlock:: getBlockFrom: childMarkup named: blockName. + finalMarkup:: childBlock = nil ifFalse: [ replaceBlocksNamed: blockName in: finalMarkup with: childBlock]. + ] ]. ^ finalMarkup. ) @@ -151,4 +169,8 @@ resolveMarkup: rawMarkup withModel: aModel = ( ^ result contents ) +textIsEndBlock: text = ( + ^ (text asLowercase findString: 'endblock' startingAt: 1) = 1. +) + ) \ No newline at end of file SaberView.ns2 6461e6dbc049de1feb4ed11845d709c3c9c3d30e Jeffery Olson olson.jeffery@gmail.com http://github.com/olsonjeffery/Saber/commit/0264c125a8d4e6a0caaca4362e948a62fdc4aa0d 0264c125a8d4e6a0caaca4362e948a62fdc4aa0d 2009-11-04T10:39:15-08:00 2009-11-04T10:39:15-08:00 some specs/stubbing towards getting a block's inner text from some markup 121db4ec882ab34f22e6f33a3c7f4e5eb8529ce8 Jeffery Olson olson.jeffery@gmail.com