runby_pace 0.6.90 → 0.6.91

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTY5ZjIwN2ZlMTc5N2ZlNzQzMzRiZTJkYzA0ZmU3N2NkODA1ZTVlNw==
+    ZjdhNDYyNjQzZmE3ZTQzNDU3MTlhMmIzYWY0OTgxMWUwNmJlMTJlZA==
   data.tar.gz: !binary |-
-    YmRmNzMyZDc5NzYyMGQ3YzlhMGU3NTRjZTg0MjBkOWRiNmQ0NDcyYw==
+    Y2IyYWI4MTNlMTVkNDdkOGM2NTI2YjljMzEyMzgzNjNlNmM4NzkyYQ==
 SHA512:
   metadata.gz: !binary |-
-    NGMwZDY2Y2UyNDUxMjk2MzE1MGY0NzVlNDAyNGVlNmE3MDdjMGZjZDc2OGYw
-    ZmFkZGI4MjEyMDc3NDAwNWE2MjBjMjkzMTE1NTVmY2VjYTUxNmMzN2UwYTNi
-    ZDUyY2MyN2JiYmY1NTZiY2RlMzQzNmVkZGI3M2M5YjkyNGMxZTQ=
+    NDg2MDRkMjAzN2MyY2ZhZjk2ODFjZjBlMGMxOGEyNjViNjM2YWFhOWM0Njcz
+    OTY5ODljYjY4NzUzMmI1MWViZWE5ZDg3MzUzNGE2MTNmZTI2MjdkYTY0Y2Vm
+    Yzg4MDM3MDAxMWE1NTk1YjQ2MGI4ZjczZTM5MWYxN2NiYWVmMDk=
   data.tar.gz: !binary |-
-    OGU4YTEwZTE5Y2Y0MDU0MWE0ZjhkODRhNzExNDgzM2QyYWJhYWNlZTEzZjU0
-    OTI1ZGVjOGMzMjQyZTdkOTkxN2EzYzM3YzYwM2JlOWNmMGUxOWY3NTMzYzM5
-    YjdkZGE0YmRjZDQ1Y2U3MjM4NTJmZDBiOWM2OTg0ZjUxYTk0NDk=
+    NzE0ZDFmNjM3NWRlMjQzNWNhZjIyMDJiNGEwZTU4ZGQzMWViNjhiM2U0NmFi
+    N2QwOGI5ODA1OGQ2ZmM1OTNkMDYyZTJkZWI2NWI4NTNhNjhjOGNlNTUwODFh
+    NTJiYjZjYTBlYjRkYjUwMGViYTMzZDhjMmMwN2FmZTBmZWQxZTU=

data/lib/runby_pace/pace.rb

@@ -2,6 +2,7 @@ module Runby
   # Represents a pace consisting of a distance and a time in which that distance was covered
   class Pace
     attr_reader :time, :distance
+
     def initialize(time, distance = '1K')
       @time = Runby::RunbyTime.parse(time)
       @distance = Runby::Distance.new(distance)

data/lib/runby_pace/pace_data.rb

@@ -26,14 +26,14 @@ module Runby
     attr_reader :midpoint_radius_divisor
 
     def initialize(fastest_pace_km, slowest_pace_km, midpoint_radius_divisor)
-      @fastest_pace_km = Runby::RunbyTime.new(fastest_pace_km)
-      @slowest_pace_km = Runby::RunbyTime.new(slowest_pace_km)
+      @fastest_pace_km = Pace.new(fastest_pace_km)
+      @slowest_pace_km = Pace.new(slowest_pace_km)
       @midpoint_radius_divisor = midpoint_radius_divisor
     end
 
     # Calculate the slope of the line between the fastest and slowest paces
     def slope
-      (@slowest_pace_km.total_minutes - @fastest_pace_km.total_minutes) / (DATA_POINTS_COUNT - 1)
+      (@slowest_pace_km.time.total_minutes - @fastest_pace_km.time.total_minutes) / (DATA_POINTS_COUNT - 1)
     end
 
     # Calculate the prescribed pace for the given 5K time
@@ -41,9 +41,13 @@ module Runby
       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.total_minutes + curve_minutes(x2)
+      minutes_per_km = slope * x2 + @fastest_pace_km.time.total_minutes + curve_minutes(x2)
       minutes_per_unit = minutes_per_km * distance_units.conversion_factor
-      Runby::RunbyTime.from_minutes(minutes_per_unit)
+
+      # TODO: Is there a way to clean up all of this "newing up"?
+      time = RunbyTime.from_minutes(minutes_per_unit)
+      distance = Distance.new distance_units, 1
+      Pace.new time, distance
     end
 
     private

data/lib/runby_pace/pace_range.rb

@@ -3,16 +3,31 @@ require_relative 'runby_range'
 module Runby
   # Represents a range of paces, from fast to slow.
   class PaceRange < RunbyRange
-    def initialize(fast, slow)
-      @fast = Runby::RunbyTime.new(fast)
-      @slow = Runby::RunbyTime.new(slow)
+    def initialize(fast, slow, distance_units = :km)
+      if fast.is_a?(Pace) && slow.is_a?(Pace)
+        @fast = fast
+        @slow = slow
+      else
+        # Hopefully 'fast' and 'slow' are parseable as a RunbyTime
+        distance = Distance.new distance_units, 1
+        @fast = Pace.new(fast, distance)
+        @slow = Pace.new(slow, distance)
+      end
     end
 
     # Create a new pace range from an existing speed range.
     def self.from_speed_range(speed_range)
-      fast = Runby::RunMath.convert_speed_to_pace speed_range.fast
-      slow = Runby::RunMath.convert_speed_to_pace speed_range.slow
+      fast = RunMath.convert_speed_to_pace speed_range.fast
+      slow = RunMath.convert_speed_to_pace speed_range.slow
       PaceRange.new fast, slow
     end
+
+    def to_s
+      if @fast.time == @slow.time
+        @fast.to_s
+      else
+        "#{@fast.time}-#{@slow.time} per #{@fast.distance.pluralized_uom}"
+      end
+    end
   end
 end

data/lib/runby_pace/run_types/find_divisor.rb

@@ -23,7 +23,7 @@ module Runby
           five_k_time = Runby::RunbyTime.new(five_k.to_s)
           pace_data = Runby::PaceData.new(first_pace, last_pace, candidate_divisor)
           calculated_pace = pace_data.calc(five_k_time)
-          unless calculated_pace.almost_equals?(golden_pace, allowable_deviation)
+          unless calculated_pace.time.almost_equals?(golden_pace, allowable_deviation)
             viable_divisor = nil
             break
           end

data/lib/runby_pace/speed_range.rb

@@ -11,8 +11,9 @@ module Runby
 
     # Create a new speed range from an existing pace range.
     def self.from_pace_range(pace_range)
-      fast = Runby::RunMath.convert_pace_to_speed pace_range.fast
-      slow = Runby::RunMath.convert_pace_to_speed pace_range.slow
+      # TODO: We need a Speed class with Distance_units included
+      fast = Runby::RunMath.convert_pace_to_speed pace_range.fast.time
+      slow = Runby::RunMath.convert_pace_to_speed pace_range.slow.time
       SpeedRange.new fast, slow
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.90
+  version: 0.6.91
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: ee97106f1aa238cd021a1952e33ec8e088f6f736
+  commit-hash: bca3bf3dde2a647c39066155a2eaba08968521ce
 post_install_message: 
 rdoc_options: []
 require_paths: