distance.rb in runby_pace-0.5.85

- old
+ new

@@ -10,11 +10,11 @@
 
       raise 'Invalid distance unit of measure' unless [String, Symbol].include? distance_uom.class
       raise 'Invalid multiplier' unless multiplier.is_a?(Numeric)
 
       if distance_uom.is_a? Symbol
-        raise "Unknown unit of measure #{distance_uom}" unless Runby::PaceUnits.known_uom? distance_uom
+        raise "Unknown unit of measure #{distance_uom}" unless Runby::DistanceUnits.known_uom? distance_uom
         @uom = distance_uom
         @multiplier = multiplier * 1.0
         return
       end
 
@@ -22,11 +22,11 @@
       @uom = distance.uom
       @multiplier = distance.multiplier
     end
 
     def meters
-      kilometers = @multiplier * Runby::PaceUnits.distance_conversion_factor(@uom)
+      kilometers = @multiplier * Runby::DistanceUnits.conversion_factor(@uom)
       kilometers * 1000.0
     end
 
     def self.parse(str)
       str = str.strip.chomp.downcase
@@ -34,11 +34,11 @@
       multiplier = str.scan(/[\d,.]+/).first.to_f
       uom = str.scan(/[-_a-z ]+$/).first
       # TODO: test V
       raise "Unable to find distance unit in #{str}" if uom.nil?
 
-      parsed_uom = Runby::PaceUnits.parse_unit_of_measure uom
+      parsed_uom = Runby::DistanceUnits.parse uom
       # TODO: test
       raise "#{uom} is not recognized as a distance unit" if parsed_uom[:uom].nil?
 
       self.new parsed_uom[:uom], parsed_uom[:factor] * multiplier
     end
@@ -46,10 +46,10 @@
     def to_s
       "#{format('%g', @multiplier.round(2))} #{pluralized_uom}"
     end
 
     def pluralized_uom
-      uom_description = PaceUnits.description(@uom).downcase
+      uom_description = DistanceUnits.description(@uom).downcase
       if @multiplier > 1 then
         uom_description += 's'
       end
       uom_description
     end