lib/unit_measurements/measurement.rb in unit_measurements-1.4.0 vs lib/unit_measurements/measurement.rb in unit_measurements-1.5.0
- old
+ new
@@ -42,13 +42,22 @@
to_s
end
def to_s
- "#{humanized_quantity} #{unit.to_s}"
+ "#{quantity} #{unit}"
end
+ def quantity
+ case @quantity
+ when Rational
+ @quantity.denominator == 1 ? @quantity.numerator : @quantity
+ else
+ @quantity
+ end
+ end
+
class << self
extend Forwardable
def unit_group
raise "`Measurement` does not have a `unit_group` object. You cannot directly use `Measurement`. Instead, build a new unit group by calling `UnitMeasurements.build`."
@@ -89,18 +98,8 @@
end
end
def unit_from_unit_or_name!(value)
value.is_a?(Unit) ? value : self.class.unit_group.unit_for!(value)
- end
-
- def humanized_quantity
- case quantity
- when Complex
- quantity
- when Numeric
- num = quantity.to_r
- num.denominator == 1 ? num.numerator.to_s : num.to_f.to_s
- end
end
end
end