runby_pace 0.4.84 → 0.5.85

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2NlZWFiMjk5NDdjOTI2OWU1OGIyNjY2MzNhYzhmMzY0MjRlNGIzYg==
+    M2Y0Y2I0Zjg3ZjYzZjc4NGNkYjBiN2NmODQwYTYyNTQ3MDkwMTZkNg==
   data.tar.gz: !binary |-
-    YjU5MDBjZDMwMTlhOTUyM2JmZTE3YzkzODk3NmY0OTA2MTk5ZDA4Yw==
+    ZmE5ZDdkZTgyNTdkOWI3YjVhYjc1NTg0NzE5ZjhhZmJhM2JkOTZiZA==
 SHA512:
   metadata.gz: !binary |-
-    NWY2YzUzODBhMmExMTJlMjVmZmMzODdlYzZkNWEyNDUyMmQyM2Y0ZmQxM2Fk
-    M2EwN2M0MGRhZjVmNzM4YmUzYjRmZTU5Zjg0NDc2M2NiMDhjYzM2ZTFjNDVh
-    ZjYwOWI3ZDQ0OTE1ZTU0NTBhMjExYjAyZGE0MWRmYjJjZWFmYTE=
+    NWEwZmIwNjM3YWUzMTNhYmQ1YjcwODdmM2YwODhmMjc3OGI4ZTE4NWRjZDQ1
+    ZjZhYWQ0NjJkNTE5NDM4MTg1NDk4MDFjYTViZDMyNjY0ZTcyNmIzYjE5ODVj
+    YWZlOTk2NmQxODFmYjI0MWVkNDA2YjA4MmQxNTk5ZGM0NjIyN2Q=
   data.tar.gz: !binary |-
-    N2Y4M2QxZDI2YWI1ZjJkNDhhZGE1MGJmZTYzZDgzYzExNzFmMzliODhlMGVj
-    N2Y3OTAxMDU5ZThmMGYxNGJiNzQxZWNlN2E4YjVjNGY2YTU3ODg5M2UzN2Y2
-    OTQ1Y2IwMTZjZmI3NzI0NDg3MTdhNmI0YWUxNTllOTYyMGEwNmQ=
+    YTZmY2ZhOGUxYTNjZDM1MDY4M2NiZWQyODRjY2I3ODEyMDNhYWMxNWUwMjM5
+    ZTk0Mzc4NTNlNzJjNTZiOTA3NGQ2MzA2YTM1MGRlZjI1MTQ1OTU1MGJmZTk5
+    NzMzZDU4NTk1MjUzMzM4YzE1NmYzNTBiMDM1YTUxNjQxMDQ5NWE=

data/lib/runby_pace/distance.rb

@@ -12,7 +12,7 @@ module Runby
       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
@@ -24,7 +24,7 @@ module Runby
     end
 
     def meters
-      kilometers = @multiplier * Runby::PaceUnits.distance_conversion_factor(@uom)
+      kilometers = @multiplier * Runby::DistanceUnits.conversion_factor(@uom)
       kilometers * 1000.0
     end
 
@@ -36,7 +36,7 @@ module Runby
       # 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?
 
@@ -48,7 +48,7 @@ module Runby
     end
 
     def pluralized_uom
-      uom_description = PaceUnits.description(@uom).downcase
+      uom_description = DistanceUnits.description(@uom).downcase
       if @multiplier > 1 then
         uom_description += 's'
       end

data/lib/runby_pace/{pace_units.rb → distance_units.rb}

@@ -2,16 +2,16 @@ module Runby
   # Represents the distance units (e.g. kilometers, miles) used in paces
   #  including the human-readable description of each unit
   #  and the factor used to convert it to kilometers.
-  class PaceUnits
+  class DistanceUnits
     def self.description(uom)
-      @@_distance_uom_definition[uom][:description]
+      @@_uom_definition[uom][:description]
     end
 
-    def self.parse_unit_of_measure(description)
+    def self.parse(description)
       description = description.strip.chomp
       found_uom = nil
       found_uom_factor = 1
-      @@_distance_uom_definition.each do |uom, details|
+      @@_uom_definition.each do |uom, details|
         if details[:synonyms].include? description
           if details.has_key? :uom
             found_uom = details[:uom]
@@ -25,22 +25,22 @@ module Runby
       { uom: found_uom, factor: found_uom_factor }
     end
 
-    def self.distance_conversion_factor(units)
-      @@_distance_uom_definition[units][:conversion_factor]
+    def self.conversion_factor(units)
+      @@_uom_definition[units][:conversion_factor]
     end
 
     def self.known_uom?(symbol)
       # TODO: test
-      @@_distance_uom_definition.has_key?(symbol)
+      @@_uom_definition.has_key?(symbol)
     end
 
-    @@_distance_uom_definition =
+    @@_uom_definition =
       { 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) },
         # Special UOMs, which just point to "real" UOMs in this hash table
-        marathon: { description: 'Marathon', uom: :mi, factor: 26.2, synonyms: %w(marathon), uom: :mi, factor: 26.2 }
+        marathon: { description: 'Marathon', synonyms: %w(marathon), uom: :mi, factor: 26.2 }
       }
   end
 end

data/lib/runby_pace/pace_data.rb

@@ -41,7 +41,7 @@ module Runby
       five_k_time = Runby::RunbyTime.new(five_k_time)
       x2 = ((five_k_time.total_minutes * 2) - (MIDPOINT_X - 1)) - 1
       minutes_per_km = slope * x2 + @fastest_pace_km.total_minutes + curve_minutes(x2)
-      minutes_per_unit = minutes_per_km * Runby::PaceUnits.distance_conversion_factor(distance_units)
+      minutes_per_unit = minutes_per_km * Runby::DistanceUnits.conversion_factor(distance_units)
       Runby::RunbyTime.from_minutes(minutes_per_unit)
     end
 

data/lib/runby_pace/version.rb

@@ -1,3 +1,3 @@
 module Runby
-  VERSION = "0.4.#{`git rev-list --count HEAD`}".freeze
+  VERSION = "0.5.#{`git rev-list --count HEAD`}".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.4.84
+  version: 0.5.85
 platform: ruby
 authors:
 - Ty Walls
@@ -74,10 +74,10 @@ files:
 - bin/setup
 - lib/runby_pace.rb
 - lib/runby_pace/distance.rb
+- lib/runby_pace/distance_units.rb
 - lib/runby_pace/pace.rb
 - lib/runby_pace/pace_data.rb
 - lib/runby_pace/pace_range.rb
-- lib/runby_pace/pace_units.rb
 - lib/runby_pace/run_math.rb
 - lib/runby_pace/run_type.rb
 - lib/runby_pace/run_types/all_run_types.g.rb
@@ -99,7 +99,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 6d6a0922c203bcbe7e3e131623a70aea292fe071
+  commit-hash: b7e91031243d197b78a140542c04b9089c35f47c
 post_install_message: 
 rdoc_options: []
 require_paths: