Improve UnorderedListWebView so it can be used with the ListLabelingC…

…ommand.
ba-st · May 2, 2017 · 994f99c · 994f99c
1 parent 812d804
commit 994f99c
Show file tree

Hide file tree

Showing 27 changed files with 83 additions and 46 deletions.
diff --git a/...package/Html5ComponentSupplierTest.class/instance/testAsynchronicButtonLabeledApplying.st b/...package/Html5ComponentSupplierTest.class/instance/testAsynchronicButtonLabeledApplying.st
@@ -1,4 +1,4 @@
-tests-Accessing
+tests-Supplying
 testAsynchronicButtonLabeledApplying
 
 	| supplier button html |

diff --git a/...e/Willow-Tests.package/Html5ComponentSupplierTest.class/instance/testDateFieldApplying.st b/...e/Willow-Tests.package/Html5ComponentSupplierTest.class/instance/testDateFieldApplying.st
@@ -1,4 +1,4 @@
-tests-Accessing
+tests-Supplying
 testDateFieldApplying
 
 	| supplier field html |

diff --git a/...illow-Tests.package/Html5ComponentSupplierTest.class/instance/testDropdownListApplying.st b/...illow-Tests.package/Html5ComponentSupplierTest.class/instance/testDropdownListApplying.st
@@ -1,4 +1,4 @@
-tests-Accessing
+tests-Supplying
 testDropdownListApplying
 
 	| supplier dropdownList html |

diff --git a/...ests.package/Html5ComponentSupplierTest.class/instance/testSingleLineTextFieldApplying.st b/...ests.package/Html5ComponentSupplierTest.class/instance/testSingleLineTextFieldApplying.st
@@ -1,4 +1,4 @@
-tests-Accessing
+tests-Supplying
 testSingleLineTextFieldApplying
 
 	| supplier textField html |

diff --git a/...tml5ComponentSupplierTest.class/instance/testSynchronicButtonLabeledApplyingEvaluating.st b/...tml5ComponentSupplierTest.class/instance/testSynchronicButtonLabeledApplyingEvaluating.st
@@ -1,4 +1,4 @@
-tests-Accessing
+tests-Supplying
 testSynchronicButtonLabeledApplyingEvaluating
 
 	| supplier button html |

diff --git a/...ml5ComponentSupplierTest.class/instance/testUnorderedListApplyingListingApplyingToEach.st b/...ml5ComponentSupplierTest.class/instance/testUnorderedListApplyingListingApplyingToEach.st
@@ -0,0 +1,15 @@
+tests-Supplying
+testUnorderedListApplyingListingApplyingToEach
+
+	| supplier list html |
+
+	supplier := Html5ComponentSupplier new.
+
+	list := supplier
+		unorderedListApplying: (ListLabelingCommand with: [ :item | 'N.<1p>' expandMacrosWith: item ])
+		listing: #(1 2 3)
+		applyingToEach: (ComponentClassificationCommand toStyleWith: 'item').
+
+	html := self render: list.
+
+	self assert: html equals: '<ul><li class="item">N.1</li><li class="item">N.2</li><li class="item">N.3</li></ul>'
diff --git a/source/Willow-Tests.package/Html5ComponentSupplierTest.class/methodProperties.json b/source/Willow-Tests.package/Html5ComponentSupplierTest.class/methodProperties.json
@@ -3,10 +3,11 @@
 		"testAsynchronicButtonLabeledApplying" : "GabrielOmarCotelli 4/11/2017 18:05",
 		"testDropdownListApplying" : "GabrielOmarCotelli 4/25/2017 11:14",
 		"testSynchronicButtonLabeledApplyingEvaluating" : "GabrielOmarCotelli 4/25/2017 11:13",
-		"testUpdateRoot" : "GabrielOmarCotelli 4/25/2017 11:16",
+		"testUnorderedListApplyingListingApplyingToEach" : "GabrielOmarCotelli 5/2/2017 17:51",
 		"testDateFieldApplying" : "GabrielOmarCotelli 4/20/2017 16:55",
 		"testNaturalNumberFieldApplying" : "GabrielOmarCotelli 4/27/2017 15:25",
-		"testSingleLineTextFieldApplying" : "GabrielOmarCotelli 4/25/2017 11:10"
+		"testSingleLineTextFieldApplying" : "GabrielOmarCotelli 4/25/2017 11:10",
+		"testUpdateRoot" : "GabrielOmarCotelli 4/25/2017 11:16"
 	},
 	"class" : { }
 }
diff --git a/source/Willow-Tests.package/ListItemWebViewTest.class/instance/testRenderContentOn.st b/source/Willow-Tests.package/ListItemWebViewTest.class/instance/testRenderContentOn.st
@@ -1,9 +1,13 @@
 tests-rendering
 testRenderContentOn
 
-	| container html |
+	| html |
 
-	container := ListItemWebView itemizing: 'Item' applying: CompositeComponentCommand empty.
-	html := self render: container.
+	html := self
+		renderUsing: [ :canvas | 
+			| list |
 
-	self assert: html equals: '<li>Item</li>'
+			list := canvas unorderedList.
+			list with: [ canvas render: (ListItemWebView itemizing: 'Item' containedIn: list applying: CompositeComponentCommand empty) ] ].
+
+	self assert: html equals: '<ul><li>Item</li></ul>'
diff --git a/...illow-Tests.package/ListItemWebViewTest.class/instance/testRenderContentOnWithCommands.st b/...illow-Tests.package/ListItemWebViewTest.class/instance/testRenderContentOnWithCommands.st
@@ -1,9 +1,14 @@
 tests-rendering
 testRenderContentOnWithCommands
 
-	| container html |
+	| html |
 
-	container := ListItemWebView itemizing: 'Item' applying: (ComponentClassificationCommand toStyleWith: 'item').
-	html := self render: container.
+	html := self
+		renderUsing: [ :canvas | 
+			| list |
 
-	self assert: html equals: '<li class="item">Item</li>'
+			list := canvas unorderedList.
+			list
+				with: [ canvas render: (ListItemWebView itemizing: 'Item' containedIn: list applying: (ComponentClassificationCommand toStyleWith: 'item')) ] ].
+
+	self assert: html equals: '<ul><li class="item">Item</li></ul>'
diff --git a/source/Willow-Tests.package/ListItemWebViewTest.class/methodProperties.json b/source/Willow-Tests.package/ListItemWebViewTest.class/methodProperties.json
@@ -1,7 +1,7 @@
 {
 	"instance" : {
-		"testRenderContentOn" : "GabrielOmarCotelli 1/31/2017 14:21",
-		"testRenderContentOnWithCommands" : "GabrielOmarCotelli 1/31/2017 14:22"
+		"testRenderContentOn" : "GabrielOmarCotelli 5/2/2017 17:50",
+		"testRenderContentOnWithCommands" : "GabrielOmarCotelli 5/2/2017 17:50"
 	},
 	"class" : { }
 }
diff --git a/source/Willow-Tests.package/monticello.meta/version b/source/Willow-Tests.package/monticello.meta/version
diff --git a/...FrontendComponentSupplier.class/instance/unorderedListApplying.listing.applyingToEach..st b/...FrontendComponentSupplier.class/instance/unorderedListApplying.listing.applyingToEach..st
@@ -0,0 +1,4 @@
+Supplying
+unorderedListApplying: aCommandToList listing: aCollection applyingToEach: aCommandToItem
+
+	^ self subclassResponsibility 
diff --git a/source/Willow.package/FrontendComponentSupplier.class/methodProperties.json b/source/Willow.package/FrontendComponentSupplier.class/methodProperties.json
@@ -3,6 +3,7 @@
 		"singleLineTextFieldApplying:" : "GabrielOmarCotelli 4/25/2017 11:00",
 		"dropdownListApplying:" : "GabrielOmarCotelli 4/3/2017 09:40",
 		"naturalNumberFieldApplying:" : "GabrielOmarCotelli 4/27/2017 15:23",
+		"unorderedListApplying:listing:applyingToEach:" : "GabrielOmarCotelli 5/2/2017 17:20",
 		"updateRoot:" : "GabrielOmarCotelli 4/3/2017 09:51",
 		"asynchronicButtonLabeled:applying:" : "GabrielOmarCotelli 4/11/2017 16:53",
 		"synchronicButtonLabeled:applying:evaluating:" : "GabrielOmarCotelli 4/25/2017 10:33",

diff --git a/...ge/Html5ComponentSupplier.class/instance/unorderedListApplying.listing.applyingToEach..st b/...ge/Html5ComponentSupplier.class/instance/unorderedListApplying.listing.applyingToEach..st
@@ -0,0 +1,4 @@
+Supplying
+unorderedListApplying: aCommandToList listing: aCollection applyingToEach: aCommandToItem
+
+	^ UnorderedListWebView applying: aCommandToList listing: aCollection applyingToEach: aCommandToItem
diff --git a/source/Willow.package/Html5ComponentSupplier.class/methodProperties.json b/source/Willow.package/Html5ComponentSupplier.class/methodProperties.json
@@ -3,6 +3,7 @@
 		"singleLineTextFieldApplying:" : "GabrielOmarCotelli 4/25/2017 11:00",
 		"dropdownListApplying:" : "GabrielOmarCotelli 4/4/2017 17:20",
 		"naturalNumberFieldApplying:" : "GabrielOmarCotelli 4/27/2017 15:23",
+		"unorderedListApplying:listing:applyingToEach:" : "GabrielOmarCotelli 5/2/2017 17:21",
 		"updateRoot:" : "GabrielOmarCotelli 4/4/2017 17:21",
 		"asynchronicButtonLabeled:applying:" : "GabrielOmarCotelli 4/11/2017 16:52",
 		"synchronicButtonLabeled:applying:evaluating:" : "GabrielOmarCotelli 4/25/2017 10:33",

diff --git a/source/Willow.package/ListItemWebView.class/class/itemizing.applying..st b/source/Willow.package/ListItemWebView.class/class/itemizing.applying..st
diff --git a/source/Willow.package/ListItemWebView.class/class/itemizing.containedIn.applying..st b/source/Willow.package/ListItemWebView.class/class/itemizing.containedIn.applying..st
@@ -0,0 +1,4 @@
+instance creation
+itemizing: anObject containedIn: aList applying: aComponentCommand
+
+	^ self new initializeItemizing: anObject containedIn: aList applying: aComponentCommand
diff --git a/source/Willow.package/ListItemWebView.class/instance/initializeItemizing.applying..st b/source/Willow.package/ListItemWebView.class/instance/initializeItemizing.applying..st
diff --git a/...illow.package/ListItemWebView.class/instance/initializeItemizing.containedIn.applying..st b/...illow.package/ListItemWebView.class/instance/initializeItemizing.containedIn.applying..st
@@ -0,0 +1,6 @@
+initialize-release
+initializeItemizing: anObject containedIn: aList applying: aComponentCommand
+
+	item := anObject.
+	list := aList.
+	commandToComponent := aComponentCommand
diff --git a/source/Willow.package/ListItemWebView.class/instance/renderContentOn..st b/source/Willow.package/ListItemWebView.class/instance/renderContentOn..st
@@ -5,4 +5,4 @@ renderContentOn: aCanvas
 
 	component := aCanvas listItem.
 	commandToComponent applyTo: component on: aCanvas.
-	component with: itemView
+	component with: (list labelForOption: item)
diff --git a/source/Willow.package/ListItemWebView.class/methodProperties.json b/source/Willow.package/ListItemWebView.class/methodProperties.json
@@ -1,9 +1,9 @@
 {
 	"instance" : {
-		"initializeItemizing:applying:" : "MaximilianoTabacman 1/31/2017 00:33",
-		"renderContentOn:" : "MaximilianoTabacman 1/31/2017 00:32"
+		"initializeItemizing:containedIn:applying:" : "GabrielOmarCotelli 5/2/2017 17:38",
+		"renderContentOn:" : "GabrielOmarCotelli 5/2/2017 17:38"
 	},
 	"class" : {
-		"itemizing:applying:" : "MaximilianoTabacman 1/31/2017 00:33"
+		"itemizing:containedIn:applying:" : "GabrielOmarCotelli 5/2/2017 17:39"
 	}
 }
diff --git a/source/Willow.package/ListItemWebView.class/properties.json b/source/Willow.package/ListItemWebView.class/properties.json
@@ -6,8 +6,9 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [
-		"itemView",
-		"commandToComponent"
+		"commandToComponent",
+		"list",
+		"item"
 	],
 	"name" : "ListItemWebView",
 	"type" : "normal"

diff --git a/...package/UnorderedListWebView.class/instance/initializeApplying.listing.applyingToEach..st b/...package/UnorderedListWebView.class/instance/initializeApplying.listing.applyingToEach..st
@@ -1,6 +1,6 @@
 initialize-release
 initializeApplying: aComponentCommand listing: anElementCollection applyingToEach: anElementCommand
 
-	listItemViews := anElementCollection
-		collect: [ :anElement | ListItemWebView itemizing: anElement applying: anElementCommand ].
-	commandToComponent := aComponentCommand
+	elements := anElementCollection.
+	commandToItem := anElementCommand.
+	commandToList := aComponentCommand
diff --git a/source/Willow.package/UnorderedListWebView.class/instance/renderContentOn..st b/source/Willow.package/UnorderedListWebView.class/instance/renderContentOn..st
@@ -1,10 +1,9 @@
 rendering
 renderContentOn: aCanvas
 
-	"The order is relevant"
-
-	| component |
+	| list |
 
-	component := aCanvas unorderedList.
-	commandToComponent applyTo: component on: aCanvas.
-	component with: listItemViews
+	list := aCanvas unorderedList.
+	"The order is relevant"
+	commandToList applyTo: list on: aCanvas.
+	list with: [ elements do: [ :anElement | aCanvas render: (ListItemWebView itemizing: anElement containedIn: list applying: commandToItem) ] ]
diff --git a/source/Willow.package/UnorderedListWebView.class/methodProperties.json b/source/Willow.package/UnorderedListWebView.class/methodProperties.json
@@ -1,7 +1,7 @@
 {
 	"instance" : {
-		"initializeApplying:listing:applyingToEach:" : "MaximilianoTabacman 1/31/2017 00:33",
-		"renderContentOn:" : "MaximilianoTabacman 1/31/2017 00:28"
+		"initializeApplying:listing:applyingToEach:" : "GabrielOmarCotelli 5/2/2017 17:43",
+		"renderContentOn:" : "GabrielOmarCotelli 5/2/2017 17:46"
 	},
 	"class" : {
 		"applying:listing:applyingToEach:" : "MaximilianoTabacman 1/31/2017 00:28"

diff --git a/source/Willow.package/UnorderedListWebView.class/properties.json b/source/Willow.package/UnorderedListWebView.class/properties.json
@@ -6,8 +6,9 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [
-		"listItemViews",
-		"commandToComponent"
+		"elements",
+		"commandToItem",
+		"commandToList"
 	],
 	"name" : "UnorderedListWebView",
 	"type" : "normal"

diff --git a/source/Willow.package/monticello.meta/version b/source/Willow.package/monticello.meta/version