Move Teapot extensions to its own package

ba-st · Sep 13, 2023 · e2bf46c · e2bf46c
1 parent 499f70a
commit e2bf46c
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/source/BaselineOfStargate/BaselineOfStargate.class.st b/source/BaselineOfStargate/BaselineOfStargate.class.st
@@ -38,11 +38,13 @@ BaselineOfStargate >> setUpCorePackages: spec [
 		group: 'Core' with: 'Stargate-Model';
 		group: 'Deployment' with: 'Stargate-Model'.
 
-	spec
-		package: 'Stargate-Zinc-Extensions'
-		with: [ spec requires: 'Stargate-Model' ];
-		group: 'Core' with: 'Stargate-Zinc-Extensions';
-		group: 'Deployment' with: 'Stargate-Zinc-Extensions'
+	#( 'Stargate-Zinc-Extensions' 'Stargate-Teapot-Extensions' ) do: [
+		:extensionPackageName |
+		spec
+			package: extensionPackageName
+			with: [ spec requires: 'Stargate-Model' ];
+			group: 'Core' with: extensionPackageName;
+			group: 'Deployment' with: extensionPackageName ]
 ]
 
 { #category : #baselines }

diff --git a/...rgate-Model/TeaDynamicRouter.extension.st → ...-Extensions/TeaDynamicRouter.extension.st b/...rgate-Model/TeaDynamicRouter.extension.st → ...-Extensions/TeaDynamicRouter.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #TeaDynamicRouter }
 
-{ #category : #'*Stargate-Model' }
+{ #category : #'*Stargate-Teapot-Extensions' }
 TeaDynamicRouter >> removeRoutesMatchedBy: aTeaRequestMatcher [
 
 	routes removeAllSuchThat: [ :route | route isMatchedBy: aTeaRequestMatcher ]

diff --git a/...ce/Stargate-Model/TeaRequest.extension.st → ...Teapot-Extensions/TeaRequest.extension.st b/...ce/Stargate-Model/TeaRequest.extension.st → ...Teapot-Extensions/TeaRequest.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #TeaRequest }
 
-{ #category : #'*Stargate-Model' }
+{ #category : #'*Stargate-Teapot-Extensions' }
 TeaRequest >> at: key ifPresent: aPresentBlock ifAbsent: anAbsentBlock [
 
 	^ aPresentBlock cull: ( self at: key ifAbsent: [ ^ anAbsentBlock value ] )

diff --git a/...gate-Model/TeaRequestMatcher.extension.st → ...Extensions/TeaRequestMatcher.extension.st b/...gate-Model/TeaRequestMatcher.extension.st → ...Extensions/TeaRequestMatcher.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #TeaRequestMatcher }
 
-{ #category : #'*Stargate-Model' }
+{ #category : #'*Stargate-Teapot-Extensions' }
 TeaRequestMatcher >> isEquivalentTo: aRequestMatcher [
 
 	^ self printString = aRequestMatcher printString

diff --git a/...e/Stargate-Model/TeaResponse.extension.st → ...eapot-Extensions/TeaResponse.extension.st b/...e/Stargate-Model/TeaResponse.extension.st → ...eapot-Extensions/TeaResponse.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #TeaResponse }
 
-{ #category : #'*Stargate-Model' }
+{ #category : #'*Stargate-Teapot-Extensions' }
 TeaResponse class >> noContent [
 
 	^ self code: ZnStatusLine noContent code

diff --git a/source/Stargate-Model/TeaRoute.extension.st → ...e-Teapot-Extensions/TeaRoute.extension.st b/source/Stargate-Model/TeaRoute.extension.st → ...e-Teapot-Extensions/TeaRoute.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #TeaRoute }
 
-{ #category : #'*Stargate-Model' }
+{ #category : #'*Stargate-Teapot-Extensions' }
 TeaRoute >> isMatchedBy: aTeaRequestMatcher [
 
 	^ requestMatcher isEquivalentTo: aTeaRequestMatcher

diff --git a/source/Stargate-Model/Teapot.extension.st → ...ate-Teapot-Extensions/Teapot.extension.st b/source/Stargate-Model/Teapot.extension.st → ...ate-Teapot-Extensions/Teapot.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Teapot }
 
-{ #category : #'*Stargate-Model' }
+{ #category : #'*Stargate-Teapot-Extensions' }
 Teapot >> addRouteMatchedBy: aTeaRequestMatcher action: aTeaAction [
 
 	current := dynamicRouter addRoute: ( TeaRoute matcher: aTeaRequestMatcher
@@ -9,7 +9,7 @@ Teapot >> addRouteMatchedBy: aTeaRequestMatcher action: aTeaAction [
 			             port: server port )
 ]
 
-{ #category : #'*Stargate-Model' }
+{ #category : #'*Stargate-Teapot-Extensions' }
 Teapot >> removeRoutesMatchedBy: aTeaRequestMatcher [
 
 	dynamicRouter removeRoutesMatchedBy: aTeaRequestMatcher

diff --git a/source/Stargate-Teapot-Extensions/package.st b/source/Stargate-Teapot-Extensions/package.st
@@ -0,0 +1 @@
+Package { #name : #'Stargate-Teapot-Extensions' }