runby_pace 0.6.123 → 0.6.124

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14bec52c2faa7e9936526d994d3d4a10c6e74509
-  data.tar.gz: 8068b32a9353c112ab6d29a87dd170bdf7d1513f
+  metadata.gz: ab3528d5bb2681d6241b9ca99106635041ede241
+  data.tar.gz: 6fd638b564e1cd2624edabb1a9833d94483c757b
 SHA512:
-  metadata.gz: 120a13af53ead77a23645364eaf91de9d9a47cdf52286dd26ac830b81d2676c6bca0978c68df415161cae288d8dd85f5512de7385b7d3512474ee5bf766cedad
-  data.tar.gz: fb4abaf19e39ac604606f0964a0fc13e487e78f89a4d68c7aee8243ebe30d41cf4c10a1f8a5104c397ed2447cf2a7ac2ff813bbb20627267dfd9387b400019e1
+  metadata.gz: 0157335b0c09de79498c21c5ddd8db68d82719dcab782731d7ffbcf66756499cc7a1562e46fc58e5abc80a3f4615865dc2e382ca74ce3c6a853c93101af8f76f
+  data.tar.gz: 45f5e6e4d3519630ca5cd8eebae21f96d0dd0af839ef1cbeca6ddaf1ac68b4acd599642dd2d803ef72af7a4babd8ac3c57a50110721aab3af6a71d019ca52696

data/lib/runby_pace/distance.rb

@@ -19,8 +19,8 @@ module Runby
       end
     end
 
-    def convert_to(uom)
-      target_uom = DistanceUnit.new uom
+    def convert_to(target_uom)
+      target_uom = DistanceUnit.new target_uom unless target_uom.is_a?(DistanceUnit)
       target_multiplier = kilometers / (target_uom.conversion_factor * 1.0)
       Distance.new target_uom, target_multiplier
     end
@@ -43,7 +43,7 @@ module Runby
       parsed_uom = Runby::DistanceUnit.parse uom
       raise "'#{uom.strip}' is not recognized as a distance unit" if parsed_uom.nil?
 
-      self.new parsed_uom, multiplier
+      new parsed_uom, multiplier
     end
 
     def self.try_parse(str)
@@ -51,7 +51,7 @@ module Runby
       begin
         distance = parse str
       rescue StandardError => ex
-        error_message = "#{ex.message}"
+        error_message = ex.message.to_s
       end
       { distance: distance, error: error_message }
     end
@@ -64,15 +64,52 @@ module Runby
       end
     end
 
+    # @param [Distance, String] other
     def <=>(other)
       raise "Cannot compare Runby::Distance to #{other.class}" unless [Distance, String].include? other.class
       if other.is_a?(String)
         return 0 if to_s == other || to_s(format: :long) == other
-        return self <=> try_parse(other)[:distance]
+        return self <=> Distance.try_parse(other)[:distance]
       end
       kilometers <=> other.kilometers
     end
 
+    # @param [Distance] other
+    # @return [Distance]
+    def +(other)
+      raise "Cannot add Runby::Distance to #{other.class}" unless other.is_a?(Distance)
+      sum_in_km = Distance.new(:km, kilometers + other.kilometers)
+      sum_in_km.convert_to(@uom)
+    end
+
+    # @param [Distance] other
+    # @return [Distance]
+    def -(other)
+      raise "Cannot add Runby::Distance to #{other.class}" unless other.is_a?(Distance)
+      sum_in_km = Distance.new(:km, kilometers - other.kilometers)
+      sum_in_km.convert_to(@uom)
+    end
+
+    # @param [Numeric] other
+    # @return [Distance]
+    def *(other)
+      raise "Cannot multiply Runby::Distance by #{other.class}" unless other.is_a?(Numeric)
+      product_in_km = Distance.new(:km, kilometers * other)
+      product_in_km.convert_to(@uom)
+    end
+
+    # @param [Numeric, Distance] other
+    # @return [Distance, Numeric]
+    def /(other)
+      raise "Cannot divide Runby::Distance by #{other.class}" unless other.is_a?(Numeric) || other.is_a?(Distance)
+      if other.is_a?(Numeric)
+        quotient_in_km = Distance.new(:km, kilometers / other)
+        return quotient_in_km.convert_to(@uom)
+      elsif other.is_a?(Distance)
+        return kilometers / other.kilometers
+      end
+    end
+
     private
 
     def init_from_clone(distance)

data/lib/runby_pace/distance_unit.rb

@@ -40,7 +40,7 @@ module Runby
         end
       end
       raise "Error parsing distance unit '#{description}'" unless found_uom
-      return DistanceUnit.new found_uom
+      DistanceUnit.new found_uom
     end
 
     def self.try_parse(str)
@@ -48,14 +48,14 @@ module Runby
       begin
         uom = parse str
       rescue StandardError => ex
-        error_message = "#{ex.message}"
+        error_message = ex.message
       end
       { uom: uom, error: error_message }
     end
 
     def self.known_uom?(symbol)
       # TODO: test
-      @@_uom_definitions.has_key?(symbol)
+      @@_uom_definitions.key?(symbol)
     end
 
     def ==(other)

data/lib/runby_pace/run_math.rb

@@ -1,10 +1,12 @@
 module Runby
   # An assortment of mathematical functions related to running.
   class RunMath
-    def self.predict_five_k_time(distance, time)
-      distance = Distance.new(distance)
-      time = RunbyTime.new(time)
+    def self.predict_race_time(race1_distance, race1_time, target_distance)
+      race1_distance = Distance.new(race1_distance)
+      race1_time = RunbyTime.new(race1_time)
+      target_distance = Distance.new(target_distance)
 
+      race1_time * (target_distance / race1_distance)**1.06
     end
   end
 end

data/lib/runby_pace/runby_time.rb

@@ -111,23 +111,27 @@ module Runby
 
     # @param [RunbyTime] other
     def -(other)
-      RunbyTime.from_seconds(total_seconds - other.total_seconds) if other.is_a?(RunbyTime)
+      raise "Cannot subtract #{other.class} from a Runby::RunbyTime" unless other.is_a?(RunbyTime)
+      RunbyTime.from_seconds(total_seconds - other.total_seconds)
     end
 
     # @param [RunbyTime] other
     def +(other)
-      RunbyTime.from_seconds(total_seconds + other.total_seconds) if other.is_a?(RunbyTime)
+      raise "Cannot add Runby::RunbyTime to a #{other.class}" unless other.is_a?(RunbyTime)
+      RunbyTime.from_seconds(total_seconds + other.total_seconds)
     end
 
     # @param [Numeric] other
     # @return [RunbyTime]
     def *(other)
-        RunbyTime.from_minutes(total_minutes * other) if other.is_a?(Numeric)
+      raise "Cannot multiply Runby::RunbyTime with a #{other.class}" unless other.is_a?(Numeric)
+      RunbyTime.from_minutes(total_minutes * other)
     end
 
     # @param [RunbyTime, Numeric] other
     # @return [Numeric, RunbyTime]
     def /(other)
+      raise "Cannot divide Runby::RunbyTime by #{other.class}" unless other.is_a?(RunbyTime) || other.is_a?(Numeric)
       case other
         when RunbyTime
           total_seconds / other.total_seconds
@@ -137,6 +141,7 @@ module Runby
     end
 
     def <=>(other)
+      raise "Cannot compare Runby::RunbyTime to #{other.class}" unless [RunbyTime, String].include? other.class
       if other.is_a? RunbyTime
         total_seconds <=> other.total_seconds
       elsif other.is_a? String

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.123
+  version: 0.6.124
 platform: ruby
 authors:
 - Ty Walls
@@ -101,7 +101,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: bafaefeb3f83f25cacbe2cd6af83382c348f1ef7
+  commit-hash: 806f350b205ca30ba6edc582c854c11ee4ac2ac1
 post_install_message: 
 rdoc_options: []
 require_paths: