runby_pace 0.6.113 → 0.6.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863f82385f5fe82d808f93f6eb35019cd214787d
-  data.tar.gz: 264faa8e329286f77b6082e34ddb41eaa12ca527
+  metadata.gz: 466c5700e4c0a990f27205c500ee6838c752d79e
+  data.tar.gz: 6238b9f490e7d70b922a00f8d9d3fcc92824fa9d
 SHA512:
-  metadata.gz: 5d5a3ec0560b51b42e05a606457c45f47a9d30ab02fca106b83293feddc0fb3d34cfae85b324e5d7ee7961eb3cd53cd414285d9f510676f9d7f20df9bfdadba8
-  data.tar.gz: 3eca9c2755d6dc94a22f8eace340fe867fca958c01d6a3cdedf57df498667d1b46acb8a088b705d09af8c5ff7e68e4a07d76cc082f67c462a41423e97b918dfe
+  metadata.gz: b435b16123b83dc030788020e7ecd295bcd70fcfd52bfdfa4fc4c0a4db3fd511af58d89d03962dbb6e5824982f1af8c9f9b85046fc6d4bd6df237fbca423c926
+  data.tar.gz: 190c585deabe76e379dffa602a6d4af6b71b6ebb553e46e4eb4feb2c34d8cf06b3ed8d9b40907690de464eca7a42bae061e86c1dc5e107f82080dfe8c7ede10a

data/lib/runby_pace/distance.rb

@@ -35,7 +35,8 @@ module Runby
 
     def self.parse(str)
       str = str.strip.chomp.downcase
-      multiplier = str.scan(/[\d,.]+/).first.to_f
+      multiplier = str.scan(/[\d,.]+/).first
+      multiplier = multiplier.nil? ? 1 : multiplier.to_f
       uom = str.scan(/[-_a-z ]+$/).first
       raise "Unable to find distance unit in '#{str}'" if uom.nil?
 
@@ -65,8 +66,8 @@ module Runby
 
     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 || to_s(format: :long) == other.to_s(format: :long)
+      if other.is_a?(String)
+        return 0 if to_s == other || to_s(format: :long) == other
         return self <=> try_parse(other)[:distance]
       end
       kilometers <=> other.kilometers

data/lib/runby_pace/pace.rb

@@ -6,11 +6,15 @@ module Runby
     attr_reader :time, :distance
 
     def initialize(time_or_pace, distance = '1K')
-      if time_or_pace.is_a? Pace
-        init_from_clone time_or_pace
-      else
-        @time = Runby::RunbyTime.new(time_or_pace)
-        @distance = Runby::Distance.new(distance)
+      case time_or_pace
+        when Pace
+          return init_from_clone time_or_pace
+        when RunbyTime
+          return init_from_time time_or_pace, distance
+        when String
+          return init_from_string time_or_pace, distance
+        else
+          raise 'Invalid Time or Pace'
       end
     end
 
@@ -30,26 +34,49 @@ module Runby
       Runby::Speed.new distance
     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
+      if str.match(/^(?<time>[:\d]*) ?(?: per |p\/)(?<distance>(?:[\d.]+ ?)?\w+)$/)
+        time = Runby::RunbyTime.new($~[:time])
+        distance = Runby::Distance.new($~[:distance])
+        Pace.new time, distance
+      else
+        raise "Invalid pace format (#{str})"
+      end
+    end
+
+    def self.try_parse(str)
+      pace, error_message = nil, warning_message = nil
+      begin
+        pace = Pace.parse str
+      rescue StandardError => ex
+        error_message = ex.message
+      end
+      { pace: pace, error: error_message, warning: warning_message }
+    end
+
     def <=>(other)
       if other.is_a? Pace
-        return nil unless @distance == other.distance
+        raise 'Comparing paces of different distances is not currently supported' unless @distance == other.distance
         @time <=> other.time
       elsif other.is_a? RunbyTime
         @time <=> other.time
       elsif other.is_a? String
-        # TODO: Parse as Pace when Pace.parse is available
-        @time <=> RunbyTime.parse(other)
+        return 0 if to_s == other || to_s(format: :long) == other
+        return 0 if @time == other
+        self <=> try_parse(other)[:pace]
       end
     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?(String)
-        # TODO: Get parsing working
+        return @time.almost_equals?(other_pace, tolerance_time) if other_pace =~ /^\d\d:\d\d$/
         other_pace = Pace.parse(other_pace)
       end
       tolerance = RunbyTime.new(tolerance_time)
-      self >= (other_pace - tolerance) && self <= (other_pace + tolerance)
+      (self - tolerance) <= other_pace && (self + tolerance) >= other_pace
     end
 
     # @param [Pace, RunbyTime] other
@@ -86,5 +113,21 @@ module Runby
       @time = other_pace.time
       @distance = other_pace.distance
     end
+
+    def init_from_string(string, distance = '1K')
+      pace = Pace.try_parse(string)
+      if pace[:pace]
+        @time = pace[:pace].time
+        @distance = pace[:pace].distance
+        return
+      end
+      @time = Runby::RunbyTime.new string
+      @distance = Runby::Distance.new distance
+    end
+
+    def init_from_time(time, distance)
+      @time = time
+      @distance = Runby::Distance.new distance
+    end
   end
 end

metadata

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