Extension of the flow-rate-of-strain tensor formulation of plasma rotation theory to non-axisymmetric tokamaks