fix issue #17

Author: Jay Janssen

myqlib/numbers.go

@@ -79,7 +79,10 @@ func collapse_number(value float64, width int64, precision int64, units UnitsDef
 				// If we have space for some extra precision, use it
 				return fmt.Sprintf(fmt.Sprint(`%.`, left-1, `f%s`), raw, unit)
 			} else {
-				if factor != 1 && str == fmt.Sprintf("0%s", unit) {
+				if factor != 1 && raw < 1 && left > 0 && fmt.Sprintf(`%.1f`, raw ) != `1.0` {
+					// Raw is < 1, therefore str is rounded up.  Let's print a decimal instead
+					return fmt.Sprintf(fmt.Sprint(`%0.`, precision+left, `f%s`), raw, unit)[1:]
+				} else if factor != 1 && str == fmt.Sprintf("0%s", unit) {
 					if left > 0 {
 						// There's still some space left to print something intelligent
 						return fmt.Sprintf(fmt.Sprint(`%.`, precision+1, `f%s`), raw, unit)[1:]

myqlib/numbers_test.go

@@ -24,6 +24,7 @@ func TestOne(t *testing.T) {
 	assert(`one twenty three k`, `123k`, NumberUnits, 123000, 0, 4)
 
 	assert(`point one em`, `.1m`, NumberUnits, 123000, 0, 3)
+	assert(`point six em`, `.6m`, NumberUnits, 550000, 0, 3)
 
 	assert(`twelve m`, `12m`, NumberUnits, 12300000, 0, 4)
 	assert(`twelve point three m`, `12.3m`, NumberUnits, 12300000, 0, 5)
@@ -35,7 +36,7 @@ func TestOne(t *testing.T) {
 	assert(`one point oh`, `1.0b`, MemoryUnits, 1, 1, 4)
 
 	assert(`five oh oh rounded down`, `.5K`, MemoryUnits, 500, 0, 3)
-	assert(`five fifty rounded up`, `1K`, MemoryUnits, 550, 0, 3)
+	assert(`five fifty fit`, `.5K`, MemoryUnits, 550, 0, 3)
 	assert(`five fifty bee`, `550b`, MemoryUnits, 550, 0, 4)
 
 	assert(`one kay`, `1K`, MemoryUnits, 1000, 0, 3)