runby_pace 0.6.146 → 0.6.147

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce07ece04ad62c724f57a747d3d7a530ca8ca925
-  data.tar.gz: 9051f2d65022fa56493b3aa12fc6a14eaf0f4679
+  metadata.gz: a23743b3322eb2563d9bacaf2d940fb3dd3ba7e4
+  data.tar.gz: a3185adb6de60b111f7dc12727f3407638f94cf5
 SHA512:
-  metadata.gz: ad59c1d1f16666cd0c05086bc77d51cf7a8c3e89323f07e0b48b92a8569207fb3045d2b04cc718f00947a233f25f0dedd61ef25f19be7638b2838728da93bca3
-  data.tar.gz: 2a9cd5bf6f551b757b05c55ad23093a0cba8fdc385f7722209cbd7cd816636c943e07c38fc0a3a1f725596166398be82fce2fb7eccab9a2948f4e5005b0dfe41
+  metadata.gz: 426b99ff4fc2dfac2252bfc7b99f5f6ce720686f28cd7196f4fdcf236d147c406d5d287594ad7839296ffa5990a7f2d0eb7db973b719bb4e58c753caafd4e487
+  data.tar.gz: 9e39d983f87a91430e0d04aee92200f3208810e5752bdf638791527830b2445d4fee1ab04c7b42b67a1c16657fd12c5344fecdb4f12b3482d41a333238c49384

data/lib/runby_pace/distance_unit.rb

@@ -30,6 +30,7 @@ module Runby
     end
 
     def self.parse(description)
+      return new description if description.is_a? Symbol
       description = description.strip.chomp.downcase
       found_uom = nil
       UOM_DEFINITIONS.each do |uom, details|

data/lib/runby_pace/pace.rb

@@ -117,7 +117,7 @@ module Runby
     end
 
     def distance_covered_over_time(time)
-      time = Runby::RunbyTime.new(time)
+      time = sanitize_arg(time).as(RunbyTime)
       if time.total_minutes.zero? || @distance.multiplier.zero?
         return Runby::Distance.new(@distance.uom, 0)
       end

data/lib/runby_pace/pace_calculator.rb

@@ -41,19 +41,26 @@ module Runby
     # Calculate the prescribed pace for the given 5K time
     # @return [Pace]
     def calc(five_k_time, distance_units = :km)
-      five_k_time = Runby::RunbyTime.new five_k_time
-      distance_units = Runby::DistanceUnit.new distance_units
-      x2 = ((five_k_time.total_minutes * 2) - (MIDPOINT_X - 1)) - 1
-      minutes_per_km = slope * x2 + @fastest_pace_km.time.total_minutes + curve_minutes(x2)
-      minutes_per_unit = minutes_per_km * distance_units.conversion_factor
+      five_k_time = sanitize_arg(five_k_time).as(RunbyTime)
+      distance_units = sanitize_arg(distance_units).as(DistanceUnit)
+
+      minutes_per_unit = calculate_minutes_per_unit(distance_units, five_k_time)
+      build_pace minutes_per_unit, distance_units
+    end
+
+    private
 
-      # TODO: Is there a way to clean up all of this "newing up"?
+    def build_pace(minutes_per_unit, distance_units)
       time = RunbyTime.from_minutes(minutes_per_unit)
       distance = Distance.new distance_units, 1
       Pace.new time, distance
     end
 
-    private
+    def calculate_minutes_per_unit(distance_units, five_k_time)
+      x2 = ((five_k_time.total_minutes * 2) - (MIDPOINT_X - 1)) - 1
+      minutes_per_km = slope * x2 + @fastest_pace_km.time.total_minutes + curve_minutes(x2)
+      minutes_per_km * distance_units.conversion_factor
+    end
 
     # Since the paces for each 5K time do not progress in a straight line
     #  when plotted on a graph, but rather a curve with its highest point near
@@ -69,7 +76,7 @@ module Runby
       midpoint = MIDPOINT_X
       if midpoint_reduction > midpoint
         midpoint_reduction = midpoint - (midpoint_reduction - midpoint)
-        midpoint_reduction = 0 if midpoint_reduction < 0
+        midpoint_reduction = 0 if midpoint_reduction.negative?
       end
       # TODO: Use an actual curve instead of a triangle to calculate the number of minutes to add.
       midpoint_reduction / @midpoint_radius_divisor / 60

data/lib/runby_pace/parameter_sanitizer.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+def sanitize_arg(parameter)
+  Runby::ParameterSanitizer.sanitize(parameter)
+end
+
+module Runby
+  # Sanitizes method parameters
+  class ParameterSanitizer
+    attr_reader :parameter
+
+    def initialize(parameter)
+      @parameter = parameter
+    end
+
+    def self.sanitize(parameter)
+      ParameterSanitizer.new parameter
+    end
+
+    def as(type)
+      return @parameter if @parameter.is_a?(type)
+      raise "Unable to sanitize parameter of type #{type}. Missing 'parse' method." unless type.respond_to? :parse
+      type.parse(@parameter)
+    end
+  end
+end

data/lib/runby_pace/run_math.rb

@@ -4,9 +4,9 @@ module Runby
   # An assortment of mathematical functions related to running.
   class RunMath
     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_distance = sanitize_arg(race1_distance).as(Distance)
+      race1_time = sanitize_arg(race1_time).as(RunbyTime)
+      target_distance = sanitize_arg(target_distance).as(Distance)
 
       race1_time * (target_distance / race1_distance)**1.06
     end

data/lib/runby_pace/speed_range.rb

@@ -23,7 +23,7 @@ module Runby
       else
         fast_multiplier = format('%g', @fast.distance.multiplier.round(2))
         slow_multiplier = format('%g', @slow.distance.multiplier.round(2))
-        @fast.to_s(format: format).sub("#{fast_multiplier}", "#{fast_multiplier}-#{slow_multiplier}")
+        @fast.to_s(format: format).sub(fast_multiplier.to_s, "#{fast_multiplier}-#{slow_multiplier}")
       end
     end
   end

data/lib/runby_pace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Runby
-  VERSION = "0.6.#{`git rev-list --count HEAD`}".freeze
+  VERSION = "0.6.#{`git rev-list --count HEAD`}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.146
+  version: 0.6.147
 platform: ruby
 authors:
 - Ty Walls
@@ -79,6 +79,7 @@ files:
 - lib/runby_pace/pace.rb
 - lib/runby_pace/pace_calculator.rb
 - lib/runby_pace/pace_range.rb
+- lib/runby_pace/parameter_sanitizer.rb
 - lib/runby_pace/run_math.rb
 - lib/runby_pace/run_type.rb
 - lib/runby_pace/run_types/all_run_types.g.rb
@@ -105,7 +106,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 65fe0e2369734efe51f94117b434af9cc57849d5
+  commit-hash: d8811ae095d9919ea5393bf0e6c93de27ae324f3
 post_install_message: 
 rdoc_options: []
 require_paths: