runby_pace 0.6.103 → 0.6.104

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjM2NzE4NDQxZTFjMWM1NDIwM2RhZWU2MmI0OGEzOWEyYzg4NTBiMw==
+    ODY0ZWIyNjQ4NmJkMmE1NzIxZWRlNzZkODQ3YWU1ZmZhZDEyNTlmMA==
   data.tar.gz: !binary |-
-    OThkMjNmYmQ0NWE5MDQwZTg0ODRkZDcwMWJiNjM2MjM5YzkxMDY2MA==
+    M2VjZjM2MjdjNjY2OTZlMDljODkxZjY0ZmM4ZTJlNDMzNmYyY2UyZg==
 SHA512:
   metadata.gz: !binary |-
-    MWIxYWYwZGU2MmQ3NDMwNGNjNjM3NWNjY2JmNGM1ZWJjYTE4NmRkNGM0YTY5
-    MDYxNTU5NGFkZDU5YmFjZmJiNWMyZTJiNzk3MzU5OWU3YWIzN2U5YzA5OTc3
-    YmI1MDQ4MzFjYjUwODk0MmRlYjNiY2RjOWJiYzQ2MDhlMTQzNzM=
+    Mjg3YjVkZDk2OWQ2ZjBkYWExNDNmMzJlZGJkMTZjNDlmMjk3ODgxYWIzMDg0
+    ZjBjMTkyNGZmNjgzNmUyNTQ3NDgzNDRkOTk2MWExYzc3NmEyYmZiZGJiYWUw
+    NDJlMjU3ODRkZDJhNmFlODFmMWY2M2M3M2M3MWFjNjZjYzU5Njk=
   data.tar.gz: !binary |-
-    NmJlNTRiY2JmMDA2ZjU1Yjc0YjI3NzQwYjBkZGQ2YzU5YjY0N2NmNmUxYTMz
-    OTZjODg2YWU1MTM1YWI1M2VjOGY3MDQ5ZDE5YmUzOWM0ZDZjNTQwMDBkODIy
-    Y2M1YTAxODViNGNjM2IwODAzMGQyZGU0NWY1MjZkZDY0N2Q2NTg=
+    NzJhMjNiOTJkZWQ5OTI1NDQ5ZDY2ZjBkY2Q2MDgzMjgwMGYwYjllZGJkMTBj
+    MWU1ZTZkM2M5ZmYwYjllZmE1ZDk2ZDliNTJjYTYzMjJiODk0MDVkOGVhOTNi
+    OTVhMzlhOTAxZmZjZmRmZTY2MjcyODg5MzNkYTg1OGQxM2UwNmY=

data/lib/runby_pace/distance.rb

@@ -54,21 +54,13 @@ module Runby
     end
 
     def to_s(format = :long)
-    formatted_multiplier = format('%g', @multiplier.round(2))
+      formatted_multiplier = format('%g', @multiplier.round(2))
       case format
-        when :short then "#{formatted_multiplier}#{@uom.to_s(:short)}"
-        when :long then "#{formatted_multiplier} #{pluralized_uom}"
+        when :short then "#{formatted_multiplier}#{@uom.to_s(format)}"
+        when :long then "#{formatted_multiplier} #{@uom.to_s(format, plural = (@multiplier > 1))}"
       end
     end
 
-    def pluralized_uom
-      uom_description = @uom.description.downcase
-      if @multiplier > 1
-        uom_description += 's'
-      end
-      uom_description
-    end
-
     def ==(other)
       raise "Cannot compare Runby::Distance to #{other.class}" unless other.is_a? Distance
       @uom == other.uom && @multiplier == other.multiplier

data/lib/runby_pace/distance_unit.rb

@@ -19,13 +19,17 @@ module Runby
       @description = @@_uom_definitions[@symbol][:description]
     end
 
-    def to_s(format = :long)
+    def to_s(format = :long, pluralize = false)
       case format
         when :short then @symbol.to_s
-        when :long then @description
+        when :long then pluralize ? description_plural : @description
       end
     end
 
+    def description_plural
+      @@_uom_definitions[@symbol][:description_plural]
+    end
+
     def self.parse(description)
       description = description.strip.chomp.downcase
       found_uom = nil
@@ -65,13 +69,13 @@ module Runby
     end
 
     @@_uom_definitions =
-      { km: { description: 'Kilometer', conversion_factor: 1.0, synonyms: %w(k km kms kilometer kilometers) },
-        m:  { description: 'Meter', conversion_factor: 0.001, synonyms: %w(m meter meters) },
-        mi: { description: 'Mile', conversion_factor: 1.609344, synonyms: %w(mi mile miles) },
-        ft: { description: 'Feet', conversion_factor: 0.0003048, synonyms: %w(ft foot feet) },
-        yd: { description: 'Yards', conversion_factor: 1093.61, synonyms: %w(y yd yds yard yards) },
+      { km: { description: 'kilometer', description_plural: 'kilometers', conversion_factor: 1.0, synonyms: %w(k km kms kilometer kilometers) },
+        m:  { description: 'meter', description_plural: 'meters', conversion_factor: 0.001, synonyms: %w(m meter meters) },
+        mi: { description: 'mile', description_plural: 'miles', conversion_factor: 1.609344, synonyms: %w(mi mile miles) },
+        ft: { description: 'foot', description_plural: 'feet', conversion_factor: 0.0003048, synonyms: %w(ft foot feet) },
+        yd: { description: 'yard', description_plural: 'yards', conversion_factor: 1093.61, synonyms: %w(y yd yds yard yards) },
         # Fun distance unit of measures
-        marathon: { description: 'Marathon', conversion_factor: 42.1648128, synonyms: %w(marathon) }
+        marathon: { description: 'marathon', description_plural: 'marathons', conversion_factor: 42.1648128, synonyms: %w(marathon) }
       }
   end
 end

data/lib/runby_pace/pace.rb

@@ -16,8 +16,8 @@ module Runby
 
     def to_s(format = :long)
       distance_s = @distance.to_s(format)
-      leading_zero_regex = /^1 ?/
-      distance_s.gsub!(leading_zero_regex, '')
+      leading_one_regex = /^1 ?/
+      distance_s.gsub!(leading_one_regex, '')
       case format
         when :short then "#{time} p/#{distance_s}"
         when :long then "#{time} per #{distance_s}"

data/lib/runby_pace/pace_range.rb

@@ -22,11 +22,11 @@ module Runby
       PaceRange.new fast, slow
     end
 
-    def to_s
+    def to_s(format = :long)
       if @fast == @slow
-        @fast.to_s
+        @fast.to_s(format)
       else
-        "#{@fast.time}-#{@slow.time} per #{@fast.distance.pluralized_uom}"
+        @fast.to_s(format).sub("#{@fast.time}", "#{@fast.time}-#{@slow.time}")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.103
+  version: 0.6.104
 platform: ruby
 authors:
 - Ty Walls
@@ -100,7 +100,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 02918a2303e0bc6d20230b68c36aba791bd52a0a
+  commit-hash: 3b7cb90d7419a84781e23693544fc46f21963b16
 post_install_message: 
 rdoc_options: []
 require_paths: