runby_pace 0.6.120 → 0.6.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f503f49bf7fb6a5f24fdc23aabc30847d816474
-  data.tar.gz: eedaf1fbae8328eb4ca890743abe84c00d6d5789
+  metadata.gz: 70cde89c41d690b7e35a2e49921cf2f347cfdfd2
+  data.tar.gz: 7f6695e47150f07c89e664f8f5a360a413639809
 SHA512:
-  metadata.gz: 036b4b1212269bf9499d7e57f1d45dd30db49940d7703f2a2b260bee3ac78ebc0f0efe279a208f5e4077fee4578dea2273790aec5dc06c299316f2ff791ca346
-  data.tar.gz: 9fb73eb7ed4ca68cdb106089bbda3e92f99bae23ab6f4b09e5756b8bd7f6ee09195a8c987e6aebb6c4ef24f511c47a655c6d773c1c7864c8c0f634c7d0251bb2
+  metadata.gz: efed2ee7348ba9b394821ed1afaa84e35c91746d70be7f773b144251b7e0918679170bd1ec0997e37948b7bec8f44c45bd0ec3fcc240cf17d9e010f873ba803e
+  data.tar.gz: b3d573405a1d3fe27df705931d5d53d5de36b3350bcb3bd1da04189dd4e1c57cae121cf4f67b6daee3fe7b63955744b68a364066819205e52a7345fcb54b095a

data/lib/runby_pace/run_math.rb

@@ -1,5 +1,10 @@
 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)
+
+    end
   end
 end

data/lib/runby_pace/runby_time.rb

@@ -3,7 +3,7 @@ module Runby
   class RunbyTime
     include Comparable
 
-    attr_reader :time_s, :minutes_part, :seconds_part
+    attr_reader :time_s, :hours_part, :minutes_part, :seconds_part
 
     def initialize(time)
       if time.is_a?(String) || time.is_a?(Symbol)
@@ -17,9 +17,14 @@ module Runby
 
     # @param [numeric] total_seconds
     def self.from_seconds(total_seconds)
-      minutes = total_seconds.abs.to_i / 60
+      hours = total_seconds.abs.to_i / 60 / 60
+      minutes = (total_seconds.abs.to_i / 60) % 60
       seconds = total_seconds.abs.to_i % 60
-      RunbyTime.new format('%02d:%02d', minutes, seconds)
+      if hours > 0
+        RunbyTime.new format('%d:%02d:%02d', hours, minutes, seconds)
+      else
+        RunbyTime.new format('%02d:%02d', minutes, seconds)
+      end
     end
 
     # @param [numeric] total_minutes
@@ -27,29 +32,48 @@ module Runby
       from_seconds(total_minutes * 60.0)
     end
 
+    # @param [numeric] total_hours
+    def self.from_hours(total_hours)
+      from_seconds(total_hours * 60.0 * 60.0)
+    end
+
     def self.parse(str)
       time = str.to_s.strip.chomp
 
-      if time.match(/^\d?\d:\d\d$/)
+      if time =~ /^\d?\d:\d\d:\d\d$/
+        parts = time.split(':')
+        hours_part = parts[0].to_i
+        minutes_part = parts[1].to_i
+        seconds_part = parts[2].to_i
+      elsif time =~ /^\d?\d:\d\d$/
         parts = time.split(':')
+        hours_part = 0
         minutes_part = parts[0].to_i
         seconds_part = parts[1].to_i
-      elsif time.match(/^\d+$/)
+      elsif time =~ /^\d+$/
+        hours_part = 0
         minutes_part = time.to_i
         seconds_part = 0
-      elsif time.match(/^\d+[,. ]\d+$/)
+      elsif time =~ /^\d+[,. ]\d+$/
         parts = time.split(/[,. ]/)
+        hours_part = 0
         minutes_part = parts[0].to_i
         seconds_part = (parts[1].to_i / 10.0 * 60).to_i
       else
         raise 'Invalid time format'
       end
 
-      raise 'Minutes must be less than 100' if minutes_part > 99
+      raise 'Hours must be less than 24' if hours_part > 23
+      raise 'Minutes must be less than 60 if hours are supplied' if hours_part > 0 && minutes_part > 59
+      raise 'Minutes must be less than 99 if no hours are supplied' if hours_part.zero? && minutes_part > 99
       raise 'Seconds must be less than 60' if seconds_part > 59
-      time_formatted = "#{minutes_part.to_s.rjust(2, '0')}:#{seconds_part.to_s.rjust(2, '0')}"
+      hours_part_formatted = ''
+      if hours_part > 0
+        hours_part_formatted = "#{hours_part.to_s.rjust(2, '0')}:"
+      end
+      time_formatted = "#{hours_part_formatted}#{minutes_part.to_s.rjust(2, '0')}:#{seconds_part.to_s.rjust(2, '0')}"
 
-      RunbyTime.new(time_s: time_formatted, minutes_part: minutes_part, seconds_part: seconds_part)
+      RunbyTime.new(time_s: time_formatted, hours_part: hours_part, minutes_part: minutes_part, seconds_part: seconds_part)
     end
 
     def self.try_parse(str, is_five_k = false)
@@ -100,7 +124,7 @@ module Runby
         total_seconds <=> other.total_seconds
       elsif other.is_a? String
         return 0 if @time_s == other
-        total_seconds <=> parse(other).total_seconds
+        total_seconds <=> RunbyTime.parse(other).total_seconds
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.120
+  version: 0.6.121
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: 040aea6faf028a8399bb3c5d044ca050e41e1b1e
+  commit-hash: 4387aae31ecca99d9e8887c65f58aef1e877653d
 post_install_message: 
 rdoc_options: []
 require_paths: