runby_pace 0.6.136 → 0.6.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a722ddc36ca17ec4f04c5f47e6b91d70368c09e
-  data.tar.gz: 41a9f043ba2fabef623a80d1f2a981cef97822e3
+  metadata.gz: 81bb614066b9c4b6adeae971f2669d7a7340ae18
+  data.tar.gz: 30c45f64bdca980098f74b2d2011d532a87e9bc7
 SHA512:
-  metadata.gz: 7e58ff1e1fd7c74791a063f57d0058cfe7d412b1c7aa55435012d682670679ed56aff6f257e8740c99e8e26286165edbb173ae440b89872155a33515ca1dcf00
-  data.tar.gz: f8e1e2f0a4cc9597b7dad991002d8441c0bdbfb485b1d456e28f0e663ddc89f6b9f652d94f9d66401515bacef88cc21f9c70b646d9df462ea377103f51553834
+  metadata.gz: 0adf46b7d38354400d1ac89ad30d3bf797b675aca5874f7b3aa141b4f47154abb6f4ee5e3a3df1cc33c9ac57061531f6555750ff11bdc1493083b6feaf4d6006
+  data.tar.gz: e25cb2fe2bbf8051501409453298e7b93383c7ae86569a55f2420853086226fc66cf47eb77ae892f5e5b83e1ea259d0b285fbfe1cf3023f8c7c3f6f9a81260e4

data/lib/runby_pace/distance_unit.rb

@@ -7,33 +7,33 @@ module Runby
 
     def initialize(unit_of_measure)
       if unit_of_measure.is_a? Symbol
-        raise "':#{unit_of_measure.to_s}' is an unknown unit of measure" unless DistanceUnit.known_uom? unit_of_measure
+        raise "':#{unit_of_measure}' is an unknown unit of measure" unless DistanceUnit.known_uom? unit_of_measure
         @symbol = unit_of_measure
-        @conversion_factor = @@_uom_definitions[@symbol][:conversion_factor]
+        @conversion_factor = UOM_DEFINITIONS[@symbol][:conversion_factor]
       elsif unit_of_measure.is_a? String
         parsed_uom = DistanceUnit.parse(unit_of_measure)
         @symbol = parsed_uom.symbol
-        @conversion_factor = @@_uom_definitions[@symbol][:conversion_factor]
+        @conversion_factor = UOM_DEFINITIONS[@symbol][:conversion_factor]
       end
 
-      @description = @@_uom_definitions[@symbol][:description]
+      @description = UOM_DEFINITIONS[@symbol][:description]
     end
 
     def to_s(format: :long, pluralize: false)
       case format
-        when :short then @symbol.to_s
-        when :long then pluralize ? description_plural : @description
+      when :short then @symbol.to_s
+      when :long then pluralize ? description_plural : @description
       end
     end
 
     def description_plural
-      @@_uom_definitions[@symbol][:description_plural]
+      UOM_DEFINITIONS[@symbol][:description_plural]
     end
 
     def self.parse(description)
       description = description.strip.chomp.downcase
       found_uom = nil
-      @@_uom_definitions.each do |uom, details|
+      UOM_DEFINITIONS.each do |uom, details|
         if details[:synonyms].include? description
           found_uom = uom
           break
@@ -55,7 +55,7 @@ module Runby
 
     def self.known_uom?(symbol)
       # TODO: test
-      @@_uom_definitions.key?(symbol)
+      UOM_DEFINITIONS.key?(symbol)
     end
 
     def ==(other)
@@ -68,14 +68,19 @@ module Runby
       end
     end
 
-    @@_uom_definitions =
-      { km: { description: 'kilometer', description_plural: 'kilometers', conversion_factor: 1.0, synonyms: %w(k km kms kilometer kilometers) },
-        m:  { description: 'meter', description_plural: 'meters', conversion_factor: 0.001, synonyms: %w(m meter meters) },
-        mi: { description: 'mile', description_plural: 'miles', conversion_factor: 1.609344, synonyms: %w(mi mile miles) },
-        ft: { description: 'foot', description_plural: 'feet', conversion_factor: 0.0003048, synonyms: %w(ft foot feet) },
-        yd: { description: 'yard', description_plural: 'yards', conversion_factor: 1093.61, synonyms: %w(y yd yds yard yards) },
+    UOM_DEFINITIONS =
+      { km: { description: 'kilometer', description_plural: 'kilometers', conversion_factor: 1.0,
+              synonyms: %w[k km kms kilometer kilometers] },
+        m:  { description: 'meter', description_plural: 'meters', conversion_factor: 0.001,
+              synonyms: %w[m meter meters] },
+        mi: { description: 'mile', description_plural: 'miles', conversion_factor: 1.609344,
+              synonyms: %w[mi mile miles] },
+        ft: { description: 'foot', description_plural: 'feet', conversion_factor: 0.0003048,
+              synonyms: %w[ft foot feet] },
+        yd: { description: 'yard', description_plural: 'yards', conversion_factor: 1093.61,
+              synonyms: %w[y yd yds yard yards] },
         # Fun distance unit of measures
-        marathon: { description: 'marathon', description_plural: 'marathons', conversion_factor: 42.1648128, synonyms: %w(marathon) }
-      }
+        marathon: { description: 'marathon', description_plural: 'marathons', conversion_factor: 42.1648128,
+                    synonyms: %w[marathon] } }.freeze
   end
 end

data/lib/runby_pace/golden_pace_set.rb

@@ -10,10 +10,10 @@ module Runby
     attr_reader :paces
 
     # The fastest 5K time supported by RunbyPace
-    @@FASTEST_5K = :'14:00'
+    FASTEST_5K = :'14:00'
 
     # The slowest 5K time supported by RunbyPace
-    @@SLOWEST_5K = :'42:00'
+    SLOWEST_5K = :'42:00'
 
     # @param [Hash] paces_hash is a hash mapping 5K time symbols to times, represented as strings.
     # An example paces_hash is {'14:00':'4:00', '15:00':'4:55'}
@@ -30,19 +30,19 @@ module Runby
 
     # Returns first/fastest recommended pace in the set
     def first
-      @paces[@@FASTEST_5K]
+      @paces[FASTEST_5K]
     end
-    alias :fastest :first
+    alias fastest first
 
     # Return the last/slowest recommended pace in the set
     def last
-      @paces[@@SLOWEST_5K]
+      @paces[SLOWEST_5K]
     end
-    alias :slowest :last
+    alias slowest last
 
     # Creates and returns a new GoldenPaceSet with only two entries
     def self.new_from_endpoints(fastest, slowest)
-      GoldenPaceSet.new({@@FASTEST_5K => fastest, @@SLOWEST_5K => slowest})
+      GoldenPaceSet.new(FASTEST_5K => fastest, SLOWEST_5K => slowest)
     end
   end
 end

data/lib/runby_pace/run_types/distance_run.rb

@@ -27,11 +27,25 @@ module Runby
       # Used in testing, contains hashes mapping 5K race times with the recommended pace-per-km for this run type.
       class GoldenPaces
         def self.fast
-          GoldenPaceSet.new({ '14:00': '03:44', '15:00': '03:58', '20:00': '05:09', '25:00': '06:18', '30:00': '07:24', '35:00': '08:29', '40:00': '09:33', '42:00': '09:58' })
+          GoldenPaceSet.new('14:00': '03:44',
+                            '15:00': '03:58',
+                            '20:00': '05:09',
+                            '25:00': '06:18',
+                            '30:00': '07:24',
+                            '35:00': '08:29',
+                            '40:00': '09:33',
+                            '42:00': '09:58')
         end
 
         def self.slow
-          GoldenPaceSet.new({ '14:00': '04:17', '15:00': '04:33', '20:00': '05:53', '25:00': '07:09', '30:00': '08:23', '35:00': '09:33', '40:00': '10:42', '42:00': '11:10' })
+          GoldenPaceSet.new('14:00': '04:17',
+                            '15:00': '04:33',
+                            '20:00': '05:53',
+                            '25:00': '07:09',
+                            '30:00': '08:23',
+                            '35:00': '09:33',
+                            '40:00': '10:42',
+                            '42:00': '11:10')
         end
       end
     end

data/lib/runby_pace/run_types/easy_run.rb

@@ -26,11 +26,25 @@ module Runby
       # Used in testing, contains hashes mapping 5K race times with the recommended pace-per-km for this run type.
       class GoldenPaces
         def self.fast
-          GoldenPaceSet.new({ '14:00': '04:17', '15:00': '04:33', '20:00': '05:53', '25:00': '07:09', '30:00': '08:23', '35:00': '09:33', '40:00': '10:41', '42:00': '11:08' })
+          GoldenPaceSet.new('14:00': '04:17',
+                            '15:00': '04:33',
+                            '20:00': '05:53',
+                            '25:00': '07:09',
+                            '30:00': '08:23',
+                            '35:00': '09:33',
+                            '40:00': '10:41',
+                            '42:00': '11:08')
         end
 
         def self.slow
-          GoldenPaceSet.new({ '14:00': '05:01', '15:00': '05:20', '20:00': '06:51', '25:00': '08:17', '30:00': '09:38', '35:00': '10:56', '40:00': '12:10', '42:00': '12:39' })
+          GoldenPaceSet.new('14:00': '05:01',
+                            '15:00': '05:20',
+                            '20:00': '06:51',
+                            '25:00': '08:17',
+                            '30:00': '09:38',
+                            '35:00': '10:56',
+                            '40:00': '12:10',
+                            '42:00': '12:39')
         end
       end
     end

data/lib/runby_pace/run_types/long_run.rb

@@ -27,11 +27,25 @@ module Runby
       # Used in testing, contains hashes mapping 5K race times with the recommended pace-per-km for this run type.
       class GoldenPaces
         def self.fast
-          GoldenPaceSet.new({ '14:00': '04:00', '15:00': '04:16', '20:00': '05:31', '25:00': '06:44', '30:00': '07:54', '35:00': '09:01', '40:00': '10:07', '42:00': '10:32' })
+          GoldenPaceSet.new('14:00': '04:00',
+                            '15:00': '04:16',
+                            '20:00': '05:31',
+                            '25:00': '06:44',
+                            '30:00': '07:54',
+                            '35:00': '09:01',
+                            '40:00': '10:07',
+                            '42:00': '10:32')
         end
 
         def self.slow
-          GoldenPaceSet.new({ '14:00': '04:39', '15:00': '04:57', '20:00': '06:22', '25:00': '07:43', '30:00': '09:00', '35:00': '10:15', '40:00': '11:26', '42:00': '11:53' })
+          GoldenPaceSet.new('14:00': '04:39',
+                            '15:00': '04:57',
+                            '20:00': '06:22',
+                            '25:00': '07:43',
+                            '30:00': '09:00',
+                            '35:00': '10:15',
+                            '40:00': '11:26',
+                            '42:00': '11:53')
         end
       end
     end

data/lib/runby_pace/run_types/tempo_run.rb

@@ -26,11 +26,25 @@ module Runby
       # Used in testing, contains hashes mapping 5K race times with the recommended pace-per-km for this run type.
       class GoldenPaces
         def self.fast
-          GoldenPaceSet.new({ '14:00': '03:07', '15:00': '03:20', '20:00': '04:21', '25:00': '05:20', '30:00': '06:19', '35:00': '07:16', '40:00': '08:12', '42:00': '08:35' })
+          GoldenPaceSet.new('14:00': '03:07',
+                            '15:00': '03:20',
+                            '20:00': '04:21',
+                            '25:00': '05:20',
+                            '30:00': '06:19',
+                            '35:00': '07:16',
+                            '40:00': '08:12',
+                            '42:00': '08:35')
         end
 
         def self.slow
-          GoldenPaceSet.new({ '14:00': '03:18', '15:00': '03:31', '20:00': '04:35', '25:00': '05:37', '30:00': '06:38', '35:00': '07:38', '40:00': '08:36', '42:00': '08:59' })
+          GoldenPaceSet.new('14:00': '03:18',
+                            '15:00': '03:31',
+                            '20:00': '04:35',
+                            '25:00': '05:37',
+                            '30:00': '06:38',
+                            '35:00': '07:38',
+                            '40:00': '08:36',
+                            '42:00': '08:59')
         end
       end
     end

data/lib/runby_pace/runby_time.rb

@@ -83,16 +83,16 @@ module Runby
       rescue StandardError => ex
         error_message = "#{ex.message} (#{str})"
       end
-
-      # Break out these sanity checks into their own class if we add any more.
-      if !time.nil? && is_five_k
-        warning_message = '5K times of less than 14:00 are unlikely' if time.minutes_part < 14
-        warning_message = '5K times of greater than 42:00 are not fully supported' if time.total_seconds > (42 * 60)
-      end
-
+      warning_message = check_5k_sanity(time) if !time.nil? && is_five_k
       { time: time, error: error_message, warning: warning_message }
     end
 
+    def self.check_5k_sanity(time)
+      return unless time.is_a? RunbyTime
+      return '5K times of less than 14:00 are unlikely' if time.minutes_part < 14
+      return '5K times of greater than 42:00 are not fully supported' if time.total_seconds > (42 * 60)
+    end
+
     def to_s
       @time_s.sub(/^0/, '')
     end
@@ -133,10 +133,10 @@ module Runby
     def /(other)
       raise "Cannot divide Runby::RunbyTime by #{other.class}" unless other.is_a?(RunbyTime) || other.is_a?(Numeric)
       case other
-        when RunbyTime
-          total_seconds / other.total_seconds
-        when Numeric
-          RunbyTime.from_seconds(total_seconds / other)
+      when RunbyTime
+        total_seconds / other.total_seconds
+      when Numeric
+        RunbyTime.from_seconds(total_seconds / other)
       end
     end
 

data/lib/runby_pace/speed.rb

@@ -7,24 +7,24 @@ module Runby
 
     def initialize(distance_or_multiplier, units = :km)
       case distance_or_multiplier
-        when Distance
-          init_from_distance distance_or_multiplier
-        when String
-          init_from_string distance_or_multiplier
-        when Numeric
-          init_from_multiplier(distance_or_multiplier, units)
-        when Speed
-          init_from_clone distance_or_multiplier
-        else
-          raise 'Unable to initialize Runby::Speed'
+      when Distance
+        init_from_distance distance_or_multiplier
+      when String
+        init_from_string distance_or_multiplier
+      when Numeric
+        init_from_multiplier(distance_or_multiplier, units)
+      when Speed
+        init_from_clone distance_or_multiplier
+      else
+        raise 'Unable to initialize Runby::Speed'
       end
     end
 
     def to_s(format: :short)
       distance = @distance.to_s(format: format)
       case format
-        when :short then "#{distance}/ph"
-        when :long then "#{distance} per hour"
+      when :short then "#{distance}/ph"
+      when :long then "#{distance} per hour"
       end
     end
 
@@ -43,7 +43,9 @@ module Runby
     end
 
     def self.try_parse(str)
-      speed, error_message = nil, warning_message = nil
+      speed = nil
+      error_message = nil
+      warning_message = nil
       begin
         speed = Speed.parse str
       rescue StandardError => ex

metadata

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