From c708e75936aad8a512e719735f753307652bb3b7 Mon Sep 17 00:00:00 2001 From: "quentin.moutte.etu" Date: Wed, 29 May 2024 09:49:31 +0200 Subject: [PATCH 1/3] fix test --- .../MicBlogCreatorTest.class.st | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Microdown-Blog-Tests/MicBlogCreatorTest.class.st b/src/Microdown-Blog-Tests/MicBlogCreatorTest.class.st index d53bd540..49cfe977 100644 --- a/src/Microdown-Blog-Tests/MicBlogCreatorTest.class.st +++ b/src/Microdown-Blog-Tests/MicBlogCreatorTest.class.st @@ -131,8 +131,7 @@ MicBlogCreatorTest >> testCreateAllHtmlFile [ allFile := (fileSystem / 'html') allFiles. - self assert: allFile size equals: 7; - assert: (fileSystem / 'html/index.html') exists; + self assert: (fileSystem / 'html/index.html') exists; assert: (fileSystem / 'html/anExample1.html') exists; assert: (fileSystem / 'html/anExample2.html') exists; assert: (fileSystem / 'html/test/anExample3.html') exists; @@ -142,12 +141,16 @@ MicBlogCreatorTest >> testCreateAllHtmlFile [ { #category : 'tests' } MicBlogCreatorTest >> testCreateFromTo [ - | allFile | - MicBlogCreator createFrom: fileSystem / 'source' to: fileSystem / 'html'. + | allFile nbMonthFile | + MicBlogCreator + createFrom: fileSystem / 'source' + to: fileSystem / 'html'. allFile := (fileSystem / 'html') allFiles. + + nbMonthFile := Date today year - 2014 * 12 + Date today month index. - self assert: allFile size equals: 7 + self assert: allFile size equals: 5 + nbMonthFile ] { #category : 'tests' } From 0ec2fcfc4909fdfd78064d94073ecdd2edfa1239 Mon Sep 17 00:00:00 2001 From: "quentin.moutte.etu" Date: Wed, 29 May 2024 10:36:17 +0200 Subject: [PATCH 2/3] Fix performence of programm --- .../MicBlogCreatorTest.class.st | 9 ++++-- src/Microdown-Blog/MicBlogCreator.class.st | 32 ++++++++++++------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/Microdown-Blog-Tests/MicBlogCreatorTest.class.st b/src/Microdown-Blog-Tests/MicBlogCreatorTest.class.st index 49cfe977..eb867069 100644 --- a/src/Microdown-Blog-Tests/MicBlogCreatorTest.class.st +++ b/src/Microdown-Blog-Tests/MicBlogCreatorTest.class.st @@ -97,7 +97,10 @@ MicBlogCreatorTest >> setUp [ blog := MicBlogCreator new. blog targetDirectory: fileSystem / 'html'; - sourceDirectory: fileSystem / 'source'. + sourceDirectory: fileSystem / 'source'; + dateList: (MicMonthListCreator new + generateMicListBlockOfLinkDateTo: + fileSystem / 'html'). ] { #category : 'tests' } @@ -148,9 +151,9 @@ MicBlogCreatorTest >> testCreateFromTo [ allFile := (fileSystem / 'html') allFiles. - nbMonthFile := Date today year - 2014 * 12 + Date today month index. + nbMonthFile := (Date today year - 2014) * 12 + Date today month index. - self assert: allFile size equals: 5 + nbMonthFile + self assert: allFile size equals: 5 + nbMonthFile ] { #category : 'tests' } diff --git a/src/Microdown-Blog/MicBlogCreator.class.st b/src/Microdown-Blog/MicBlogCreator.class.st index 54c8c047..62d4692b 100644 --- a/src/Microdown-Blog/MicBlogCreator.class.st +++ b/src/Microdown-Blog/MicBlogCreator.class.st @@ -12,7 +12,8 @@ Class { #superclass : 'Object', #instVars : [ 'sourceDirectory', - 'targetDirectory' + 'targetDirectory', + 'dateList' ], #category : 'Microdown-Blog', #package : 'Microdown-Blog' @@ -48,6 +49,9 @@ MicBlogCreator >> copySourceDirectoryInTarget [ MicBlogCreator >> createAllHtmlFile [ | allFile allFileParse sum summar listOfSingleSummarize | + + dateList := MicMonthListCreator new generateMicListBlockOfLinkDateTo: + targetDirectory fullName. "Copy the source directory in the target directory" self copySourceDirectoryInTarget. @@ -77,9 +81,11 @@ MicBlogCreator >> createAllHtmlFile [ MicMonthListCreator new generateDateListSince2014 do: [ :each | summar := sum group: allFileParse byDate: each. - summar isNotEmpty ifTrue: [ - summar := sum summarize: summar. - self createHtmlGroupFile: summar at: each ] ifFalse: [ self createHtmlEmptyGroupFileAt: each]] + summar isNotEmpty + ifTrue: [ + summar := sum summarize: summar. + self createHtmlGroupFile: summar at: each ] + ifFalse: [ self createHtmlEmptyGroupFileAt: each ] ] ] { #category : 'rendering' } @@ -138,6 +144,12 @@ MicBlogCreator >> createHtmlSummarize: aMicRoot [ self write: a to: targetDirectory named: 'index.html' ] +{ #category : 'accessing' } +MicBlogCreator >> dateList: aDateList [ + + dateList := aDateList. +] + { #category : 'rendering' } MicBlogCreator >> renameMarkdownIntoHtmlFile: aFileReference [ @@ -151,9 +163,7 @@ MicBlogCreator >> renameMarkdownIntoHtmlFile: aFileReference [ { #category : 'as yet unclassified' } MicBlogCreator >> rootAssembly: aMicRoot [ - aMicRoot addChild: - (MicMonthListCreator new generateMicListBlockOfLinkDateTo: - targetDirectory fullName). + aMicRoot addChild: dateList copy. ^ aMicRoot ] @@ -164,9 +174,9 @@ MicBlogCreator >> sourceDirectory [ ] { #category : 'accessing' } -MicBlogCreator >> sourceDirectory: source [ +MicBlogCreator >> sourceDirectory: arg1 [ - sourceDirectory := source. + sourceDirectory := arg1 ] { #category : 'accessing' } @@ -176,9 +186,9 @@ MicBlogCreator >> targetDirectory [ ] { #category : 'accessing' } -MicBlogCreator >> targetDirectory: target [ +MicBlogCreator >> targetDirectory: arg1 [ - targetDirectory := target + targetDirectory := arg1 ] { #category : 'rendering' } From 5e302414806bcfe931a781b7b3e35fbd7dca0a2c Mon Sep 17 00:00:00 2001 From: "quentin.moutte.etu" Date: Wed, 29 May 2024 11:04:36 +0200 Subject: [PATCH 3/3] update tonel --- .../BaselineOfMicrodownDev.class.st | 9 +- src/BaselineOfMicrodownDev/package.st | 2 +- .../BaselineOfMicrodownH5P.class.st | 9 +- src/BaselineOfMicrodownH5P/package.st | 2 +- .../BaselineOfPillarSlideConverter.class.st | 9 +- src/BaselineOfPillarSlideConverter/package.st | 2 +- src/Microdown - HTML/MicHTMLBrush.class.st | 7 +- src/Microdown - HTML/MicHTMLCanvas.class.st | 13 +- .../MicHTMLExporterTest.class.st | 15 +- src/Microdown - HTML/MicHTMLTag.class.st | 13 +- src/Microdown - HTML/MicHTMLWriter.class.st | 21 +- src/Microdown - HTML/package.st | 2 +- .../MicAgendaBlockTest.class.st | 13 +- .../MicAgendaGeneratorTest.class.st | 33 ++-- .../MicDayBlockTest.class.st | 13 +- .../MicSegmentBlockTest.class.st | 13 +- src/Microdown-Agenda-Tests/package.st | 2 +- .../MicAbstractComponentBlock.class.st | 25 +-- src/Microdown-Agenda/MicAgendaBlock.class.st | 15 +- .../MicAgendaGenerator.class.st | 37 ++-- src/Microdown-Agenda/MicBreakBlock.class.st | 13 +- src/Microdown-Agenda/MicDayBlock.class.st | 15 +- src/Microdown-Agenda/MicSegmentBlock.class.st | 15 +- src/Microdown-Agenda/MicTalkBlock.class.st | 11 +- src/Microdown-Agenda/package.st | 2 +- .../ManifestMicrodownCalypso.class.st | 8 +- src/Microdown-Calypso/package.st | 2 +- .../MicCodeblockEvaluatorTest.class.st | 19 +- src/Microdown-Evaluator-Tests/package.st | 2 +- src/Microdown-H5P/MicH5PCommandLine.class.st | 13 +- .../MicH5PTemplateWriter.class.st | 59 +++--- .../MicH5PTemplateWriterTest.class.st | 37 ++-- .../MicJPEGH5PTemplateWriter.class.st | 11 +- .../MicPictureBasedWriter.class.st | 61 +++--- src/Microdown-H5P/package.st | 2 +- .../MacLineBreakBlock.extension.st | 4 +- src/Microdown-Macrodown-Pillar/package.st | 2 +- .../MacInlineParserTest.class.st | 13 +- .../MacParagraphBlockTest.class.st | 11 +- src/Microdown-Macrodown-Tests/package.st | 2 +- src/Microdown-Macrodown/MacConstants.class.st | 9 +- .../MacInlineParser.class.st | 15 +- .../MacLineBreakBlock.class.st | 15 +- .../MacLineBreakDelimiter.class.st | 27 +-- .../MacMailtoResourceReference.class.st | 11 +- .../MacParagraphBlock.class.st | 11 +- .../MacRawParagraphBlock.class.st | 19 +- .../MacrodownParser.class.st | 15 +- .../MicAbstractDelimiter.extension.st | 10 +- ...ObjectToPillarObjectConverter.extension.st | 6 +- .../MicrodownVisitor.extension.st | 6 +- src/Microdown-Macrodown/package.st | 2 +- .../MicRichTextComposerTest.extension.st | 8 +- src/Microdown-MathFlaky-Tests/package.st | 2 +- .../MicElement.extension.st | 4 +- src/Microdown-Pharo-Tools/package.st | 2 +- .../MicAnchorBlockTest.extension.st | 4 +- .../MicCodeBlockTest.extension.st | 4 +- .../MicEnvironmentBlockTest.extension.st | 6 +- .../MicHeaderBlockTest.extension.st | 4 +- .../MicHorizontalLineBlockTest.extension.st | 4 +- .../MicInlineParserTest.extension.st | 14 +- .../MicMathBlockTest.extension.st | 8 +- ...ObjectToPillarObjectConverterTest.class.st | 87 ++++---- .../MicOrderedListBlockTest.extension.st | 4 +- .../MicParagraphBlockTest.extension.st | 6 +- .../MicQuoteBlockTest.extension.st | 4 +- .../MicRawBlockTest.extension.st | 6 +- .../MicRootBlockTest.extension.st | 4 +- .../MicTextualMicrodownToPillarTest.class.st | 119 +++++------ .../MicToPillarBasicTest.class.st | 17 +- .../MicUnorderedListBlockTest.extension.st | 10 +- src/Microdown-Pillar-Tests/package.st | 2 +- .../ManifestMicrodownPillar.class.st | 8 +- .../MicAbstractBlock.extension.st | 6 +- .../MicAnchorReferenceBlock.extension.st | 4 +- .../MicAnnotationBlock.extension.st | 4 +- .../MicBoldFormatBlock.extension.st | 4 +- src/Microdown-Pillar/MicElement.extension.st | 4 +- .../MicFigureBlock.extension.st | 4 +- .../MicInlineElement.extension.st | 4 +- .../MicInlineParser.extension.st | 4 +- .../MicItalicFormatBlock.extension.st | 4 +- .../MicLinkBlock.extension.st | 4 +- .../MicMathInlineBlock.extension.st | 4 +- ...downObjectToPillarObjectConverter.class.st | 72 +++---- .../MicMonospaceFormatBlock.extension.st | 4 +- src/Microdown-Pillar/MicRawBlock.extension.st | 4 +- .../MicStrikeFormatBlock.extension.st | 4 +- .../MicTextBlock.extension.st | 4 +- src/Microdown-Pillar/Trait.extension.st | 4 +- src/Microdown-Pillar/package.st | 2 +- .../MicCodeBlock.extension.st | 4 +- .../MicCodeblockLineNumberer.class.st | 23 +-- .../MicCodeblockLineNumbererTest.class.st | 21 +- .../MicHeadRenumbererTest.class.st | 23 +-- .../MicHeaderRenumberer.class.st | 17 +- .../MicLevelLetterPrinter.class.st | 9 +- .../MicLevelNumberPrinter.class.st | 9 +- .../MicLevelRomanPrinter.class.st | 9 +- .../MicLevelUpperLetterPrinter.class.st | 9 +- .../MicTitlePrinter.class.st | 57 +++--- .../MicTitlePrinterSpecification.class.st | 63 +++--- src/Microdown-RenderingFeatures/package.st | 2 +- src/Microdown-ResolvePath-Tests/package.st | 2 +- src/Microdown-ResolvePath/package.st | 2 +- .../MicPillarSlideConverter.class.st | 11 +- .../MicPillarSlideConverterTest.class.st | 13 +- .../MicSlideConverter.class.st | 11 +- src/Microdown-Slide-Utils/package.st | 2 +- .../MicAbstractOutputDocumentMaker.class.st | 17 +- .../MicLaTeXMaker.class.st | 11 +- .../MicTemplatedWriter.class.st | 187 +++++++++--------- .../MicTemplatedWriterTest.class.st | 73 +++---- .../MicTextDocumentMaker.class.st | 11 +- src/Microdown-Templated/package.st | 2 +- .../MicCyclicFileInclusionError.class.st | 9 +- .../MicElement.extension.st | 4 +- .../MicFileIncluder.class.st | 25 +-- .../MicInputDocument.class.st | 29 +-- .../MicMicrodownInputDocument.class.st | 13 +- .../MicNoInputDocument.class.st | 11 +- .../MicNodeTransformer.class.st | 31 +-- .../MicRootBlock.extension.st | 4 +- .../RelativePath.extension.st | 4 +- src/Microdown-Transformer/package.st | 2 +- 126 files changed, 979 insertions(+), 911 deletions(-) diff --git a/src/BaselineOfMicrodownDev/BaselineOfMicrodownDev.class.st b/src/BaselineOfMicrodownDev/BaselineOfMicrodownDev.class.st index be34f997..09670081 100644 --- a/src/BaselineOfMicrodownDev/BaselineOfMicrodownDev.class.st +++ b/src/BaselineOfMicrodownDev/BaselineOfMicrodownDev.class.st @@ -1,10 +1,11 @@ Class { - #name : #BaselineOfMicrodownDev, - #superclass : #BaselineOf, - #category : #BaselineOfMicrodownDev + #name : 'BaselineOfMicrodownDev', + #superclass : 'BaselineOf', + #category : 'BaselineOfMicrodownDev', + #package : 'BaselineOfMicrodownDev' } -{ #category : #baselines } +{ #category : 'baselines' } BaselineOfMicrodownDev >> baseline: spec [ diff --git a/src/BaselineOfMicrodownDev/package.st b/src/BaselineOfMicrodownDev/package.st index 9ecd413f..eee237a3 100644 --- a/src/BaselineOfMicrodownDev/package.st +++ b/src/BaselineOfMicrodownDev/package.st @@ -1 +1 @@ -Package { #name : #BaselineOfMicrodownDev } +Package { #name : 'BaselineOfMicrodownDev' } diff --git a/src/BaselineOfMicrodownH5P/BaselineOfMicrodownH5P.class.st b/src/BaselineOfMicrodownH5P/BaselineOfMicrodownH5P.class.st index ddf83912..cfe82c52 100644 --- a/src/BaselineOfMicrodownH5P/BaselineOfMicrodownH5P.class.st +++ b/src/BaselineOfMicrodownH5P/BaselineOfMicrodownH5P.class.st @@ -14,12 +14,13 @@ baseline: spec ] " Class { - #name : #BaselineOfMicrodownH5P, - #superclass : #BaselineOf, - #category : #BaselineOfMicrodownH5P + #name : 'BaselineOfMicrodownH5P', + #superclass : 'BaselineOf', + #category : 'BaselineOfMicrodownH5P', + #package : 'BaselineOfMicrodownH5P' } -{ #category : #baselines } +{ #category : 'baselines' } BaselineOfMicrodownH5P >> baseline: spec [ diff --git a/src/BaselineOfMicrodownH5P/package.st b/src/BaselineOfMicrodownH5P/package.st index 7ae39f32..de65c60b 100644 --- a/src/BaselineOfMicrodownH5P/package.st +++ b/src/BaselineOfMicrodownH5P/package.st @@ -1 +1 @@ -Package { #name : #BaselineOfMicrodownH5P } +Package { #name : 'BaselineOfMicrodownH5P' } diff --git a/src/BaselineOfPillarSlideConverter/BaselineOfPillarSlideConverter.class.st b/src/BaselineOfPillarSlideConverter/BaselineOfPillarSlideConverter.class.st index 74011d18..7c624e79 100644 --- a/src/BaselineOfPillarSlideConverter/BaselineOfPillarSlideConverter.class.st +++ b/src/BaselineOfPillarSlideConverter/BaselineOfPillarSlideConverter.class.st @@ -1,10 +1,11 @@ Class { - #name : #BaselineOfPillarSlideConverter, - #superclass : #BaselineOf, - #category : #BaselineOfPillarSlideConverter + #name : 'BaselineOfPillarSlideConverter', + #superclass : 'BaselineOf', + #category : 'BaselineOfPillarSlideConverter', + #package : 'BaselineOfPillarSlideConverter' } -{ #category : #baselines } +{ #category : 'baselines' } BaselineOfPillarSlideConverter >> baseline: spec [ diff --git a/src/BaselineOfPillarSlideConverter/package.st b/src/BaselineOfPillarSlideConverter/package.st index 3d821954..b6e5ede3 100644 --- a/src/BaselineOfPillarSlideConverter/package.st +++ b/src/BaselineOfPillarSlideConverter/package.st @@ -1 +1 @@ -Package { #name : #BaselineOfPillarSlideConverter } +Package { #name : 'BaselineOfPillarSlideConverter' } diff --git a/src/Microdown - HTML/MicHTMLBrush.class.st b/src/Microdown - HTML/MicHTMLBrush.class.st index 94eafda6..3d42b524 100644 --- a/src/Microdown - HTML/MicHTMLBrush.class.st +++ b/src/Microdown - HTML/MicHTMLBrush.class.st @@ -2,10 +2,11 @@ I'm an abstract brush dedicated to HTML documents. As of today, the only subclass is the tag brush but we can imagine others (e.g., to write HTML comments). " Class { - #name : #MicHTMLBrush, - #superclass : #MicExportBrush, + #name : 'MicHTMLBrush', + #superclass : 'MicExportBrush', #instVars : [ 'name' ], - #category : #'Microdown - HTML' + #category : 'Microdown - HTML', + #package : 'Microdown - HTML' } diff --git a/src/Microdown - HTML/MicHTMLCanvas.class.st b/src/Microdown - HTML/MicHTMLCanvas.class.st index 1b866c6d..e3ec237d 100644 --- a/src/Microdown - HTML/MicHTMLCanvas.class.st +++ b/src/Microdown - HTML/MicHTMLCanvas.class.st @@ -1,16 +1,17 @@ Class { - #name : #MicHTMLCanvas, - #superclass : #MicExportCanvas, + #name : 'MicHTMLCanvas', + #superclass : 'MicExportCanvas', #instVars : [ 'name' ], #classVars : [ 'HTMLCharacters' ], - #category : #'Microdown - HTML' + #category : 'Microdown - HTML', + #package : 'Microdown - HTML' } -{ #category : #initialization } +{ #category : 'initialization' } MicHTMLCanvas class >> initialize [ HTMLCharacters := Dictionary new. HTMLCharacters @@ -20,14 +21,14 @@ MicHTMLCanvas class >> initialize [ at: $> put: '>' ] -{ #category : #accessing } +{ #category : 'accessing' } MicHTMLCanvas >> nextPut: aCharacter [ (HTMLCharacters at: aCharacter ifAbsent: nil) ifNil: [ super nextPut: aCharacter ] ifNotNil: [ :string | self raw: string ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicHTMLCanvas >> tag [ ^ self brush: MicHTMLTag new ] diff --git a/src/Microdown - HTML/MicHTMLExporterTest.class.st b/src/Microdown - HTML/MicHTMLExporterTest.class.st index 276456f2..9002c508 100644 --- a/src/Microdown - HTML/MicHTMLExporterTest.class.st +++ b/src/Microdown - HTML/MicHTMLExporterTest.class.st @@ -1,15 +1,16 @@ Class { - #name : #MicHTMLExporterTest, - #superclass : #TestCase, + #name : 'MicHTMLExporterTest', + #superclass : 'TestCase', #instVars : [ 'parser', 'writer', 'factory' ], - #category : #'Microdown - HTML' + #category : 'Microdown - HTML', + #package : 'Microdown - HTML' } -{ #category : #utils } +{ #category : 'utils' } MicHTMLExporterTest >> parse: aString andCheckWeGet: aResultingString [ | mic | @@ -17,7 +18,7 @@ MicHTMLExporterTest >> parse: aString andCheckWeGet: aResultingString [ self assert: (writer visit: mic) contents equals: aResultingString ] -{ #category : #running } +{ #category : 'running' } MicHTMLExporterTest >> setUp [ super setUp. parser := MicroDownParser new. @@ -25,14 +26,14 @@ MicHTMLExporterTest >> setUp [ factory := MicMicrodownSnippetFactory new ] -{ #category : #tests } +{ #category : 'tests' } MicHTMLExporterTest >> testHeaderLevel1 [ self parse: factory headerLevel1Sample andCheckWeGet: writer usedNewLine , '

Foo

' ] -{ #category : #tests } +{ #category : 'tests' } MicHTMLExporterTest >> testUnorderedList [ | mic | mic := parser parse: factory unorderedListWithTwoItemsSample. diff --git a/src/Microdown - HTML/MicHTMLTag.class.st b/src/Microdown - HTML/MicHTMLTag.class.st index 40fef53a..093fa2db 100644 --- a/src/Microdown - HTML/MicHTMLTag.class.st +++ b/src/Microdown - HTML/MicHTMLTag.class.st @@ -1,21 +1,22 @@ Class { - #name : #MicHTMLTag, - #superclass : #MicHTMLBrush, - #category : #'Microdown - HTML' + #name : 'MicHTMLTag', + #superclass : 'MicHTMLBrush', + #category : 'Microdown - HTML', + #package : 'Microdown - HTML' } -{ #category : #accessing } +{ #category : 'accessing' } MicHTMLTag >> name: aString [ name := aString. stream nextPut: $<; << aString ] -{ #category : #accessing } +{ #category : 'accessing' } MicHTMLTag >> parameterAt: aString put: anotherString [ stream space. stream << aString << '="' << anotherString << '"' ] -{ #category : #accessing } +{ #category : 'accessing' } MicHTMLTag >> with: aString [ stream nextPut: $>; diff --git a/src/Microdown - HTML/MicHTMLWriter.class.st b/src/Microdown - HTML/MicHTMLWriter.class.st index bff99516..21ef8e69 100644 --- a/src/Microdown - HTML/MicHTMLWriter.class.st +++ b/src/Microdown - HTML/MicHTMLWriter.class.st @@ -1,25 +1,26 @@ Class { - #name : #MicHTMLWriter, - #superclass : #MicrodownVisitor, + #name : 'MicHTMLWriter', + #superclass : 'MicrodownVisitor', #instVars : [ 'stream', 'canvas' ], - #category : #'Microdown - HTML' + #category : 'Microdown - HTML', + #package : 'Microdown - HTML' } -{ #category : #initialization } +{ #category : 'initialization' } MicHTMLWriter >> canvasClass [ ^ MicHTMLCanvas ] -{ #category : #accessing } +{ #category : 'accessing' } MicHTMLWriter >> contents [ ^ stream contents ] -{ #category : #initialization } +{ #category : 'initialization' } MicHTMLWriter >> initialize [ super initialize. stream := MicOutputStream new setStream: (WriteStream on: (String new: 1000)). @@ -27,14 +28,14 @@ MicHTMLWriter >> initialize [ ] -{ #category : #initialization } +{ #category : 'initialization' } MicHTMLWriter >> usedNewLine [ "Return the encoded new line. Useful for tests." ^ stream usedNewLine ] -{ #category : #visiting } +{ #category : 'visiting' } MicHTMLWriter >> visitHeader: aHeader [ canvas newLine. @@ -44,7 +45,7 @@ MicHTMLWriter >> visitHeader: aHeader [ ] -{ #category : #visiting } +{ #category : 'visiting' } MicHTMLWriter >> visitUnorderedList: anUnorderedList [ canvas newLine. @@ -53,7 +54,7 @@ MicHTMLWriter >> visitUnorderedList: anUnorderedList [ with: [ canvas newLine. super visitUnorderedList: anUnorderedList ] ] -{ #category : #visiting } +{ #category : 'visiting' } MicHTMLWriter >> visitUnorderedListItem: anUnorderedListItem [ "will not work with we have text decorators such as bold, italic, monospace" diff --git a/src/Microdown - HTML/package.st b/src/Microdown - HTML/package.st index d4ad9d91..3ba85e08 100644 --- a/src/Microdown - HTML/package.st +++ b/src/Microdown - HTML/package.st @@ -1 +1 @@ -Package { #name : #'Microdown - HTML' } +Package { #name : 'Microdown - HTML' } diff --git a/src/Microdown-Agenda-Tests/MicAgendaBlockTest.class.st b/src/Microdown-Agenda-Tests/MicAgendaBlockTest.class.st index c6014073..e1ce3153 100644 --- a/src/Microdown-Agenda-Tests/MicAgendaBlockTest.class.st +++ b/src/Microdown-Agenda-Tests/MicAgendaBlockTest.class.st @@ -1,6 +1,6 @@ Class { - #name : #MicAgendaBlockTest, - #superclass : #TestCase, + #name : 'MicAgendaBlockTest', + #superclass : 'TestCase', #instVars : [ 'builder', 'parser' @@ -8,10 +8,11 @@ Class { #pools : [ 'MicMicrodownSharedPool' ], - #category : #'Microdown-Agenda-Tests' + #category : 'Microdown-Agenda-Tests', + #package : 'Microdown-Agenda-Tests' } -{ #category : #running } +{ #category : 'running' } MicAgendaBlockTest >> setUp [ super setUp. @@ -19,7 +20,7 @@ MicAgendaBlockTest >> setUp [ parser := Microdown new. ] -{ #category : #tests } +{ #category : 'tests' } MicAgendaBlockTest >> testAgenda [ "' @@ -33,7 +34,7 @@ MicAgendaBlockTest >> testAgenda [ self assert: env environmentName equals: 'agenda' ] -{ #category : #tests } +{ #category : 'tests' } MicAgendaBlockTest >> testAgendaWithArgument [ "' diff --git a/src/Microdown-Agenda-Tests/MicAgendaGeneratorTest.class.st b/src/Microdown-Agenda-Tests/MicAgendaGeneratorTest.class.st index cde648ae..cdac03f6 100644 --- a/src/Microdown-Agenda-Tests/MicAgendaGeneratorTest.class.st +++ b/src/Microdown-Agenda-Tests/MicAgendaGeneratorTest.class.st @@ -2,8 +2,8 @@ This class contains tests but all the test are not correct beacaus we need to have a file in a repertory with the templates because if we don't have them we can't generate the calendar. " Class { - #name : #MicAgendaGeneratorTest, - #superclass : #ParametrizedTestCase, + #name : 'MicAgendaGeneratorTest', + #superclass : 'ParametrizedTestCase', #instVars : [ 'builder', 'parser', @@ -14,10 +14,11 @@ Class { #pools : [ 'MicMicrodownSharedPool' ], - #category : #'Microdown-Agenda-Tests' + #category : 'Microdown-Agenda-Tests', + #package : 'Microdown-Agenda-Tests' } -{ #category : #'building suites' } +{ #category : 'building suites' } MicAgendaGeneratorTest class >> testParameters [ ^ ParametrizedTestMatrix new @@ -27,7 +28,7 @@ MicAgendaGeneratorTest class >> testParameters [ yourself ] -{ #category : #exemple } +{ #category : 'exemple' } MicAgendaGeneratorTest >> agendaExempleMultiplesTalks [ ^ '> agendaExempleMultiplesTalks [ ] -{ #category : #exemple } +{ #category : 'exemple' } MicAgendaGeneratorTest >> agendaExempleOneTalk [ ^ '> agendaExempleOneTalk [ ] -{ #category : #exemple } +{ #category : 'exemple' } MicAgendaGeneratorTest >> agendaExempleWithRealInfo [ ^ '> agendaExempleWithRealInfo [ ] -{ #category : #accessing } +{ #category : 'accessing' } MicAgendaGeneratorTest >> fileSystem: aFileSystem [ fileSystem := aFileSystem memory. ] -{ #category : #accessing } +{ #category : 'accessing' } MicAgendaGeneratorTest >> newLine: aNewLine [ (aNewLine = String cr) ifTrue:[ writer crAsNewLine ]. (aNewLine = String lf) ifTrue:[ writer lfAsNewLine ]. @@ -148,7 +149,7 @@ MicAgendaGeneratorTest >> newLine: aNewLine [ newLine := aNewLine ] -{ #category : #running } +{ #category : 'running' } MicAgendaGeneratorTest >> setUp [ super setUp. @@ -156,7 +157,7 @@ MicAgendaGeneratorTest >> setUp [ parser := Microdown new. ] -{ #category : #tests } +{ #category : 'tests' } MicAgendaGeneratorTest >> testAgendaAstIsCorrect [ | fs file ast agenda day segment| @@ -177,7 +178,7 @@ MicAgendaGeneratorTest >> testAgendaAstIsCorrect [ ] -{ #category : #tests } +{ #category : 'tests' } MicAgendaGeneratorTest >> testConvertMicFileCorrectly [ "Look at the class comment for more information about this test" @@ -254,7 +255,7 @@ MicAgendaGeneratorTest >> testConvertMicFileCorrectly [ ] -{ #category : #tests } +{ #category : 'tests' } MicAgendaGeneratorTest >> testConvertMicFileCorrectlyWithMultiplesTalks [ "Look at the class comment for more information about this test" @@ -332,7 +333,7 @@ MicAgendaGeneratorTest >> testConvertMicFileCorrectlyWithMultiplesTalks [ ] -{ #category : #tests } +{ #category : 'tests' } MicAgendaGeneratorTest >> testConvertMicFileCorrectlyWithOneTalk [ "Look at the class comment for more information about this test" @@ -371,7 +372,7 @@ MicAgendaGeneratorTest >> testConvertMicFileCorrectlyWithOneTalk [ ' ', newLine, newLine" ] -{ #category : #tests } +{ #category : 'tests' } MicAgendaGeneratorTest >> testConvertMicFileCorrectlyWithRealInfo [ "Look at the class comment for more information about this test" @@ -449,7 +450,7 @@ MicAgendaGeneratorTest >> testConvertMicFileCorrectlyWithRealInfo [ ] -{ #category : #accessing } +{ #category : 'accessing' } MicAgendaGeneratorTest >> writer: aWriter [ writer := aWriter new ] diff --git a/src/Microdown-Agenda-Tests/MicDayBlockTest.class.st b/src/Microdown-Agenda-Tests/MicDayBlockTest.class.st index 06d9110e..ffe3f6a4 100644 --- a/src/Microdown-Agenda-Tests/MicDayBlockTest.class.st +++ b/src/Microdown-Agenda-Tests/MicDayBlockTest.class.st @@ -1,6 +1,6 @@ Class { - #name : #MicDayBlockTest, - #superclass : #TestCase, + #name : 'MicDayBlockTest', + #superclass : 'TestCase', #instVars : [ 'builder', 'parser' @@ -8,10 +8,11 @@ Class { #pools : [ 'MicMicrodownSharedPool' ], - #category : #'Microdown-Agenda-Tests' + #category : 'Microdown-Agenda-Tests', + #package : 'Microdown-Agenda-Tests' } -{ #category : #running } +{ #category : 'running' } MicDayBlockTest >> setUp [ super setUp. @@ -19,7 +20,7 @@ MicDayBlockTest >> setUp [ parser := Microdown new. ] -{ #category : #tests } +{ #category : 'tests' } MicDayBlockTest >> testDay [ "' @@ -33,7 +34,7 @@ MicDayBlockTest >> testDay [ self assert: env environmentName equals: 'day' ] -{ #category : #tests } +{ #category : 'tests' } MicDayBlockTest >> testDayWithArgument [ "' diff --git a/src/Microdown-Agenda-Tests/MicSegmentBlockTest.class.st b/src/Microdown-Agenda-Tests/MicSegmentBlockTest.class.st index 7b71310e..1c1ce648 100644 --- a/src/Microdown-Agenda-Tests/MicSegmentBlockTest.class.st +++ b/src/Microdown-Agenda-Tests/MicSegmentBlockTest.class.st @@ -1,6 +1,6 @@ Class { - #name : #MicSegmentBlockTest, - #superclass : #TestCase, + #name : 'MicSegmentBlockTest', + #superclass : 'TestCase', #instVars : [ 'builder', 'parser' @@ -8,10 +8,11 @@ Class { #pools : [ 'MicMicrodownSharedPool' ], - #category : #'Microdown-Agenda-Tests' + #category : 'Microdown-Agenda-Tests', + #package : 'Microdown-Agenda-Tests' } -{ #category : #running } +{ #category : 'running' } MicSegmentBlockTest >> setUp [ super setUp. @@ -19,7 +20,7 @@ MicSegmentBlockTest >> setUp [ parser := Microdown new. ] -{ #category : #tests } +{ #category : 'tests' } MicSegmentBlockTest >> testSegment [ "' @@ -33,7 +34,7 @@ MicSegmentBlockTest >> testSegment [ self assert: env environmentName equals: 'segment'. ] -{ #category : #tests } +{ #category : 'tests' } MicSegmentBlockTest >> testSegmentWithArgument [ "' diff --git a/src/Microdown-Agenda-Tests/package.st b/src/Microdown-Agenda-Tests/package.st index 584fe09c..f70a20ad 100644 --- a/src/Microdown-Agenda-Tests/package.st +++ b/src/Microdown-Agenda-Tests/package.st @@ -1 +1 @@ -Package { #name : #'Microdown-Agenda-Tests' } +Package { #name : 'Microdown-Agenda-Tests' } diff --git a/src/Microdown-Agenda/MicAbstractComponentBlock.class.st b/src/Microdown-Agenda/MicAbstractComponentBlock.class.st index a56ab599..e10d1fce 100644 --- a/src/Microdown-Agenda/MicAbstractComponentBlock.class.st +++ b/src/Microdown-Agenda/MicAbstractComponentBlock.class.st @@ -2,60 +2,61 @@ I am an abstractComponent which represent the standard behaviour of each components of a Segment. " Class { - #name : #MicAbstractComponentBlock, - #superclass : #MicSegmentBlock, - #category : #'Microdown-Agenda' + #name : 'MicAbstractComponentBlock', + #superclass : 'MicSegmentBlock', + #category : 'Microdown-Agenda', + #package : 'Microdown-Agenda' } -{ #category : #testing } +{ #category : 'testing' } MicAbstractComponentBlock class >> isAbstract [ ^ self == MicAbstractComponentBlock ] -{ #category : #accessing } +{ #category : 'accessing' } MicAbstractComponentBlock >> author [ ^ self arguments at: #author ifAbsent: [ 'Not Specified' ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicAbstractComponentBlock >> author: anAuthor [ arguments at: #author put: anAuthor ] -{ #category : #accessing } +{ #category : 'accessing' } MicAbstractComponentBlock >> length [ ^ self arguments at: #length ifAbsent: [ 'There is no length' ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicAbstractComponentBlock >> length: aLength [ arguments at: #length put: aLength ] -{ #category : #accessing } +{ #category : 'accessing' } MicAbstractComponentBlock >> room [ ^ self arguments at: #room ifAbsent: [ 'Not Specified' ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicAbstractComponentBlock >> room: aRoom [ arguments at: #room put: aRoom ] -{ #category : #accessing } +{ #category : 'accessing' } MicAbstractComponentBlock >> subject [ ^ self arguments at: #subject ifAbsent: [ 'There is no subject' ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicAbstractComponentBlock >> subject: aSubject [ arguments at: #subject put: aSubject diff --git a/src/Microdown-Agenda/MicAgendaBlock.class.st b/src/Microdown-Agenda/MicAgendaBlock.class.st index 460f9c24..d88399a2 100644 --- a/src/Microdown-Agenda/MicAgendaBlock.class.st +++ b/src/Microdown-Agenda/MicAgendaBlock.class.st @@ -2,28 +2,29 @@ I represent an Agenda which contain the differents days which are my children. " Class { - #name : #MicAgendaBlock, - #superclass : #MicEnvironmentBlock, - #category : #'Microdown-Agenda' + #name : 'MicAgendaBlock', + #superclass : 'MicEnvironmentBlock', + #category : 'Microdown-Agenda', + #package : 'Microdown-Agenda' } -{ #category : #accessing } +{ #category : 'accessing' } MicAgendaBlock class >> tag [ ^ #agenda ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaBlock >> accept: aVisitor [ ^ aVisitor visitAgenda: self ] -{ #category : #accessing } +{ #category : 'accessing' } MicAgendaBlock >> title [ ^ self arguments at: #title ifAbsent: [ 'There is no title' ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicAgendaBlock >> title: aTitle [ arguments at: #title put: aTitle diff --git a/src/Microdown-Agenda/MicAgendaGenerator.class.st b/src/Microdown-Agenda/MicAgendaGenerator.class.st index c1ae9233..7fbc85a3 100644 --- a/src/Microdown-Agenda/MicAgendaGenerator.class.st +++ b/src/Microdown-Agenda/MicAgendaGenerator.class.st @@ -2,8 +2,8 @@ I generate HTML specificly for a calendar in HTML from a template and a microdown AST. " Class { - #name : #MicAgendaGenerator, - #superclass : #MicHTMLVisitor, + #name : 'MicAgendaGenerator', + #superclass : 'MicHTMLVisitor', #instVars : [ 'parentFile', 'time', @@ -16,10 +16,11 @@ Class { 'daysNumber', 'dayHeaderBlockTemplate' ], - #category : #'Microdown-Agenda' + #category : 'Microdown-Agenda', + #package : 'Microdown-Agenda' } -{ #category : #template } +{ #category : 'template' } MicAgendaGenerator class >> agendaTemplate: aNewLine [ | newLine | newLine := aNewLine asString. @@ -105,7 +106,7 @@ MicAgendaGenerator class >> agendaTemplate: aNewLine [ '' ] -{ #category : #template } +{ #category : 'template' } MicAgendaGenerator class >> dayHeaderBlockTemplate: aNewLine [ | newLine | @@ -119,7 +120,7 @@ MicAgendaGenerator class >> dayHeaderBlockTemplate: aNewLine [ ' ', newLine ] -{ #category : #template } +{ #category : 'template' } MicAgendaGenerator class >> dayTalksTemplate: aNewLine [ | newLine | @@ -141,7 +142,7 @@ MicAgendaGenerator class >> dayTalksTemplate: aNewLine [ ' ', newLine ] -{ #category : #template } +{ #category : 'template' } MicAgendaGenerator class >> talkTemplate: aNewLine [ | newLine | newLine := aNewLine asString. @@ -167,7 +168,7 @@ MicAgendaGenerator class >> talkTemplate: aNewLine [ ' ' ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaGenerator >> build: aScheduleFile [ | file fileReference| @@ -179,7 +180,7 @@ MicAgendaGenerator >> build: aScheduleFile [ fileReference writeStreamDo: [ :stream | stream nextPutAll: self contents ] ] -{ #category : #initialization } +{ #category : 'initialization' } MicAgendaGenerator >> initialize [ super initialize. @@ -190,7 +191,7 @@ MicAgendaGenerator >> initialize [ daysNumber := 0. ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaGenerator >> templateInitialization [ agendaTemplate := parentFile / 'Template/agendaTemplate.mustache' . @@ -199,19 +200,19 @@ MicAgendaGenerator >> templateInitialization [ talkTemplate := parentFile / 'Template/talkTemplate.mustache'. ] -{ #category : #accessing } +{ #category : 'accessing' } MicAgendaGenerator >> time [ ^ time ] -{ #category : #accessing } +{ #category : 'accessing' } MicAgendaGenerator >> time: aTime [ time := aTime ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaGenerator >> timePlus: aLength [ | currentHours currentMins addedTime nbHours | @@ -230,7 +231,7 @@ MicAgendaGenerator >> timePlus: aLength [ ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaGenerator >> visitAgenda: anAgenda [ | agenda | @@ -243,7 +244,7 @@ MicAgendaGenerator >> visitAgenda: anAgenda [ canvas nextPutAll: agenda ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaGenerator >> visitBreak: aBreak [ | length talk | @@ -259,7 +260,7 @@ MicAgendaGenerator >> visitBreak: aBreak [ talks := talks, talk. ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaGenerator >> visitDay: aDay [ | day dayBlock number numberDay active| @@ -285,7 +286,7 @@ MicAgendaGenerator >> visitDay: aDay [ talks := ''. ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaGenerator >> visitSegment: aSegment [ self time: aSegment start. @@ -293,7 +294,7 @@ MicAgendaGenerator >> visitSegment: aSegment [ self visitChildrenOf: aSegment. ] -{ #category : #visiting } +{ #category : 'visiting' } MicAgendaGenerator >> visitTalk: aTalk [ | length talk | diff --git a/src/Microdown-Agenda/MicBreakBlock.class.st b/src/Microdown-Agenda/MicBreakBlock.class.st index 7297fdf7..8f5237d3 100644 --- a/src/Microdown-Agenda/MicBreakBlock.class.st +++ b/src/Microdown-Agenda/MicBreakBlock.class.st @@ -2,22 +2,23 @@ I represent a Break in a Segment like a break for lunch or a coffee time for a certain amount of time at a certain place. " Class { - #name : #MicBreakBlock, - #superclass : #MicAbstractComponentBlock, - #category : #'Microdown-Agenda' + #name : 'MicBreakBlock', + #superclass : 'MicAbstractComponentBlock', + #category : 'Microdown-Agenda', + #package : 'Microdown-Agenda' } -{ #category : #accessing } +{ #category : 'accessing' } MicBreakBlock class >> tag [ ^ #break ] -{ #category : #visiting } +{ #category : 'visiting' } MicBreakBlock >> accept: aVisitor [ ^ aVisitor visitBreak: self ] -{ #category : #accessing } +{ #category : 'accessing' } MicBreakBlock >> author [ ^ self arguments at: #author ifAbsent: [ '' ] diff --git a/src/Microdown-Agenda/MicDayBlock.class.st b/src/Microdown-Agenda/MicDayBlock.class.st index 869d22df..d68481fc 100644 --- a/src/Microdown-Agenda/MicDayBlock.class.st +++ b/src/Microdown-Agenda/MicDayBlock.class.st @@ -2,28 +2,29 @@ I represent a Day in a Agenda with all my differents segment which are my children. " Class { - #name : #MicDayBlock, - #superclass : #MicEnvironmentBlock, - #category : #'Microdown-Agenda' + #name : 'MicDayBlock', + #superclass : 'MicEnvironmentBlock', + #category : 'Microdown-Agenda', + #package : 'Microdown-Agenda' } -{ #category : #accessing } +{ #category : 'accessing' } MicDayBlock class >> tag [ ^ #day ] -{ #category : #visiting } +{ #category : 'visiting' } MicDayBlock >> accept: aVisitor [ ^ aVisitor visitDay: self ] -{ #category : #accessing } +{ #category : 'accessing' } MicDayBlock >> start [ ^ self arguments at: #start ifAbsent: [ 'There is no start' ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicDayBlock >> start: aStart [ arguments at: #start put: aStart diff --git a/src/Microdown-Agenda/MicSegmentBlock.class.st b/src/Microdown-Agenda/MicSegmentBlock.class.st index 6a59a46b..8fb8b436 100644 --- a/src/Microdown-Agenda/MicSegmentBlock.class.st +++ b/src/Microdown-Agenda/MicSegmentBlock.class.st @@ -2,28 +2,29 @@ I represent a Segment of a Day which i contains all the differents components which are my children. " Class { - #name : #MicSegmentBlock, - #superclass : #MicEnvironmentBlock, - #category : #'Microdown-Agenda' + #name : 'MicSegmentBlock', + #superclass : 'MicEnvironmentBlock', + #category : 'Microdown-Agenda', + #package : 'Microdown-Agenda' } -{ #category : #accessing } +{ #category : 'accessing' } MicSegmentBlock class >> tag [ ^ #segment ] -{ #category : #visiting } +{ #category : 'visiting' } MicSegmentBlock >> accept: aVisitor [ ^ aVisitor visitSegment: self ] -{ #category : #accessing } +{ #category : 'accessing' } MicSegmentBlock >> start [ ^ self arguments at: #start ifAbsent: [ 'There is no start' ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicSegmentBlock >> start: aStart [ arguments at: #start put: aStart diff --git a/src/Microdown-Agenda/MicTalkBlock.class.st b/src/Microdown-Agenda/MicTalkBlock.class.st index a6898e50..58ce8172 100644 --- a/src/Microdown-Agenda/MicTalkBlock.class.st +++ b/src/Microdown-Agenda/MicTalkBlock.class.st @@ -2,17 +2,18 @@ I represent a Talk in a Segment like a presentation of a new tool or projet by someone for a certains amount of time at a certain place. " Class { - #name : #MicTalkBlock, - #superclass : #MicAbstractComponentBlock, - #category : #'Microdown-Agenda' + #name : 'MicTalkBlock', + #superclass : 'MicAbstractComponentBlock', + #category : 'Microdown-Agenda', + #package : 'Microdown-Agenda' } -{ #category : #accessing } +{ #category : 'accessing' } MicTalkBlock class >> tag [ ^ #talk ] -{ #category : #visiting } +{ #category : 'visiting' } MicTalkBlock >> accept: aVisitor [ ^ aVisitor visitTalk: self ] diff --git a/src/Microdown-Agenda/package.st b/src/Microdown-Agenda/package.st index 6576cf86..25bb2e85 100644 --- a/src/Microdown-Agenda/package.st +++ b/src/Microdown-Agenda/package.st @@ -1 +1 @@ -Package { #name : #'Microdown-Agenda' } +Package { #name : 'Microdown-Agenda' } diff --git a/src/Microdown-Calypso/ManifestMicrodownCalypso.class.st b/src/Microdown-Calypso/ManifestMicrodownCalypso.class.st index 38879c26..0d8e4bb0 100644 --- a/src/Microdown-Calypso/ManifestMicrodownCalypso.class.st +++ b/src/Microdown-Calypso/ManifestMicrodownCalypso.class.st @@ -2,7 +2,9 @@ I provide some extensions to the class browser Calypso. I allow rendering of package and class comments in MicroDown. " Class { - #name : #ManifestMicrodownCalypso, - #superclass : #PackageManifest, - #category : #'Microdown-Calypso-Manifest' + #name : 'ManifestMicrodownCalypso', + #superclass : 'PackageManifest', + #category : 'Microdown-Calypso-Manifest', + #package : 'Microdown-Calypso', + #tag : 'Manifest' } diff --git a/src/Microdown-Calypso/package.st b/src/Microdown-Calypso/package.st index c0836798..323b4e47 100644 --- a/src/Microdown-Calypso/package.st +++ b/src/Microdown-Calypso/package.st @@ -1 +1 @@ -Package { #name : #'Microdown-Calypso' } +Package { #name : 'Microdown-Calypso' } diff --git a/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st b/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st index b72a743e..a349b1e8 100644 --- a/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st +++ b/src/Microdown-Evaluator-Tests/MicCodeblockEvaluatorTest.class.st @@ -1,15 +1,16 @@ Class { - #name : #MicCodeblockEvaluatorTest, - #superclass : #TestCase, - #category : #'Microdown-Evaluator-Tests' + #name : 'MicCodeblockEvaluatorTest', + #superclass : 'TestCase', + #category : 'Microdown-Evaluator-Tests', + #package : 'Microdown-Evaluator-Tests' } -{ #category : #private } +{ #category : 'private' } MicCodeblockEvaluatorTest >> actualClass [ ^ MicCodeblockEvaluator ] -{ #category : #private } +{ #category : 'private' } MicCodeblockEvaluatorTest >> testCodeblockWithEvalExecuteBody [ | input | @@ -32,7 +33,7 @@ MicCodeblockEvaluatorTest >> testCodeblockWithEvalExecuteBody [ equals: 'Text(test)' ] -{ #category : #tests } +{ #category : 'tests' } MicCodeblockEvaluatorTest >> testCodeblockWithProblematicEval [ | input | input := MicRootBlock new @@ -47,7 +48,7 @@ MicCodeblockEvaluatorTest >> testCodeblockWithProblematicEval [ equals: 'Instance of Object class did not understand #SomethingThatIsNotAMethod' ] -{ #category : #tests } +{ #category : 'tests' } MicCodeblockEvaluatorTest >> testCodeblockWithoutEval [ | input | input := MicRootBlock new @@ -61,7 +62,7 @@ MicCodeblockEvaluatorTest >> testCodeblockWithoutEval [ self assert: input children first body equals: 'stream nextPut: $h; nextPut: $e; nextPut: $l; nextPutAll: ''lo''' ] -{ #category : #tests } +{ #category : 'tests' } MicCodeblockEvaluatorTest >> testParsedCodeblockEvaluated [ | input | input := MicCodeblockEvaluator new visit: (Microdown @@ -74,7 +75,7 @@ stream nextPutAll: ''Hello world'' self assert: input children first text equals: 'Hello world' ] -{ #category : #tests } +{ #category : 'tests' } MicCodeblockEvaluatorTest >> testParsedCodeblockNonEvaluated [ | input | input := MicCodeblockEvaluator new visit: (Microdown diff --git a/src/Microdown-Evaluator-Tests/package.st b/src/Microdown-Evaluator-Tests/package.st index e8b60ca0..9a9f4563 100644 --- a/src/Microdown-Evaluator-Tests/package.st +++ b/src/Microdown-Evaluator-Tests/package.st @@ -1 +1 @@ -Package { #name : #'Microdown-Evaluator-Tests' } +Package { #name : 'Microdown-Evaluator-Tests' } diff --git a/src/Microdown-H5P/MicH5PCommandLine.class.st b/src/Microdown-H5P/MicH5PCommandLine.class.st index eb752c05..15c75968 100644 --- a/src/Microdown-H5P/MicH5PCommandLine.class.st +++ b/src/Microdown-H5P/MicH5PCommandLine.class.st @@ -4,12 +4,13 @@ ``` " Class { - #name : #MicH5PCommandLine, - #superclass : #ClapApplication, - #category : #'Microdown-H5P' + #name : 'MicH5PCommandLine', + #superclass : 'ClapApplication', + #category : 'Microdown-H5P', + #package : 'Microdown-H5P' } -{ #category : #'command line' } +{ #category : 'command line' } MicH5PCommandLine class >> h5p [ @@ -23,12 +24,12 @@ MicH5PCommandLine class >> h5p [ (self with: args) execute ] ] -{ #category : #accessing } +{ #category : 'accessing' } MicH5PCommandLine >> argumentAt: identifier [ ^ (arguments at: identifier) value: self ] -{ #category : #accessing } +{ #category : 'accessing' } MicH5PCommandLine >> execute [ MicPictureBasedWriter new diff --git a/src/Microdown-H5P/MicH5PTemplateWriter.class.st b/src/Microdown-H5P/MicH5PTemplateWriter.class.st index 1e934c7d..69996eb9 100644 --- a/src/Microdown-H5P/MicH5PTemplateWriter.class.st +++ b/src/Microdown-H5P/MicH5PTemplateWriter.class.st @@ -97,12 +97,13 @@ params"""":{ } " Class { - #name : #MicH5PTemplateWriter, - #superclass : #MicDocumentWriter, - #category : #'Microdown-H5P' + #name : 'MicH5PTemplateWriter', + #superclass : 'MicDocumentWriter', + #category : 'Microdown-H5P', + #package : 'Microdown-H5P' } -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } MicH5PTemplateWriter class >> docString [ "since we may lose class comment..." ^ 'I''m a slide converter to a limited subset of H5P. @@ -133,12 +134,12 @@ params"":{ }' ] -{ #category : #initialization } +{ #category : 'initialization' } MicH5PTemplateWriter >> canvasClass [ ^ MicHTMLCanvas ] -{ #category : #'static document parts' } +{ #category : 'static document parts' } MicH5PTemplateWriter >> creditSlide [ ^ '{ @@ -388,7 +389,7 @@ MicH5PTemplateWriter >> creditSlide [ }' ] -{ #category : #'to debug generation' } +{ #category : 'to debug generation' } MicH5PTemplateWriter >> fillTemplateWithVariables [ "self new fillTemplateWithVariables" @@ -403,7 +404,7 @@ MicH5PTemplateWriter >> fillTemplateWithVariables [ }) asDictionary. ] -{ #category : #'to debug generation' } +{ #category : 'to debug generation' } MicH5PTemplateWriter >> fillTemplateWithVariables2 [ "self new fillTemplateWithVariables" @@ -418,7 +419,7 @@ MicH5PTemplateWriter >> fillTemplateWithVariables2 [ }) asDictionary. ] -{ #category : #actions } +{ #category : 'actions' } MicH5PTemplateWriter >> fillTemplateWithVariables: aMicPresentation [ "aMicPresentation is a collection with metadata and slides." @@ -437,7 +438,7 @@ MicH5PTemplateWriter >> fillTemplateWithVariables: aMicPresentation [ }) asDictionary. ] -{ #category : #'to debug generation' } +{ #category : 'to debug generation' } MicH5PTemplateWriter >> fillUpOneSlide [ " works too" "self new fillUpOneSlide" @@ -452,7 +453,7 @@ MicH5PTemplateWriter >> fillUpOneSlide [ ] -{ #category : #'to debug generation' } +{ #category : 'to debug generation' } MicH5PTemplateWriter >> fillUpOneSlide2 [ "works" "self new fillUpOneSlide" @@ -467,7 +468,7 @@ MicH5PTemplateWriter >> fillUpOneSlide2 [ ] -{ #category : #actions } +{ #category : 'actions' } MicH5PTemplateWriter >> fillUpOneSlide: aSlide [ | oneSlideWriter | @@ -483,7 +484,7 @@ MicH5PTemplateWriter >> fillUpOneSlide: aSlide [ ] -{ #category : #actions } +{ #category : 'actions' } MicH5PTemplateWriter >> fillUpSlides: aCollection [ aCollection @@ -492,7 +493,7 @@ MicH5PTemplateWriter >> fillUpSlides: aCollection [ ] -{ #category : #'old working templates' } +{ #category : 'old working templates' } MicH5PTemplateWriter >> fullTemplateString [ ^ '{ "presentation":{ @@ -1170,7 +1171,7 @@ MicH5PTemplateWriter >> fullTemplateString [ }' ] -{ #category : #'old working templates' } +{ #category : 'old working templates' } MicH5PTemplateWriter >> fullTemplateString2 [ "Working too" ^ '{ @@ -1945,7 +1946,7 @@ MicH5PTemplateWriter >> fullTemplateString2 [ }' ] -{ #category : #'old working templates' } +{ #category : 'old working templates' } MicH5PTemplateWriter >> fullTemplateString3 [ "working too" ^ '{ @@ -2693,7 +2694,7 @@ MicH5PTemplateWriter >> fullTemplateString3 [ }' ] -{ #category : #'old working templates' } +{ #category : 'old working templates' } MicH5PTemplateWriter >> fullTemplateString4 [ "no subcomponentid" ^ '{ @@ -3421,7 +3422,7 @@ MicH5PTemplateWriter >> fullTemplateString4 [ }' ] -{ #category : #'old working templates' } +{ #category : 'old working templates' } MicH5PTemplateWriter >> fullTemplateString5 [ "Cleaned subcomponents removed some extra space" @@ -4103,7 +4104,7 @@ MicH5PTemplateWriter >> fullTemplateString5 [ }' ] -{ #category : #'working templates with parameters' } +{ #category : 'working templates with parameters' } MicH5PTemplateWriter >> fullTemplateStringParam [ "with slides and credit variables." ^ '{ @@ -4375,7 +4376,7 @@ MicH5PTemplateWriter >> fullTemplateStringParam [ }' ] -{ #category : #'working templates with parameters' } +{ #category : 'working templates with parameters' } MicH5PTemplateWriter >> fullTemplateStringParam2 [ "This one is working" ^ '{ @@ -4811,7 +4812,7 @@ MicH5PTemplateWriter >> fullTemplateStringParam2 [ }' ] -{ #category : #'working templates with parameters' } +{ #category : 'working templates with parameters' } MicH5PTemplateWriter >> fullTemplateStringParam3 [ "with slides and credit variables." ^ '{ @@ -5083,7 +5084,7 @@ MicH5PTemplateWriter >> fullTemplateStringParam3 [ }' ] -{ #category : #'working templates with parameters' } +{ #category : 'working templates with parameters' } MicH5PTemplateWriter >> slideTemplate [ ^ '{ @@ -5150,7 +5151,7 @@ MicH5PTemplateWriter >> slideTemplate [ }' ] -{ #category : #visiting } +{ #category : 'visiting' } MicH5PTemplateWriter >> visitCode: aCodeBlock [ canvas nextPutAll: '
'.
  	aCodeBlock body do: [ :each | each = Character cr ifTrue: [ canvas nextPutAll: '\n' ]
@@ -5158,7 +5159,7 @@ MicH5PTemplateWriter >> visitCode: aCodeBlock [
 	canvas nextPutAll: '\n
\n'. ] -{ #category : #visiting } +{ #category : 'visiting' } MicH5PTemplateWriter >> visitFigure: aFigureBlock [ @@ -5201,7 +5202,7 @@ MicH5PTemplateWriter >> visitFigure: aFigureBlock [ }' ] -{ #category : #visiting } +{ #category : 'visiting' } MicH5PTemplateWriter >> visitOrderedList: anOrderedList [ canvas nextPutAll: '
    \n\t'. @@ -5209,7 +5210,7 @@ MicH5PTemplateWriter >> visitOrderedList: anOrderedList [ canvas nextPutAll: '\n<\ol>\n'. ] -{ #category : #visiting } +{ #category : 'visiting' } MicH5PTemplateWriter >> visitUnorderedList: anOrderedList [ canvas nextPutAll: '
      \n\t'. @@ -5217,7 +5218,7 @@ MicH5PTemplateWriter >> visitUnorderedList: anOrderedList [ canvas nextPutAll: '\n
    \n'. ] -{ #category : #visiting } +{ #category : 'visiting' } MicH5PTemplateWriter >> visitUnorderedListItem: anUnorderedListItem [ canvas nextPutAll: '
  1. '. @@ -5226,7 +5227,7 @@ MicH5PTemplateWriter >> visitUnorderedListItem: anUnorderedListItem [ ] -{ #category : #'to debug generation' } +{ #category : 'to debug generation' } MicH5PTemplateWriter >> writeContentJSONOnDisk [ "self new writeContentJSONOnDisk" @@ -5236,7 +5237,7 @@ MicH5PTemplateWriter >> writeContentJSONOnDisk [ writeStreamDo: [ :str | str nextPutAll: self fillTemplateWithVariables ] ] -{ #category : #actions } +{ #category : 'actions' } MicH5PTemplateWriter >> writeContentJSONOnDisk: aMicDocument [ "self new writeContentJSONOnDisk: (Microdown parse: MicH5PTemplateWriterTest new mainSlideInMicrodown, MicH5PTemplateWriterTest new oneSlideWithCodeInMicrodown )" '/Users/ducasse/Workspace/FirstCircle/MyBooks/Bk-Writing/AdvancedOODesign/h5p/pharo-Template-withVariableNames2/content/content.json' asFileReference ensureDelete. diff --git a/src/Microdown-H5P/MicH5PTemplateWriterTest.class.st b/src/Microdown-H5P/MicH5PTemplateWriterTest.class.st index 2b3dde23..c5593583 100644 --- a/src/Microdown-H5P/MicH5PTemplateWriterTest.class.st +++ b/src/Microdown-H5P/MicH5PTemplateWriterTest.class.st @@ -1,10 +1,11 @@ Class { - #name : #MicH5PTemplateWriterTest, - #superclass : #TestCase, - #category : #'Microdown-H5P' + #name : 'MicH5PTemplateWriterTest', + #superclass : 'TestCase', + #category : 'Microdown-H5P', + #package : 'Microdown-H5P' } -{ #category : #sample } +{ #category : 'sample' } MicH5PTemplateWriterTest >> mainSlideInMicrodown [ ^ ' @@ -17,7 +18,7 @@ MicH5PTemplateWriterTest >> mainSlideInMicrodown [ ' ] -{ #category : #sample } +{ #category : 'sample' } MicH5PTemplateWriterTest >> oneSlideWithCodeInMicrodown [ ^ ' @@ -34,13 +35,13 @@ SpTextInputFieldWithValidation >> validateInto: aValidationReport !>' ] -{ #category : #sample } +{ #category : 'sample' } MicH5PTemplateWriterTest >> presentationInMicrodown [ ^ self mainSlideInMicrodown , self twoSlidesInMicrodown ] -{ #category : #sample } +{ #category : 'sample' } MicH5PTemplateWriterTest >> slideInMicrodown [ ^ ' @@ -56,7 +57,7 @@ MicH5PTemplateWriterTest >> slideInMicrodown [ ' ] -{ #category : #sample } +{ #category : 'sample' } MicH5PTemplateWriterTest >> slideInMicrodownWithCode [ ^ ' @@ -80,7 +81,7 @@ testFoo ' ] -{ #category : #sample } +{ #category : 'sample' } MicH5PTemplateWriterTest >> slideInMicrodownWithSimpleCode [ ^ ' @@ -97,7 +98,7 @@ testMethod ' ] -{ #category : #sample } +{ #category : 'sample' } MicH5PTemplateWriterTest >> slideWithFigure [ ^ ' @@ -109,7 +110,7 @@ MicH5PTemplateWriterTest >> slideWithFigure [ ' ] -{ #category : #tests } +{ #category : 'tests' } MicH5PTemplateWriterTest >> testNSlide [ | doc h5p | @@ -242,7 +243,7 @@ MicH5PTemplateWriterTest >> testNSlide [ }' ] -{ #category : #tests } +{ #category : 'tests' } MicH5PTemplateWriterTest >> testOneSlide [ | doc h5p | @@ -312,7 +313,7 @@ MicH5PTemplateWriterTest >> testOneSlide [ }' ] -{ #category : #'low level visitor tests' } +{ #category : 'low level visitor tests' } MicH5PTemplateWriterTest >> testOneSlideBodyWithBullets [ | doc h5p | @@ -322,7 +323,7 @@ MicH5PTemplateWriterTest >> testOneSlideBodyWithBullets [ self assert: h5p contents equals: '
      \n\t
    • slide 1 bullet 1
      • \n\t
    • slide 1 bullet 2
      • \n\t
    • slide 1 bullet 3
      • \n\t\n
    \n' ] -{ #category : #'low level visitor tests' } +{ #category : 'low level visitor tests' } MicH5PTemplateWriterTest >> testOneSlideBodyWithCode [ | doc h5p | @@ -332,7 +333,7 @@ MicH5PTemplateWriterTest >> testOneSlideBodyWithCode [ self assert: h5p contents equals: '
    testMethod\n self assert: 4 foo equals: 55\n
    \n
    testFoo\n   self assertSpace.\n   self assertSpace2\n   ^ self\n
    \n' ] -{ #category : #'low level visitor tests' } +{ #category : 'low level visitor tests' } MicH5PTemplateWriterTest >> testOneSlideBodyWithSimpleCode [ | doc h5p | @@ -342,7 +343,7 @@ MicH5PTemplateWriterTest >> testOneSlideBodyWithSimpleCode [ self assert: h5p contents equals: '
    testMethod\n self assert: 4 foo equals: 55\n
    \n' ] -{ #category : #tests } +{ #category : 'tests' } MicH5PTemplateWriterTest >> testOneSlideWithOneFigure [ | doc h5p | @@ -389,7 +390,7 @@ MicH5PTemplateWriterTest >> testOneSlideWithOneFigure [ ] -{ #category : #tests } +{ #category : 'tests' } MicH5PTemplateWriterTest >> testSlides [ | doc | @@ -417,7 +418,7 @@ MicH5PTemplateWriterTest >> testSlides [ !>' ] -{ #category : #sample } +{ #category : 'sample' } MicH5PTemplateWriterTest >> twoSlidesInMicrodown [ ^ self slideInMicrodown, ' diff --git a/src/Microdown-H5P/MicJPEGH5PTemplateWriter.class.st b/src/Microdown-H5P/MicJPEGH5PTemplateWriter.class.st index 8fdcc321..48c3864e 100644 --- a/src/Microdown-H5P/MicJPEGH5PTemplateWriter.class.st +++ b/src/Microdown-H5P/MicJPEGH5PTemplateWriter.class.st @@ -3,12 +3,13 @@ MicJPEGH5PTemplateWriter new writeContentJSONOnDisk: (Microdown parse: MicH5PTemplateWriterTest new mainSlideInMicrodown, MicH5PTemplateWriterTest new oneSlideWithCodeInMicrodown ) " Class { - #name : #MicJPEGH5PTemplateWriter, - #superclass : #MicH5PTemplateWriter, - #category : #'Microdown-H5P' + #name : 'MicJPEGH5PTemplateWriter', + #superclass : 'MicH5PTemplateWriter', + #category : 'Microdown-H5P', + #package : 'Microdown-H5P' } -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } MicJPEGH5PTemplateWriter >> presentationString [ ^ '{ @@ -140,7 +141,7 @@ MicJPEGH5PTemplateWriter >> presentationString [ ' ] -{ #category : #'working templates with parameters' } +{ #category : 'working templates with parameters' } MicJPEGH5PTemplateWriter >> slideTemplate [ "in this version we only embed jpeg" diff --git a/src/Microdown-H5P/MicPictureBasedWriter.class.st b/src/Microdown-H5P/MicPictureBasedWriter.class.st index 0cfadd3d..5bfb0623 100644 --- a/src/Microdown-H5P/MicPictureBasedWriter.class.st +++ b/src/Microdown-H5P/MicPictureBasedWriter.class.st @@ -57,18 +57,19 @@ MicPictureBasedWriter new " Class { - #name : #MicPictureBasedWriter, - #superclass : #Object, + #name : 'MicPictureBasedWriter', + #superclass : 'Object', #instVars : [ 'placeOfTemplateFolder', 'sourceSlideImagesFolder', 'slideNames', 'sourcePDF' ], - #category : #'Microdown-H5P' + #category : 'Microdown-H5P', + #package : 'Microdown-H5P' } -{ #category : #examples } +{ #category : 'examples' } MicPictureBasedWriter class >> example [