Add handlers to Application.

Author: Alejandro Infante

src/PythonBridge/Collection.extension.st

@@ -0,0 +1,6 @@
+Extension { #name : #Collection }
+
+{ #category : #'*PythonBridge' }
+Collection >> ensureDo: aBlock [
+	self do: [ :el | aBlock valueUninterruptably ]
+]

src/PythonBridge/PBApplication.class.st

@@ -3,6 +3,7 @@ Class {
 	#superclass : #Object,
 	#instVars : [
 		'promiseHandler',
+		'sendMessageHandler',
 		'processHandler'
 	],
 	#classInstVars : [
@@ -228,6 +229,15 @@ if __name__ == "__main__":
 		pharo_hooks_globals.logger.log("PYTHON: Finished command execution")'
 ]
 
+{ #category : #instructions }
+PBApplication class >> resetUniqueInstance [
+	uniqueInstance ifNotNil: [ 
+		[ uniqueInstance stop ] 
+			on: Error 
+			do: [ UIManager inform: 'Error on reseting unique instance.' ]. ].
+	uniqueInstance := nil
+]
+
 { #category : #instructions }
 PBApplication class >> retrieveExpression: obj [
 	self assert: self isRunning.
@@ -279,6 +289,21 @@ PBApplication class >> stop [
 	uniqueInstance := nil
 ]
 
+{ #category : #handlers }
+PBApplication >> handlers [
+	^ Array
+		with: promiseHandler
+		with: sendMessageHandler
+		with: processHandler
+]
+
+{ #category : #accessing }
+PBApplication >> initializeHandlers [
+	processHandler := PBProcessHandler new.
+	promiseHandler := PBPromiseHandler new.
+	sendMessageHandler := PBSendMessageHandler new
+]
+
 { #category : #testing }
 PBApplication >> isPythonReady [
 	"Ensures python webserver is ready for receiving commands"
@@ -287,21 +312,19 @@ PBApplication >> isPythonReady [
 
 { #category : #testing }
 PBApplication >> isRunning [
-	^ processHandler isRunning and: [ promiseHandler isRunning ]
+	^ self handlers allSatisfy: #isRunning
 ]
 
 { #category : #accessing }
 PBApplication >> start [
-	processHandler := PBProcessHandler new.
-	processHandler start.
-	promiseHandler := PBPromiseHandler new.
-	promiseHandler start.
-	
+	self initializeHandlers.
+	self handlers do: #start.	
 	self waitInitialization.
 ]
 
 { #category : #accessing }
 PBApplication >> stop [
+	self handlers do: #stop
 ]
 
 { #category : #'as yet unclassified' }

src/PythonBridge/PBApplicationTest.class.st

@@ -6,7 +6,7 @@ Class {
 
 { #category : #running }
 PBApplicationTest >> tearDown [
-	PBApplication isRunning ifTrue: [ PBApplication stop ]
+	PBApplication resetUniqueInstance
 ]
 
 { #category : #tests }

src/PythonBridge/PBHandler.class.st

@@ -0,0 +1,18 @@
+Class {
+	#name : #PBHandler,
+	#superclass : #Object,
+	#category : #PythonBridge
+}
+
+{ #category : #testing }
+PBHandler >> isRunning [
+	^ true
+]
+
+{ #category : #accessing }
+PBHandler >> start [
+]
+
+{ #category : #accessing }
+PBHandler >> stop [
+]

src/PythonBridge/PBProcessHandler.class.st

@@ -1,14 +1,5 @@
 Class {
 	#name : #PBProcessHandler,
-	#superclass : #Object,
+	#superclass : #PBHandler,
 	#category : #PythonBridge
 }
-
-{ #category : #testing }
-PBProcessHandler >> isRunning [
-	^ true
-]
-
-{ #category : #accessing }
-PBProcessHandler >> start [
-]

src/PythonBridge/PBPromiseHandler.class.st

@@ -1,14 +1,5 @@
 Class {
 	#name : #PBPromiseHandler,
-	#superclass : #Object,
+	#superclass : #PBHandler,
 	#category : #PythonBridge
 }
-
-{ #category : #testing }
-PBPromiseHandler >> isRunning [
-	^ true
-]
-
-{ #category : #accessing }
-PBPromiseHandler >> start [
-]

src/PythonBridge/PBSendMessageHandler.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #PBSendMessageHandler,
+	#superclass : #PBHandler,
+	#category : #PythonBridge
+}