spec layouts should now be on instance side

zeroflag · Oct 17, 2024 · a59f7c8 · a59f7c8
1 parent 5774572
commit a59f7c8
Show file tree

Hide file tree

Showing 15 changed files with 211 additions and 195 deletions.
diff --git a/source/Teapot-Tools/Cupboard.class.st b/source/Teapot-Tools/Cupboard.class.st
@@ -7,8 +7,8 @@ You can open me with:
 	self soleInstance open
 "
 Class {
-	#name : #Cupboard,
-	#superclass : #SpPresenter,
+	#name : 'Cupboard',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'teapots',
 		'toolbar'
@@ -17,16 +17,18 @@ Class {
 		'soleInstance',
 		'icons'
 	],
-	#category : #'Teapot-Tools-UI'
+	#category : 'Teapot-Tools-UI',
+	#package : 'Teapot-Tools',
+	#tag : 'UI'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 Cupboard class >> iconProvider [
 
 	^TeaIconProvider
 ]
 
-{ #category : #'world menu' }
+{ #category : 'world menu' }
 Cupboard class >> menuCommandOn: aBuilder [ 
 	<worldMenu> 
 
@@ -38,28 +40,28 @@ Cupboard class >> menuCommandOn: aBuilder [
 	 aBuilder withSeparatorAfter 
 ]
 
-{ #category : #'instance creation' }
+{ #category : 'instance creation' }
 Cupboard class >> new [
 
 	self error: 'Do not create new instances - access using #soleInstance'
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 Cupboard class >> reset [
 	<script>
 
 	soleInstance := nil.
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 Cupboard class >> soleInstance [
 	<script: 'self soleInstance inspect'>
 
 	^ soleInstance ifNil: [ soleInstance := self basicNew initialize ]
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildBrowseToolBarItem [
 
 	^ SpToolbarButtonPresenter new
@@ -70,7 +72,7 @@ Cupboard >> buildBrowseToolBarItem [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildContextMenu [
 
 	^ SpMenuPresenter new
@@ -92,7 +94,7 @@ Cupboard >> buildContextMenu [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildInspectToolBarItem [
 
 	^ SpToolbarButtonPresenter new
@@ -103,7 +105,7 @@ Cupboard >> buildInspectToolBarItem [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildNewStaticToolBarItem [
 
 	^ SpToolbarButtonPresenter new
@@ -116,7 +118,7 @@ Cupboard >> buildNewStaticToolBarItem [
 		  yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildNewToolBarItem [
 
 	^ SpToolbarButtonPresenter new
@@ -129,7 +131,7 @@ Cupboard >> buildNewToolBarItem [
 		  yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildRefreshToolBarItem [
 
 	^ SpToolbarButtonPresenter new
@@ -140,7 +142,7 @@ Cupboard >> buildRefreshToolBarItem [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildStartToolBarItem [
 
 	^ SpToolbarButtonPresenter new
@@ -151,7 +153,7 @@ Cupboard >> buildStartToolBarItem [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildStopToolBarItem [
 
 	^ SpToolbarButtonPresenter new
@@ -162,7 +164,7 @@ Cupboard >> buildStopToolBarItem [
 		yourself
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> buildToolbar [
 
 	^ self newToolbar 
@@ -176,27 +178,27 @@ Cupboard >> buildToolbar [
 		yourself
 ]
 
-{ #category : #layout }
+{ #category : 'layout' }
 Cupboard >> defaultLayout [ 
 
 	^ SpBoxLayout newTopToBottom 
 		add: teapots;
 		yourself
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 Cupboard >> iconForTeapot: aTeapot [
 	^aTeapot server isRunning 
 			ifTrue: [ self iconProvider teapotServerStartIcon ] 
 			ifFalse: [ self iconProvider teapotServerStopIcon ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 Cupboard >> iconProvider [
 	^ self class iconProvider
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> initializePresenters [
 
 	teapots := self newList.
@@ -209,7 +211,7 @@ Cupboard >> initializePresenters [
 		contextMenu: self buildContextMenu
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 Cupboard >> initializeWindow: aWindowPresenter [
 
 	super initializeWindow: aWindowPresenter.
@@ -218,7 +220,7 @@ Cupboard >> initializeWindow: aWindowPresenter [
 		toolbar: (toolbar := self buildToolbar).
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 Cupboard >> nameForTeapot: aTeapot [
 	^ String streamContents: [:stream |
 		stream nextPutAll: aTeapot server port asString.
@@ -227,7 +229,7 @@ Cupboard >> nameForTeapot: aTeapot [
 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 Cupboard >> onNewServer [
 	| port pot |
 	port := UIManager default request: 'New server' initialAnswer: '80'.
@@ -241,7 +243,7 @@ Cupboard >> onNewServer [
 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 Cupboard >> onNewStaticServer [
 	| port directory pot |
 	port := UIManager default request: 'New server' initialAnswer: '80'.
@@ -258,31 +260,31 @@ Cupboard >> onNewStaticServer [
 
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 Cupboard >> open [
 
 	self refreshTeapots.
 	super open.
 ]
 
-{ #category : #printing }
+{ #category : 'printing' }
 Cupboard >> printOn: aStream [
 	aStream nextPutAll: 'Cupboard'
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 Cupboard >> refreshTeapots [
 
 	teapots items: self teapots
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 Cupboard >> selectedTeapot [
 
 	^ teapots selectedItem
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 Cupboard >> teapots [
 	^ Teapot allInstances
 ]
diff --git a/source/Teapot-Tools/ManifestTeapotTools.class.st b/source/Teapot-Tools/ManifestTeapotTools.class.st
@@ -2,12 +2,14 @@
 Please describe the package using the class comment of the included manifest class. The manifest class also includes other additional metadata for the package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser
 "
 Class {
-	#name : #ManifestTeapotTools,
-	#superclass : #PackageManifest,
-	#category : #'Teapot-Tools-Manifest'
+	#name : 'ManifestTeapotTools',
+	#superclass : 'PackageManifest',
+	#category : 'Teapot-Tools-Manifest',
+	#package : 'Teapot-Tools',
+	#tag : 'Manifest'
 }
 
-{ #category : #'code-critics' }
+{ #category : 'code-critics' }
 ManifestTeapotTools class >> ruleLongMethodsRuleV1FalsePositive [
 	^ #(#(#(#RGMethodDefinition #(#Cupboard #inspectTeapot: #false)) #'2022-08-29T16:00:19.64012+02:00') )
 ]
diff --git a/source/Teapot-Tools/TeaFormTab.class.st b/source/Teapot-Tools/TeaFormTab.class.st
@@ -2,42 +2,44 @@
 I'm built up from a dynamically extensible key value pair list (TeaKeyValueInput). I can represent POST parameters or HTTP headers for example.
 "
 Class {
-	#name : #TeaFormTab,
-	#superclass : #SpPresenter,
+	#name : 'TeaFormTab',
+	#superclass : 'SpPresenter',
 	#instVars : [
 		'form',
 		'addButton'
 	],
-	#category : #'Teapot-Tools-UI-Components'
+	#category : 'Teapot-Tools-UI-Components',
+	#package : 'Teapot-Tools',
+	#tag : 'UI-Components'
 }
 
-{ #category : #specs }
-TeaFormTab class >> defaultLayout [
-	^ SpBoxLayout newVertical 
-		add: #form expand: false fill: false;
-      add: (SpBoxLayout newHorizontal 
-		   add: #addButton expand: false fill: false;
-         hAlignCenter;
-         yourself) expand: false fill: false;		
-		yourself
-]
-
-{ #category : #accessing }
+{ #category : 'accessing' }
 TeaFormTab >> addButton [
 	^ addButton 
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 TeaFormTab >> connectPresenters [ 
 	addButton whenActionPerformedDo: [ form addKey: 'key' value: 'value' ]
 ]
 
-{ #category : #accessing }
+{ #category : 'layout' }
+TeaFormTab >> defaultLayout [
+	^ SpBoxLayout newVertical 
+		add: form expand: false fill: false;
+      add: (SpBoxLayout newHorizontal 
+		   add: addButton expand: false fill: false;
+         hAlignCenter;
+         yourself) expand: false fill: false;		
+		yourself
+]
+
+{ #category : 'accessing' }
 TeaFormTab >> form [
 	^ form
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 TeaFormTab >> initializePresenters [
 	addButton := self newButton label: 'Add parameter'; yourself.
 	form := self instantiate: TeaKeyValueList.
@@ -46,12 +48,12 @@ TeaFormTab >> initializePresenters [
 		add: addButton.
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 TeaFormTab >> updateKeyValus: keyValueCollection [
 	form items: keyValueCollection
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 TeaFormTab >> urlEncoded [
 	| url formParams |
 	url := '/' asZnUrl.
@@ -62,7 +64,7 @@ TeaFormTab >> urlEncoded [
 
 ]
 
-{ #category : #protocol }
+{ #category : 'protocol' }
 TeaFormTab >> writeUrlEncodedTo: aTextModel [
 	self urlEncoded 
 		ifNotEmpty: [ aTextModel text: self urlEncoded ]

diff --git a/source/Teapot-Tools/TeaGlobUrlPattern.extension.st b/source/Teapot-Tools/TeaGlobUrlPattern.extension.st
@@ -1,6 +1,6 @@
-Extension { #name : #TeaGlobUrlPattern }
+Extension { #name : 'TeaGlobUrlPattern' }
 
-{ #category : #'*Teapot-Tools' }
+{ #category : '*Teapot-Tools' }
 TeaGlobUrlPattern >> asTeaspoonPath [
 	^ String streamContents: [ :aStream |
 			segments