runby_pace 0.6.114 → 0.6.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466c5700e4c0a990f27205c500ee6838c752d79e
-  data.tar.gz: 6238b9f490e7d70b922a00f8d9d3fcc92824fa9d
+  metadata.gz: d173050371c8c896f1086adc61c56fbba2726439
+  data.tar.gz: 77f31225d1de289be644fccf8069a3cb753dfd5c
 SHA512:
-  metadata.gz: b435b16123b83dc030788020e7ecd295bcd70fcfd52bfdfa4fc4c0a4db3fd511af58d89d03962dbb6e5824982f1af8c9f9b85046fc6d4bd6df237fbca423c926
-  data.tar.gz: 190c585deabe76e379dffa602a6d4af6b71b6ebb553e46e4eb4feb2c34d8cf06b3ed8d9b40907690de464eca7a42bae061e86c1dc5e107f82080dfe8c7ede10a
+  metadata.gz: 8b4d551333c4c8b82c64ace458239e79395195bdd455b88133f6b4c25d7391b48e993c085bb948df361650981dcad7d424ddb411343aa4216b5efa282601eb0f
+  data.tar.gz: c2fff4b74e04ea4c1116d8536dc159e75a80886dc69a4bd3537ae830ca8129513e4a5d50dc8545b14830cadb14525a70f26320e4ced81791bb487735830cbc1c

data/lib/runby_pace/pace.rb

@@ -29,11 +29,18 @@ module Runby
     end
 
     def as_speed
-      multiplier = (60 / @time.total_minutes).round(2)
+      total_minutes = @time.total_minutes
+      multiplier = total_minutes > 0 ? (60 / total_minutes).round(2) : 0
       distance = Runby::Distance.new(@distance.uom, multiplier)
       Runby::Speed.new distance
     end
 
+    def meters_per_minute
+      total_minutes = @time.total_minutes
+      return 0 unless total_minutes > 0
+      @distance.meters / total_minutes
+    end
+
     # @param [String] str is either a long-form pace such as "10:00 per mile" or a short-form pace like "10:00 p/mi"
     def self.parse(str)
       str = str.to_s.strip.chomp
@@ -58,8 +65,7 @@ module Runby
 
     def <=>(other)
       if other.is_a? Pace
-        raise 'Comparing paces of different distances is not currently supported' unless @distance == other.distance
-        @time <=> other.time
+        (meters_per_minute.round(2)) <=> (other.meters_per_minute.round(2))
       elsif other.is_a? RunbyTime
         @time <=> other.time
       elsif other.is_a? String
@@ -70,13 +76,17 @@ module Runby
     end
 
     def almost_equals?(other_pace, tolerance_time = '00:01')
-      return @time.almost_equals?(other_pace, tolerance_time) if other_pace.is_a?(RunbyTime)
+      if other_pace.is_a?(RunbyTime)
+        return almost_equals?(Pace.new(other_pace, @distance), tolerance_time)
+      end
       if other_pace.is_a?(String)
-        return @time.almost_equals?(other_pace, tolerance_time) if other_pace =~ /^\d\d:\d\d$/
+        return almost_equals?(Pace.new(other_pace, @distance), tolerance_time) if other_pace =~ /^\d?\d:\d\d$/
         other_pace = Pace.parse(other_pace)
       end
       tolerance = RunbyTime.new(tolerance_time)
-      (self - tolerance) <= other_pace && (self + tolerance) >= other_pace
+      fast_end = (self - tolerance)
+      slow_end = (self + tolerance)
+      slow_end <= other_pace && other_pace <= fast_end
     end
 
     # @param [Pace, RunbyTime] other

data/lib/runby_pace/speed.rb

@@ -33,7 +33,6 @@ module Runby
       Runby::Pace.new(time, @distance.uom)
     end
 
-
     # @param [String] str is either a long-form speed such as "7.5 miles per hour" or a short-form speed like "7.5mi/ph"
     def self.parse(str)
       str = str.to_s.strip.chomp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.114
+  version: 0.6.115
 platform: ruby
 authors:
 - Ty Walls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2016-11-28 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: d6e06c6e669965e0c1225bab6f06d671dca85bb4
+  commit-hash: 011b197e6b9ba9ff4e2373154596693f370b21ec
 post_install_message: 
 rdoc_options: []
 require_paths: