runby_pace 0.6.139 → 0.6.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1793c4ee3dcc9a82a2dfb850663245262e39b890
-  data.tar.gz: 27ef20e02f51e150bc1cf13b6561be36c2fc0dbd
+  metadata.gz: 56abfe8dad10070a1ce15f6615e2b44c36508536
+  data.tar.gz: d8faf0b03d0b9a87e62efb8bfee09dffc0ce64f6
 SHA512:
-  metadata.gz: ac4742901102bdccd88d4e12544e3d4caa17cb846cdebd31ee70b62137587bed1afc330cc21ab5790e2a3f645146b131e504940429debd5e8aa482930446dd25
-  data.tar.gz: 572842f60a3b248599cb9289a176736bc0bde9d910f40b4229d274b80b385cbd635d03a260c5d2074cea26f8dd64dddf57967d95ab25c480261162f13723a687
+  metadata.gz: 8d8bd2ae1fce0cb2c9a6cc7c4fa36dc26dc337de516692b0020b05903f84b864b6243b106b43dafd1bca14577688cef0ef6911d97a6ccd08e2734c7791385ef3
+  data.tar.gz: bf09f4b68dd8402fd5e2443d815bc6bf74c5b9182562b2220ffcb2f5c107e651e4b3c74576a3498227822eb95070d1ffe57d9b6a9dc7915648b666e9bc3569f1

data/lib/runby_pace/pace.rb

@@ -7,14 +7,14 @@ module Runby
 
     def initialize(time_or_pace, distance = '1K')
       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'
+      when Pace
+        init_from_clone time_or_pace
+      when RunbyTime
+        init_from_time time_or_pace, distance
+      when String
+        init_from_string time_or_pace, distance
+      else
+        raise 'Invalid Time or Pace'
       end
     end
 
@@ -30,38 +30,38 @@ module Runby
       leading_one_regex = /^1 ?/
       distance_s.gsub!(leading_one_regex, '')
       case format
-        when :short then "#{time} p/#{distance_s}"
-        when :long then "#{time} per #{distance_s}"
+      when :short then "#{time} p/#{distance_s}"
+      when :long then "#{time} per #{distance_s}"
       end
     end
 
     def as_speed
       total_minutes = @time.total_minutes
-      multiplier = total_minutes > 0 ? (60 / total_minutes).round(2) : 0
+      multiplier = total_minutes.positive? ? (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
+      return 0 unless total_minutes.positive?
       @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
-      if str =~ /^(?<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
+      match = str.match %r{^(?<time>[:\d]*) ?(?: per |p\/)(?<distance>(?:[\d.]+ ?)?\w+)$}
+      raise "Invalid pace format (#{str})" unless match
+      time = Runby::RunbyTime.new(match[:time])
+      distance = Runby::Distance.new(match[:distance])
+      Pace.new time, distance
     end
 
     def self.try_parse(str)
-      pace, error_message = nil, warning_message = nil
+      pace = nil
+      error_message = nil
+      warning_message = nil
       begin
         pace = Pace.parse str
       rescue StandardError => ex
@@ -72,7 +72,7 @@ module Runby
 
     def <=>(other)
       if other.is_a? Pace
-        (meters_per_minute.round(2)) <=> (other.meters_per_minute.round(2))
+        meters_per_minute.round(2) <=> other.meters_per_minute.round(2)
       elsif other.is_a? RunbyTime
         @time <=> other.time
       elsif other.is_a? String
@@ -87,7 +87,7 @@ module Runby
         return almost_equals?(Pace.new(other_pace, @distance), tolerance_time)
       end
       if other_pace.is_a?(String)
-        return almost_equals?(Pace.new(other_pace, @distance), tolerance_time) if other_pace =~ /^\d?\d:\d\d$/
+        return almost_equals?(Pace.new(other_pace, @distance), tolerance_time) if other_pace.match? /^\d?\d:\d\d$/
         other_pace = Pace.parse(other_pace)
       end
       tolerance = RunbyTime.new(tolerance_time)

data/lib/runby_pace/runby_time.rb

@@ -64,11 +64,11 @@ module Runby
       end
 
       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 60 if hours are supplied' if hours_part.positive? && 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
       hours_part_formatted = ''
-      if hours_part > 0
+      if hours_part.positive?
         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')}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runby_pace
 version: !ruby/object:Gem::Version
-  version: 0.6.139
+  version: 0.6.140
 platform: ruby
 authors:
 - Ty Walls
@@ -104,7 +104,7 @@ homepage: https://github.com/tygerbytes/runby-pace
 licenses:
 - MIT
 metadata:
-  commit-hash: fa3d1ec83532d6d20ddebd3ec095ea4881cc4b66
+  commit-hash: 01a70d7e4ba6544e76da8e3822fb42674f0568df
 post_install_message: 
 rdoc_options: []
 require_paths: