Fixed Bug in #toHtml

Author: Joshua-Dias-Barreto

src/DataFrame-Tests/DataFrameTest.class.st

@@ -377,6 +377,23 @@ DataFrameTest >> testAsArrayOfRowsWithName [
 		equals: expected asOrderedCollection
 ]
 
+{ #category : #tests }
+DataFrameTest >> testAscendingSortBy [
+
+	| actual expected |
+
+	expected := DataFrame withRows: #(
+		(Barcelona 1.609 true)
+   		(Dubai 2.789 true)
+		(London 8.788 false)).
+
+	expected rowNames: #(A B C).
+	expected columnNames: #(City Population BeenThere).
+
+	actual := df sortAscendingBy: #(Population).
+	self assert: actual equals: expected
+]
+
 { #category : #tests }
 DataFrameTest >> testAt [
 
@@ -5005,7 +5022,7 @@ DataFrameTest >> testSelectEmptyDataFrame [
 ]
 
 { #category : #tests }
-DataFrameTest >> testSortBy [
+DataFrameTest >> testSortAscendingBy [
 
 	| actual expected |
 
@@ -5017,7 +5034,7 @@ DataFrameTest >> testSortBy [
 	expected rowNames: #(A B C).
 	expected columnNames: #(City Population BeenThere).
 
-	actual := df sortBy: #Population.
+	actual := df sortAscendingBy: #(Population).
 	self assert: actual equals: expected
 ]
 
@@ -5053,7 +5070,7 @@ DataFrameTest >> testSortDescendingBy [
 	expected rowNames: #(C B A).
 	expected columnNames: #(City Population BeenThere).
 
-	actual := df sortDescendingBy: #Population.
+	actual := df sortDescendingBy: #(Population).
 	self assert: actual equals: expected
 ]
 

src/DataFrame/DataFrame.class.st

@@ -2276,7 +2276,9 @@ DataFrame >> toHtml [
 
 	columnWidths := dataFrame columnNames collect: [ :columnName |
 		                | maxWidth |
-		                maxWidth := columnName size.
+		                columnName isString
+			                ifFalse: [ maxWidth := columnName asString size ]
+			                ifTrue: [ maxWidth := columnName size ].
 		                dataFrame rows do: [ :row |
 			                | value |
 			                value := row at: columnName.
@@ -2285,7 +2287,10 @@ DataFrame >> toHtml [
 
 	dataFrame columnNames withIndexDo: [ :columnName :index |
 		| paddedColumnName |
-		paddedColumnName := columnName padRightTo: (columnWidths at: index).
+		paddedColumnName := (columnName isString
+			                     ifFalse: [ columnName asString ]
+			                     ifTrue: [ columnName ]) padRightTo:
+			                    (columnWidths at: index).
 		html
 			nextPutAll: '      <th>';
 			nextPutAll: paddedColumnName;